Merge branch '17967-storage-classes-config' into main

closes #17967

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 9da55cbeb3fedd36a3add088ab8a9d0e29607ed1..ed19d51d2574a0b7bc044e923e4d3c66d5ca4e0b 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -161,15 +161,9 @@ SPDX-License-Identifier: AGPL-3.0 %>
                   <li role="menuitem"><a href="/groups">
                       <i class="fa fa-lg fa-users fa-fw"></i> Groups
                   </a></li>
-                  <li role="menuitem"><a href="/nodes">
-                      <i class="fa fa-lg fa-cloud fa-fw"></i> Compute nodes
-                  </a></li>
                   <li role="menuitem"><a href="/keep_services">
                       <i class="fa fa-lg fa-exchange fa-fw"></i> Keep services
                   </a></li>
-                  <li role="menuitem"><a href="/keep_disks">
-                      <i class="fa fa-lg fa-hdd-o fa-fw"></i> Keep disks
-                  </a></li>
                 </ul>
               </li>
             <% end %>

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 7d34c43deb5103d72ac986f90a49dd24c48a5e73..35a1415213db789d441c4973b1f544ff16b6797c 100644 (file)
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -251,9 +251,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     ['SSH keys', nil, 'public_key'],
     ['Links', nil, 'link_class'],
     ['Groups', nil, 'All users'],
-    ['Compute nodes', nil, 'ping_secret'],
     ['Keep services', nil, 'service_ssl_flag'],
-    ['Keep disks', nil, 'bytes_free'],
   ].each do |page_name, add_button_text, look_for|
     test "test system menu #{page_name} link" do
       visit page_with_token('admin')