Merge pull request #1043 from chalettu/help-menu-visibility

Added RBAC controls for Help menu
ManageIQ · Sep 29, 2017 · 3d1caf0 · 3d1caf0
2 parents 80c7636 + 30576b7
commit 3d1caf0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/client/app/core/navigation/navigation-controller.js b/client/app/core/navigation/navigation-controller.js
@@ -1,6 +1,6 @@
 /** @ngInject */
 export function NavigationController (Text, Navigation, Session, API_BASE, ShoppingCart, $scope, $uibModal, $state,
-                                      EventNotifications, ApplianceInfo, CollectionsApi) {
+                                      EventNotifications, ApplianceInfo, CollectionsApi, RBAC) {
   const vm = this
 
   const destroy = $scope.$on('shoppingCartUpdated', refresh)
@@ -59,7 +59,13 @@ export function NavigationController (Text, Navigation, Session, API_BASE, Shopp
     })
     getNavigationItems(Navigation.items)
     refresh()
-
+    vm.permissions = {
+      help: {
+        about: RBAC.has('about'),
+        documentation: RBAC.has('documentation')
+      },
+      helpMenu: RBAC.hasAny(['about', 'product', 'documentation'])
+    }
     if (ShoppingCart.allowed()) {
       ShoppingCart.reload()
     }

diff --git a/client/app/core/navigation/navigation.controller.spec.js b/client/app/core/navigation/navigation.controller.spec.js
@@ -5,7 +5,7 @@ describe('Controller: Navigation', () => {
   beforeEach(inject(function ($controller) {
 
     bard.inject('Text', 'Navigation', 'Session', 'ShoppingCart', 'API_BASE', '$rootScope', '$uibModal', '$state',
-      '$document', 'EventNotifications', 'ApplianceInfo', 'CollectionsApi')
+      '$document', 'EventNotifications', 'ApplianceInfo', 'CollectionsApi', 'RBAC')
 
     ctrl = $controller('NavigationController', {
       Text: Text,
@@ -19,6 +19,7 @@ describe('Controller: Navigation', () => {
       $document: $document,
       EventNotifications: EventNotifications,
       ApplianceInfo: ApplianceInfo,
+      RBAC, RBAC
     })
   }))
 

diff --git a/client/app/layouts/application.html b/client/app/layouts/application.html
@@ -38,13 +38,13 @@
         <li>
           <miq-site-switcher sites="vm.sites"></miq-site-switcher>
         </li>
-        <li uib-dropdown>
+        <li uib-dropdown ng-if="vm.permissions.helpMenu">
           <a class="nav-item-iconic" uib-dropdown-toggle aria-haspopup="true" aria-expanded="true">
             <span class="fa pficon-help"></span>
             <span class="caret"></span>
           </a>
           <ul uib-dropdown-menu aria-labelledby="aboutModal">
-            <li>
+            <li ng-if="vm.permissions.help.documentation">
               <a href="/support/index?support_tab=about" target="_blank">
                 {{ 'Documentation' | translate}}
               </a>
@@ -54,7 +54,7 @@
                 {{vm.about.supportWebsiteText}}
               </a>
             </li>
-            <li>
+            <li ng-if="vm.permissions.help.about">
               <a href="#" ng-click="vm.about.isOpen = true">
                 {{'About' | translate}}
               </a>