X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1650c9eec24fea204cdbf5229ed61d564b48cdb9..0821f5481edd016a3744bb50d97a9e5b99cd1a0f:/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 80e8e23650..c02577fcfd 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -1,39 +1,80 @@
-
Active processes +
+ Recent pipelines and processes <% if current_user.andand.is_active %> - - <%= link_to( - choose_pipeline_templates_path( - title: 'Choose a pipeline to run:', - action_name: 'Next: choose inputs ', - action_href: pipeline_instances_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), - { class: "btn btn-primary btn-xs", remote: true }) do %> - Run a pipeline... - <% end %> - + + + <%= link_to( + choose_work_unit_templates_path( + title: 'Choose a pipeline or workflow to run:', + action_name: 'Next: choose inputs ', + action_href: work_units_path, + action_method: 'post', + 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... + <% end %> + + + <%= link_to all_processes_path, class: 'btn btn-default btn-xs' do %> + All processes + <% end %> + + <% end %>
- <% _running_processes = running_processes(8) %> - <% _finished_processes = finished_processes(8) %> -
- <% if _running_processes.empty? %> - No processes are currently running. + <% _recent_processes = recent_processes(12) %> +
+ <% if _recent_processes.empty? %> + No recent pipelines or processes. <% else %> - <% _running_processes.each do |p| %> + <% _recent_processes.each do |p| %> <% wu = p.work_unit %> -
-
- <%= link_to_if_arvados_object p, {friendly_name: true} %> -
+ <% if wu.is_finished? %> +
+
+
+ <%= link_to_if_arvados_object p, {friendly_name: true} %> +
+
+ <%=wu.state_label%> +
+
+ <%= render_localized_date(wu.finished_at || wu.modified_at, "noseconds") %> +
+
+
+
+ <% if wu.started_at and wu.finished_at %> + <% wu_time = wu.finished_at - wu.started_at %> + Active for <%= render_runtime(wu_time, false) %> + <% 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} %> +
+ <% if wu.is_running? %> +
<% wu.progress %>
+ <% else %> +
+ <%=wu.state_label%> +
+ <% end %>
<% @@ -57,90 +98,44 @@
- <% end %> - <% end %> -
-
- -
-
Recently finished processes - - <%= link_to pipeline_instances_path, class: 'btn btn-default btn-xs' do %> - All pipelines <% end %> - -
-
- <% _finished_processes.each do |p| %> - <% wu = p.work_unit %> -
-
-
- <%= link_to_if_arvados_object p, {friendly_name: true} %> -
-
- <%=wu.state_label%> -
-
- <%= render_localized_date(wu.finished_at || wu.modified_at, "noseconds") %> -
-
-
-
- <% if wu.started_at and wu.finished_at %> - <% wu_time = wu.finished_at - wu.started_at %> - 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 %> - Outputs - <% end %> - -
-
- -
-
-
- <% outputs.each do |out| %> -
- <%= link_to_if_arvados_object out, friendly_name: true %> -
- <% end %> -
-
-
-
+ <% end %> <% end %>
- <% nodes = Node.all %> + <% nodes = Node.filter([["last_ping_at", ">", Time.now - 3600]]) %>
-
Compute and job status - - <%= link_to jobs_path, class: 'btn btn-default btn-xs' do %> - All jobs +
Compute node status + + <% if current_user.andand.is_admin %> + + <%= link_to nodes_path, class: 'btn btn-default btn-xs' do %> + All nodes + <% end %> + <% end %>
<%= 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"] %> + <% active_nodes << n %> + <% end %> + <% end %> + <% if active_nodes.any? %> + + <% end %>
- <%= render partial: 'compute_node_status', locals: {nodes: nodes} %> + <%= render partial: 'compute_node_status', locals: {nodes: active_nodes} %>