Feature Controls - Simplify Saved Objects Management UI Capabilities

src/legacy/core_plugins/kibana/index.js

@@ -240,9 +240,7 @@ export default function (kibana) {
       migrations,
     },
 
-    uiCapabilities: async function (server) {
-      const { savedObjects } = server;
-
+    uiCapabilities: async function () {
       return {
         discover: {
           show: true,
@@ -275,14 +273,11 @@ export default function (kibana) {
         indexPatterns: {
           save: true,
         },
-        savedObjectsManagement: savedObjects.types.reduce((acc, type) => ({
-          ...acc,
-          [type]: {
-            delete: true,
-            edit: true,
-            read: true,
-          }
-        }), {}),
+        savedObjectsManagement: {
+          delete: true,
+          edit: true,
+          read: true,
+        },
         management: {
           /*
            * Management settings correspond to management section/link ids, and should not be changed

src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js

@@ -139,7 +139,7 @@ uiModules.get('apps/management', ['monospaced.elastic'])
           }
         };
 
-        const { edit: canEdit, delete: canDelete } = uiCapabilities.savedObjectsManagement[service.type];
+        const { edit: canEdit, delete: canDelete } = uiCapabilities.savedObjectsManagement;
         $scope.canEdit = canEdit;
         $scope.canDelete = canDelete;
         $scope.canViewInApp = canViewInApp(uiCapabilities, service.type);

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js

@@ -134,26 +134,12 @@ const defaultProps = {
   services: [],
   uiCapabilities: {
     savedObjectsManagement: {
-      'index-pattern': {
-        read: true
-      },
-      visualization: {
-        read: true
-      },
-      dashboard: {
-        read: true
-      },
-      search: {
-        read: true
-      }
+      read: true,
+      edit: false,
+      delete: false,
     }
   },
-  canDeleteSavedObjectTypes: [
-    'index-pattern',
-    'visualization',
-    'dashboard',
-    'search'
-  ]
+  canDelete: true,
 };
 
 beforeEach(() => {
@@ -272,41 +258,6 @@ describe('ObjectsTable', () => {
     expect(addDangerMock).toHaveBeenCalled();
   });
 
-  it('should filter find operation based on the uiCapabilities', async () => {
-    const uiCapabilities = {
-      savedObjectsManagement: {
-        'index-pattern': {
-          read: false,
-        },
-        visualization: {
-          read: false,
-        },
-        dashboard: {
-          read: false,
-        },
-        search: {
-          read: true,
-        }
-      }
-    };
-    const customizedProps = { ...defaultProps, uiCapabilities };
-    const component = shallowWithIntl(
-      <ObjectsTable.WrappedComponent
-        {...customizedProps}
-        perPageConfig={15}
-      />
-    );
-
-    // Ensure all promises resolve
-    await new Promise(resolve => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
-
-    expect(findObjects).toHaveBeenCalledWith(expect.objectContaining({
-      type: ['search']
-    }));
-  });
-
   describe('export', () => {
     it('should export selected objects', async () => {
       const mockSelectedSavedObjects = [
@@ -452,42 +403,6 @@ describe('ObjectsTable', () => {
       expect(getRelationships).toHaveBeenCalledWith('search', '1', savedObjectTypes, defaultProps.$http, defaultProps.basePath);
     });
 
-    it('should fetch relationships filtered based on the uiCapabilities', async () => {
-      const { getRelationships } = require('../../../lib/get_relationships');
-
-      const uiCapabilities = {
-        savedObjectsManagement: {
-          'index-pattern': {
-            read: false,
-          },
-          visualization: {
-            read: false,
-          },
-          dashboard: {
-            read: false,
-          },
-          search: {
-            read: true,
-          }
-        }
-      };
-      const customizedProps = { ...defaultProps, uiCapabilities };
-      const component = shallowWithIntl(
-        <ObjectsTable.WrappedComponent
-          {...customizedProps}
-        />
-      );
-
-      // Ensure all promises resolve
-      await new Promise(resolve => process.nextTick(resolve));
-      // Ensure the state changes are reflected
-      component.update();
-
-      await component.instance().getRelationships('search', '1');
-      const savedObjectTypes = ['search'];
-      expect(getRelationships).toHaveBeenCalledWith('search', '1', savedObjectTypes, defaultProps.$http, defaultProps.basePath);
-    });
-
     it('should show the flyout', async () => {
       const component = shallowWithIntl(
         <ObjectsTable.WrappedComponent

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js

@@ -86,7 +86,7 @@ const defaultProps = {
   onTableChange: () => {},
   isSearching: false,
   onShowRelationships: () => {},
-  canDeleteSavedObjectTypes: ['visualization']
+  canDelete: true
 };
 
 describe('Table', () => {
@@ -127,9 +127,9 @@ describe('Table', () => {
     expect(component.state().isSearchTextValid).toBe(true);
   });
 
-  it(`restricts which saved objects can be deleted based on type`, () => {
+  it(`prevents saved objects from being deleted`, () => {
     const selectedSavedObjects = [{ type: 'visualization' }, { type: 'search' }, { type: 'index-pattern' }];
-    const customizedProps = { ...defaultProps, selectedSavedObjects, canDeleteSavedObjectTypes: ['visualization'] };
+    const customizedProps = { ...defaultProps, selectedSavedObjects, canDelete: false };
     const component = shallowWithIntl(
       <Table.WrappedComponent
         {...customizedProps}

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js

@@ -36,6 +36,7 @@ import {
   EuiText
 } from '@elastic/eui';
 import { getDefaultTitle, getSavedObjectLabel } from '../../../../lib';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
 
 class TableUI extends PureComponent {
@@ -47,7 +48,7 @@ class TableUI extends PureComponent {
       onSelectionChange: PropTypes.func.isRequired,
     }).isRequired,
     filterOptions: PropTypes.array.isRequired,
-    canDeleteSavedObjectTypes: PropTypes.array.isRequired,
+    canDelete: PropTypes.bool.isRequired,
     onDelete: PropTypes.func.isRequired,
     onExport: PropTypes.func.isRequired,
     goInspectObject: PropTypes.func.isRequired,
@@ -254,10 +255,6 @@ class TableUI extends PureComponent {
       );
     }
 
-    const unableToDeleteSavedObjectTypes = selectedSavedObjects
-      .map(({ type }) => type)
-      .filter(type => !this.props.canDeleteSavedObjectTypes.includes(type));
-
     const button = (
       <EuiButton
         iconType="arrowDown"
@@ -286,10 +283,15 @@ class TableUI extends PureComponent {
               onClick={onDelete}
               isDisabled={
                 selectedSavedObjects.length === 0 ||
-                unableToDeleteSavedObjectTypes.length > 0
+                !this.props.canDelete
               }
               title={
-                unableToDeleteSavedObjectTypes.length > 0 ? `Unable to delete ${unableToDeleteSavedObjectTypes.join(', ')}` : undefined
+                this.props.canDelete
+                  ? undefined
+                  : i18n.translate(
+                    'kbn.management.objects.objectsTable.table.deleteButtonTitle',
+                    { defaultMessage: 'Unable to delete saved objects' }
+                  )
               }
               data-test-subj="savedObjectsManagementDelete"
             >

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js

@@ -82,9 +82,7 @@ class ObjectsTableUI extends Component {
 
   constructor(props) {
     super(props);
-    this.savedObjectTypes = POSSIBLE_TYPES.filter(type => {
-      return this.props.uiCapabilities.savedObjectsManagement[type].read;
-    });
+    this.savedObjectTypes = POSSIBLE_TYPES;
 
     this.state = {
       totalCount: 0,
@@ -677,10 +675,6 @@ class ObjectsTableUI extends Component {
       view: `${type} (${savedObjectCounts[type] || 0})`,
     }));
 
-    const canDeleteSavedObjectTypes = POSSIBLE_TYPES.filter(type => {
-      return this.props.uiCapabilities.savedObjectsManagement[type].delete;
-    });
-
     return (
       <EuiPageContent
         horizontalPosition="center"
@@ -706,7 +700,7 @@ class ObjectsTableUI extends Component {
           onTableChange={this.onTableChange}
           filterOptions={filterOptions}
           onExport={this.onExport}
-          canDeleteSavedObjectTypes={canDeleteSavedObjectTypes}
+          canDelete={this.props.uiCapabilities.savedObjectsManagement.delete}
           onDelete={this.onDelete}
           goInspectObject={this.props.goInspectObject}
           pageIndex={page}

x-pack/plugins/security/server/lib/authorization/privileges/feature_privilege_builder/index.ts

@@ -14,7 +14,6 @@ import { FeaturePrivilegeBuilder } from './feature_privilege_builder';
 import { FeaturePrivilegeManagementBuilder } from './management';
 import { FeaturePrivilegeNavlinkBuilder } from './navlink';
 import { FeaturePrivilegeSavedObjectBuilder } from './saved_object';
-import { FeaturePrivilegeSavedObjectsManagementBuilder } from './saved_objects_management';
 import { FeaturePrivilegeUIBuilder } from './ui';
 export { FeaturePrivilegeBuilder };
 
@@ -26,7 +25,6 @@ export const featurePrivilegeBuilderFactory = (actions: Actions): FeaturePrivile
     new FeaturePrivilegeManagementBuilder(actions),
     new FeaturePrivilegeNavlinkBuilder(actions),
     new FeaturePrivilegeSavedObjectBuilder(actions),
-    new FeaturePrivilegeSavedObjectsManagementBuilder(actions),
     new FeaturePrivilegeUIBuilder(actions),
   ];