Fix 2.4.2 upgrade notes formatting refs #19330

[arvados.git] / apps / workbench / app / views / projects / _compute_node_status.html.erb

diff --git a/apps/workbench/app/views/projects/_compute_node_status.html.erb b/apps/workbench/app/views/projects/_compute_node_status.html.erb
index da5871cb7a662f3018434830cf6b922640750a6a..3de2ab67ab5d6cf7a34c84d4effe4de066354907 100644 (file)
--- a/apps/workbench/app/views/projects/_compute_node_status.html.erb
+++ b/apps/workbench/app/views/projects/_compute_node_status.html.erb
@@ -1,50 +1,10 @@
-<h4>Queue</h4>
-<% queue = Job.queue %>
-<% if queue.any? %>
+<%# Copyright (C) The Arvados Authors. All rights reserved.
 
-<% queue.each do |j| %>
-  <div class="row">
-    <div class="col-md-3 text-overflow-ellipsis">
-      <%= link_to_if_arvados_object j, friendly_name: true %>
-    </div>
-    <div class="col-md-4">
-      <%= render_localized_date(j[:created_at]) %>
-    </div>
-    <div class="col-md-3">
-      <%= render_runtime(Time.now - j[:created_at], false) %>
-    </div>
-    <div class="col-md-2">
-      <%= j[:priority] %>
-    </div>
-  </div>
-<% end %>
-  <div class="row">
-    <div class="col-md-3">
-      <b>Job</b>
-    </div>
-    <div class="col-md-4">
-      <b>Submitted</b>
-    </div>
-    <div class="col-md-3">
-      <b>Queued</b>
-    </div>
-    <div class="col-md-2">
-      <b>Priority</b>
-    </div>
-  </div>
-  <% if Job.queue_size > queue.size %>
-    <i>Note: some items in the queue are not visible to you.</i>
-  <% end %>
-  <div>    
-  </div>
-<% else %>
-  There are currently no jobs in the queue.
-<% end %>
+SPDX-License-Identifier: AGPL-3.0 %>
 
 <h4>Node status</h4>
 <div class="compute-summary-nodelist">
-    <% 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 %>
+    <% nodes.each do |n| %>
         <div class="compute-summary">
           <a data-toggle="collapse" href="#detail_<%= n.hostname %>" class="compute-summary-head label label-<%= if n.crunch_worker_state == 'busy' then 'primary' else 'default' end %>">
             <%= n.hostname %>
@@ -52,10 +12,9 @@
           <div id="detail_<%= n.hostname %>" class="collapse compute-detail">
             state: <%= n.crunch_worker_state %><br>
             <% [:total_cpu_cores, :total_ram_mb, :total_scratch_mb].each do |i| %>
-              <%= i.to_s.gsub '_', ' ' %>: <%= n.info[i] %><br>
+              <%= i.to_s.gsub '_', ' ' %>: <%= n.properties[i] %><br>
             <% end %>
           </div>
         </div>
-      <% end %>
     <% end %>
 </div>