Merge branch 'master' into 14930-arvput-trash-at

[arvados.git] / 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 e51cf5314d275137260f214f2e0bbbc6852bd373..d4ea2de155af7384a844d0c4593314ebd201867c 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -10,9 +10,6 @@ SPDX-License-Identifier: AGPL-3.0 %>
   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.andand > 0 and cr.state != 'Final' and cr.container_uuid)}
-
   wus = {}
   outputs = []
   recent_procs.each do |p|
@@ -88,8 +85,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} %>
@@ -114,7 +122,7 @@ 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 text-overflow-ellipsis">
                   <%= link_to_if_arvados_object p, {friendly_name: true} %>