fix added to task page and computed prop moved to allocation model

hashicorp · Apr 20, 2022 · f16fdc5 · f16fdc5
1 parent 3926584
commit f16fdc5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/ui/.ember-cli b/ui/.ember-cli
@@ -6,5 +6,5 @@
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
   "disableAnalytics": false,
-  "proxy": "http://127.0.0.1:4646"
+  "proxy": "http://192.168.56.11:4646"
 }
diff --git a/ui/app/components/task-row.js b/ui/app/components/task-row.js
@@ -31,14 +31,6 @@ export default class TaskRow extends Component {
     return !Ember.testing;
   }
 
-  // When per_alloc is set to true on a volume, the volumes are duplicated between active allocations.
-  // We differentiate them with a [#] suffix, inferred from a volume's allocation's name property.
-  @computed('task.allocation.name')
-  get volumeExtension() {
-    let allocName = this.task.allocation.name;
-    return allocName.substring(allocName.lastIndexOf('['));
-  }
-
   // Since all tasks for an allocation share the same tracker, use the registry
   @computed('task.{allocation,isRunning}')
   get stats() {

diff --git a/ui/app/models/allocation.js b/ui/app/models/allocation.js
@@ -119,6 +119,13 @@ export default class Allocation extends Model {
     return [];
   }
 
+  // When per_alloc is set to true on a volume, the volumes are duplicated between active allocations.
+  // We differentiate them with a [#] suffix, inferred from a volume's allocation's name property.
+  @computed('name')
+  get volumeExtension() {
+    return this.name.substring(this.name.lastIndexOf('['));
+  }
+
   @fragmentArray('task-state') states;
   @fragmentArray('reschedule-event') rescheduleEvents;
 

diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
@@ -161,12 +161,13 @@
               </td>
               <td data-test-volume-client-source>
                 {{#if row.model.isCSI}}
+                {{log "ah heck" row.model}}
                   <LinkTo
                     @route="csi.volumes.volume"
-                    @model={{concat row.model.volume "@" row.model.namespace.id
+                    @model={{concat row.model.source (if row.model.volumeDeclaration.perAlloc this.model.allocation.volumeExtension) "@" row.model.namespace.id
                     }}
                   >
-                    {{row.model.volume}}
+                    {{row.model.source}}
                   </LinkTo>
                 {{else}}
                   {{row.model.source}}

diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/templates/components/task-row.hbs
@@ -47,7 +47,7 @@
         {{#if volume.isCSI}}
           <LinkTo
             @route="csi.volumes.volume"
-            @model={{concat volume.source (if volume.volumeDeclaration.perAlloc this.volumeExtension) "@" volume.namespace.id}}
+            @model={{concat volume.source (if volume.volumeDeclaration.perAlloc this.task.allocation.volumeExtension) "@" volume.namespace.id}}
           >
             {{volume.source}}
           </LinkTo>