X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8e6d577f1381da0d42481ef8dd0479241e3c50bf..3156c76f53b4142beb912cb57fd66e343c9e09d4:/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 873d4f3f70..713582654f 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -1,10 +1,23 @@ +<%# Copyright (C) The Arvados Authors. All rights reserved. + +SPDX-License-Identifier: AGPL-3.0 %> + <% recent_procs = recent_processes(12) + # 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.andand > 0 and cr.state != 'Final' and cr.container_uuid)} + wus = {} outputs = [] recent_procs.each do |p| wu = p.work_unit + wus[p] = wu outputs << wu.outputs end @@ -13,7 +26,7 @@ collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact collection_uuids = outputs - collection_pdhs - if Rails.configuration.show_recent_collections_in_dashboard + if Rails.configuration.show_recent_collections_on_dashboard recent_cs = recent_collections(8) collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid} collection_uuids.flatten.uniq @@ -24,23 +37,41 @@ preload_links_for_objects(collection_pdhs + collection_uuids) %> +<% + recent_procs_panel_width = 6 + if !PipelineInstance.api_exists?(:index) + 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 + recent_procs_panel_width = 12 + end + else + recent_procs_title = 'Recent pipelines and processes' + run_proc_title = 'Choose a pipeline or workflow to run:' + show_node_status = true + end +%> +