[AppServices] Space privilege "Index pattern management" read still s…

…hows delete button (#53682) (#115390) (#115899) * [AppServices] Space privilege Index pattern management read still shows delete button (#53682) Co-authored-by: Shivindera Singh <shivindera@gmail.com>
elastic · Oct 21, 2021 · 3bdd9d6 · 3bdd9d6
1 parent 92051f7
commit 3bdd9d6
Show file tree

Hide file tree

Showing 18 changed files with 210 additions and 146 deletions.
diff --git a/...gins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/...gins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -56,7 +56,7 @@ const confirmModalOptionsDelete = {
 
 export const EditIndexPattern = withRouter(
   ({ indexPattern, history, location }: EditIndexPatternProps) => {
-    const { uiSettings, overlays, chrome, data } =
+    const { application, uiSettings, overlays, chrome, data } =
       useKibana<IndexPatternManagmentContext>().services;
     const [fields, setFields] = useState<IndexPatternField[]>(indexPattern.getNonScriptedFields());
     const [conflictedFields, setConflictedFields] = useState<IndexPatternField[]>(
@@ -134,12 +134,14 @@ export const EditIndexPattern = withRouter(
     const showTagsSection = Boolean(indexPattern.timeFieldName || (tags && tags.length > 0));
     const kibana = useKibana();
     const docsUrl = kibana.services.docLinks!.links.elasticsearch.mapping;
+    const userEditPermission = !!application?.capabilities?.indexPatterns?.save;
+
     return (
       <div data-test-subj="editIndexPattern" role="region" aria-label={headingAriaLabel}>
         <IndexHeader
           indexPattern={indexPattern}
           setDefault={setDefaultPattern}
-          deleteIndexPatternClick={removePattern}
+          {...(userEditPermission ? { deleteIndexPatternClick: removePattern } : {})}
           defaultIndex={defaultIndex}
         >
           {showTagsSection && (

diff --git a/.../edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap b/.../edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
diff --git a/...dit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap b/...dit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap
diff --git a/...public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx b/...public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
@@ -26,6 +26,7 @@ const items: IndexedFieldItem[] = [
     kbnType: 'string',
     excluded: false,
     isMapped: true,
+    isUserEditable: true,
     hasRuntime: false,
   },
   {
@@ -36,6 +37,7 @@ const items: IndexedFieldItem[] = [
     info: [],
     excluded: false,
     isMapped: true,
+    isUserEditable: true,
     hasRuntime: false,
   },
   {
@@ -46,6 +48,7 @@ const items: IndexedFieldItem[] = [
     info: [],
     excluded: false,
     isMapped: true,
+    isUserEditable: true,
     hasRuntime: false,
   },
   {
@@ -56,6 +59,18 @@ const items: IndexedFieldItem[] = [
     info: [],
     excluded: false,
     isMapped: false,
+    isUserEditable: true,
+    hasRuntime: true,
+  },
+  {
+    name: 'noedit',
+    displayName: 'noedit',
+    type: 'keyword',
+    kbnType: 'text',
+    info: [],
+    excluded: false,
+    isMapped: false,
+    isUserEditable: false,
     hasRuntime: true,
   },
 ];
@@ -114,6 +129,13 @@ describe('Table', () => {
     expect(editField).toBeCalled();
   });
 
+  test('should not allow edit or deletion for user with only read access', () => {
+    const editAvailable = renderTable().prop('columns')[6].actions[0].available(items[4]);
+    const deleteAvailable = renderTable().prop('columns')[7].actions[0].available(items[4]);
+    expect(editAvailable).toBeFalsy();
+    expect(deleteAvailable).toBeFalsy();
+  });
+
   test('render name', () => {
     const mappedField = {
       name: 'customer',
@@ -122,6 +144,7 @@ describe('Table', () => {
       kbnType: 'string',
       type: 'keyword',
       isMapped: true,
+      isUserEditable: true,
       hasRuntime: false,
     };
 
@@ -134,6 +157,7 @@ describe('Table', () => {
       kbnType: 'string',
       type: 'keyword',
       isMapped: false,
+      isUserEditable: true,
       hasRuntime: true,
     };
 

diff --git a/...ment/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx b/...ment/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx
@@ -319,6 +319,7 @@ export class Table extends PureComponent<IndexedFieldProps> {
             onClick: editField,
             type: 'icon',
             'data-test-subj': 'editFieldFormat',
+            available: (field) => field.isUserEditable,
           },
         ],
         width: '40px',
@@ -333,7 +334,7 @@ export class Table extends PureComponent<IndexedFieldProps> {
             onClick: (field) => deleteField(field.name),
             type: 'icon',
             'data-test-subj': 'deleteField',
-            available: (field) => !field.isMapped,
+            available: (field) => !field.isMapped && field.isUserEditable,
           },
         ],
         width: '40px',

diff --git a/...t/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx b/...t/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { shallow } from 'enzyme';
+import { shallow, ShallowWrapper } from 'enzyme';
 import { IndexPatternField, IndexPattern, IndexPatternType } from 'src/plugins/data/public';
 import { IndexedFieldsTable } from './indexed_fields_table';
 import { getFieldInfo } from '../../utils';
@@ -78,15 +78,21 @@ const fields = [
     displayName: 'Elastic',
     searchable: true,
     esTypes: ['keyword'],
+    isUserEditable: true,
   },
-  { name: 'timestamp', displayName: 'timestamp', esTypes: ['date'] },
-  { name: 'conflictingField', displayName: 'conflictingField', esTypes: ['keyword', 'long'] },
-  { name: 'amount', displayName: 'amount', esTypes: ['long'] },
+  { name: 'timestamp', displayName: 'timestamp', esTypes: ['date'], isUserEditable: true },
+  {
+    name: 'conflictingField',
+    displayName: 'conflictingField',
+    esTypes: ['keyword', 'long'],
+    isUserEditable: true,
+  },
+  { name: 'amount', displayName: 'amount', esTypes: ['long'], isUserEditable: true },
 ].map(mockFieldToIndexPatternField);
 
 describe('IndexedFieldsTable', () => {
   test('should render normally', async () => {
-    const component = shallow(
+    const component: ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>> = shallow(
       <IndexedFieldsTable
         fields={fields}
         indexPattern={indexPattern}
@@ -97,7 +103,7 @@ describe('IndexedFieldsTable', () => {
         indexedFieldTypeFilter=""
         fieldFilter=""
       />
-    );
+    ).dive();
 
     await new Promise((resolve) => process.nextTick(resolve));
     component.update();
@@ -106,7 +112,7 @@ describe('IndexedFieldsTable', () => {
   });
 
   test('should filter based on the query bar', async () => {
-    const component = shallow(
+    const component: ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>> = shallow(
       <IndexedFieldsTable
         fields={fields}
         indexPattern={indexPattern}
@@ -117,7 +123,7 @@ describe('IndexedFieldsTable', () => {
         indexedFieldTypeFilter=""
         fieldFilter=""
       />
-    );
+    ).dive();
 
     await new Promise((resolve) => process.nextTick(resolve));
     component.setProps({ fieldFilter: 'Elast' });
@@ -127,7 +133,7 @@ describe('IndexedFieldsTable', () => {
   });
 
   test('should filter based on the type filter', async () => {
-    const component = shallow(
+    const component: ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>> = shallow(
       <IndexedFieldsTable
         fields={fields}
         indexPattern={indexPattern}
@@ -138,7 +144,7 @@ describe('IndexedFieldsTable', () => {
         indexedFieldTypeFilter=""
         fieldFilter=""
       />
-    );
+    ).dive();
 
     await new Promise((resolve) => process.nextTick(resolve));
     component.setProps({ indexedFieldTypeFilter: 'date' });
@@ -149,7 +155,7 @@ describe('IndexedFieldsTable', () => {
 
   describe('IndexedFieldsTable with rollup index pattern', () => {
     test('should render normally', async () => {
-      const component = shallow(
+      const component: ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>> = shallow(
         <IndexedFieldsTable
           fields={fields}
           indexPattern={rollupIndexPattern}
@@ -160,7 +166,7 @@ describe('IndexedFieldsTable', () => {
           indexedFieldTypeFilter=""
           fieldFilter=""
         />
-      );
+      ).dive();
 
       await new Promise((resolve) => process.nextTick(resolve));
       component.update();