X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c2a861d06b51978847a02369e673eb1288ada1ee..434dee9ff1b42d7169fbd9368263e6a0f5c40bed:/apps/workbench/app/views/projects/_show_dashboard.html.erb?ds=sidebyside diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb index 00780c4089..6c58cd30fc 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -10,26 +10,10 @@ 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)} - 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 = {} outputs = [] recent_procs.each do |p| - if p.uuid.in?(active_cr_uuids) - wu = p.work_unit(nil, child_objects=cr_children[p.container_uuid]) - else - wu = p.work_unit - end + wu = p.work_unit wus[p] = wu outputs << wu.outputs @@ -39,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 @@ -52,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 @@ -101,8 +85,19 @@ SPDX-License-Identifier: AGPL-3.0 %> No recent pipelines or processes. <% else %> <% wus.each do |p, wu| %> + <% + # Set up tooltip containing useful runtime information + runtime_status_tooltip = nil + if wu.runtime_status + if wu.runtime_status[:error] + runtime_status_tooltip = "Error: #{wu.runtime_status[:error]}" + elsif wu.runtime_status[:warning] + runtime_status_tooltip = "Warning: #{wu.runtime_status[:warning]}" + end + end + %> <% if wu.is_finished? %> -