MB-29093: MB-28417: change permissions for index service in UI

Change-Id: Icda137f374cf25c10f7840abcbbd14b6e74197d2
Reviewed-on: http://review.couchbase.org/92172
Well-Formed: Build Bot <[email protected]>
Tested-by: Pavel Blagodov <[email protected]>
Reviewed-by: Pavel Blagodov <[email protected]>
Reviewed-by: Mike Wiederhold <[email protected]>

Author: pavel-blagodov

priv/public/ui/app/components/directives/mn_auto_compaction_form/mn_auto_compaction_form.js

@@ -26,7 +26,7 @@
       $scope.maybeDisableTimeInterval = maybeDisableTimeInterval;
       $scope.props = {};
 
-      if (mnPoolDefault.export.compat.atLeast40 && $scope.rbac.cluster.indexes.read) {
+      if (mnPoolDefault.export.compat.atLeast40 && $scope.rbac.cluster.settings.indexes.read) {
         mnPromiseHelper($scope, mnSettingsClusterService.getIndexSettings())
           .applyToScope("indexSettings");
       }

priv/public/ui/app/components/directives/mn_storage_mode/mn_storage_mode.html

@@ -7,7 +7,7 @@
        id="storage_mode_forestdb"
        ng-model="mnModel.storageMode"
        ng-disabled="(mnServices && !mnServicesModel.index) ||
-                    (mnPermissions && !mnPermissions.cluster.indexes.write) ||
+                    (mnPermissions && !mnPermissions.cluster.settings.indexes.write) ||
                     (mnInitial && mnInitial.storageMode === 'forestdb')">
     <label for="storage_mode_forestdb" class="checkbox">
       {{:: mnIsEnterprise ? 'Legacy' : 'Standard'}} Global Secondary
@@ -22,7 +22,7 @@
        ng-model="mnModel.storageMode"
        ng-disabled="!mnIsEnterprise ||
                     (mnServicesModel && !mnServicesModel.index) ||
-                    (mnPermissions && !mnPermissions.cluster.indexes.write)">
+                    (mnPermissions && !mnPermissions.cluster.settings.indexes.write)">
     <label for="storage_plasma_indexes" class="checkbox">
       Standard Global Secondary
     </label>
@@ -35,7 +35,7 @@
        ng-model="mnModel.storageMode"
        ng-disabled="!mnIsEnterprise ||
                     (mnServices && !mnServicesModel.index) ||
-                    (mnPermissions && !mnPermissions.cluster.indexes.write)">
+                    (mnPermissions && !mnPermissions.cluster.settings.indexes.write)">
     <label for="storage_memory_optimized" class="checkbox margin-right-zero">
       Memory-Optimized
     </label>

priv/public/ui/app/components/mn_permissions.js

@@ -24,7 +24,10 @@
         "cluster.bucket[" + name + "].xdcr!read",
         "cluster.bucket[" + name + "].xdcr!write",
         "cluster.bucket[" + name + "].xdcr!execute",
-        "cluster.bucket[" + name + "].n1ql.select!execute"
+        "cluster.bucket[" + name + "].n1ql.select!execute",
+        "cluster.bucket[" + name + "].n1ql.index!read",
+        "cluster.bucket[" + name + "].n1ql.index!write"
+
       ];
       if (name === "." || buckets.byName[name].isMembase) {
         basePermissions = basePermissions.concat([
@@ -55,7 +58,7 @@
       "cluster.settings!write",
       "cluster.stats!read",
       "cluster.tasks!read",
-      "cluster.indexes!read",
+      "cluster.settings.indexes!read",
       "cluster.admin.internal!all",
       "cluster.xdcr.settings!read",
       "cluster.xdcr.settings!write",
@@ -67,7 +70,7 @@
       "cluster.admin.settings!write",
       "cluster.logs!read",
       "cluster.pools!write",
-      "cluster.indexes!write",
+      "cluster.settings.indexes!write",
       "cluster.admin.security!write",
       "cluster.samples!read",
       "cluster.nodes!read"

priv/public/ui/app/mn_admin/mn_admin.html

@@ -195,15 +195,15 @@ <h1>
       <a
          mn-tab="indexes"
          ng-class="{currentnav: ('app.admin.indexes' | includedByState)}"
-         ng-show="rbac.cluster.bucket['.'].views.read || rbac.cluster.indexes.read"
+         ng-show="rbac.cluster.bucket['.'].views.read || rbac.cluster.bucket['.'].n1ql.index.read"
          ui-sref="app.admin.indexes.gsi"
          class="resp-hide-sml">
         <span
            ui-sref="app.admin.indexes.gsi"
-           ng-show="rbac.cluster.indexes.read">Indexes</span>
+           ng-show="rbac.cluster.bucket['.'].n1ql.index.read">Indexes</span>
         <span
            ui-sref="app.admin.indexes.views.list"
-           ng-show="rbac.cluster.indexes.read === false">Indexes</span>
+           ng-show="rbac.cluster.bucket['.'].n1ql.index.read === false">Indexes</span>
       </a>
     </nav>
 

priv/public/ui/app/mn_admin/mn_indexes/mn_indexes.html

@@ -4,7 +4,7 @@
      mn-pluggable-ui-tabs
      mn-tab-bar-name="indexesTab">
     <a
-       ng-show="rbac.cluster.indexes.read"
+       ng-show="rbac.cluster.bucket['.'].n1ql.index.read"
        ui-sref="app.admin.indexes.gsi"
        ui-sref-active="selected">Global Indexes</a>
     <a

priv/public/ui/app/mn_admin/mn_indexes/mn_indexes_config.js

@@ -31,7 +31,7 @@
           }
         },
         data: {
-          permissions: "cluster.indexes.read"
+          permissions: "cluster.bucket['.'].n1ql.index.read"
         },
         controller: "mnGsiController as gsiCtl",
         templateUrl: "app/mn_admin/mn_indexes/mn_gsi/mn_gsi.html"

priv/public/ui/app/mn_admin/mn_servers/list/item/mn_servers_list_item_controller.js

@@ -120,7 +120,7 @@
         if (mnPoolDefault.export.isEnterprise) {
           warnings.isLastCBAS = mnMemoryQuotaService.isOnlyOneNodeWithService(nodes.allNodes, node.services, 'cbas', true);
         }
-        return mnPoolDefault.export.compat.atLeast40 && mnPermissions.export.cluster.indexes.read ? mnGsiService.getIndexesState().then(function (indexStatus) {
+        return mnPoolDefault.export.compat.atLeast40 && mnPermissions.export.cluster.bucket['.'].n1ql.index.read ? mnGsiService.getIndexesState().then(function (indexStatus) {
           warnings.isThereIndex = !!_.find(indexStatus.indexes, function (index) {
             return _.indexOf(index.hosts, node.hostname) > -1;
           });

priv/public/ui/app/mn_admin/mn_settings/cluster/mn_settings_cluster.html

@@ -1,5 +1,5 @@
 <div
-   mn-spinner="settingsClusterCtl.clusterName === undefined || !settingsClusterCtl.memoryQuotaConfig || (rbac.cluster.indexes.read && poolDefault.compat.atLeast40 && !settingsClusterCtl.indexSettings) || (poolDefault.value.isEnterprise && !settingsClusterCtl.certificate)">
+   mn-spinner="settingsClusterCtl.clusterName === undefined || !settingsClusterCtl.memoryQuotaConfig || (rbac.cluster.settings.indexes.read && poolDefault.compat.atLeast40 && !settingsClusterCtl.indexSettings) || (poolDefault.value.isEnterprise && !settingsClusterCtl.certificate)">
   <form
      ng-submit="settingsClusterCtl.saveVisualInternalSettings()"
      class="forms">
@@ -38,10 +38,10 @@
 
       <div class="fix-width-6">
 
-        <label ng-show="poolDefault.compat.atLeast40 && rbac.cluster.indexes.read" class="margin-top-half">
+        <label ng-show="poolDefault.compat.atLeast40 && rbac.cluster.settings.indexes.read" class="margin-top-half">
           Index Storage Mode
         </label>
-        <div ng-show="poolDefault.compat.atLeast40 && rbac.cluster.indexes.read">
+        <div ng-show="poolDefault.compat.atLeast40 && rbac.cluster.settings.indexes.read">
           <div class="formrow">
             <mn-storage-mode
                mn-is-enterprise="adminCtl.poolDefault.isEnterprise"
@@ -73,7 +73,7 @@
             <input
                type="number"
                ng-model="settingsClusterCtl.indexSettings.indexerThreads"
-               ng-disabled="settingsClusterCtl.indexSettings.storageMode === '' || !rbac.cluster.indexes.write"
+               ng-disabled="settingsClusterCtl.indexSettings.storageMode === '' || !rbac.cluster.settings.indexes.write"
                id="index_settings_thread">
             <div
                class="error error-field"
@@ -96,7 +96,7 @@
             <input
                type="text"
                ng-model="settingsClusterCtl.indexSettings.maxRollbackPoints"
-               ng-disabled="settingsClusterCtl.indexSettings.storageMode === '' || !rbac.cluster.indexes.write"
+               ng-disabled="settingsClusterCtl.indexSettings.storageMode === '' || !rbac.cluster.settings.indexes.write"
                id="in_memory_snapshot">
             <div
                class="error error-field"
@@ -112,7 +112,7 @@
             <select
                ng-model="settingsClusterCtl.indexSettings.logLevel"
                name="logLevel"
-               ng-disabled="settingsClusterCtl.indexSettings.storageMode === '' || !rbac.cluster.indexes.write"
+               ng-disabled="settingsClusterCtl.indexSettings.storageMode === '' || !rbac.cluster.settings.indexes.write"
                id="indexer_log_level">
               <option value="silent">Silent</option>
               <option value="fatal">Fatal</option>
@@ -269,7 +269,7 @@
     <div class="margin-top-1-5">
       <button
          type="submit"
-         ng-show="rbac.cluster.pools.write || rbac.cluster.indexes.write"
+         ng-show="rbac.cluster.pools.write || rbac.cluster.settings.indexes.write"
          ng-disabled="!!settingsClusterCtl.indexSettingsErrors || !!settingsClusterCtl.memoryQuotaErrors">
         Save
       </button>

priv/public/ui/app/mn_admin/mn_settings/cluster/mn_settings_cluster_controller.js

@@ -30,7 +30,7 @@
 
     if (mnPoolDefault.export.compat.atLeast40) {
       $scope.$watch('settingsClusterCtl.indexSettings', _.debounce(function (indexSettings, prevIndexSettings) {
-        if (!indexSettings || !$scope.rbac.cluster.indexes.write || !(prevIndexSettings && !_.isEqual(indexSettings, prevIndexSettings))) {
+        if (!indexSettings || !$scope.rbac.cluster.settings.indexes.write || !(prevIndexSettings && !_.isEqual(indexSettings, prevIndexSettings))) {
           return;
         }
         var promise = mnSettingsClusterService.postIndexSettings(vm.indexSettings, true);
@@ -53,7 +53,7 @@
 
       queries.push(promise1);
 
-      if (!_.isEqual(vm.indexSettings, vm.initialIndexSettings) && mnPoolDefault.export.compat.atLeast40 && $scope.rbac.cluster.indexes.write) {
+      if (!_.isEqual(vm.indexSettings, vm.initialIndexSettings) && mnPoolDefault.export.compat.atLeast40 && $scope.rbac.cluster.settings.indexes.write) {
         promise2 = mnPromiseHelper(vm, mnSettingsClusterService.postIndexSettings(vm.indexSettings))
             .catchErrors("indexSettingsErrors")
             .applyToScope("initialIndexSettings")
@@ -135,7 +135,7 @@
           vm.memoryQuotaConfig = resp;
         });
 
-      if (mnPoolDefault.export.compat.atLeast40 && $scope.rbac.cluster.indexes.read) {
+      if (mnPoolDefault.export.compat.atLeast40 && $scope.rbac.cluster.settings.indexes.read) {
         mnPromiseHelper(vm, mnSettingsClusterService.getIndexSettings())
           .applyToScope(function (indexSettings) {
             vm.indexSettings = indexSettings;

priv/public/ui/app/mn_admin/mn_settings/notifications/mn_settings_notifications_service.js

@@ -297,13 +297,13 @@ angular.module('mnSettingsNotificationsService', [
           $q.when(poolDefault)
         ];
 
-        if (mnPoolDefault.export.compat.atLeast40 && mnPermissions.export.cluster.indexes.read) {
+        if (mnPoolDefault.export.compat.atLeast40 && mnPermissions.export.cluster.bucket['.'].n1ql.index.read) {
           queries[4] = mnGsiService.getIndexesState(mnHttpParams);
         }
         if (mnPools.export.isEnterprise && mnPermissions.export.cluster.admin.security.read && mnPoolDefault.export.compat.atLeast40) {
           queries[5] = mnAuditService.getAuditSettings();
         }
-        if (mnPoolDefault.export.compat.atLeast40 && mnPermissions.export.cluster.indexes.read) {
+        if (mnPoolDefault.export.compat.atLeast40 && mnPermissions.export.cluster.settings.indexes.read) {
           queries[6] = mnSettingsClusterService.getIndexSettings();
         }
         if (mnPermissions.export.cluster.settings.read) {