X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cbd67fc6ba667bc27ca7e885145a6e34e5596f37..b5d352d6099b60db5dcdd9183dcab3e8e17d729e:/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 8abcee49e6..f472b1e75a 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -1,38 +1,102 @@ +<% + 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? + + # 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 + + wus[p] = wu + outputs << wu.outputs + end + outputs = outputs.flatten.uniq + + 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 + recent_cs = recent_collections(8) + collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid} + collection_uuids.flatten.uniq + end + + preload_collections_for_objects collection_uuids if collection_uuids.any? + preload_for_pdhs collection_pdhs if collection_pdhs.any? + preload_links_for_objects(collection_pdhs + collection_uuids) +%> + +<% + recent_procs_panel_width = 6 + if !PipelineInstance.api_exists?(:index) + 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 + recent_procs_panel_width = 12 + end + else + recent_procs_title = 'Recent pipelines and processes' + run_proc_title = 'Choose a pipeline or workflow to run:' + show_node_status = true + end +%> +
-
+
- Recent pipelines and processes + <%=recent_procs_title%> <% if current_user.andand.is_active %> <%= link_to( - choose_pipeline_templates_path( - title: 'Choose a pipeline to run:', + choose_work_unit_templates_path( + title: run_proc_title, action_name: 'Next: choose inputs ', - action_href: pipeline_instances_path, + action_href: work_units_path, action_method: 'post', - action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => current_user.uuid, 'success' => 'redirect-to-created-object'}.to_json), + action_data: {'selection_param' => 'work_unit[template_uuid]', 'work_unit[owner_uuid]' => current_user.uuid, 'success' => 'redirect-to-created-object'}.to_json), { class: "btn btn-primary btn-xs", remote: true }) do %> - Run a pipeline... + Run a process... <% end %> - <%= link_to pipeline_instances_path, class: 'btn btn-default btn-xs' do %> - All pipelines + <%= link_to all_processes_path, class: 'btn btn-default btn-xs' do %> + All processes <% end %> <% end %>
- <% _recent_processes = recent_processes(12) %>
- <% if _recent_processes.empty? %> + <% if recent_procs.empty? %> No recent pipelines or processes. <% else %> - <% _recent_processes.each do |p| %> - <% wu = p.work_unit %> + <% wus.each do |p, wu| %> <% if wu.is_finished? %>
@@ -53,29 +117,28 @@ Active for <%= render_runtime(wu_time, false) %> <% end %> - - <% outputs = wu.outputs %> - <% if outputs.size == 0 %> - No output. - <% elsif outputs.size == 1 %> - <%= link_to_if_arvados_object outputs[0], friendly_name: true %> - <% else %> - <%= render partial: 'work_unit/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:"pull-right"} %> - <% end %> - + <%= render partial: 'work_units/show_output', locals: {wu: wu, align: 'pull-right', include_icon: true} %>
<% else %>
-
- <%= link_to_if_arvados_object p, {friendly_name: true} %> -
+
+
+ <%= link_to_if_arvados_object p, {friendly_name: true} %> +
+ <% if wu.is_running? %> +
<% wu.progress %>
+ <% else %> +
+ <%=wu.state_label%> +
+ <% end %>
<% @@ -107,7 +170,8 @@
- <% nodes = Node.all %> + <% if show_node_status %> + <% nodes = Node.filter([["last_ping_at", ">", Time.now - 3600]]).results %>
Compute node status @@ -118,11 +182,6 @@ <% end %> <% end %> - - <%= link_to jobs_path, class: 'btn btn-default btn-xs' do %> - All jobs - <% end %> -
@@ -130,7 +189,7 @@ <%= render partial: 'compute_node_summary', locals: {nodes: nodes} %> <% active_nodes = [] %> <% nodes.sort_by { |n| n.hostname || "" }.each do |n| %> - <% if n.crunch_worker_state.in? ["busy", "idle"] and (Time.now - n[:last_ping_at]) < 3600 %> + <% if n.crunch_worker_state.in? ["busy", "idle"] %> <% active_nodes << n %> <% end %> <% end %> @@ -145,6 +204,8 @@
+ <% end %> + <% if Rails.configuration.show_recent_collections_on_dashboard %>
Recent collections @@ -154,11 +215,12 @@
- <% r = recent_collections(8) %> - <% r[:collections].each do |p| %> + <% recent_cs[:collections].each do |p| %>
- <%= link_to_if_arvados_object r[:owners][p[:owner_uuid]], friendly_name: true %>/ + <% if recent_cs[:owners][p[:owner_uuid]].is_a?(Group) %> + <%= link_to_if_arvados_object recent_cs[:owners][p[:owner_uuid]], friendly_name: true %>/ + <% end %> <%= render_localized_date(p[:modified_at], "noseconds") %>
<%= link_to_if_arvados_object p, {friendly_name: true, no_tags: true} %> @@ -167,5 +229,6 @@ <% end %>
+ <% end %>