X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/18b51f2620505d4efbc9de322e24d5218a5ca19b..01a3368db1de44656e82fbc066e85ae4feb5eb75:/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 69abf04e68..6c58cd30fc 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -10,9 +10,6 @@ SPDX-License-Identifier: AGPL-3.0 %> 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| @@ -26,7 +23,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 @@ -39,13 +36,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 @@ -190,7 +187,17 @@ SPDX-License-Identifier: AGPL-3.0 %> <% end %> - <% if Rails.configuration.show_recent_collections_on_dashboard %> + <% if Container.api_exists?(:index) %> +
+
Container status
+
+
+ <%= render partial: 'container_summary' %> +
+
+
+ <% end %> + <% if Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard %>
Recent collections