grahamc/hydra2 - Change ZFEN2MAOJRRQEIORSK2N6PNAWGBEN2WNAWA6IWUVOHP5I5PQC6JAC

Simplify jobset cloning

We can just show the normal "edit jobset" page for the original jobset and then do a PUT request to create a new jobset.

Also simplified updating the jobset inputs. We can just delete all of them and recreate them from the user parameters. That's safe because it's done in a transaction.

Created by Eelco Dolstra on October 3, 2013

ZFEN2MAOJRRQEIORSK2N6PNAWGBEN2WNAWA6IWUVOHP5I5PQC6JAC

Dependencies

In channels

main

Change contents

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 152 [7.104]
[5.705]
[6.795]
```
    $c->stash->{clone} = defined $c->stash->{params}->{clone};
```

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 213 [7.104]

∅:D[8.185] → [5.2314:2355]

B:BD[5.2314] → [5.2314:2355]

B:BD[5.2355] → [9.12196:12900]

    # Process the inputs of this jobset.
    unless (defined $c->stash->{params}->{inputs}) {
        $c->stash->{params}->{inputs} = {};
        foreach my $param (keys %{$c->stash->{params}}) {
            next unless $param =~ /^input-(\w+)-name$/;
            my $baseName = $1;
            next if $baseName eq "template";
            $c->stash->{params}->{inputs}->{$c->stash->{params}->{$param}} = { type => $c->stash->{params}->{"input-$baseName-type"}, values => $c->stash->{params}->{"input-$baseName-values"} };
            unless ($baseName =~ /^\d+$/) { # non-numeric base name is an existing entry
                $c->stash->{params}->{inputs}->{$c->stash->{params}->{$param}}->{oldName} = $baseName;
            }
        }
    }

[5.2285]

[5.2579]

    # Set the inputs of this jobset.
    $jobset->jobsetinputs->delete;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 216 [7.104]

B:BD[5.2580] → [9.12901:13038]

