From ed738ecc83161e0dd70a53d92b0e92ce910f3cc9 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 12 Feb 2020 22:14:28 -0800
Subject: [PATCH] Add volumes column to the task row component

---
 ui/app/models/task.js                             |  4 +++-
 ui/app/models/volume-mount.js                     |  7 +++++++
 ui/app/templates/allocations/allocation/index.hbs |  1 +
 ui/app/templates/components/task-row.hbs          | 14 ++++++++++++--
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ui/app/models/task.js b/ui/app/models/task.js
index 43660aab4..2ca3f59ed 100644
--- a/ui/app/models/task.js
+++ b/ui/app/models/task.js
@@ -1,8 +1,10 @@
 import attr from 'ember-data/attr';
 import Fragment from 'ember-data-model-fragments/fragment';
-import { fragmentArray } from 'ember-data-model-fragments/attributes';
+import { fragmentArray, fragmentOwner } from 'ember-data-model-fragments/attributes';
 
 export default Fragment.extend({
+  taskGroup: fragmentOwner(),
+
   name: attr('string'),
   driver: attr('string'),
   kind: attr('string'),
diff --git a/ui/app/models/volume-mount.js b/ui/app/models/volume-mount.js
index 7d3d41add..d30ae4593 100644
--- a/ui/app/models/volume-mount.js
+++ b/ui/app/models/volume-mount.js
@@ -1,8 +1,15 @@
+import { computed } from '@ember/object';
 import attr from 'ember-data/attr';
 import Fragment from 'ember-data-model-fragments/fragment';
+import { fragmentOwner } from 'ember-data-model-fragments/attributes';
 
 export default Fragment.extend({
+  task: fragmentOwner(),
+
   volume: attr('string'),
+  source: computed('task.taskGroup.volumes.@each.{name,source}', function() {
+    return this.task.taskGroup.volumes.findBy('name', this.volume).source;
+  }),
 
   destination: attr('string'),
   propagationMode: attr('string'),
diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs
index 7e51f6605..f39646375 100644
--- a/ui/app/templates/allocations/allocation/index.hbs
+++ b/ui/app/templates/allocations/allocation/index.hbs
@@ -95,6 +95,7 @@
             {{#t.sort-by prop="state"}}State{{/t.sort-by}}
             <th>Last Event</th>
             {{#t.sort-by prop="events.lastObject.time"}}Time{{/t.sort-by}}
+            <th>Volumes</th>
             <th>Addresses</th>
             <th>CPU</th>
             <th>Memory</th>
diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/templates/components/task-row.hbs
index b248e31e2..f2dcd5fbd 100644
--- a/ui/app/templates/components/task-row.hbs
+++ b/ui/app/templates/components/task-row.hbs
@@ -22,16 +22,26 @@
   {{/if}}
 </td>
 <td data-test-time>{{format-ts task.events.lastObject.time}}</td>
+<td data-test-volumes>
+  <ul>
+    {{#each task.task.volumeMounts as |volume|}}
+      <li data-test-volume>
+        <strong>{{volume.volume}}:</strong>
+        {{volume.source}}
+      </li>
+    {{/each}}
+  </ul>
+</td>
 <td data-test-ports>
   <ul>
-    {{#with task.resources.networks.firstObject as |network|}}
+    {{#let task.resources.networks.firstObject as |network|}}
       {{#each network.ports as |port|}}
         <li data-test-port>
           <strong>{{port.name}}:</strong>
           <a href="http://{{network.ip}}:{{port.port}}" target="_blank" rel="noopener noreferrer">{{network.ip}}:{{port.port}}</a>
         </li>
       {{/each}}
-    {{/with}}
+    {{/let}}
   </ul>
 </td>
 <td data-test-cpu class="is-1 has-text-centered">