[RAM] Alert table all column fix 2 (#161054)

#160455 --------- Co-authored-by: Kibana Machine <[email protected]>
elastic · Jul 7, 2023 · bed184b · bed184b
1 parent 4fc4ded
commit bed184b
Show file tree

Hide file tree

Showing 12 changed files with 256 additions and 169 deletions.
diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
@@ -66,6 +66,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
         /^x-pack\/plugins\/security_solution/,
         /^x-pack\/plugins\/timelines/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
+        /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/alerts_table/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
         /^x-pack\/test\/defend_workflows_cypress/,
         /^x-pack\/test\/security_solution_cypress/,

diff --git a/vars/tasks.groovy b/vars/tasks.groovy
@@ -140,6 +140,7 @@ def functionalXpack(Map params = [:]) {
       'x-pack/test/security_solution_cypress/',
       'x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/',
       'x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx',
+      'x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/',
     ]) {
       if (githubPr.isPr()) {
         task(kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypressChrome', './test/scripts/jenkins_security_solution_cypress_chrome.sh'))

diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.test.ts b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.test.ts
@@ -1261,66 +1261,17 @@ describe('SiemLocalStorage', () => {
           ],
           sort: [{ '@timestamp': { order: 'desc' } }],
           visibleColumns: [
-            {
-              columnHeaderType: 'not-filtered',
-              id: '@timestamp',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Rule',
-              id: 'kibana.alert.rule.name',
-              initialWidth: 180,
-              linkField: 'kibana.alert.rule.uuid',
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Severity',
-              id: 'kibana.alert.severity',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Risk Score',
-              id: 'kibana.alert.risk_score',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Reason',
-              id: 'kibana.alert.reason',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'host.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'user.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'process.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'file.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'source.ip',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'destination.ip',
-              initialWidth: 180,
-            },
+            '@timestamp',
+            'kibana.alert.rule.name',
+            'kibana.alert.severity',
+            'kibana.alert.risk_score',
+            'kibana.alert.reason',
+            'host.name',
+            'user.name',
+            'process.name',
+            'file.name',
+            'source.ip',
+            'destination.ip',
           ],
         },
       },
@@ -1393,66 +1344,17 @@ describe('SiemLocalStorage', () => {
             { 'kibana.alert.rule.name': { order: 'desc' } },
           ],
           visibleColumns: [
-            {
-              columnHeaderType: 'not-filtered',
-              id: '@timestamp',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Rule',
-              id: 'kibana.alert.rule.name',
-              initialWidth: 180,
-              linkField: 'kibana.alert.rule.uuid',
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Severity',
-              id: 'kibana.alert.severity',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Risk Score',
-              id: 'kibana.alert.risk_score',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              displayAsText: 'Reason',
-              id: 'kibana.alert.reason',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'host.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'user.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'process.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'file.name',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'source.ip',
-              initialWidth: 180,
-            },
-            {
-              columnHeaderType: 'not-filtered',
-              id: 'destination.ip',
-              initialWidth: 180,
-            },
+            '@timestamp',
+            'kibana.alert.rule.name',
+            'kibana.alert.severity',
+            'kibana.alert.risk_score',
+            'kibana.alert.reason',
+            'host.name',
+            'user.name',
+            'process.name',
+            'file.name',
+            'source.ip',
+            'destination.ip',
           ],
         },
       },

diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
@@ -100,7 +100,7 @@ export const migrateAlertTableStateToTriggerActionsState = (
           sort: legacyDataTableState[tableKey].sort.map((sortCandidate) => ({
             [sortCandidate.columnId]: { order: sortCandidate.sortDirection },
           })),
-          visibleColumns: legacyDataTableState[tableKey].columns,
+          visibleColumns: legacyDataTableState[tableKey].columns.map((c) => c.id),
         },
       };
     });
@@ -110,6 +110,7 @@ export const migrateAlertTableStateToTriggerActionsState = (
       storage.set(key, stateObj[key]);
     })
   );
