Merge branch '9180-avoid-overreplication-keepclient'

[arvados.git] / apps / workbench / app / views / work_unit / _show_component.html.erb

diff --git a/apps/workbench/app/views/work_unit/_show_component.html.erb b/apps/workbench/app/views/work_unit/_show_component.html.erb
index 6bd6f02a028717c91b416893c138db133251c8ee..da3e5a787b18b1ef338f5dca1c45991911af9dfe 100644 (file)
--- a/apps/workbench/app/views/work_unit/_show_component.html.erb
+++ b/apps/workbench/app/views/work_unit/_show_component.html.erb
@@ -1,84 +1,46 @@
 <%# Work unit status %>
 
-<% if wu.state_label %>
-  <div class="pull-right" style="padding-left: 1em">
-    Current state: <span class="badge badge-<%= wu.state_bootstrap_class %>" data-wu-state="<%= wu.state_label %>">
-      <% if wu.state_label == "running" %>
-        Active
-      <% else %>
-        <%= wu.state_label %>
-      <% end %>
-    </span>&nbsp;
-  </div>
-<% end %>
-
-<% if wu.state_label == 'Paused' %>
-  <p>
-    This <%= wu.title %> is paused. Children that are
-    already running will continue to run, but no new work units will be submitted.
-  </p>
-<% end %>
-
-<% runningtime = determine_wallclock_runtime(wu.children) %>
-
-<p>
-  <% if wu.started_at %>
-    This <%= wu.title %> started at <%= render_localized_date(wu.started_at) %>.
-    It
-    <% if wu.state_label == 'Complete' %>
-      completed in
-    <% elsif wu.state_label == 'Failed' %>
-      failed after
-    <% else %>
-      has been active for
+<div class="container-fluid>
+  <div class="row-fluid">
+    <%# Need additional handling for main object display  %>
+    <% if @object.uuid == wu.uuid %>
+    <div class="container-fluid">
+      <div class="pull-right">
+        <div class="container-fluid">
+          <div class="row-fulid pipeline-instance-spacing">
+            <div class="col-md-7">
+            <% if wu.is_running? and wu.child_summary_str %>
+                <%= wu.child_summary_str %>
+            <% end %>
+            </div>
+            <div class="col-md-3">
+              <%= render partial: 'work_unit/progress', locals: {wu: wu} %>
+            </div>
+            <div class="col-md-1">
+              <% if wu.can_cancel? and @object.editable? %>
+                  <%= form_tag "#{wu.uri}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>
+                    <%= hidden_field_tag :return_to, url_for(@object) %>
+                    <%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-obj-button"} %>
+                  <% end %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
     <% end %>
 
-    <% walltime = if wu.finished_at then
-                    wu.finished_at - wu.started_at
-                  else
-                    Time.now - wu.started_at
-                  end %>
-
-    <%= if walltime > runningtime
-          render_runtime(walltime, false)
-        else
-          render_runtime(runningtime, false)
-        end %><% if wu.finished_at %> at <%= render_localized_date(wu.finished_at) %><% end %>.
-  <% else %>
-    <% if wu.state_label %> This <%= wu.title %> is <%= if wu.state_label == 'Running' then 'active' else wu.state_label.downcase end %>. <% end %>
-      <% walltime = 0%>
-  <% end %>
-
-  <% if wu.state_label == 'Failed' %>
-    Check the Log tab for more detail about why it failed.
-  <% end %>
-</p>
-
-<% if wu.state_label %>
-  <p>
-      It
-      <% if wu.state_label == 'Running' %>
-        has run
-      <% else %>
-        ran
-      <% end %>
-      for
-      <%
-          cputime = wu.children.map { |c|
-          if c.started_at
-            (c.runtime_constraints.andand[:min_nodes] || 1) * ((c.finished_at || Time.now()) - c.started_at)
-          else
-            0
-          end
-         }.reduce(:+) || 0 %>
-      <%= render_runtime(runningtime, false) %><% if (walltime - runningtime) > 0 %>
-        (<%= render_runtime(walltime - runningtime, false) %> queued)<% end %><% if cputime == 0 %>.<% else %>
-        and used
-      <%= render_runtime(cputime, false) %>
-      of node allocation time (<%= (cputime/runningtime).round(1) %>&Cross; scaling).
+    <div class="col-md-10" >
+      <% if wu.is_paused? %>
+        <p>
+          This <%= wu.title %> is paused. Children that are already running
+          will continue to run, but no new processes will be submitted.
+        </p>
       <% end %>
-  </p>
-<% end %>
+
+      <%= raw(wu.show_runtime) %>
+    </div>
+  </div>
 
 <p>
   <%= render(partial: 'work_unit/component_detail', locals: {current_obj: wu}) %>
@@ -93,7 +55,8 @@
     preload_objects_for_dataclass resource_class, uuids
   end
 
-  collections = wu.children.collect {|j| j.output}.compact
+  collections = wu.children.collect {|j| j.outputs}.compact
+  collections = collections.flatten.uniq
   collections.concat wu.children.collect {|j| j.docker_image}.uniq.compact
   collections_pdhs = collections.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
   collections_uuids = collections - collections_pdhs
@@ -101,9 +64,13 @@
   preload_for_pdhs collections_pdhs if collections_pdhs.any?
 %>
 
-<% @descendent_count = 0 if !@descendent_count %>
-
-<% wu.children.each_with_index do |c, i| %>
-  <% @descendent_count += 1 %>
-  <%= render(partial: 'work_unit/show_child', locals: {current_obj: c, i: @descendent_count, expanded: false}) %>
+<% if wu.has_unreadable_children %>
+  <%= render(partial: "pipeline_instances/show_components_json",
+             locals: {error_name: "Unreadable components", backtrace: nil, wu: wu}) %>
+<% else %>
+  <% @descendent_count = 0 if !@descendent_count %>
+  <% wu.children.each do |c| %>
+    <% @descendent_count += 1 %>
+    <%= render(partial: 'work_unit/show_child', locals: {current_obj: c, i: @descendent_count, expanded: false}) %>
+  <% end %>
 <% end %>