grahamc/hydra - Change KSBB33RE2PK5SFN7ZMOTZJQHZB4JYIIUUKWDSD3LSZ5GD465AJHQC

Add a dashboard

Currently the dashboard allows users to get a quick overview of the status of jobs they're interested in, but more will be added, e.g. viewing all your jobsets or all jobs of which you're a maintainer.

Created by Eelco Dolstra on October 14, 2013

KSBB33RE2PK5SFN7ZMOTZJQHZB4JYIIUUKWDSD3LSZ5GD465AJHQC

Dependencies

In channels

main

upstream

Change contents

Insertion in src/lib/Hydra/Controller/Job.pm at line 63 [8.46]

[7.969]

[8.544]


    $c->stash->{starred} = $c->user->starredjobs(
        { project => $c->stash->{project}->name
        , jobset => $c->stash->{jobset}->name
        , job => $c->stash->{job}->name
        })->count == 1 if $c->user_exists;

Insertion in src/lib/Hydra/Controller/Job.pm at line 80 [8.46]

[9.521]

[8.902]

}
sub star : Chained('job') PathPart('star') Args(0) {
    my ($self, $c) = @_;
    requirePost($c);
    requireUser($c);
    my $args =
        { project => $c->stash->{project}->name
        , jobset => $c->stash->{jobset}->name
        , job => $c->stash->{job}->name
        };
    if ($c->request->params->{star} eq "1") {
        $c->user->starredjobs->update_or_create($args);
    } else {
        $c->user->starredjobs->find($args)->delete;
    }
    $c->stash->{resource}->{success} = 1;

Insertion in src/lib/Hydra/Controller/User.pm at line 270 [10.252]
[10.3415]
[10.3415]

Insertion in src/lib/Hydra/Controller/User.pm at line 272 [10.252]

[10.3416]

sub dashboard :Chained('user') :Args(0) {
    my ($self, $c) = @_;
    $c->stash->{template} = 'dashboard.tt';

Insertion in src/lib/Hydra/Controller/User.pm at line 276 [10.252]

[10.3417]

    # Get the N most recent builds for each starred job.
    $c->stash->{starredJobs} = [];
    foreach my $j ($c->stash->{user}->starredjobs->search({}, { order_by => ['project', 'jobset', 'job'] })) {
        my @builds = $j->job->builds->search(
            { },
            { rows => 20, order_by => "id desc" });
        push $c->stash->{starredJobs}, { job => $j->job, builds => [@builds] };
    }
}

Insertion in src/lib/Hydra/Schema/Jobs.pm at line 139 [12.1454]
[11.3830]
[12.2611]
```
=head2 starredjobs
Type: has_many
Related object: L<Hydra::Schema::StarredJobs>
```
Insertion in src/lib/Hydra/Schema/Jobs.pm at line 146 [12.1454]
[12.2612]
[12.2612]
```
=cut
```

Replacement in src/lib/Hydra/Schema/Jobs.pm at line 148 [12.1454]

B:BD[12.2613] → [13.30150:30292]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-06-13 01:54:50
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:t2CCfUjFEz/lO4szROz1AQ

[12.2613]

[12.2756]

__PACKAGE__->has_many(
  "starredjobs",
  "Hydra::Schema::StarredJobs",
  {
    "foreign.job"     => "self.name",
    "foreign.jobset"  => "self.jobset",
    "foreign.project" => "self.project",
  },
  undef,
);
# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uYKWjewvKBEAuK53u7vKuw

Insertion in src/lib/Hydra/Schema/Jobsets.pm at line 288 [15.1960]
[11.6041]
[14.22483]
```
=head2 starredjobs
Type: has_many
```
Insertion in src/lib/Hydra/Schema/Jobsets.pm at line 293 [15.1960]
[14.22484]
[15.3135]
```
Related object: L<Hydra::Schema::StarredJobs>
```

Replacement in src/lib/Hydra/Schema/Jobsets.pm at line 295 [15.1960]

B:BD[15.3136] → [4.214:356]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-09-25 14:10:28
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cAZ4+c7OhqGW8ATru8Foiw

[15.3136]

[14.22627]

=cut
__PACKAGE__->has_many(
  "starredjobs",
  "Hydra::Schema::StarredJobs",
  {
    "foreign.jobset"  => "self.name",
    "foreign.project" => "self.project",
  },
  undef,
);

Insertion in src/lib/Hydra/Schema/Jobsets.pm at line 307 [15.1960]

[14.22628]

[15.3226]


# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DTAGxP5RFvcNxP/ciJGo4Q

Insertion in src/lib/Hydra/Schema/Projects.pm at line 228 [15.3266]
[16.2375]
[17.21130]
```
=head2 starredjobs
Type: has_many
Related object: L<Hydra::Schema::StarredJobs>
```

Insertion in src/lib/Hydra/Schema/Projects.pm at line 235 [15.3266]

[17.21131]

[14.25357]

=cut
__PACKAGE__->has_many(
  "starredjobs",
  "Hydra::Schema::StarredJobs",
  { "foreign.project" => "self.name" },
  undef,
);

Replacement in src/lib/Hydra/Schema/Projects.pm at line 285 [15.3266]

B:BD[11.7308] → [13.32751:32893]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-06-13 01:54:50
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:RffghAo9jAaqYk41y1Sdqw

[11.7308]

[18.4514]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PdNQ2mf5azBB6nI+iAm8fQ

File addition: StarredJobs.pm (----------)

[19.477]

use utf8;
package Hydra::Schema::StarredJobs;
# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE
=head1 NAME
Hydra::Schema::StarredJobs
=cut
use strict;
use warnings;
use base 'DBIx::Class::Core';
=head1 COMPONENTS LOADED
=over 4
=item * L<Hydra::Component::ToJSON>
=back
=cut
__PACKAGE__->load_components("+Hydra::Component::ToJSON");
=head1 TABLE: C<StarredJobs>
=cut
__PACKAGE__->table("StarredJobs");
=head1 ACCESSORS
=head2 username
  data_type: 'text'
  is_foreign_key: 1
  is_nullable: 0
=head2 project
  data_type: 'text'
  is_foreign_key: 1
  is_nullable: 0
=head2 jobset
  data_type: 'text'
  is_foreign_key: 1
  is_nullable: 0
=head2 job
  data_type: 'text'
  is_foreign_key: 1
  is_nullable: 0
=cut
__PACKAGE__->add_columns(
  "username",
  { data_type => "text", is_foreign_key => 1, is_nullable => 0 },
  "project",
  { data_type => "text", is_foreign_key => 1, is_nullable => 0 },
  "jobset",
  { data_type => "text", is_foreign_key => 1, is_nullable => 0 },
  "job",
  { data_type => "text", is_foreign_key => 1, is_nullable => 0 },
);
=head1 PRIMARY KEY
=over 4
=item * L</username>
=item * L</project>
=item * L</jobset>
=item * L</job>
=back
=cut
__PACKAGE__->set_primary_key("username", "project", "jobset", "job");
=head1 RELATIONS
=head2 job
Type: belongs_to
Related object: L<Hydra::Schema::Jobs>
=cut
__PACKAGE__->belongs_to(
  "job",
  "Hydra::Schema::Jobs",
  { jobset => "jobset", name => "job", project => "project" },
  { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" },
);
=head2 jobset
Type: belongs_to
Related object: L<Hydra::Schema::Jobsets>
=cut
__PACKAGE__->belongs_to(
  "jobset",
  "Hydra::Schema::Jobsets",
  { name => "jobset", project => "project" },
  { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" },
);
=head2 project
Type: belongs_to
Related object: L<Hydra::Schema::Projects>
=cut
__PACKAGE__->belongs_to(
  "project",
  "Hydra::Schema::Projects",
  { name => "project" },
  { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" },
);
=head2 username
Type: belongs_to
Related object: L<Hydra::Schema::Users>
=cut
__PACKAGE__->belongs_to(
  "username",
  "Hydra::Schema::Users",
  { username => "username" },
  { is_deferrable => 0, on_delete => "CASCADE", on_update => "CASCADE" },
);
# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:naj5aKWuw8hLE6klmvW9Eg
# You can replace this text with custom code or comments, and it will be preserved on regeneration
1;

Insertion in src/lib/Hydra/Schema/Users.pm at line 137 [20.3258]
[18.7219]
[18.7219]
```
=head2 starredjobs
Type: has_many
Related object: L<Hydra::Schema::StarredJobs>
```

Insertion in src/lib/Hydra/Schema/Users.pm at line 144 [20.3258]

[18.7220]

[14.30336]

=cut
__PACKAGE__->has_many(
  "starredjobs",
  "Hydra::Schema::StarredJobs",
  { "foreign.username" => "self.username" },
  undef,
);

Replacement in src/lib/Hydra/Schema/Users.pm at line 179 [20.3258]

B:BD[11.8787] → [13.34774:34916]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-06-13 01:54:50
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hy3MKvFxfL+1bTc7Hcb1zA

[11.8787]

[18.7363]

# Created by DBIx::Class::Schema::Loader v0.07033 @ 2013-10-14 15:46:29
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Hv9Ukqud0d3uIUot0ErKeg

Insertion in src/root/common.tt at line 461 [23.2803]
[21.2473]
[22.1165]

Insertion in src/root/common.tt at line 463 [23.2803]

[22.1166]

[24.679]

BLOCK makeStar %]
<span class="star" data-post="[% starUri %]">[% IF starred; "★"; ELSE; "☆"; END %]</span>
[% END;

File addition: dashboard.tt (----------)

[19.1486]

[% WRAPPER layout.tt title="Dashboard" %]
[% PROCESS common.tt %]
<ul class="nav nav-tabs">
  <li class="active"><a href="#tabs-starred-jobs" data-toggle="tab">Starred jobs</a></li>
</ul>
<div id="generic-tabs" class="tab-content">
  <div id="tabs-starred-jobs" class="tab-pane active">
    [% IF starredJobs.size > 0 %]
      <p>Below are the 20 most recent builds of your starred jobs.</p>
      <table class="table table-striped table-condensed">
        <thead>
          <tr><th>Job</th></tr>
        </thead>
        <tdata>
          [% FOREACH j IN starredJobs %]
            <tr>
              <td>[% INCLUDE renderFullJobName project=j.job.get_column('project') jobset=j.job.get_column('jobset') job=j.job.name %]</td>
              [% FOREACH b IN j.builds %]
                <td><a href="[% c.uri_for('/build' b.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=b %]</a></td>
              [% END %]
            </tr>
          [% END %]
        </tdata>
      </table>
    [% ELSE %]
      <div class="alert alert-warning">You have no starred jobs.  You can add them by visiting a job page and clicking on the ☆ icon.</div>
    [% END %]
  </div>
</div>
[% END %]

Replacement in src/root/job.tt at line 1 [25.7675]

B:BD[25.7675] → [2.0:73]

[% WRAPPER layout.tt title="Job $project.name:$jobset.name:$job.name" %]

[25.7675]

[25.7755]

[% WRAPPER layout.tt
    title="Job $project.name:$jobset.name:$job.name"
    starUri=c.uri_for(c.controller('Job').action_for('star'), c.req.captures)
%]

Replacement in src/root/layout.tt at line 85 [27.11219]

B:BD[26.3204] → [26.3204:3263]

          <h1><small>[% HTML.escape(title) %]</small></h1>

[26.3204]

[26.3263]

          <h1><small>[% IF c.user_exists && starUri; INCLUDE makeStar; " "; END; HTML.escape(title) %]</small></h1>

Replacement in src/root/static/css/hydra.css at line 100 [27.8691]
B:BD[5.87] → [5.87:107]
```
  font-weight:bold;
```
[5.87]
[28.296]
```
    font-weight: bold;
}
.star {
    color: black;
    font-size: 110%;
```
Insertion in src/root/static/css/hydra.css at line 107 [27.8691]
[28.298]
```
.star:hover {
    cursor: pointer;
}
```

Insertion in src/root/static/js/common.js at line 83 [29.74]

[6.1482]

[29.2151]


    $(".star").click(function(event) {
        var star = $(this);
        var active = star.text() != '★';
        requestJSON({
            url: star.attr("data-post"),
            data: active ? "star=1" : "star=0",
            type: 'POST',
            success: function(res) {
                if (active) {
                    star.text('★');
                } else {
                    star.text('☆');
                }
            }
        });
    });

Insertion in src/root/topbar.tt at line 11 [32.6671]

[30.4142]

[31.0]


  [% IF c.user_exists %]
    [% INCLUDE menuItem uri = c.uri_for(c.controller('User').action_for('dashboard'), [c.user.username]) title = "Dashboard" %]
  [% END %]

Insertion in src/sql/hydra.sql at line 535 [34.1]

[3.6000]

[33.1368]

create table StarredJobs (
    userName      text not null,
    project       text not null,
    jobset        text not null,
    job           text not null,
    primary key   (userName, project, jobset, job),
    foreign key   (userName) references Users(userName) on update cascade on delete cascade,
    foreign key   (project) references Projects(name) on update cascade on delete cascade,
    foreign key   (project, jobset) references Jobsets(project, name) on update cascade on delete cascade,
    foreign key   (project, jobset, job) references Jobs(project, jobset, name) on update cascade on delete cascade
);

File addition: upgrade-23.sql (----------)

[19.3004]

create table StarredJobs (
    userName      text not null,
    project       text not null,
    jobset        text not null,
    job           text not null,
    primary key   (userName, project, jobset, job),
    foreign key   (userName) references Users(userName) on update cascade on delete cascade,
    foreign key   (project) references Projects(name) on update cascade on delete cascade,
    foreign key   (project, jobset) references Jobsets(project, name) on update cascade on delete cascade,
    foreign key   (project, jobset, job) references Jobs(project, jobset, name) on update cascade on delete cascade
);