luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix scale and summary adapters to correct live reloading

This commit is contained in:
Michael Lange 2020-07-28 18:24:24 -07:00
parent 602b6771ba
commit b0f2a9f51d
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/adapters/job-scale.js
View File

@ -1,3 +1,7 @@
import WatchableNamespaceIDs from './watchable-namespace-ids';
export default class JobScaleAdapter extends WatchableNamespaceIDs {}
export default class JobScaleAdapter extends WatchableNamespaceIDs {
urlForFindRecord(id, type, hash) {
return super.urlForFindRecord(id, 'job', hash, 'scale');
}
}

6
ui/app/adapters/job-summary.js
View File

@ -1,3 +1,7 @@
import WatchableNamespaceIDs from './watchable-namespace-ids';
export default class JobSummaryAdapter extends WatchableNamespaceIDs {}
export default class JobSummaryAdapter extends WatchableNamespaceIDs {
urlForFindRecord(id, type, hash) {
return super.urlForFindRecord(id, 'job', hash, 'summary');
}
}

3
ui/app/adapters/watchable-namespace-ids.js
View File

@ -35,9 +35,10 @@ export default class WatchableNamespaceIDs extends Watchable {
return associateNamespace(url, namespace);
}
urlForFindRecord(id, type, hash) {
urlForFindRecord(id, type, hash, pathSuffix) {
const [name, namespace] = JSON.parse(id);
let url = super.urlForFindRecord(name, type, hash);
if (pathSuffix) url += `/${pathSuffix}`;
return associateNamespace(url, namespace);
}

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

@ -55,8 +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),
scale: this.watchScale.perform(job),
summary: this.watchSummary.perform(job.get('summary')),
scale: this.watchScale.perform(job.get('scaleState')),
allocations: this.watchAllocations.perform(job),
latestDeployment: job.get('supportsDeployments') && this.watchLatestDeployment.perform(job),
});
@ -64,8 +64,8 @@ export default class TaskGroupRoute extends Route.extend(WithWatchers) {
}
@watchRecord('job') watchJob;
@watchRelationship('job-summary') watchSummary;
@watchRelationship('job-scale') watchScale;
@watchRecord('job-summary') watchSummary;
@watchRecord('job-scale') watchScale;
@watchRelationship('allocations') watchAllocations;
@watchRelationship('latestDeployment') watchLatestDeployment;