11739: preload containers and children of all container_requests in dashboard display.

11751: in /container_requests page, use the column name "Name" and display either name of uuid of the object.

diff --git a/apps/workbench/app/views/container_requests/_show_recent.html.erb b/apps/workbench/app/views/container_requests/_show_recent.html.erb
index 6a4c8b18ecc97e30d1c931da18ccdf6020925d14..7ee20db7c5e22298cbfb8016adedb86b7565850f 100644 (file)
--- a/apps/workbench/app/views/container_requests/_show_recent.html.erb
+++ b/apps/workbench/app/views/container_requests/_show_recent.html.erb
@@ -3,8 +3,8 @@
 <table class="table table-condensed table-fixedlayout arv-recent-container-requests">
   <colgroup>
     <col width="10%" />
-    <col width="15%" />
-    <col width="25%" />
+    <col width="20%" />
+    <col width="20%" />
     <col width="15%" />
     <col width="15%" />
     <col width="15%" />
@@ -15,7 +15,7 @@
       <th>
         Status
       </th><th>
-        Container request
+        Name
       </th><th>
         Description
       </th><th>

diff --git a/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb b/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb
index d11bf35c21bc7c61f9da22cd28f3d69ef7449fff..6caf6d563002d5461320dc8cf45515ad0c79f1a9 100644 (file)
--- a/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb
+++ b/apps/workbench/app/views/container_requests/_show_recent_rows.html.erb
@@ -20,7 +20,7 @@
     <td>
       <span class="label label-<%= wu.state_bootstrap_class %>"><%= wu.state_label %></span>
     </td><td>
-      <%= link_to_if_arvados_object obj, friendly_name: true %>
+      <%= link_to_if_arvados_object obj, friendly_name: true, link_text: if !obj.name.empty? then obj.name else obj.uuid end %>
     </td><td>
       <%= obj.description || '' %>
     </td><td>

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index bcfeb6a466e544926dc4a8c7555dcbcd0cdd4ab7..f472b1e75afefd711b9457ea8223dca20a95ee44 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -1,10 +1,32 @@
 <%
   recent_procs = recent_processes(12)
 
+  # preload container_uuids of any container requests
+  recent_crs = recent_procs.map {|p| p if p.is_a?(ContainerRequest)}.compact.uniq
+  recent_cr_containers = recent_crs.map {|cr| cr.container_uuid}.compact.uniq
+  preload_objects_for_dataclass(Container, recent_cr_containers) if recent_cr_containers.andand.any?
+
+  # fetch children of all the active crs in one call, if there are any
+  active_crs = recent_crs.each {|cr| cr if (cr.priority > 0 and cr.state != 'Final' and cr.container_uuid)}
+  active_cr_uuids = active_crs.map(&:uuid)
+  active_cr_containers = active_crs.map {|cr| cr.container_uuid}.compact.uniq
+  cr_children = {}
+  if active_cr_containers.any?
+    active_cr_containers.each { |c| cr_children[c] = []}
+    cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts)
+    reqs = ContainerRequest.select(cols).where(requesting_container_uuid: active_cr_containers).results
+    reqs.each {|cr| cr_children[cr.requesting_container_uuid] << cr} if reqs
+  end
+
   wus = {}
   outputs = []
   recent_procs.each do |p|
-    wu = p.work_unit
+    if p.uuid.in?(active_cr_uuids)
+      wu = p.work_unit(nil, child_objects=cr_children[p.container_uuid])
+    else
+      wu = p.work_unit
+    end
+
     wus[p] = wu
     outputs << wu.outputs
   end