grahamc/hydra2 - Change D7X6XTKQVG7SQTAIQ24SOVT6YHBHFKXDXB5GBPII6VK3CB4MYNTQC

Integrate the "Job status" and "All jobs" tabs

The job status tabs now has a toggle to show inactive jobs, rendering the "All jobs" tab redundant.

Created by Eelco Dolstra on August 28, 2013

D7X6XTKQVG7SQTAIQ24SOVT6YHBHFKXDXB5GBPII6VK3CB4MYNTQC

Dependencies

In channels

main

Change contents

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 150 [6.104]

∅:D[4.118] → [5.335:336]

∅:D[7.436] → [5.335:336]

∅:D[8.491] → [5.335:336]

B:BD[5.335] → [5.335:336]

B:BD[5.336] → [8.492:562]

B:BD[8.562] → [7.437:438]

B:BD[7.438] → [9.0:63]

B:BD[9.63] → [2.119:199]

∅:D[9.143] → [7.575:596]

∅:D[2.199] → [7.575:596]

B:BD[7.575] → [7.575:596]

B:BD[7.596] → [10.82:116]

∅:D[10.116] → [7.596:867]

B:BD[7.596] → [7.596:867]

B:BD[7.867] → [10.117:156]

∅:D[10.156] → [7.922:952]

B:BD[7.922] → [7.922:952]


    $c->stash->{activeJobs} = [];
    $c->stash->{inactiveJobs} = [];
    my $latestEval = $c->stash->{jobset}->jobsetevals->search(
        { hasnewbuilds => 1 }, { rows => 1, order_by => ["id desc"] })->single;
    my %activeJobs;
    $c->stash->{activeJobs} = {};
    if (defined $latestEval) {
        foreach my $build ($latestEval->builds->search({}, { order_by => ["job"], select => ["job"] })) {
            my $job = $build->get_column("job");
            if (!defined $activeJobs{$job}) {
                $activeJobs{$job} = 1;
		$c->stash->{activeJobs}->{$job} = 1;
            }
        }
    }

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 151 [6.104]

B:BD[7.953] → [7.953:1041]

B:BD[7.1041] → [10.157:370]

    foreach my $job ($c->stash->{jobset}->jobs->search({}, { order_by => ["name"] })) {
	push @{$c->stash->{jobs}}, $job->name;
    }
}
sub job_status_tab : Chained('jobsetChain') PathPart('job-status-tab') Args(0) {
    my ($self, $c) = @_;
    $c->stash->{template} = 'jobset-job-status-tab.tt';

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 152 [6.104]
[10.433]
[10.433]
```
    my $filter = "%" . $c->stash->{filter} . "%";
```

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 162 [6.104]

B:BD[10.687] → [10.687:756]

            { job => { ilike => "%" . $c->stash->{filter} . "%" } },

[10.687]

[10.756]

            { job => { ilike => $filter } },

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 174 [6.104]

[10.1098]

    if ($c->request->params->{showInactive}) {
	$c->stash->{showInactive} = 1;
	foreach my $job ($c->stash->{jobset}->jobs->search({ name => { ilike => $filter } })) {
	    next if defined $jobs{$job->name};
	    $c->stash->{inactiveJobs}->{$job->name} = $jobs{$job->name} = 1;
	}
    }

File deletion: jobset-job-status-tab.tt

BF:BFD[11.1486] → [10.2795:2843]

BF:BFD[10.2843] → [10.1178:1178]

B:BD[10.1178] → [10.1179:1258]

∅:D[3.310] → [12.0:107]

B:BD[10.1403] → [12.0:107]

∅:D[12.107] → [10.1403:1421]

B:BD[10.1403] → [10.1403:1421]

∅:D[3.528] → [10.1629:1811]

B:BD[10.1629] → [10.1629:1811]

∅:D[3.621] → [10.1811:1938]

B:BD[10.1811] → [10.1811:1938]

∅:D[3.817] → [10.1938:2794]

B:BD[10.1938] → [10.1938:2794]

B:BD[10.1938] → [3.622:817]

B:BD[10.1811] → [3.529:621]

B:BD[10.1421] → [3.311:528]

B:BD[10.1258] → [3.160:310]

[% PROCESS common.tt; USE Math %]
<form class="form-search" id="filter-jobs">
  <img src="/static/images/ajax-loader.gif" alt="Loading..." style="display: none;" id="filter-loading" />
</form>
<script>
      if (status == "error") {
        $('#[% tabName %]').html("<div class='alert alert-error'>Error loading tab: " + xhr.status + " " + xhr.statusText + "</div>");
      }
    });
    return false;
  });
</script>
[% IF jobs.size == 0 %]
  <div class="alert">There are no matching jobs.</div>
