grahamc/hydra - Change TQVKZQUGCFYNH5P56LXMXRXZNTD56MH5T5GX2BMQ5YSRPGHAUYMAC

Use the REST API in the web interface for editing jobsets

Created by Eelco Dolstra on October 3, 2013

TQVKZQUGCFYNH5P56LXMXRXZNTD56MH5T5GX2BMQ5YSRPGHAUYMAC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 13 [9.104]
[9.389]
[9.389]
```
    $c->stash->{jobsetName} //= $jobsetName;
```

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 21 [9.104]

B:BD[10.1] → [7.115:244]

    $c->stash->{jobset_} = $project->jobsets->search({'me.name' => $jobsetName});
    my $jobset = $c->stash->{jobset_}->single;

[10.1]

[7.244]

    $c->stash->{jobset} = $project->jobsets->find({ name => $jobsetName });

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 23 [9.104]

B:BD[7.245] → [7.245:444]

∅:D[7.444] → [11.6555:6572]

B:BD[11.6555] → [11.6555:6572]

B:BD[11.6572] → [7.445:514]

∅:D[7.514] → [11.6922:6932]

B:BD[11.6922] → [11.6922:6932]

B:BD[11.7086] → [11.7086:7092]

    if ($jobset) {
        $c->stash->{jobset} = $jobset;
    } else {
        if ($c->action->name eq "jobset" and $c->request->method eq "PUT") {
            $c->stash->{jobsetName} = $jobsetName;
        } else {
            notFound($c, "Jobset ‘$jobsetName’ doesn't exist.");
        }
    }

[7.245]

[9.699]

    notFound($c, "Jobset ‘$jobsetName’ doesn't exist.")
        if !$c->stash->{jobset} && !($c->action->name eq "jobset" and $c->request->method eq "PUT");

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 41 [9.104]

B:BD[11.7209] → [11.7209:7423]

B:BD[11.7423] → [3.0:40]

∅:D[3.40] → [11.7423:7860]

B:BD[11.7423] → [11.7423:7860]

    $self->status_ok(
        $c,
        entity => $c->stash->{jobset_}->find({}, {
                columns => [
                    'me.name',
                    'me.project',
                    'me.errormsg',
                    'me.emailoverride',
                    'jobsetinputs.name',
                    {
                        'jobsetinputs.jobsetinputalts.altnr' => 'jobsetinputalts.altnr',
                        'jobsetinputs.jobsetinputalts.value' => 'jobsetinputalts.value'
                    }
                ],
                join => { 'jobsetinputs' => 'jobsetinputalts' },
                collapse => 1,
                order_by => "me.name"
            })
    );

[11.7209]

[12.293]

    $self->status_ok($c, entity => $c->stash->{jobset});

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 50 [9.104]

B:BD[11.7995] → [11.7995:8225]

        error($c, "Cannot rename jobset `$c->stash->{params}->{oldName}' over existing jobset `$c->stash->{jobset}->name") if defined $c->stash->{params}->{oldName} and $c->stash->{params}->{oldName} ne $c->stash->{jobset}->name;

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 53 [9.104]

B:BD[11.8334] → [11.8334:9683]


        if ($c->req->looks_like_browser) {
            $c->res->redirect($c->uri_for($self->action_for("jobset"),
                [$c->stash->{project}->name, $c->stash->{jobset}->name]) . "#tabs-configuration");
        } else {
            $self->status_no_content($c);
        }
    } elsif (defined $c->stash->{params}->{oldName}) {
        my $jobset = $c->stash->{project}->jobsets->find({'me.name' => $c->stash->{params}->{oldName}});
        if (defined $jobset) {
            txn_do($c->model('DB')->schema, sub {
                updateJobset($c, $jobset);
            });
            my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $jobset->name]);
            if ($c->req->looks_like_browser) {
                $c->res->redirect($uri . "#tabs-configuration");
            } else {
                $self->status_created(
                    $c,
                    location => "$uri",
                    entity => { name => $jobset->name, uri => "$uri", type => "jobset" }
                );
            }
        } else {
            $self->status_not_found(
                $c,
                message => "Jobset $c->stash->{params}->{oldName} doesn't exist."
            );
        }
    } else {
        my $exprType =
            $c->stash->{params}->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 54 [9.104]

B:BD[11.9684] → [11.9684:9805]

        error($c, "Invalid jobset name: ‘$c->stash->{jobsetName}’") if $c->stash->{jobsetName} !~ /^$jobsetNameRE$/;

[11.9684]

[11.9805]

        my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $c->stash->{jobset}->name]) . "#tabs-configuration";
        $self->status_ok($c, entity => { redirect => "$uri" });
    }

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 58 [9.104]
[11.9806]
[11.9806]
```
    else {
```

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 64 [9.104]

