X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b5d352d6099b60db5dcdd9183dcab3e8e17d729e..4aee7d57faff02fc6b7b6f750dc22a29e58bb963:/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 f472b1e75a..d4ea2de155 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -1,3 +1,7 @@ +<%# Copyright (C) The Arvados Authors. All rights reserved. + +SPDX-License-Identifier: AGPL-3.0 %> + <% recent_procs = recent_processes(12) @@ -6,26 +10,10 @@ 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 > 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 @@ -97,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? %> -