Merge branch 'master' into 4232-slow-pipes-n-jobs
[arvados.git] / apps / workbench / app / views / pipeline_instances / _running_component.html.erb
index 8613d54a100515bd2f1093757a8f62d366c33e80..4359860c6e5529c487dd8b4a672e9058e31e1cef 100644 (file)
@@ -1,84 +1,97 @@
-  <% current_job = pj[:job] if pj[:job] != {} and pj[:job][:uuid] %>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <div class="container-fluid">
-        <div class="row">
+<% current_job = pj[:job] if pj[:job] != {} and pj[:job][:uuid] %>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <%# column offset 0 %>
+        <div class="col-md-3" style="word-break:break-all;">
+          <h4 class="panel-title">
+            <a data-toggle="collapse" href="#collapse<%= i %>">
+              <%= pj[:name] %> <span class="caret"></span>
+            </a>
+          </h4>
+        </div>
+
+        <%# column offset 3 %>
+        <div class="col-md-2 pipeline-instance-spacing">
+          <%= pj[:progress_bar] %>
+        </div>
+
+        <% if current_job %>
+          <%# column offset 5 %>
+          <% if current_job[:state] != "Queued" %>
           <div class="col-md-3">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" href="#collapse<%= i %>" style="white-space: nowrap;">
-                <%= pj[:name] %> <span class="caret"></span>
-              </a>
-            </h4>
+            <% if current_job[:started_at] %>
+              <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
+              <% cputime = tasks.map { |task|
+                   if task.started_at and task.job_uuid == current_job[:uuid]
+                     (if task.finished_at then task.finished_at else Time.now() end) - task.started_at
+                   else
+                     0
+                   end
+                 }.reduce(:+) || 0 %>
+              <%= render_runtime(walltime, false, false) %>
+              <% if cputime > 0 %> / <%= render_runtime(cputime, false, false) %> (<%= (cputime/walltime).round(1) %>&Cross;)<% end %>
+            <% end %>
           </div>
+          <% end %>
 
-          <% if current_job %>
-            <div class="col-md-1">
-              <%= render(partial: 'job_status_label', locals: { j: current_job }) %>
+          <% if current_job[:state] == "Queued" %>
+            <%# column offset 5 %>
+            <div class="col-md-6">
+              <% queuetime = Time.now - Time.iso8601(current_job[:created_at]) %>
+              Queued for <%= render_runtime(queuetime, true) %>.
+              <% begin %>
+                <% if current_job[:queue_position] == 0 %>
+                  This job is next in the queue to run.
+                <% elsif current_job[:queue_position] == 1 %>
+                  There is 1 job in the queue ahead of this one.
+                <% elsif current_job[:queue_position] %>
+                  There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one.
+                <% end %>
+              <% rescue %>
+              <% end %>
             </div>
-
+          <% elsif current_job[:state] == "Running" %>
+            <%# column offset 8 %>
             <div class="col-md-3">
-              <% if current_job[:started_at] %>
-                <% walltime = ((if current_job.finished_at then current_job.finished_at else Time.now() end) - current_job.started_at) %>
-                <% cputime = tasks.map { |task|
-                     if task.started_at and task.job_uuid == current_job.uuid
-                       (if task.finished_at then task.finished_at else Time.now() end) - task.started_at
-                     else
-                       0
-                     end
-                   }.reduce(:+) || 0 %>
-                <%= render_runtime(walltime, false, false) %>
-                <% if cputime > 0 %> / <%= render_runtime(cputime, false, false) %> (<%= (cputime/walltime).round(1) %>&Cross;)<% end %>
+              <span class="task-summary-status">
+                <%= current_job[:tasks_summary][:done] %>&nbsp;<%= "task".pluralize(current_job[:tasks_summary][:done]) %> done,
+                <%= current_job[:tasks_summary][:failed] %>&nbsp;failed,
+                <%= current_job[:tasks_summary][:running] %>&nbsp;running,
+                <%= current_job[:tasks_summary][:todo] %>&nbsp;pending
+              </span>
+            </div>
+          <% elsif current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
+            <%# column offset 8 %>
+            <div class="col-md-4 text-overflow-ellipsis">
+              <% if pj[:output_uuid] %>
+                <%= link_to_if_arvados_object pj[:output_uuid], friendly_name: true %>
+              <% elsif current_job[:output] %>
+                <%= link_to_if_arvados_object current_job[:output], link_text: "Output of #{pj[:name]}" %>
+              <% else %>
+                No output.
               <% end %>
             </div>
+          <% end %>
 
-            <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
-              <div class="col-md-5 text-overflow-ellipsis">
-                <% if pj[:output_uuid] %>
-                  <%= link_to_if_arvados_object pj[:output_uuid], friendly_name: true %>
-                <% elsif current_job.andand[:output] %>
-                  <%= link_to_if_arvados_object current_job[:output], link_text: "Output of #{pj[:name]}" %>
-                <% else %>
-                  No output.
-                <% end %>
-              </div>
-            <% elsif current_job[:state] == "Running" %>
-              <div class="col-md-3 pipeline-instance-spacing">
-                <%= pj[:progress_bar] %>
-              </div>
-              <div class="col-md-1 pipeline-instance-spacing">
-                <%= form_tag "/jobs/#{current_job.uuid}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
+          <% if current_job[:state].in? ["Queued", "Running"] and @object.editable? %>
+            <%# column offset 11 %>
+            <div class="col-md-1 pipeline-instance-spacing">
+              <%= form_tag "/jobs/#{current_job[:uuid]}/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-job-button"} %>
-            </div>
-            <% end %>
-          <% elsif current_job[:state] == "Queued" %>
-            <div class="col-md-5">
-              <% queuetime = Time.now - current_job[:created_at] %>
-              Queued for <%= render_runtime(queuetime, true) %>.
-              <% begin %>
-              <% if current_job.queue_position == 0 %>
-                This job is next in the queue to run.
-              <% elsif current_job.queue_position == 1 %>
-                There is 1 job in the queue ahead of this one.
-              <% else  %>
-                There are <%= current_job.queue_position %> jobs in the queue ahead of this one.
               <% end %>
-              <% rescue %>
-          <% end %>
             </div>
           <% end %>
-        <% else %>
-          <div class="col-md-3 col-md-offset-3">
-            <span class="label label-default">Not ready</span>
-          </div>
-<% end %>
-</div>
-</div>
-</div>
+        <% end %>
+      </div>
+    </div>
+  </div>
 
-<div id="collapse<%= i %>" class="panel-collapse collapse <%= if expanded then 'in' end %>">
-  <div class="panel-body">
-    <div class="container">
+  <div id="collapse<%= i %>" class="panel-collapse collapse <%= if expanded then 'in' end %>">
+    <div class="panel-body">
+      <div class="container">
         <% current_component = (if current_job then current_job else pj end) %>
         <div class="row">
           <div class="col-md-6">
             <p>script_parameters:</p>
             <pre><%= JSON.pretty_generate(current_component[:script_parameters]) rescue nil %></pre>
           </div>
-          <% if current_component[:tasks_summary] %>
-          <div class="col-md-3">
-            <table>
-              <% [:done, :running, :failed, :todo].each do |d| %>
-              <tr>
-                <td style="padding-right: 1em"><%= 'tasks:' if d == :done %></td>
-                <td style="padding-right: 1em"><%= d.to_s %></td>
-                <td><%= current_component[:tasks_summary][d] %></td>
-              </tr>
-              <% end %>
-            </table>
-          </div>
-          <% end %>
         </div>
+      </div>
     </div>
   </div>
 </div>
-</div>