From 518fc11dca80ce2e2baac707d2f6184d190681e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.althaus@tu-dortmund.de>
Date: Wed, 26 Jan 2022 20:17:29 +0100
Subject: [PATCH] ui: move volume link to the source column and fix the link
 target (#11896)

The link target used the volume name instead of the volume id.
Fixes issue #11884.
---
 .changelog/11896.txt                          |  3 +++
 .../allocations/allocation/task/index.hbs     | 20 +++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 .changelog/11896.txt

diff --git a/.changelog/11896.txt b/.changelog/11896.txt
new file mode 100644
index 000000000..783bc1431
--- /dev/null
+++ b/.changelog/11896.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fix the link target for CSI volumes on the task detail page
+```
diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
index 7cf44fd97..e033567c7 100644
--- 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>
-                {{#if row.model.isCSI}}
-                  <LinkTo @route="csi.volumes.volume" @model={{row.model.volume}} @query={{hash volumeNamespace=row.model.namespace.id}}>
-                    {{row.model.volume}}
-                  </LinkTo>
-                {{else}}
-                  {{row.model.volume}}
-                {{/if}}
-              </td>
+              <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>{{row.model.source}}</td>
+              <td data-test-volume-client-source>
+                {{#if row.model.isCSI}}
+                  <LinkTo @route="csi.volumes.volume" @model={{row.model.source}} @query={{hash volumeNamespace=row.model.namespace.id}}>
+                    {{row.model.source}}
+                  </LinkTo>
+                {{else}}
+                  {{row.model.source}}
+                {{/if}}
+              </td>
             </tr>
           </t.body>
         </ListTable>