snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Use the REST API in the web interface for editing jobsets

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-03 18:49:37 +02:00
parent 63062f7bba
commit 232f46c750
5 changed files with 93 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
src/lib/Hydra/Controller/Jobset.pm
View file

@ -10,6 +10,7 @@ use Hydra::Helper::CatalystUtils;
sub jobsetChain :Chained('/') :PathPart('jobset') :CaptureArgs(2) { sub jobsetChain :Chained('/') :PathPart('jobset') :CaptureArgs(2) {
my ($self, $c, $projectName, $jobsetName) = @_; my ($self, $c, $projectName, $jobsetName) = @_;
$c->stash->{jobsetName} //= $jobsetName;
my $project = $c->model('DB::Projects')->find($projectName); my $project = $c->model('DB::Projects')->find($projectName);
@ -17,18 +18,10 @@ sub jobsetChain :Chained('/') :PathPart('jobset') :CaptureArgs(2) {
$c->stash->{project} = $project; $c->stash->{project} = $project;
$c->stash->{jobset_} = $project->jobsets->search({'me.name' => $jobsetName}); $c->stash->{jobset} = $project->jobsets->find({ name => $jobsetName });
my $jobset = $c->stash->{jobset_}->single;
if ($jobset) { notFound($c, "Jobset ‘$jobsetName’ doesn't exist.")
$c->stash->{jobset} = $jobset; if !$c->stash->{jobset} && !($c->action->name eq "jobset" and $c->request->method eq "PUT");
} 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.");
}
}
} }
@ -45,25 +38,7 @@ sub jobset_GET {
$c->stash->{totalShares} = getTotalShares($c->model('DB')->schema); $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);
$self->status_ok( $self->status_ok($c, entity => $c->stash->{jobset});
$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"
})
);
} }
sub jobset_PUT { sub jobset_PUT {
@ -72,67 +47,28 @@ sub jobset_PUT {
requireProjectOwner($c, $c->stash->{project}); requireProjectOwner($c, $c->stash->{project});
if (defined $c->stash->{jobset}) { if (defined $c->stash->{jobset}) {
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;
txn_do($c->model('DB')->schema, sub { txn_do($c->model('DB')->schema, sub {
updateJobset($c, $c->stash->{jobset}); updateJobset($c, $c->stash->{jobset});
}); });
if ($c->req->looks_like_browser) { my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $c->stash->{jobset}->name]) . "#tabs-configuration";
$c->res->redirect($c->uri_for($self->action_for("jobset"), $self->status_ok($c, entity => { redirect => "$uri" });
[$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";
error($c, "Invalid jobset name: ‘$c->stash->{jobsetName}’") if $c->stash->{jobsetName} !~ /^$jobsetNameRE$/;
else {
my $jobset; my $jobset;
txn_do($c->model('DB')->schema, sub { txn_do($c->model('DB')->schema, sub {
# Note: $jobsetName is validated in updateProject, which will # Note: $jobsetName is validated in updateProject, which will
# abort the transaction if the name isn't valid. # abort the transaction if the name isn't valid.
$jobset = $c->stash->{project}->jobsets->create( $jobset = $c->stash->{project}->jobsets->create(
{name => $c->stash->{jobsetName}, nixexprinput => "", nixexprpath => "", emailoverride => ""}); {name => ".tmp", nixexprinput => "", nixexprpath => "", emailoverride => ""});
updateJobset($c, $jobset); updateJobset($c, $jobset);
}); });
my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $jobset->name]); my $uri = $c->uri_for($self->action_for("jobset"), [$c->stash->{project}->name, $jobset->name]);
if ($c->req->looks_like_browser) { $self->status_created($c,
$c->res->redirect($uri . "#tabs-configuration"); location => "$uri",
} else { entity => { name => $jobset->name, uri => "$uri", redirect => "$uri", type => "jobset" });
$self->status_created(
$c,
location => "$uri",
entity => { name => $jobset->name, uri => "$uri", type => "jobset" }
);
}
} }
} }
@ -217,32 +153,15 @@ sub edit : Chained('jobsetChain') PathPart Args(0) {
} }
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);
}
sub nixExprPathFromParams { sub nixExprPathFromParams {
my ($c) = @_; my ($c) = @_;
# The Nix expression path must be relative and can't contain ".." elements. # The Nix expression path must be relative and can't contain ".." elements.
my $nixExprPath = trim $c->stash->{params}->{"nixexprpath"}; my $nixExprPath = trim $c->stash->{params}->{"nixexprpath"};
error($c, "Invalid Nix expression path: $nixExprPath") if $nixExprPath !~ /^$relPathRE$/; error($c, "Invalid Nix expression path ‘$nixExprPath’.") if $nixExprPath !~ /^$relPathRE$/;
my $nixExprInput = trim $c->stash->{params}->{"nixexprinput"}; my $nixExprInput = trim $c->stash->{params}->{"nixexprinput"};
error($c, "Invalid Nix expression input name: $nixExprInput") unless $nixExprInput =~ /^[[:alpha:]][\w-]*$/; error($c, "Invalid Nix expression input name ‘$nixExprInput’.") unless $nixExprInput =~ /^[[:alpha:]][\w-]*$/;
return ($nixExprPath, $nixExprInput); return ($nixExprPath, $nixExprInput);
} }
@ -251,7 +170,7 @@ sub nixExprPathFromParams {
sub checkInputValue { sub checkInputValue {
my ($c, $type, $value) = @_; my ($c, $type, $value) = @_;
$value = trim $value; $value = trim $value;
error($c, "Invalid Boolean value: $value") if error($c, "Invalid Boolean value ‘$value’.") if
$type eq "boolean" && !($value eq "true" || $value eq "false"); $type eq "boolean" && !($value eq "true" || $value eq "false");
return $value; return $value;
} }
@ -260,8 +179,11 @@ sub checkInputValue {
sub updateJobset { sub updateJobset {
my ($c, $jobset) = @_; my ($c, $jobset) = @_;
my $jobsetName = $c->stash->{jobsetName} // $jobset->name; my $jobsetName = $c->stash->{params}->{name};
error($c, "Invalid jobset name: ‘$jobsetName’") if $jobsetName !~ /^$jobsetNameRE$/; error($c, "Invalid jobset identifier ‘$jobsetName’.") if $jobsetName !~ /^$jobsetNameRE$/;
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 });
# When the expression is in a .scm file, assume it's a Guile + Guix # When the expression is in a .scm file, assume it's a Guile + Guix
# build expression. # build expression.
@ -303,11 +225,11 @@ sub updateJobset {
foreach my $inputName (keys %{$c->stash->{params}->{inputs}}) { foreach my $inputName (keys %{$c->stash->{params}->{inputs}}) {
my $inputData = $c->stash->{params}->{inputs}->{$inputName}; my $inputData = $c->stash->{params}->{inputs}->{$inputName};
error($c, "Invalid input name: $inputName") unless $inputName =~ /^[[:alpha:]][\w-]*$/; error($c, "Invalid input name ‘$inputName’.") unless $inputName =~ /^[[:alpha:]][\w-]*$/;
my $inputType = $inputData->{type}; my $inputType = $inputData->{type};
error($c, "Invalid input type: $inputType") unless defined $c->stash->{inputTypes}->{$inputType}; error($c, "Invalid input type ‘$inputType’.") unless defined $c->stash->{inputTypes}->{$inputType};
my $input; my $input;
unless (defined $inputData->{oldName}) { unless (defined $inputData->{oldName}) {

11
src/lib/Hydra/Controller/Project.pm
View file

@ -28,7 +28,7 @@ sub projectChain :Chained('/') :PathPart('project') :CaptureArgs(1) {
], join => [ 'owner', 'releases', 'jobsets' ], order_by => { -desc => "releases.timestamp" }, collapse => 1 }); ], join => [ 'owner', 'releases', 'jobsets' ], order_by => { -desc => "releases.timestamp" }, collapse => 1 });
notFound($c, "Project ‘$projectName’ doesn't exist.") notFound($c, "Project ‘$projectName’ doesn't exist.")
if (!$c->stash->{project} && !($c->action->name eq "project" and $c->request->method eq "PUT")); if !$c->stash->{project} && !($c->action->name eq "project" and $c->request->method eq "PUT");
} }
@ -141,15 +141,6 @@ sub create_jobset : Chained('projectChain') PathPart('create-jobset') Args(0) {
} }
sub create_jobset_submit : Chained('projectChain') PathPart('create-jobset/submit') Args(0) {
my ($self, $c) = @_;
$c->stash->{jobsetName} = trim $c->stash->{params}->{name};
Hydra::Controller::Jobset::jobset_PUT($self, $c);
}
sub updateProject { sub updateProject {
my ($c, $project) = @_; my ($c, $project) = @_;

60
src/root/edit-jobset.tt
View file

@ -44,7 +44,7 @@
</table> </table>
[% END %] [% END %]
<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"> <form class="form-horizontal">
<fieldset> <fieldset>
@ -132,7 +132,7 @@
[% INCLUDE renderJobsetInputs %] [% INCLUDE renderJobsetInputs %]
<div class="form-actions"> <div class="form-actions">
<button type="submit" class="btn btn-primary"><i class="icon-ok icon-white"></i> [%IF create %]Create[% ELSE %]Apply changes[% END %]</button> <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>
</div> </div>
</fieldset> </fieldset>
@ -145,26 +145,42 @@
[% INCLUDE renderJobsetInputAlt alt=alt %] [% INCLUDE renderJobsetInputAlt alt=alt %]
</tt> </tt>
<script type="text/javascript">
$(document).ready(function() {
var id = 0;
$(".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;
});
$(".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");
});
});
</script>
</form> </form>
<script type="text/javascript">
$(document).ready(function() {
var id = 0;
$(".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;
});
$(".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");
});
});
$("#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>
[% END %] [% END %]

36
src/root/edit-project.tt
View file

@ -57,23 +57,6 @@
<button id="submit-project" type="submit" class="btn btn-primary"> <button id="submit-project" type="submit" class="btn btn-primary">
<i class="icon-ok icon-white"></i> <i class="icon-ok icon-white"></i>
[%IF create %]Create[% ELSE %]Apply changes[% END %] [%IF create %]Create[% ELSE %]Apply changes[% END %]
<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>
</button> </button>
</div> </div>
@ -81,4 +64,23 @@
</form> </form>
<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>
[% END %] [% END %]

20
src/root/static/js/common.js
View file

@ -74,7 +74,7 @@ $(document).ready(function() {
var tabsLoaded = {}; var tabsLoaded = {};
var makeLazyTab = function(tabName, uri) { function makeLazyTab(tabName, uri) {
$('.nav-tabs').bind('show', function(e) { $('.nav-tabs').bind('show', function(e) {
var pattern = /#.+/gi; var pattern = /#.+/gi;
var id = e.target.toString().match(pattern)[0]; var id = e.target.toString().match(pattern)[0];
@ -87,9 +87,13 @@ var makeLazyTab = function(tabName, uri) {
}); });
} }
}); });
} };
var requestJSON = function(args) { function escapeHTML(s) {
return $('<div/>').text(s).html();
};
function requestJSON(args) {
args.dataType = 'json'; args.dataType = 'json';
args.error = function(data) { args.error = function(data) {
json = {}; json = {};
@ -99,18 +103,18 @@ var requestJSON = function(args) {
} catch (err) { } catch (err) {
} }
if (json.error) if (json.error)
bootbox.alert(json.error); bootbox.alert(escapeHTML(json.error));
else if (data.responseText) else if (data.responseText)
bootbox.alert("Server error: " + data.responseText); bootbox.alert("Server error: " + escapeHTML(data.responseText));
else else
bootbox.alert("Unknown server error!"); bootbox.alert("Unknown server error!");
}; };
return $.ajax(args); return $.ajax(args);
} };
var redirectJSON = function(args) { function redirectJSON(args) {
args.success = function(data) { args.success = function(data) {
window.location = data.redirect; window.location = data.redirect;
}; };
return requestJSON(args); return requestJSON(args);
} };