Merge branch 'master' into 9372-container-display

[arvados.git] / apps / workbench / app / controllers / application_controller.rb

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 63c75bcbbb13a7fbd04ba51987f3510b225d3345..dfa5ebc95c277127b42649fd4f2c141b22490118 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -828,57 +828,23 @@ class ApplicationController < ActionController::Base
     pi
   end
 
-  helper_method :running_processes
-  def running_processes lim
-    lim = 8 if lim.nil?
+  helper_method :recent_processes
+  def recent_processes lim
+    lim = 12 if lim.nil?
 
-    pipelines = PipelineInstance.limit(lim).order(["started_at desc", "created_at desc"]).filter([["state", "in", ["RunningOnServer", "RunningOnClient"]]])
+    pipelines = PipelineInstance.limit(lim).order(["created_at desc"])
 
-    crs = ContainerRequest.order(["modified_at desc"]).filter([["requesting_container_uuid", "!=", nil], ["state", "=", "Committed"]])
+    crs = ContainerRequest.limit(lim).order(["created_at desc"]).filter([["requesting_container_uuid", "=", nil]])
     cr_uuids = crs.results.collect { |c| c.container_uuid }
-    containers = Container.limit(lim).order(["started_at desc", "created_at desc"]).filter([["uuid", "in", cr_uuids], ["state", "=", "Running"]]).results if cr_uuids.any?
+    containers = Container.order(["created_at desc"]).results if cr_uuids.any?
 
     procs = {}
-    pipelines.results.each { |pi| procs[pi] = (pi.started_at || pi.created_at)}
+    pipelines.results.each { |pi| procs[pi] = pi.created_at }
     containers.each { |c| procs[c] = c.created_at } if !containers.nil?
 
     Hash[procs.sort_by {|key, value| value}].keys.reverse.first(lim)
   end
 
-  helper_method :finished_pipelines
-  def finished_pipelines lim
-    PipelineInstance.limit(lim).order(["finished_at desc"]).filter([["state", "in", ["Complete", "Failed", "Paused"]], ["finished_at", "!=", nil]])
-  end
-
-  helper_method :finished_processes
-  def finished_processes lim
-    lim = 8 if lim.nil?
-
-    pipelines = PipelineInstance.limit(lim).order(["finished_at desc"]).filter([["state", "in", ["Complete", "Failed", "Paused"]], ["finished_at", "!=", nil]])
-
-    crs = ContainerRequest.order(["modified_at desc"]).filter([["requesting_container_uuid", "!=", nil], ["state", "=", "Final"]])
-    cr_uuids = crs.results.collect { |c| c.container_uuid }
-    containers = Container.limit(lim).order(["finished_at desc"]).filter([["uuid", "in", cr_uuids], ["state", "in", ["Complete", "Canceled"]], ["finished_at", "!=", nil]]).results if cr_uuids.any?
-
-    procs = {}
-    pipelines.results.each { |pi| procs[pi] = pi.finished_at }
-    containers.each { |pi| procs[pi] = pi.finished_at } if !containers.nil?
-
-    Hash[procs.sort_by {|key, value| value}].keys.reverse.first(lim)
-  end
-
-  helper_method :queued_processes
-  def queued_processes
-    procs = {}
-    queued_jobs = Job.queue
-    queued_jobs.each { |j| procs[j] = j.priority }
-
-    queued_containers = Container.order(["priority desc", "created_at desc"]).filter([["state", "in", ["Queued", "Locked"]]])
-    queued_containers.results.each { |c| procs[c] = c.priority }
-
-    Hash[procs.sort_by {|key, value| value}].keys.reverse
-  end
-
   helper_method :recent_collections
   def recent_collections lim
     c = Collection.limit(lim).order(["modified_at desc"]).filter([["owner_uuid", "is_a", "arvados#group"]])