Change name for task state FS model component

This fixes errors such as these: https://app.circleci.com/pipelines/github/hashicorp/nomad/9595/workflows/69183c14-c50d-4076-a1f7-da5a36fb8b24/jobs/71633/tests It seems that there’s now a shadowing situation where {{task}} is being interpreted as an Ember Concurrency helper…? Since this is actually a task state anyway, easier to just rename it.
hashicorp · May 29, 2020 · 2078c2a · 2078c2a
1 parent def33f5
commit 2078c2a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/ui/app/controllers/allocations/allocation/task/fs.js b/ui/app/controllers/allocations/allocation/task/fs.js
@@ -12,7 +12,7 @@ export default Controller.extend({
   sortDescending: false,
 
   path: null,
-  task: null,
+  taskState: null,
   directoryEntries: null,
   isFile: null,
   stat: null,

diff --git a/ui/app/routes/allocations/allocation/task/fs.js b/ui/app/routes/allocations/allocation/task/fs.js
@@ -5,30 +5,30 @@ import notifyError from 'nomad-ui/utils/notify-error';
 export default Route.extend({
   model({ path = '/' }) {
     const decodedPath = decodeURIComponent(path);
-    const task = this.modelFor('allocations.allocation.task');
+    const taskState = this.modelFor('allocations.allocation.task');
 
-    const pathWithTaskName = `${task.name}${decodedPath.startsWith('/') ? '' : '/'}${decodedPath}`;
+    const pathWithTaskStateName = `${taskState.name}${decodedPath.startsWith('/') ? '' : '/'}${decodedPath}`;
 
-    if (!task.isRunning) {
+    if (!taskState.isRunning) {
       return {
         path: decodedPath,
-        task,
+        taskState,
       };
     }
 
-    return RSVP.all([task.stat(pathWithTaskName), task.get('allocation.node')])
+    return RSVP.all([taskState.stat(pathWithTaskStateName), taskState.get('allocation.node')])
       .then(([statJson]) => {
         if (statJson.IsDir) {
           return RSVP.hash({
             path: decodedPath,
-            task,
-            directoryEntries: task.ls(pathWithTaskName).catch(notifyError(this)),
+            taskState,
+            directoryEntries: taskState.ls(pathWithTaskStateName).catch(notifyError(this)),
             isFile: false,
           });
         } else {
           return {
             path: decodedPath,
-            task,
+            taskState,
             isFile: true,
             stat: statJson,
           };
@@ -37,8 +37,8 @@ export default Route.extend({
       .catch(notifyError(this));
   },
 
-  setupController(controller, { path, task, directoryEntries, isFile, stat } = {}) {
+  setupController(controller, { path, taskState, directoryEntries, isFile, stat } = {}) {
     this._super(...arguments);
-    controller.setProperties({ path, task, directoryEntries, isFile, stat });
+    controller.setProperties({ path, taskState, directoryEntries, isFile, stat });
   },
 });
diff --git a/ui/app/templates/allocations/allocation/task/fs.hbs b/ui/app/templates/allocations/allocation/task/fs.hbs
@@ -1,15 +1,15 @@
-{{title pathWithLeadingSlash " -  Task " task.name " filesystem"}}
-<TaskSubnav @task={{task}} />
+{{title pathWithLeadingSlash " -  Task " taskState.name " filesystem"}}
+<TaskSubnav @task={{taskState}} />
 <section class="section is-closer {{if isFile "full-width-section"}}">
-  {{#if task.isRunning}}
+  {{#if taskState.isRunning}}
     {{#if isFile}}
-      <TaskFile @allocation={{task.allocation}} @task={{task}} @file={{path}} @stat={{stat}} @class="fs-explorer">
-        <FsBreadcrumbs @task={{task}} @path={{path}} />
+      <TaskFile @allocation={{taskState.allocation}} @task={{taskState}} @file={{path}} @stat={{stat}} @class="fs-explorer">
+        <FsBreadcrumbs @task={{taskState}} @path={{path}} />
       </TaskFile>
     {{else}}
       <div class="fs-explorer boxed-section">
         <div class="boxed-section-head">
-          <FsBreadcrumbs @task={{task}} @path={{path}} />
+          <FsBreadcrumbs @task={{taskState}} @path={{path}} />
         </div>
         {{#if directoryEntries}}
           <ListTable
@@ -23,7 +23,7 @@
               <t.sort-by @prop="ModTime" @class="has-text-right">Last Modified</t.sort-by>
             </t.head>
             <t.body as |row|>
-              <FsDirectoryEntry @path={{path}} @task={{task}} @entry={{row.model}} />
+              <FsDirectoryEntry @path={{path}} @task={{taskState}} @entry={{row.model}} />
             </t.body>
           </ListTable>
         {{else}}