X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3655323be70c758c3c47460598a9644c45a3ee08..cbd67fc6ba667bc27ca7e885145a6e34e5596f37:/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..8abcee49e6 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -1,79 +1,40 @@
-
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 %> - - <% end %> -
- - <% _running_processes = running_processes(8) %> - <% _finished_processes = finished_processes(8) %> -
- <% if _running_processes.empty? %> - No processes are currently running. - <% else %> - <% _running_processes.each do |p| %> - <% wu = p.work_unit %> -
-
- <%= link_to_if_arvados_object p, {friendly_name: true} %> -
-
- <% wu.progress %> -
-
-
- - <% - children = wu.children - running = children.select { |c| c.state_label == "Running" } - queued = children.select { |c| c.state_label == "Queued" } - %> - -
- Started at <%= render_localized_date(wu.started_at || wu.created_at, "noseconds") %>. - <% wu_time = Time.now - (wu.started_at || wu.created_at) %> - Active for <%= render_runtime(wu_time, false) %>. - -
- <% running.each do |r| %> - <%= r.label || r.state_label || 'Not ready' %> + + + <%= 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 pipeline_instances_path, class: 'btn btn-default btn-xs' do %> + All pipelines <% end %> - <% queued.each do |q| %> - <%= q.label || r.state_label || 'Not ready' %> - <% end %> -
-
-
- <% 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| %> + <% _recent_processes = recent_processes(12) %> +
+ <% if _recent_processes.empty? %> + No recent pipelines or processes. + <% else %> + <% _recent_processes.each do |p| %> <% wu = p.work_unit %> -
+ <% if wu.is_finished? %> +
<%= link_to_if_arvados_object p, {friendly_name: true} %> @@ -99,24 +60,47 @@ <% elsif outputs.size == 1 %> <%= link_to_if_arvados_object outputs[0], friendly_name: true %> <% else %> - Outputs + <%= render partial: 'work_unit/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:"pull-right"} %> <% end %>
-
-
-
- <% outputs.each do |out| %> -
- <%= link_to_if_arvados_object out, friendly_name: true %> -
- <% end %> +
+ <% else %> +
+
+ <%= link_to_if_arvados_object p, {friendly_name: true} %> +
+
+ <% wu.progress %>
+ + <% + children = wu.children + running = children.select { |c| c.state_label == "Running" } + queued = children.select { |c| c.state_label == "Queued" } + %> + +
+ Started at <%= render_localized_date(wu.started_at || wu.created_at, "noseconds") %>. + <% wu_time = Time.now - (wu.started_at || wu.created_at) %> + Active for <%= render_runtime(wu_time, false) %>. + +
+ <% running.each do |r| %> + <%= r.label || r.state_label || 'Not ready' %> + <% end %> + <% queued.each do |q| %> + <%= q.label || r.state_label || 'Not ready' %> + <% end %> +
+
+ <% end %> + <% end %> <% end %>
@@ -125,22 +109,39 @@
<% nodes = Node.all %>
-
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 %> + + <%= link_to jobs_path, class: 'btn btn-default btn-xs' do %> + All jobs + <% 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"] and (Time.now - n[:last_ping_at]) < 3600 %> + <% 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} %>