Move volume link to the source column and fix the link target

The link target used the volume name instead of the volume id. Fixes issue hashicorp#11884.
NomAnor · Jan 21, 2022 · 97c2f52 · 97c2f52
1 parent 1471de4
commit 97c2f52
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
@@ -108,18 +108,18 @@
           </t.head>
           <t.body as |row|>
             <tr data-test-volume>
-              <td data-test-volume-name>
+              <td data-test-volume-name>{{row.model.volume}}</td>
+              <td data-test-volume-destination><code>{{row.model.destination}}</code></td>
+              <td data-test-volume-permissions>{{if row.model.readOnly "Read" "Read/Write"}}</td>
+              <td data-test-volume-client-source>
                 {{#if row.model.isCSI}}
-                  <LinkTo @route="csi.volumes.volume" @model={{row.model.volume}} @query={{hash volumeNamespace=row.model.namespace.id}}>
-                    {{row.model.volume}}
+                  <LinkTo @route="csi.volumes.volume" @model={{row.model.source}} @query={{hash volumeNamespace=row.model.namespace.id}}>
+                    {{row.model.source}}
                   </LinkTo>
                 {{else}}
-                  {{row.model.volume}}
+                  {{row.model.source}}
                 {{/if}}
               </td>
-              <td data-test-volume-destination><code>{{row.model.destination}}</code></td>
-              <td data-test-volume-permissions>{{if row.model.readOnly "Read" "Read/Write"}}</td>
-              <td data-test-volume-client-source>{{row.model.source}}</td>
             </tr>
           </t.body>
         </ListTable>