From 45e1c652c63a272dccda05b6c304400ec202ead6 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Thu, 30 Jul 2020 08:43:15 -0700 Subject: [PATCH] Use the correct Message property instead of Reason in scale POST request Also use a more informative default message (one that includes the new count) --- ui/app/adapters/job.js | 4 ++-- ui/app/models/job.js | 5 +++-- ui/app/models/task-group.js | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/app/adapters/job.js b/ui/app/adapters/job.js index dad4b37aa..cda5c218a 100644 --- a/ui/app/adapters/job.js +++ b/ui/app/adapters/job.js @@ -69,12 +69,12 @@ export default class JobAdapter extends WatchableNamespaceIDs { }); } - scale(job, group, count, reason) { + scale(job, group, count, message) { const url = addToPath(this.urlForFindRecord(job.get('id'), 'job'), '/scale'); return this.ajax(url, 'POST', { data: { Count: count, - Reason: reason, + Message: message, Target: { Group: group, }, diff --git a/ui/app/models/job.js b/ui/app/models/job.js index 86717ea0a..7af777d4e 100644 --- a/ui/app/models/job.js +++ b/ui/app/models/job.js @@ -246,8 +246,9 @@ export default class Job extends Model { return promise; } - scale(group, count, reason = 'Manual scaling event from the Nomad UI') { - return this.store.adapterFor('job').scale(this, group, count, reason); + scale(group, count, message) { + if (message == null) message = `Manually scaled to ${count} from the Nomad UI`; + return this.store.adapterFor('job').scale(this, group, count, message); } setIdByPayload(payload) { diff --git a/ui/app/models/task-group.js b/ui/app/models/task-group.js index e92c2c82c..08e1b5b32 100644 --- a/ui/app/models/task-group.js +++ b/ui/app/models/task-group.js @@ -59,7 +59,7 @@ export default class TaskGroup extends Fragment { return maybe(this.get('job.scaleState.taskGroupScales')).findBy('name', this.name); } - scale(count, reason) { - return this.job.scale(this.name, count, reason); + scale(count, message) { + return this.job.scale(this.name, count, message); } }