Fix scale and summary adapters to correct live reloading

hashicorp · Jul 29, 2020 · 6c6eb05 · 6c6eb05
1 parent cb801aa
commit 6c6eb05
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/ui/app/adapters/job-scale.js b/ui/app/adapters/job-scale.js
@@ -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');
+  }
+}
diff --git a/ui/app/adapters/job-summary.js b/ui/app/adapters/job-summary.js
@@ -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');
+  }
+}
diff --git a/ui/app/adapters/watchable-namespace-ids.js b/ui/app/adapters/watchable-namespace-ids.js
@@ -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);
   }
 

diff --git a/ui/app/routes/jobs/job/task-group.js b/ui/app/routes/jobs/job/task-group.js
@@ -55,17 +55,17 @@ 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),
       });
     }
   }
 
   @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;