X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b629d9e88ad0c6e62018a8fb4768013975eccc70..d58c2423e8e038e4c47c2329299059978abc7fbf:/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 22d89fff6d..f26d89780b 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -8,7 +8,10 @@ SPDX-License-Identifier: AGPL-3.0 %> # 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? + if recent_cr_containers.andand.any? + preload_objects_for_dataclass(Container, recent_cr_containers, nil, + ["uuid", "started_at", "finished_at", "state", "runtime_status", "created_at", "modified_at"]) + end wus = {} outputs = [] @@ -23,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0 %> collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact collection_uuids = outputs - collection_pdhs - if Rails.configuration.show_recent_collections_on_dashboard + if Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard recent_cs = recent_collections(8) collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid} collection_uuids.flatten.uniq @@ -36,13 +39,13 @@ SPDX-License-Identifier: AGPL-3.0 %> <% recent_procs_panel_width = 6 - if !PipelineInstance.api_exists?(:index) + if !PipelineInstance.api_exists?(:create) 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 + if !Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard recent_procs_panel_width = 12 end else @@ -197,7 +200,7 @@ SPDX-License-Identifier: AGPL-3.0 %> <% end %> - <% if Rails.configuration.show_recent_collections_on_dashboard %> + <% if Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard %>
Recent collections