Rip out a bunch of very very slow workbench code that doesn't seem to

[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 f472b1e75afefd711b9457ea8223dca20a95ee44..07a62aed4242a09f8eef529ddff5d2025bbfcbfb 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -1,3 +1,7 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
 <%
   recent_procs = recent_processes(12)
 
@@ -7,15 +11,13 @@
   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_crs = recent_crs.each {|cr| cr if (cr.priority.andand > 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 = {}
@@ -141,24 +143,12 @@
                 <% 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>
-                  <% end %>
                 </div>
               </div>
             </div>