B:BD[11.10068] → [11.10068:10180]

                {name => $c->stash->{jobsetName}, nixexprinput => "", nixexprpath => "", emailoverride => ""});

[11.10068]

[11.10180]

                {name => ".tmp", nixexprinput => "", nixexprpath => "", emailoverride => ""});

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 69 [9.104]

B:BD[11.10337] → [11.10337:10659]

        if ($c->req->looks_like_browser) {
            $c->res->redirect($uri . "#tabs-configuration");
        } else {
            $self->status_created(
                $c,
                location => "$uri",
                entity => { name => $jobset->name, uri => "$uri", type => "jobset" }
            );
        }

[11.10337]

[11.10659]

        $self->status_created($c,
            location => "$uri",
            entity => { name => $jobset->name, uri => "$uri", redirect => "$uri", type => "jobset" });

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 153 [9.104]

∅:D[5.867] → [13.705:709]

B:BD[13.705] → [13.705:709]

B:BD[13.709] → [11.10938:10993]

∅:D[11.10993] → [13.759:784]

B:BD[13.759] → [13.759:784]

B:BD[13.784] → [10.14:15]

B:BD[13.840] → [13.840:861]

B:BD[13.861] → [14.0:51]

∅:D[15.229] → [10.16:17]

B:BD[13.861] → [10.16:17]

