15087: Add links to the oldest/longest running container
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 17 Jun 2019 13:37:05 +0000 (09:37 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 17 Jun 2019 13:37:05 +0000 (09:37 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

apps/workbench/app/views/projects/_container_summary.html.erb

index 1a411afc9f4c7324ed6a8b03651af94171b47271..2df4d81c0f595bd3149db0da2d0f2170f397a701 100644 (file)
@@ -3,28 +3,39 @@
 SPDX-License-Identifier: AGPL-3.0 %>
 
 <div class="compute-summary-numbers">
-    <table>
+  <table>
       <colgroup>
         <col width="50%">
         <col width="50%">
       </colgroup>
       <tr>
-       <% pending_containers = Container.order("modified_at asc").filter([["state", "in", ["Queued", "Locked"]], ["priority", ">", 0]]).limit(1) %>
+        <th>Pending containers</th>
+       <th>Running containers</th>
+      </tr>
+      <tr>
+       <% pending_containers = Container.order("created_at asc").filter([["state", "in", ["Queued", "Locked"]], ["priority", ">", 0]]).limit(1) %>
        <% running_containers = Container.order("started_at asc").where(state: "Running").limit(1) %>
         <td><%= pending_containers.items_available %></td>
         <td><%= running_containers.items_available %></td>
       </tr>
       <tr>
-        <th>Pending containers</th>
-        <th>Running containers</th>
+       <th>Oldest pending</th>
+       <th>Longest running</th>
       </tr>
       <tr>
-        <th><%= if pending_containers.first then render_runtime(Time.now - pending_containers.first.modified_at, false, false) else "-" end %></th>
-        <th><%= if running_containers.first then render_runtime(Time.now - running_containers.first.started_at, false, false) else "-" end %></th>
-      </tr>
-      <tr>
-        <th>Oldest pending</th>
-        <th>Longest running</th>
+        <td><% if pending_containers.first then %>
+           <%= link_to_if_arvados_object pending_containers.first, link_text: render_runtime(Time.now - pending_containers.first.created_at, false, false) %>
+         <% else %>
+           -
+         <% end %>
+       </td>
+
+        <td><% if running_containers.first then %>
+           <%= link_to_if_arvados_object running_containers.first, link_text: render_runtime(Time.now - running_containers.first.created_at, false, false) %>
+         <% else %>
+           -
+         <% end %>
+       </td>
       </tr>
     </table>