kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Load and watch the job scale endpoint on the task group page

Browse Source
This commit is contained in:
Michael Lange
2020-07-27 21:27:03 -07:00
parent 9d43e66c99
commit 4e01b2c35e
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/app/routes/jobs/job/task-group.js
View File

@@ -1,7 +1,7 @@
import Route from '@ember/routing/route';
import { collect } from '@ember/object/computed';
import EmberError from '@ember/error';
import { resolve } from 'rsvp';
import { resolve, all } from 'rsvp';
import { watchRecord, watchRelationship } from 'nomad-ui/utils/properties/watch';
import WithWatchers from 'nomad-ui/mixins/with-watchers';
import { qpBuilder } from 'nomad-ui/utils/classes/query-params';
@@ -43,10 +43,9 @@ export default class TaskGroupRoute extends Route.extend(WithWatchers) {
}
// Refresh job allocations before-hand (so page sort works on load)
return job
.hasMany('allocations')
.reload()
.then(() => taskGroup);
return all([job.hasMany('allocations').reload(), job.get('scaleState')]).then(
() => taskGroup
);
})
.catch(notifyError(this));
}
@@ -56,7 +55,8 @@ export default class TaskGroupRoute extends Route.extend(WithWatchers) {
const job = model.get('job');
controller.set('watchers', {
job: this.watchJob.perform(job),
summary: this.watchSummary.perform(job.get('summary')),
summary: this.watchSummary.perform(job),
scale: this.watchScale.perform(job),
allocations: this.watchAllocations.perform(job),
latestDeployment: job.get('supportsDeployments') && this.watchLatestDeployment.perform(job),
});
@@ -64,9 +64,11 @@ export default class TaskGroupRoute extends Route.extend(WithWatchers) {
}
@watchRecord('job') watchJob;
@watchRecord('job-summary') watchSummary;
@watchRelationship('job-summary') watchSummary;
@watchRelationship('job-scale') watchScale;
@watchRelationship('allocations') watchAllocations;
@watchRelationship('latestDeployment') watchLatestDeployment;
@collect('watchJob', 'watchSummary', 'watchAllocations', 'watchLatestDeployment') watchers;
@collect('watchJob', 'watchSummary', 'watchScale', 'watchAllocations', 'watchLatestDeployment')
watchers;
}

4
ui/tests/acceptance/task-group-detail-test.js
View File

@@ -329,7 +329,9 @@ module('Acceptance | task group detail', function(hooks) {
await TaskGroup.countStepper.increment.click();
await settled();
const scaleRequest = server.pretender.handledRequests.find(req => req.url.endsWith('/scale'));
const scaleRequest = server.pretender.handledRequests.find(
req => req.method === 'POST' && req.url.endsWith('/scale')
);
const requestBody = JSON.parse(scaleRequest.requestBody);
assert.equal(requestBody.Target.Group, scalingGroup.name);
assert.equal(requestBody.Count, scalingGroup.count + 1);