diff --git a/ui/app/templates/components/job-versions-stream.hbs b/ui/app/templates/components/job-versions-stream.hbs
index c05caa48a61..0528fc292c6 100644
--- a/ui/app/templates/components/job-versions-stream.hbs
+++ b/ui/app/templates/components/job-versions-stream.hbs
@@ -5,6 +5,6 @@
{{/if}}
-
+
{{/each}}
diff --git a/ui/app/templates/jobs/job/versions.hbs b/ui/app/templates/jobs/job/versions.hbs
index dc643705345..d6829bd849c 100644
--- a/ui/app/templates/jobs/job/versions.hbs
+++ b/ui/app/templates/jobs/job/versions.hbs
@@ -1,5 +1,19 @@
{{page-title "Job " this.job.name " versions"}}
-
+ {{#if this.error}}
+
+
+
+
{{this.error.title}}
+
{{this.error.description}}
+
+
+
+
+
+
diff --git a/ui/mirage/config.js b/ui/mirage/config.js
index f739a353b69..1641fca8c6c 100644
--- a/ui/mirage/config.js
+++ b/ui/mirage/config.js
@@ -180,6 +180,15 @@ export default function() {
return okEmpty();
});
+ this.post('/job/:id/revert', function({ jobs }, { requestBody }) {
+ const { JobID, JobVersion } = JSON.parse(requestBody);
+ const job = jobs.find(JobID);
+ job.version = JobVersion;
+ job.save();
+
+ return okEmpty();
+ });
+
this.post('/job/:id/scale', function({ jobs }, { params }) {
return this.serialize(jobs.find(params.id));
});
diff --git a/ui/tests/acceptance/job-versions-test.js b/ui/tests/acceptance/job-versions-test.js
index cd2c224d602..d9b973e49cd 100644
--- a/ui/tests/acceptance/job-versions-test.js
+++ b/ui/tests/acceptance/job-versions-test.js
@@ -4,9 +4,11 @@ import { setupApplicationTest } from 'ember-qunit';
import { setupMirage } from 'ember-cli-mirage/test-support';
import a11yAudit from 'nomad-ui/tests/helpers/a11y-audit';
import Versions from 'nomad-ui/tests/pages/jobs/job/versions';
+import Layout from 'nomad-ui/tests/pages/layout';
import moment from 'moment';
let job;
+let namespace;
let versions;
module('Acceptance | job versions', function(hooks) {
@@ -14,10 +16,16 @@ module('Acceptance | job versions', function(hooks) {
setupMirage(hooks);
hooks.beforeEach(async function() {
- job = server.create('job', { createAllocations: false });
+ server.create('namespace');
+ namespace = server.create('namespace');
+
+ job = server.create('job', { namespaceId: namespace.id, createAllocations: false });
versions = server.db.jobVersions.where({ jobId: job.id });
- await Versions.visit({ id: job.id });
+ const managementToken = server.create('token');
+ window.localStorage.nomadTokenSecret = managementToken.secretId;
+
+ await Versions.visit({ id: job.id, namespace: namespace.id });
});
test('it passes an accessibility audit', async function(assert) {
@@ -41,6 +49,79 @@ module('Acceptance | job versions', function(hooks) {
assert.equal(versionRow.submitTime, formattedSubmitTime, 'Submit time');
});
+ test('all versions but the current one have a button to revert to that version', async function(assert) {
+ let versionRowToRevertTo;
+
+ Versions.versions.forEach((versionRow) => {
+ if (versionRow.number === job.version) {
+ assert.ok(versionRow.revertToButton.isHidden);
+ } else {
+ assert.ok(versionRow.revertToButton.isPresent);
+
+ versionRowToRevertTo = versionRow;
+ }
+ });
+
+ if (versionRowToRevertTo) {
+ const versionNumberRevertingTo = versionRowToRevertTo.number;
+ await versionRowToRevertTo.revertToButton.idle();
+ await versionRowToRevertTo.revertToButton.confirm();
+
+ const revertRequest = this.server.pretender.handledRequests.find(request => request.url.includes('revert'));
+
+ assert.equal(revertRequest.url, `/v1/job/${job.id}/revert?namespace=${namespace.id}`);
+
+ assert.deepEqual(JSON.parse(revertRequest.requestBody), {
+ JobID: job.id,
+ JobVersion: versionNumberRevertingTo,
+ });
+
+ assert.equal(currentURL(), `/jobs/${job.id}?namespace=${namespace.id}`);
+ }
+ });
+
+ test('when reversion fails, the error message from the API is piped through to the alert', async function(assert) {
+ const versionRowToRevertTo = Versions.versions.filter(versionRow => versionRow.revertToButton.isPresent)[0];
+
+ if (versionRowToRevertTo) {
+ const message = 'A plaintext error message';
+ server.pretender.post('/v1/job/:id/revert', () => [500, {}, message]);
+
+ await versionRowToRevertTo.revertToButton.idle();
+ await versionRowToRevertTo.revertToButton.confirm();
+
+ assert.ok(Layout.inlineError.isShown);
+ assert.ok(Layout.inlineError.isDanger);
+ assert.ok(Layout.inlineError.title.includes('Could Not Revert'));
+ assert.equal(Layout.inlineError.message, message);
+
+ await Layout.inlineError.dismiss();
+
+ assert.notOk(Layout.inlineError.isShown);
+ } else {
+ assert.expect(0);
+ }
+ });
+
+ test('when reversion has no effect, the error message explains', async function(assert) {
+ const versionRowToRevertTo = Versions.versions.filter(versionRow => versionRow.revertToButton.isPresent)[0];
+
+ if (versionRowToRevertTo) {
+ // The default Mirage implementation updates the job version as passed in, this does nothing
+ server.pretender.post('/v1/job/:id/revert', () => [200, {}, '']);
+
+ await versionRowToRevertTo.revertToButton.idle();
+ await versionRowToRevertTo.revertToButton.confirm();
+
+ assert.ok(Layout.inlineError.isShown);
+ assert.ok(Layout.inlineError.isWarning);
+ assert.ok(Layout.inlineError.title.includes('Reversion Had No Effect'));
+ assert.equal(Layout.inlineError.message, 'Reverting to an identical older version doesn’t produce a new version');
+ } else {
+ assert.expect(0);
+ }
+ });
+
test('when the job for the versions is not found, an error message is shown, but the URL persists', async function(assert) {
await Versions.visit({ id: 'not-a-real-job' });
@@ -56,3 +137,31 @@ module('Acceptance | job versions', function(hooks) {
assert.equal(Versions.error.title, 'Not Found', 'Error message is for 404');
});
});
+
+module('Acceptance | job versions (with client token)', function(hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ hooks.beforeEach(async function() {
+ job = server.create('job', { createAllocations: false });
+ versions = server.db.jobVersions.where({ jobId: job.id });
+
+ server.create('token');
+ const clientToken = server.create('token');
+ window.localStorage.nomadTokenSecret = clientToken.secretId;
+
+ await Versions.visit({ id: job.id });
+ });
+
+ test('reversion buttons are disabled when the token lacks permissions', async function(assert) {
+ const versionRowWithReversion = Versions.versions.filter(versionRow => versionRow.revertToButton.isPresent)[0];
+
+ if (versionRowWithReversion) {
+ assert.ok(versionRowWithReversion.revertToButtonIsDisabled);
+ } else {
+ assert.expect(0);
+ }
+
+ window.localStorage.clear();
+ });
+});
diff --git a/ui/tests/pages/jobs/job/versions.js b/ui/tests/pages/jobs/job/versions.js
index 1b58b9557f7..416406f00e9 100644
--- a/ui/tests/pages/jobs/job/versions.js
+++ b/ui/tests/pages/jobs/job/versions.js
@@ -1,5 +1,7 @@
-import { create, collection, text, visitable } from 'ember-cli-page-object';
+import { attribute, create, collection, text, visitable } from 'ember-cli-page-object';
+import { getter } from 'ember-cli-page-object/macros';
+import twoStepButton from 'nomad-ui/tests/pages/components/two-step-button';
import error from 'nomad-ui/tests/pages/components/error';
export default create({
@@ -9,6 +11,13 @@ export default create({
text: text(),
stability: text('[data-test-version-stability]'),
submitTime: text('[data-test-version-submit-time]'),
+
+ revertToButton: twoStepButton('[data-test-revert-to]'),
+ revertToButtonIsDisabled: attribute('disabled', '[data-test-revert-to]'),
+
+ number: getter(function() {
+ return parseInt(this.text.match(/#(\d+)/)[1]);
+ }),
}),
error: error(),
diff --git a/ui/tests/pages/layout.js b/ui/tests/pages/layout.js
index cb1fcbbe8c2..c2a34c343f0 100644
--- a/ui/tests/pages/layout.js
+++ b/ui/tests/pages/layout.js
@@ -99,4 +99,14 @@ export default create({
title: text('[data-test-error-title]'),
message: text('[data-test-error-message]'),
},
+
+ inlineError: {
+ isShown: isPresent('[data-test-inline-error]'),
+ title: text('[data-test-inline-error-title]'),
+ message: text('[data-test-inline-error-body]'),
+ dismiss: clickable('[data-test-inline-error-close]'),
+
+ isDanger: hasClass('is-danger', '[data-test-inline-error]'),
+ isWarning: hasClass('is-warning', '[data-test-inline-error]'),
+ },
});