Merge pull request #5453 from skateman/settings-menu-extract

Menu Simplification: extract Configuration into the top-right bar
ManageIQ · Apr 17, 2019 · 2e2543b · 2e2543b
2 parents bfeb5b3 + e1f565d
commit 2e2543b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/app/presenters/menu/default_menu.rb b/app/presenters/menu/default_menu.rb
@@ -264,8 +264,7 @@ def monitor_menu_section
       def settings_menu_section
         Menu::Section.new(:set, N_("Settings"), 'pficon pficon-settings', [
           Menu::Item.new('configuration', N_('My Settings'),   'my_settings',  {:feature => 'my_settings', :any => true},  '/configuration/index'),
-          Menu::Item.new('my_tasks',      N_('Tasks'),         'tasks',        {:feature => 'tasks', :any => true},        '/miq_task/index?jobs_tab=tasks'),
-          Menu::Item.new('ops',           N_('Configuration'), 'ops_explorer', {:feature => 'ops_explorer', :any => true}, '/ops/explorer')
+          Menu::Item.new('my_tasks',      N_('Tasks'),         'tasks',        {:feature => 'tasks', :any => true},        '/miq_task/index?jobs_tab=tasks')
         ], :top_right)
       end
 

diff --git a/app/views/layouts/_user_options.html.haml b/app/views/layouts/_user_options.html.haml
@@ -1,4 +1,8 @@
 - if current_user
+  - if ApplicationHelper.role_allows?(:feature => 'ops_explorer', :any => true)
+    %li.dropdown
+      %a.nav-item-iconic{:href => '/ops/explorer', :title => _('Configuration')}
+        %i.fa.fa-cog
   %li.dropdown
     %a{:href => "#", :class => "dropdown-toggle nav-item-iconic", :id => "dropdownMenu2", "data-toggle" => "dropdown", "aria-haspopup" => "true"}
       %span.pficon.pficon-user

diff --git a/spec/controllers/dashboard_controller_spec.rb b/spec/controllers/dashboard_controller_spec.rb
@@ -246,22 +246,6 @@
     end
   end
 
-  context "#main_tab redirects to correct url when maintab is pressed by user with only Tenant features" do
-    before do
-      allow_any_instance_of(described_class).to receive(:set_user_time_zone)
-      allow(controller).to receive(:check_privileges).and_return(true)
-      EvmSpecHelper.seed_specific_product_features("rbac_tenant")
-      feature_id = MiqProductFeature.find_all_by_identifier(["rbac_tenant"])
-      login_as FactoryBot.create(:user, :features => feature_id)
-    end
-
-    it "for Configure maintab" do
-      session[:tab_url] = {}
-      post :maintab, :params => { :tab => "set" }
-      expect(response.body).to include("ops/explorer")
-    end
-  end
-
   describe "#start_url_for_user" do
     before do
       MiqShortcut.seed