X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b77893f2a8ae755f22615054f2c267d990995e1c..7653054635e3f4f84da3f2b6862cd2c02fbe3fd4:/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 bcfeb6a466..71ef245419 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -1,10 +1,20 @@ +<%# 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? + wus = {} outputs = [] recent_procs.each do |p| wu = p.work_unit + wus[p] = wu outputs << wu.outputs end @@ -13,7 +23,7 @@ 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 @@ -32,7 +42,7 @@ 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 @@ -75,8 +85,19 @@ 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? %> -