9372: Corrected dashboard display to list container_requests, not containers as imple...

[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 efd6acfd65d642c0ce97a9c4118f212ec35a8318..8abcee49e6f976ced6a5dae62dc044a141b3599b 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -1,9 +1,10 @@
   <div class="row">
     <div class="col-md-6">
       <div class="panel panel-default" style="min-height: 10.5em">
-        <div class="panel-heading"><span class="panel-title">Recent processes</span>
+        <div class="panel-heading">
+          <span class="panel-title">Recent pipelines and processes</span>
           <% if current_user.andand.is_active %>
-            <span class="pull-right">
+            <span class="pull-right recent-processes-actions">
               <span>
                 <%= link_to(
                 choose_pipeline_templates_path(
@@ -28,12 +29,12 @@
         <% _recent_processes = recent_processes(12) %>
         <div class="panel-body recent-processes">
           <% if _recent_processes.empty? %>
-            No recent processes.
+            No recent pipelines or processes.
           <% else %>
           <% _recent_processes.each do |p| %>
             <% wu = p.work_unit %>
             <% if wu.is_finished? %>
-            <div class="dashboard-panel-info-row">
+            <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
               <div class="row">
                 <div class="col-md-6 text-overflow-ellipsis">
                   <%= link_to_if_arvados_object p, {friendly_name: true} %>
@@ -67,7 +68,7 @@
 
             </div>
             <% else %>
-            <div class="dashboard-panel-info-row">
+            <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
               <div class="clearfix">
                 <%= link_to_if_arvados_object p, {friendly_name: true} %>
                 <div class="pull-right" style="width: 40%">
@@ -109,7 +110,7 @@
       <% nodes = Node.all %>
       <div class="panel panel-default" style="min-height: 10.5em">
         <div class="panel-heading"><span class="panel-title">Compute node status</span>
-          <span class="pull-right">
+          <span class="pull-right compute-node-actions">
             <% if current_user.andand.is_admin %>
               <span>
                 <%= link_to nodes_path, class: 'btn btn-default btn-xs' do %>
@@ -127,12 +128,20 @@
         <div class="panel-body compute-node-summary-pane">
           <div>
             <%= render partial: 'compute_node_summary', locals: {nodes: nodes} %>
-            <div style="text-align: center">
-              <a data-toggle="collapse" href="#compute_node_status">Details <span class="caret"></span></a>
-            </div>
+            <% active_nodes = [] %>
+            <% nodes.sort_by { |n| n.hostname || "" }.each do |n| %>
+              <% if n.crunch_worker_state.in? ["busy", "idle"] and (Time.now - n[:last_ping_at]) < 3600 %>
+                <% active_nodes << n %>
+              <% end %>
+            <% end %>
+            <% if active_nodes.any? %>
+              <div style="text-align: center">
+                <a data-toggle="collapse" href="#compute_node_status">Details <span class="caret"></span></a>
+              </div>
+            <% end %>
           </div>
           <div id="compute_node_status" class="collapse">
-            <%= render partial: 'compute_node_status', locals: {nodes: nodes} %>
+            <%= render partial: 'compute_node_status', locals: {nodes: active_nodes} %>
           </div>
         </div>
       </div>