[ui, bugfix] Link fix for volumes where per_alloc=true

.changelog/12713.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fixed a bug where volumes were being incorrectly linked when per_alloc=true
+```

jsconfig.json

@@ -0,0 +1 @@
+{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}

ui/.template-lintrc.js

@@ -7,5 +7,6 @@ module.exports = {
     'no-action': 'off',
     'no-invalid-interactive': 'off',
     'no-inline-styles': 'off',
+    'no-curly-component-invocation': { allow: ['format-volume-name'] },
   },
 };

ui/app/components/task-row.js

@@ -5,6 +5,7 @@ import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { task, timeout } from 'ember-concurrency';
 import { lazyClick } from '../helpers/lazy-click';
+
 import {
   classNames,
   tagName,

ui/app/helpers/format-volume-name.js

@@ -0,0 +1,18 @@
+import { helper } from '@ember/component/helper';
+
+/**
+ * Volume Name Formatter
+ *
+ * Usage: {{format-volume-name source=string isPerAlloc=boolean volumeExtension=string}}
+ *
+ * Outputs a title/link for volumes that are per_alloc-aware.
+ * (when a volume is per_alloc, its route location requires an additional extension)
+ */
+export function formatVolumeName(
+  _,
+  { source = '', isPerAlloc, volumeExtension }
+) {
+  return `${source}${isPerAlloc ? volumeExtension : ''}`;
+}
+
+export default helper(formatVolumeName);

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;
 

ui/app/models/volume-definition.js

@@ -11,6 +11,7 @@ export default class VolumeDefinition extends Fragment {
   @attr('string') source;
   @attr('string') type;
   @attr('boolean') readOnly;
+  @attr('boolean') perAlloc;
 
   @equal('type', 'csi') isCSI;
   @alias('taskGroup.job.namespace') namespace;

ui/app/templates/allocations/allocation/task/index.hbs

@@ -163,10 +163,19 @@
                 {{#if row.model.isCSI}}
                   <LinkTo
                     @route="csi.volumes.volume"
-                    @model={{concat row.model.volume "@" row.model.namespace.id
+                    @model={{concat
+                    (format-volume-name
+                      source=row.model.source
+                      isPerAlloc=row.model.volumeDeclaration.perAlloc
+                      volumeExtension=this.model.allocation.volumeExtension)
+                    "@"
+                    row.model.namespace.id
                     }}
                   >
-                    {{row.model.volume}}
+                  {{format-volume-name
+                    source=row.model.source
+                    isPerAlloc=row.model.volumeDeclaration.perAlloc
+                    volumeExtension=this.model.allocation.volumeExtension}}
                   </LinkTo>
                 {{else}}
                   {{row.model.source}}

ui/app/templates/components/task-row.hbs

@@ -47,9 +47,19 @@
         {{#if volume.isCSI}}
           <LinkTo
             @route="csi.volumes.volume"
-            @model={{concat volume.source "@" volume.namespace.id}}
+            @model={{concat
+              (format-volume-name
+                source=volume.source
+                isPerAlloc=volume.volumeDeclaration.perAlloc
+                volumeExtension=this.task.allocation.volumeExtension)
+              "@"
+              volume.namespace.id
+            }}
           >
-            {{volume.source}}
+          {{format-volume-name
+            source=volume.source
+            isPerAlloc=volume.volumeDeclaration.perAlloc
+            volumeExtension=this.task.allocation.volumeExtension}}
           </LinkTo>
         {{else}}
           {{volume.source}}

ui/app/templates/jobs/job/task-group.hbs

@@ -293,12 +293,17 @@
             <tr data-test-volume>
               <td data-test-volume-name>
                 {{#if row.model.isCSI}}
-                  <LinkTo
-                    @route="csi.volumes.volume"
-                    @model={{concat row.model.source "@" row.model.namespace.id}}
-                  >
-                    {{row.model.name}}
-                  </LinkTo>
+                  {{!-- if volume is per_alloc=true, there's no one specific volume. So, link to the volumes index with an active query --}}
+                  {{#if row.model.perAlloc}}
+                    <LinkTo @route="csi.volumes.index" @query={{hash search=row.model.source}}>{{row.model.name}}</LinkTo>
+                  {{else}}
+                    <LinkTo
+                      @route="csi.volumes.volume"
+                      @model={{concat row.model.source "@" row.model.namespace.id}}
+                    >
+                      {{row.model.name}}
+                    </LinkTo>
+                  {{/if}}
                 {{else}}
                   {{row.model.name}}
                 {{/if}}

ui/tests/unit/helpers/format-volume-name-test.js

@@ -0,0 +1,39 @@
+import { module, test } from 'qunit';
+import { formatVolumeName } from 'nomad-ui/helpers/format-volume-name';
+
+module('Unit | Helper | formatVolumeName', function () {
+  test('Returns source as string when isPerAlloc is false', function (assert) {
+    const expectation = 'my-volume-source';
+    assert.equal(
+      formatVolumeName(null, {
+        source: 'my-volume-source',
+        isPerAlloc: false,
+        volumeExtension: '[arbitrary]',
+      }),
+      expectation,
+      'false perAlloc'
+    );
+    assert.equal(
+      formatVolumeName(null, {
+        source: 'my-volume-source',
+        isPerAlloc: null,
+        volumeExtension: '[arbitrary]',
+      }),
+      expectation,
+      'null perAlloc'
+    );
+  });
+
+  test('Returns concatonated name when isPerAlloc is true', function (assert) {
+    const expectation = 'my-volume-source[1]';
+    assert.equal(
+      formatVolumeName(null, {
+        source: 'my-volume-source',
+        isPerAlloc: true,
+        volumeExtension: '[1]',
+      }),
+      expectation,
+      expectation
+    );
+  });
+});