X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0f644e242ef37c911ad3dc25aca8135c339de349..d58c2423e8e038e4c47c2329299059978abc7fbf:/apps/workbench/app/views/projects/_show_dashboard.html.erb

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 3be8e374a2..f26d89780b 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -8,28 +8,15 @@ SPDX-License-Identifier: AGPL-3.0 %>
   # 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
+  if recent_cr_containers.andand.any?
+    preload_objects_for_dataclass(Container, recent_cr_containers, nil,
+				["uuid", "started_at", "finished_at", "state", "runtime_status", "created_at", "modified_at"])
   end
 
   wus = {}
   outputs = []
   recent_procs.each do |p|
-    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
+    wu = p.work_unit
 
     wus[p] = wu
     outputs << wu.outputs
@@ -39,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
   collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
   collection_uuids = outputs - collection_pdhs
 
-  if Rails.configuration.show_recent_collections_on_dashboard
+  if Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard
     recent_cs = recent_collections(8)
     collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid}
     collection_uuids.flatten.uniq
@@ -52,13 +39,13 @@ SPDX-License-Identifier: AGPL-3.0 %>
 
 <%
   recent_procs_panel_width = 6
-  if !PipelineInstance.api_exists?(:index)
+  if !PipelineInstance.api_exists?(:create)
     recent_procs_title = 'Recent processes'
     run_proc_title = 'Choose a workflow to run:'
     show_node_status = false
     # Recent processes panel should take the entire width when is the only one
     # being rendered.
-    if !Rails.configuration.show_recent_collections_on_dashboard
+    if !Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard
       recent_procs_panel_width = 12
     end
   else
@@ -101,8 +88,19 @@ SPDX-License-Identifier: AGPL-3.0 %>
             No recent pipelines or processes.
           <% else %>
           <% wus.each do |p, wu| %>
+            <%
+            # Set up tooltip containing useful runtime information
+            runtime_status_tooltip = nil
+            if wu.runtime_status
+              if wu.runtime_status[:error]
+                runtime_status_tooltip = "Error: #{wu.runtime_status[:error]}"
+              elsif wu.runtime_status[:warning]
+                runtime_status_tooltip = "Warning: #{wu.runtime_status[:warning]}"
+              end
+            end
+            %>
             <% if wu.is_finished? %>
-            <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
+            <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=sanitize(runtime_status_tooltip)%>">
               <div class="row">
                 <div class="col-md-6 text-overflow-ellipsis">
                   <%= link_to_if_arvados_object p, {friendly_name: true} %>
@@ -127,43 +125,26 @@ SPDX-License-Identifier: AGPL-3.0 %>
 
             </div>
             <% else %>
-            <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
+            <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=sanitize(runtime_status_tooltip)%>">
               <div class="row">
-                <div class="col-md-6">
+                <div class="col-md-6 text-overflow-ellipsis">
                   <%= link_to_if_arvados_object p, {friendly_name: true} %>
                 </div>
-                <% if wu.is_running? %>
-                <div class="col-md-6">
-                  <div class="progress" style="margin-bottom: 0px">
-                    <% wu.progress %>
-                  </div>
-                </div>
-                <% else %>
                 <div class="col-md-2">
                   <span class="label label-<%=wu.state_bootstrap_class%>"><%=wu.state_label%></span>
                 </div>
-                <% end %>
               </div>
 
-              <%
-                children = wu.children
-                running = children.select { |c| c.state_label == "Running" }
-                queued = children.select { |c| c.state_label == "Queued" }
-              %>
-
               <div class="clearfix">
-                Started at <%= render_localized_date(wu.started_at || wu.created_at, "noseconds") %>.
-                <% wu_time = Time.now - (wu.started_at || wu.created_at) %>
-                Active for <%= render_runtime(wu_time, false) %>.
-
-                <div class="pull-right">
-                  <% running.each do |r| %>
-                    <span class="label label-<%= r.state_bootstrap_class %>"> <%= r.label || r.state_label || 'Not ready' %> </span>
-                  <% end %>
-                  <% queued.each do |q| %>
-                    <span class="label label-<%= q.state_bootstrap_class %>"> <%= q.label || r.state_label || 'Not ready' %> </span>
+                <% if wu.started_at %>
+                  Started at <%= render_localized_date(wu.started_at, "noseconds") %>
+                  Active for <%= render_runtime(Time.now - wu.started_at, false) %>.
+                <% else %>
+                  Created at <%= render_localized_date(wu.created_at, "noseconds") %>.
+                  <% if wu.state_label == 'Queued' %>
+                    Queued for <%= render_runtime(Time.now - wu.created_at, false) %>.
                   <% end %>
-                </div>
+                <% end %>
               </div>
             </div>
             <% end %>
@@ -209,7 +190,17 @@ SPDX-License-Identifier: AGPL-3.0 %>
         </div>
       </div>
       <% end %>
-      <% if Rails.configuration.show_recent_collections_on_dashboard %>
+       <% if Container.api_exists?(:index) %>
+      <div class="panel panel-default" style="min-height: 10.5em">
+        <div class="panel-heading"><span class="panel-title">Container status</span></div>
+        <div class="panel-body containers-summary-pane">
+          <div>
+            <%= render partial: 'container_summary' %>
+	  </div>
+	</div>
+      </div>
+      <% end %>
+      <% if Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard %>
       <div class="panel panel-default">
         <div class="panel-heading"><span class="panel-title">Recent collections</span>
           <span class="pull-right">