+  return Object.assign(legacyDataTableState, triggersActionsState);
 };
 
 /**
@@ -154,7 +155,7 @@ export const getDataTablesInStorageByIds = (storage: Storage, tableIds: TableIdL
     }
   }
 
-  migrateAlertTableStateToTriggerActionsState(storage, allDataTables);
+  allDataTables = migrateAlertTableStateToTriggerActionsState(storage, allDataTables);
 
   return tableIds.reduce((acc, tableId) => {
     const tableModel = allDataTables[tableId];

diff --git a/...lugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx b/...lugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx
@@ -329,7 +329,6 @@ describe('AlertsTable', () => {
     updatedAt: Date.now(),
     onToggleColumn: () => {},
     onResetColumns: () => {},
-    onColumnsChange: () => {},
     onChangeVisibleColumns: () => {},
     browserFields,
     query: {},

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
@@ -142,6 +142,7 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
     updatedAt,
     browserFields,
     onChangeVisibleColumns,
+    onColumnResize,
     showAlertStatusWithFlapping = false,
     showInspectButton = false,
   } = props;
@@ -486,6 +487,7 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
               onChangePage: onChangePageIndex,
             }}
             rowHeightsOptions={props.rowHeightsOptions}
+            onColumnResize={onColumnResize}
             ref={dataGridRef}
           />
         )}

diff --git a/.../triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.test.tsx b/.../triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.test.tsx
@@ -762,9 +762,15 @@ describe('AlertsTableState', () => {
       storageMock.mockImplementation(() => ({
         get: () => {
           return {
-            columns: [{ displayAsText: 'Reason', id: 'kibana.alert.reason', schema: undefined }],
-            sort: [],
-            visibleColumns: ['kibana.alert.reason'],
+            columns: [{ displayAsText: 'Reason', id: AlertsField.reason, schema: undefined }],
+            sort: [
+              {
+                [AlertsField.reason]: {
+                  order: 'asc',
+                },
+              },
+            ],
+            visibleColumns: [AlertsField.reason],
           };
         },
         set: jest.fn(),
@@ -780,11 +786,11 @@ describe('AlertsTableState', () => {
 
       await waitFor(() => {
         expect(queryByTestId(`dataGridHeaderCell-${AlertsField.name}`)).not.toBe(null);
-        expect(
-          getByTestId('dataGridHeader')
-            .querySelectorAll('.euiDataGridHeaderCell__content')[1]
-            .getAttribute('title')
-        ).toBe('Name');
+        const titles: string[] = [];
+        getByTestId('dataGridHeader')
+          .querySelectorAll('.euiDataGridHeaderCell__content')
+          .forEach((n) => titles.push(n?.getAttribute('title') ?? ''));
+        expect(titles).toContain('Name');
       });
     });
 

diff --git a/...ugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx b/...ugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx
@@ -219,13 +219,13 @@ const AlertsTableStateWithQueryProvider = ({
 
   const {
     columns,
-    onColumnsChange,
     browserFields,
     isBrowserFieldDataLoading,
     onToggleColumn,
     onResetColumns,
     visibleColumns,
     onChangeVisibleColumns,
+    onColumnResize,
     fields,
   } = useColumns({
     featureIds,
@@ -393,8 +393,8 @@ const AlertsTableStateWithQueryProvider = ({
       browserFields,
       onToggleColumn,
       onResetColumns,
-      onColumnsChange,
       onChangeVisibleColumns,
+      onColumnResize,
       query,
       rowHeightsOptions,
       renderCellValue,
@@ -410,7 +410,7 @@ const AlertsTableStateWithQueryProvider = ({
       memoizedMaintenanceWindows,
       columns,
       flyoutSize,
-      pagination,
+      pagination.pageSize,
       id,
       leadingControlColumns,
       showExpandToDetails,
@@ -421,8 +421,8 @@ const AlertsTableStateWithQueryProvider = ({
       browserFields,
       onToggleColumn,
       onResetColumns,
-      onColumnsChange,
       onChangeVisibleColumns,
+      onColumnResize,
       query,
       rowHeightsOptions,
       renderCellValue,

diff --git a/...rs_actions_ui/public/application/sections/alerts_table/bulk_actions/bulk_actions.test.tsx b/...rs_actions_ui/public/application/sections/alerts_table/bulk_actions/bulk_actions.test.tsx
@@ -171,7 +171,6 @@ describe('AlertsTable.BulkActions', () => {
     updatedAt: Date.now(),
     onToggleColumn: () => {},
     onResetColumns: () => {},
-    onColumnsChange: () => {},
     onChangeVisibleColumns: () => {},
     browserFields: {},
     query: {},