diff --git a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap index bf03d59186ab7..955f341c33a80 100644 --- a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap +++ b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap @@ -201,14 +201,9 @@ exports[`Table should render normally 1`] = ` "onClick": [Function], "type": "icon", }, - ], - "name": "", - "width": "40px", - }, - Object { - "actions": Array [ Object { "available": [Function], + "color": "danger", "data-test-subj": "deleteField", "description": "Delete", "icon": "trash", @@ -217,8 +212,8 @@ exports[`Table should render normally 1`] = ` "type": "icon", }, ], - "name": "", - "width": "40px", + "name": "Actions", + "width": "80px", }, ] } diff --git a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx index f0f7e444de5c2..15b5ba84ebe64 100644 --- a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx +++ b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx @@ -171,7 +171,7 @@ describe('Table', () => { 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]); + const deleteAvailable = renderTable().prop('columns')[6].actions[1].available(items[4]); expect(editAvailable).toBeFalsy(); expect(deleteAvailable).toBeFalsy(); }); diff --git a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx index 69dfbb7b48761..5422f56489142 100644 --- a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx +++ b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx @@ -145,6 +145,13 @@ const isExcludedAriaLabel = i18n.translate( } ); +const actionsLabel = i18n.translate( + 'indexPatternManagement.editIndexPattern.fields.table.actionsLabel', + { + defaultMessage: 'Actions', + } +); + const editLabel = i18n.translate('indexPatternManagement.editIndexPattern.fields.table.editLabel', { defaultMessage: 'Edit', }); @@ -477,7 +484,7 @@ class TableClass extends PureComponent< render: (value: string) => this.renderBooleanTemplate(value, isExcludedAriaLabel), }, { - name: '', + name: actionsLabel, actions: [ { name: editLabel, @@ -488,16 +495,11 @@ class TableClass extends PureComponent< 'data-test-subj': 'editFieldFormat', available: (field) => field.isUserEditable, }, - ], - width: '40px', - }, - { - name: '', - actions: [ { name: deleteLabel, description: deleteDescription, icon: 'trash', + color: 'danger', onClick: (field) => { const toDelete = [field.name]; if (field.spec?.runtimeField?.fields) { @@ -513,7 +515,7 @@ class TableClass extends PureComponent< available: showDelete, }, ], - width: '40px', + width: '80px', }, ]; diff --git a/src/platform/test/functional/apps/management/data_views/_data_view_create_delete.ts b/src/platform/test/functional/apps/management/data_views/_data_view_create_delete.ts index 9f213fd50f6ef..baa302b038b62 100644 --- a/src/platform/test/functional/apps/management/data_views/_data_view_create_delete.ts +++ b/src/platform/test/functional/apps/management/data_views/_data_view_create_delete.ts @@ -139,6 +139,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 'Searchable', 'Aggregatable', 'Excluded', + 'Actions', ]; expect(headers.length).to.be(expectedHeaders.length); diff --git a/src/platform/test/functional/page_objects/settings_page.ts b/src/platform/test/functional/page_objects/settings_page.ts index d705332e75c4f..fd745e498ed06 100644 --- a/src/platform/test/functional/page_objects/settings_page.ts +++ b/src/platform/test/functional/page_objects/settings_page.ts @@ -399,7 +399,7 @@ export class SettingsPageObject extends FtrService { await this.find.clickByCssSelector( `table.euiTable tbody tr.euiTableRow:nth-child(${tableFields.indexOf(name) + 1}) - td:nth-last-child(2) button` + td:last-child button` ); await this.retry.waitFor('flyout to open', async () => { return await this.testSubjects.exists('flyoutTitle'); diff --git a/x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js b/x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js index ef834ee977bca..e6f161e704bec 100644 --- a/x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js +++ b/x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js @@ -49,6 +49,7 @@ export default ({ getService, getPageObjects }) => { 'Searchable', 'Aggregatable', 'Excluded', + 'Actions', ]; expect(headers.length).to.be(expectedHeaders.length); diff --git a/x-pack/test_serverless/functional/test_suites/common/management/data_views/_data_view_create_delete.ts b/x-pack/test_serverless/functional/test_suites/common/management/data_views/_data_view_create_delete.ts index 3463876f4b2a2..b116649ea7d67 100644 --- a/x-pack/test_serverless/functional/test_suites/common/management/data_views/_data_view_create_delete.ts +++ b/x-pack/test_serverless/functional/test_suites/common/management/data_views/_data_view_create_delete.ts @@ -154,6 +154,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 'Searchable', 'Aggregatable', 'Excluded', + 'Actions', ]; expect(headers.length).to.be(expectedHeaders.length);