B:BD[9.13038] → [4.1475:1577]

    foreach my $inputName (keys %{$c->stash->{params}->{inputs}}) {
        my $inputData = $c->stash->{params}->{inputs}->{$inputName};
        error($c, "Invalid input name ‘$inputName’.") unless $inputName =~ /^[[:alpha:]][\w-]*$/;

[5.2580]

[5.2750]

    foreach my $param (keys %{$c->stash->{params}}) {
        next unless $param =~ /^input-(\w+)-name$/;
        my $baseName = $1;
        next if $baseName eq "template";
        my $name = $c->stash->{params}->{$param};
        my $type = $c->stash->{params}->{"input-$baseName-type"};
        my $values = $c->stash->{params}->{"input-$baseName-values"};

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 224 [7.104]

B:BD[5.2751] → [9.13132:13176]

        my $inputType = $inputData->{type};

[5.2751]

[10.0]

        error($c, "Invalid input name ‘$name’.") unless $name =~ /^[[:alpha:]][\w-]*$/;
        error($c, "Invalid input type ‘$type’.") unless defined $c->stash->{inputTypes}->{$type};

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 227 [7.104]

B:BD[10.1] → [4.1578:1690]

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

[10.1]

[8.186]

        my $input = $jobset->jobsetinputs->create({ name => $name, type => $type });

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 229 [7.104]

∅:D[8.187] → [5.3147:3166]

B:BD[5.3147] → [5.3147:3166]

B:BD[5.3166] → [9.13583:13694]

∅:D[9.13694] → [5.3311:3447]

B:BD[5.3311] → [5.3311:3447]

B:BD[5.3447] → [9.13695:13785]

∅:D[11.2527] → [5.3526:3808]

∅:D[9.13785] → [5.3526:3808]

B:BD[5.3526] → [5.3526:3808]

B:BD[5.3808] → [9.13786:13829]

∅:D[11.2598] → [5.3879:3984]

∅:D[9.13829] → [5.3879:3984]

B:BD[5.3879] → [5.3879:3984]

        my $input;
        unless (defined $inputData->{oldName}) {
            $input = $jobset->jobsetinputs->update_or_create(
                { name => $inputName
                , type => $inputType
                });
        } else { # it's an existing input
            $input = ($jobset->jobsetinputs->search({name => $inputData->{oldName}}))[0];
            die unless defined $input;
            $input->update({name => $inputName, type => $inputType});
        }
        # Update the values for this input.  Just delete all the
        # current ones, then create the new values.
        $input->jobsetinputalts->delete_all;
        my $values = $inputData->{values};
        $values = [] unless defined $values;
        $values = [$values] unless ref($values) eq 'ARRAY';

[8.187]

[5.3984]

        # Set the values for this input.
        my @values = ref($values) eq 'ARRAY' ? @{$values} : ($values);

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

B:BD[5.4007] → [5.4007:4048]

B:BD[5.4048] → [11.2599:2661]

        foreach my $value (@{$values}) {
            $value = checkInputValue($c, $inputType, $value);

[5.4007]

[5.4272]

        foreach my $value (@values) {
            $value = checkInputValue($c, $type, $value);

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 237 [7.104]

B:BD[5.4371] → [5.4371:4484]

B:BD[5.4484] → [9.13830:13915]

∅:D[9.13915] → [5.4549:4555]

B:BD[5.4549] → [5.4549:4555]


    # Get rid of deleted inputs.
    my @inputs = $jobset->jobsetinputs->all;
    foreach my $input (@inputs) {
        $input->delete unless defined $c->stash->{params}->{inputs}->{$input->name};
    }

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 243 [7.104]

B:BD[12.88] → [12.88:173]

    my $jobset = $c->stash->{jobset};
    requireProjectOwner($c, $jobset->project);

[12.88]

[12.173]

    requireProjectOwner($c, $c->stash->{project});

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 245 [7.104]

B:BD[12.174] → [12.174:221]

    $c->stash->{template} = 'clone-jobset.tt';

[12.174]

[7.1137]

    $c->stash->{template} = 'edit-jobset.tt';
    $c->stash->{clone} = 1;
    $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 251 [7.104]

B:BD[13.139] → [9.13980:14057]

∅:D[9.14057] → [12.294:319]

B:BD[12.294] → [12.294:319]

∅:D[12.319] → [7.1140:1141]

B:BD[7.1140] → [7.1140:1141]

B:BD[7.1141] → [12.320:427]

B:BD[12.427] → [9.14058:14123]

B:BD[9.14123] → [2.0:93]

∅:D[2.93] → [12.594:595]

∅:D[14.261] → [12.594:595]

B:BD[12.594] → [12.594:595]

B:BD[12.595] → [14.262:281]

∅:D[14.281] → [8.207:249]

B:BD[8.207] → [8.207:249]

B:BD[8.249] → [14.282:375]

∅:D[14.375] → [12.757:936]

B:BD[12.757] → [12.757:936]

B:BD[8.308] → [8.308:358]

∅:D[8.358] → [15.77:137]

B:BD[12.987] → [15.77:137]

B:BD[15.137] → [8.359:376]

∅:D[8.376] → [12.1066:1118]

B:BD[12.1066] → [12.1066:1118]

B:BD[12.1118] → [14.376:483]

∅:D[14.483] → [12.1225:1426]

B:BD[12.1225] → [12.1225:1426]

B:BD[12.1426] → [8.377:378]

B:BD[8.378] → [14.484:608]

∅:D[8.380] → [12.1560:1562]

∅:D[16.477] → [12.1560:1562]

∅:D[17.713] → [12.1560:1562]

∅:D[18.967] → [12.1560:1562]

∅:D[19.1495] → [12.1560:1562]

B:BD[12.1560] → [12.1560:1562]

B:BD[12.1562] → [20.37:39]

sub clone_submit : Chained('jobsetChain') PathPart('clone/submit') Args(0) {
    my ($self, $c) = @_;
    my $jobset = $c->stash->{jobset};
    requireProjectOwner($c, $jobset->project);
    requirePost($c);
    my $newJobsetName = trim $c->stash->{params}->{"newjobset"};
    error($c, "Invalid jobset name: $newJobsetName") if $newJobsetName !~ /^$jobsetNameRE$/;
    my $newJobset;
    txn_do($c->model('DB')->schema, sub {
        $newJobset = $jobset->project->jobsets->create(
            { name => $newJobsetName
            , description => $jobset->description
            , nixexprpath => $jobset->nixexprpath
            , nixexprinput => $jobset->nixexprinput
            , enabled => 0
            , enableemail => $jobset->enableemail
            , emailoverride => $jobset->emailoverride || ""
            });
        foreach my $input ($jobset->jobsetinputs) {
            my $newinput = $newJobset->jobsetinputs->create({name => $input->name, type => $input->type});
            foreach my $inputalt ($input->jobsetinputalts) {
                $newinput->jobsetinputalts->create({altnr => $inputalt->altnr, value => $inputalt->value});
            }
        }
    });
    $c->res->redirect($c->uri_for($c->controller('Jobset')->action_for("edit"), [$jobset->project->name, $newJobsetName]));
}

File deletion: clone-jobset.tt

BF:BFD[21.1486] → [12.2041:2080]

BF:BFD[12.2080] → [12.1567:1567]

B:BD[12.1567] → [22.1045:1124]

∅:D[22.1124] → [12.1613:1666]

B:BD[12.1613] → [12.1613:1666]

B:BD[12.1666] → [22.1125:1255]

∅:D[22.1255] → [12.1772:1773]

B:BD[12.1772] → [12.1772:1773]

B:BD[12.1773] → [22.1256:1382]

B:BD[22.1382] → [23.0:69]

∅:D[23.69] → [22.1458:1594]

B:BD[22.1458] → [22.1458:1594]

∅:D[22.1594] → [12.2020:2021]

B:BD[12.2020] → [12.2020:2021]

∅:D[22.1610] → [12.2021:2040]

B:BD[12.2021] → [12.2021:2040]

B:BD[12.2021] → [22.1595:1610]

[% WRAPPER layout.tt title="Clone jobset $jobset.project.name:$jobset.name" %]
[% PROCESS common.tt %]
[% USE HTML %]
[% edit=1 %]
<form class="form-horizontal" action="[% c.uri_for('/jobset' jobset.project.name jobset.name 'clone' 'submit') %]" method="post">
  <fieldset>
    <div class="control-group">
      <label class="control-label">New name</label>
      <div class="controls">
        <input type="text" class="span3" name="newjobset" value=""/>
      </div>
    </div>
    <div class="form-actions">
      <input type="submit" value="Submit" class="btn btn-primary" />
    </div>
</form>
[% END %]
  </fieldset>

Replacement in src/root/edit-jobset.tt at line 1 [24.367]

B:BD[24.367] → [24.368:496]

[% WRAPPER layout.tt title=(create ? "Create jobset in project $project.name" : "Editing jobset $project.name:$jobset.name") %]

[24.367]

[24.496]

[% WRAPPER layout.tt title=(create ? "Create jobset in project $project.name" : clone ? "Cloning jobset $project.name:$jobset.name" : "Editing jobset $project.name:$jobset.name") %]

Replacement in src/root/edit-jobset.tt at line 67 [24.367]

B:BD[24.2855] → [23.1366:1465]

        <input type="text" class="span3" name="name" [% HTML.attributes(value => jobset.name) %]/>

[24.2855]

[24.2961]

        <input type="text" class="span3" name="name" [% HTML.attributes(value => clone ? "" : jobset.name) %]/>

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

B:BD[24.4510] → [4.1827:1995]

      <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>

[24.4510]

[24.4659]

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

Replacement in src/root/edit-jobset.tt at line 171 [24.367]
B:BD[4.2763] → [4.2763:2785]
```
      [% IF create %]
```
[4.2763]
[4.2785]
```
      [% IF create || clone %]
```

Replacement in src/root/edit-project.tt at line 59 [26.285]

B:BD[25.2269] → [25.2269:2330]

        [%IF create %]Create[% ELSE %]Apply changes[% END %]

[25.2269]

[27.1721]

        [%IF create %]Create project[% ELSE %]Apply changes[% END %]

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

B:BD[3.905] → [3.905:1020]

        [% INCLUDE menuItem title="Clone this jobset" uri=c.uri_for('/jobset' project.name jobset.name 'clone') %]

[3.905]

[3.1020]

        [% INCLUDE menuItem title="Clone this jobset" uri=c.uri_for(c.controller('Jobset').action_for('edit'), [project.name, jobset.name], { clone => 1 }) %]