B:BD[10.17] → [11.11122:11423]

}
sub submit : Chained('jobsetChain') PathPart Args(0) {
    my ($self, $c) = @_;
    requirePost($c);
    requireProjectOwner($c, $c->stash->{project});
    my $newName = trim $c->stash->{params}->{name};
    my $oldName = trim $c->stash->{jobset}->name;
    unless ($oldName eq $newName) {
        $c->stash->{params}->{oldName} = $oldName;
        $c->stash->{jobsetName} = $newName;
        undef $c->stash->{jobset};
    }
    jobset_PUT($self, $c);

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 161 [9.104]

∅:D[11.11489] → [16.1048:1142]

B:BD[16.1048] → [16.1048:1142]

    error($c, "Invalid Nix expression path: $nixExprPath") if $nixExprPath !~ /^$relPathRE$/;

[11.11489]

[16.1142]

    error($c, "Invalid Nix expression path ‘$nixExprPath’.") if $nixExprPath !~ /^$relPathRE$/;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 164 [9.104]

B:BD[11.11557] → [6.0:113]

    error($c, "Invalid Nix expression input name: $nixExprInput") unless $nixExprInput =~ /^[[:alpha:]][\w-]*$/;

[11.11557]

[16.1309]

    error($c, "Invalid Nix expression input name ‘$nixExprInput’.") unless $nixExprInput =~ /^[[:alpha:]][\w-]*$/;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 173 [9.104]
B:BD[16.2009] → [16.2009:2059]
```
    error($c, "Invalid Boolean value: $value") if
```
[16.2009]
[16.2059]
```
    error($c, "Invalid Boolean value ‘$value’.") if
```

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 181 [9.104]

[13.1513]


    my $jobsetName = $c->stash->{params}->{name};
    error($c, "Invalid jobset identifier ‘$jobsetName’.") if $jobsetName !~ /^$jobsetNameRE$/;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 185 [9.104]

B:BD[13.1514] → [2.0:63]

∅:D[2.63] → [17.0:93]

∅:D[11.11621] → [17.0:93]

B:BD[13.1571] → [17.0:93]

    my $jobsetName = $c->stash->{jobsetName} // $jobset->name;
    error($c, "Invalid jobset name: ‘$jobsetName’") if $jobsetName !~ /^$jobsetNameRE$/;

[13.1514]

[13.1667]

    error($c, "Cannot rename jobset to ‘$jobsetName’ since that identifier is already taken.")
        if $jobsetName ne $jobset->name && defined $c->stash->{project}->jobsets->find({ name => $jobsetName });

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 228 [9.104]

B:BD[11.13038] → [6.114:210]

        error($c, "Invalid input name: $inputName") unless $inputName =~ /^[[:alpha:]][\w-]*$/;

[11.13038]

[13.2750]

        error($c, "Invalid input name ‘$inputName’.") unless $inputName =~ /^[[:alpha:]][\w-]*$/;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 232 [9.104]

B:BD[4.1] → [4.1:107]

        error($c, "Invalid input type: $inputType") unless defined $c->stash->{inputTypes}->{$inputType};

[4.1]

[10.186]

        error($c, "Invalid input type ‘$inputType’.") unless defined $c->stash->{inputTypes}->{$inputType};

Replacement in src/lib/Hydra/Controller/Project.pm at line 31 [18.1245]

B:BD[7.577] → [7.577:682]

        if (!$c->stash->{project} && !($c->action->name eq "project" and $c->request->method eq "PUT"));

[7.577]

[18.1753]

        if !$c->stash->{project} && !($c->action->name eq "project" and $c->request->method eq "PUT");

Deletion in src/lib/Hydra/Controller/Project.pm at line 142 [18.1245]
B:BD[13.5029] → [13.5029:5030]
Deletion in src/lib/Hydra/Controller/Project.pm at line 143 [18.1245]
B:BD[13.5031] → [11.20063:20157]
∅:D[11.20157] → [13.5120:5145]
B:BD[13.5120] → [13.5120:5145]
```
sub create_jobset_submit : Chained('projectChain') PathPart('create-jobset/submit') Args(0) {
    my ($self, $c) = @_;
```
Deletion in src/lib/Hydra/Controller/Project.pm at line 144 [18.1245]
B:BD[13.5146] → [11.20158:20222]
∅:D[11.20222] → [19.2236:2237]
B:BD[13.5197] → [19.2236:2237]
B:BD[19.2237] → [11.20223:20277]
∅:D[13.5771] → [18.3745:3749]
∅:D[11.20277] → [18.3745:3749]
B:BD[18.3745] → [18.3745:3749]
```
    $c->stash->{jobsetName} = trim $c->stash->{params}->{name};
    Hydra::Controller::Jobset::jobset_PUT($self, $c);
}
```

Replacement in src/root/edit-jobset.tt at line 47 [20.367]

B:BD[20.2263] → [20.2263:2475]

<form class="form-horizontal" action="[% IF create %][% c.uri_for('/project' project.name 'create-jobset/submit') %][% ELSE %][% c.uri_for('/jobset' project.name jobset.name 'submit') %][% END %]" method="post">

[20.2263]

[20.2475]

<form class="form-horizontal">

Replacement in src/root/edit-jobset.tt at line 135 [20.367]

B:BD[20.4510] → [20.4510:4659]

      <button type="submit" class="btn btn-primary"><i class="icon-ok icon-white"></i> [%IF create %]Create[% ELSE %]Apply changes[% END %]</button>

[20.4510]

[20.4659]

      <button id="submit-jobset" type="submit" class="btn btn-primary"><i class="icon-ok icon-white"></i> [%IF create %]Create[% ELSE %]Apply changes[% END %]</button>

Replacement in src/root/edit-jobset.tt at line 148 [20.367]
B:BD[20.4934] → [20.4934:5021]
```
  <script type="text/javascript">
    $(document).ready(function() {
      var id = 0;
```
[20.4934]
[20.5021]
```
</form>
```

Replacement in src/root/edit-jobset.tt at line 150 [20.367]

B:BD[20.5022] → [20.5022:5427]

      $(".add-input").click(function() {
        var newid = "input-" + id++;
        var x = $("#input-template").clone(true).attr("id", "").insertBefore($(this).parents("tr")).show();
        $("#input-template-name", x).attr("name", newid + "-name");
        $("#input-template-type", x).attr("name", newid + "-type");
        $("#input-template", x).attr("id", newid);
        return false;
      });

[20.5022]

[20.5427]

<script type="text/javascript">
  $(document).ready(function() {
    var id = 0;

Replacement in src/root/edit-jobset.tt at line 154 [20.367]

B:BD[20.5428] → [20.5428:5663]

      $(".add-inputalt").click(function() {
        var x = $("#inputalt-template").clone(true).insertBefore($(this)).attr("id", "").show();
        $("input", x).attr("name", x.parents(".inputalts").attr("id") + "-values");
      });

[20.5428]

[20.5663]

    $(".add-input").click(function() {
      var newid = "input-" + id++;
      var x = $("#input-template").clone(true).attr("id", "").insertBefore($(this).parents("tr")).show();
      $("#input-template-name", x).attr("name", newid + "-name");
      $("#input-template-type", x).attr("name", newid + "-type");
      $("#input-template", x).attr("id", newid);
      return false;

Replacement in src/root/edit-jobset.tt at line 162 [20.367]

B:BD[20.5671] → [20.5671:5683]

  </script>

[20.5671]

[20.5683]


    $(".add-inputalt").click(function() {
      var x = $("#inputalt-template").clone(true).insertBefore($(this)).attr("id", "").show();
      $("input", x).attr("name", x.parents(".inputalts").attr("id") + "-values");
    });
  });

Replacement in src/root/edit-jobset.tt at line 169 [20.367]

B:BD[20.5684] → [20.5684:5692]

</form>

[20.5684]

[20.5692]

  $("#submit-jobset").click(function() {
    requestJSON({
      [% IF create %]
        url: "[% c.uri_for('/jobset' project.name '.new') %]",
      [% ELSE %]
        url: "[% c.uri_for('/jobset' project.name jobset.name) %]",
      [% END %]
      data: $(this).parents("form").serialize(),
      type: 'PUT',
      success: function(data) {
        window.location = data.redirect;
      },
    });
    return false;
  });
</script>

Deletion in src/root/edit-project.tt at line 60 [22.285]

B:BD[21.2553] → [21.2553:2593]

B:BD[21.2593] → [8.1209:1720]

∅:D[8.1720] → [21.2720:2752]

B:BD[21.2720] → [21.2720:2752]

        <script type="text/javascript">
          $("#submit-project").click(function() {
            requestJSON({
              [% IF create %]
                url: "[% c.uri_for('/project' '.new') %]",
              [% ELSE %]
                url: "[% c.uri_for('/project' project.name) %]",
              [% END %]
              data: $(this).parents("form").serialize(),
              type: 'PUT',
              success: function(data) {
                window.location = data.redirect;
              },
            });
            return false;
          });
        </script>

Insertion in src/root/edit-project.tt at line 66 [22.285]

[22.2107]


<script type="text/javascript">
  $("#submit-project").click(function() {
    requestJSON({
      [% IF create %]
        url: "[% c.uri_for('/project' '.new') %]",
      [% ELSE %]
        url: "[% c.uri_for('/project' project.name) %]",
      [% END %]
      data: $(this).parents("form").serialize(),
      type: 'PUT',
      success: function(data) {
        window.location = data.redirect;
      },
    });
    return false;
  });
</script>

Insertion in src/root/edit-project.tt at line 85 [22.285]
[22.2108]
[22.2108]
Replacement in src/root/static/js/common.js at line 77 [24.74]
B:BD[23.90] → [23.90:133]
```
var makeLazyTab = function(tabName, uri) {
```
[23.90]
[23.133]
```
function makeLazyTab(tabName, uri) {
```
Replacement in src/root/static/js/common.js at line 90 [24.74]
B:BD[23.642] → [8.2294:2296]
```
}
```
[23.642]
[8.2296]
```
};
```

Replacement in src/root/static/js/common.js at line 92 [24.74]

B:BD[8.2297] → [8.2297:2332]

var requestJSON = function(args) {

[8.2297]

[8.2332]

function escapeHTML(s) {
    return $('<div/>').text(s).html();
};
function requestJSON(args) {

Replacement in src/root/static/js/common.js at line 106 [24.74]

B:BD[8.2575] → [8.2575:2614]

            bootbox.alert(json.error);

[8.2575]

[8.2614]

            bootbox.alert(escapeHTML(json.error));

Replacement in src/root/static/js/common.js at line 108 [24.74]

B:BD[8.2650] → [8.2650:2715]

            bootbox.alert("Server error: " + data.responseText);

[8.2650]

[8.2715]

            bootbox.alert("Server error: " + escapeHTML(data.responseText));

Replacement in src/root/static/js/common.js at line 113 [24.74]
∅:D[8.2812] → [23.642:644]
B:BD[23.642] → [23.642:644]
```
}
```
[8.2812]
[8.2813]
```
};
```
Replacement in src/root/static/js/common.js at line 115 [24.74]
B:BD[8.2814] → [8.2814:2850]
```
var redirectJSON = function(args) {
```
[8.2814]
[8.2850]
```
function redirectJSON(args) {
```
Replacement in src/root/static/js/common.js at line 120 [24.74]
B:BD[8.2964] → [8.2964:2966]
```
}
```
[8.2964]
```
};
```