[% ELSE %]
  [% evalIds = evals.keys.nsort.reverse %]
  <table class="table table-striped table-condensed table-header-rotated">
    <thead>
      <tr>
        <th style="width: 1em;">Job</th>
        [% FOREACH eval IN evalIds %]
          <th class="rotate-45">
            <div><span>
              <a href="[% c.uri_for('/eval' eval) %]">[% eval %]</a>
            </span></div></th>
        [% END %]
      </tr>
    </thead>
    <tbody>
      [% FOREACH j IN jobs-%]
        <tr>
          <th>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]</th>
          [% FOREACH eval IN evalIds %]
            <td>[% r = evals.$eval.$j; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
          [% END %]
        </tr>
      [% END %]
    </tbody>
  </table>
  
[% END %]
  [% IF nrJobs > jobs.size %]
    <div class="alert">Showing the first [% jobs.size %] jobs only.  <a href="javascript:setFilter('filter=%')">Show all [% nrJobs %] jobs...</a></div>
  [% END %]
  };
  $('#filter-jobs').submit(function() {
    setFilter($('#filter-jobs').serialize());
  function setFilter(filter) {
    $('#filter-loading').show().focus();
    $('#tabs-job-status').load("[% c.uri_for('/jobset' project.name jobset.name "job-status-tab") %]", filter, function(response, status, xhr) {
  <input name="filter" type="text" class="input-large search-query" placeholder="Search jobs by name" [% HTML.attributes(value => filter) %]></input>

Replacement in src/root/jobset-jobs-tab.tt at line 1 [7.2227]

B:BD[7.2227] → [7.2228:2252]

[% PROCESS common.tt %]

[7.2227]

[7.2252]

[% PROCESS common.tt; USE Math %]
<form class="form-search" id="filter-jobs">
  <div class="input-append">
    <input name="filter" type="text" class="input-large search-query" placeholder="Search jobs by name..." [% HTML.attributes(value => filter) %]></input>
    <button type="button" class="btn btn-info [% IF showInactive %]active[% END %]" id="active-toggle">Show inactive jobs</button>
  </div>
  &nbsp;
  <img src="/static/images/ajax-loader.gif" alt="Loading..." style="display: none;" id="filter-loading" />
</form>
<script>
  function setFilter(filter) {
    $('#filter-loading').show();
    if ($('#active-toggle').hasClass('active')) filter += '&amp;showInactive=1';
    $('#tabs-jobs').load("[% c.uri_for('/jobset' project.name jobset.name "jobs-tab") %]", filter, function(response, status, xhr) {
      if (status == "error") {
        $('#[% tabName %]').html("<div class='alert alert-error'>Error loading tab: " + xhr.status + " " + xhr.statusText + "</div>");
      }
    });
  };

Insertion in src/root/jobset-jobs-tab.tt at line 23 [7.2227]

[7.2253]

[10.2844]

  $('#filter-jobs').submit(function() {    
    setFilter($('#filter-jobs').serialize());
    return false;
  });
  $('#active-toggle').click(function() {
    $(this).toggleClass('active');
    $('#filter-jobs').submit();
  });
</script>

Replacement in src/root/jobset-jobs-tab.tt at line 35 [7.2227]

B:BD[10.2868] → [10.2868:2924]

  <div class="alert">This jobset has no jobs yet.</div>

[10.2868]

[10.2924]


  <div class="alert">There are no matching jobs.</div>

Replacement in src/root/jobset-jobs-tab.tt at line 39 [7.2227]

B:BD[10.2935] → [10.2935:3215]

  <div class="well well-small">Below is the list of all [% jobs.size
  %] jobs that have ever existed in this jobset.  Jobs that are no
  longer part of the jobset (i.e., that don't appear in the latest
  evaluation of the jobset) are <span class="muted">grayed out</span>.</div>

[10.2935]

[7.2544]


  [% IF nrJobs > jobs.size %]
    <div class="alert">Showing the first [% jobs.size %] jobs.  <a href="javascript:setFilter('filter=%')">Show all [% nrJobs %] jobs...</a></div>
  [% END %]

Replacement in src/root/jobset-jobs-tab.tt at line 44 [7.2227]

B:BD[7.2545] → [10.3216:3270]

  <table class="table table-striped table-condensed">

[7.2545]

[10.3270]

  [% evalIds = evals.keys.nsort.reverse %]
  <table class="table table-striped table-condensed table-header-rotated">

Replacement in src/root/jobset-jobs-tab.tt at line 47 [7.2227]

B:BD[10.3282] → [10.3282:3315]

      <tr><th>Job name</th></tr>

[10.3282]

[10.3315]

      <tr>
        <th style="width: 1em;">Job</th>
        [% FOREACH eval IN evalIds %]
          <th class="rotate-45">
            <div><span>
              <a href="[% c.uri_for('/eval' eval) %]">[% eval %]</a>
            </span></div></th>
        [% END %]
      </tr>

Replacement in src/root/jobset-jobs-tab.tt at line 58 [7.2227]

B:BD[10.3340] → [10.3340:3543]

      [% FOREACH j IN jobs %]<tr><td><span class="[% IF !activeJobs.$j %]muted override-link[% END %]">[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]</span></td></tr>[% END %]

[10.3340]

[10.3543]

      [% FOREACH j IN jobs-%]
        <tr>
          <th><span [% IF inactiveJobs.$j %]class="muted override-link"[% END %]>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]</span></th>
          [% FOREACH eval IN evalIds %]
            <td>[% r = evals.$eval.$j; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
          [% END %]
        </tr>
      [% END %]

Insertion in src/root/jobset-jobs-tab.tt at line 68 [7.2227]
[10.3567]
[10.3567]
```
  
```

Replacement in src/root/jobset.tt at line 48 [5.8409]

B:BD[13.6829] → [10.3689:3823]

  <li><a href="#tabs-job-status" data-toggle="tab">Job status</a></li>
  <li><a href="#tabs-jobs" data-toggle="tab">All jobs</a></li>

[13.6829]

[14.210]

  <li><a href="#tabs-jobs" data-toggle="tab">Jobs</a></li>

Deletion in src/root/jobset.tt at line 143 [5.8409]

B:BD[15.30687] → [10.3824:3946]

  [% INCLUDE makeLazyTab tabName="tabs-job-status" uri=c.uri_for('/jobset' project.name jobset.name "job-status-tab") %]