fix broken e2e tests

elastic · Dec 1, 2021 · 8cb282f · 8cb282f
1 parent ce86fdf
commit 8cb282f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/...security_solution/public/detections/containers/detection_engine/rules/use_rule_status.tsx b/...security_solution/public/detections/containers/detection_engine/rules/use_rule_status.tsx
@@ -99,7 +99,6 @@ export const useRulesStatuses = (rules: Rules): ReturnRulesStatuses => {
             rules.map((rule) => ({
               id: rule.id,
               ...ruleStatusesResponse[rule.id],
-              rule,
             }))
           );
         }

diff --git a/.../plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx b/.../plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
@@ -54,7 +54,7 @@ type HasReadActionsPrivileges =
       [x: string]: boolean;
     }>;
 
-export type TableItem = RuleStatus & Rule;
+export type TableItem = Rule & Partial<RuleStatus>;
 export type TableColumn = EuiBasicTableColumn<TableItem> | EuiTableActionsColumnType<TableItem>;
 
 const extractRuleFromRow = ({ current_status: _, failures, ...rule }: TableItem): Rule => rule;
@@ -129,7 +129,6 @@ export const getActions = (
 
 export type EnhancedRuleStatus = RuleStatus & {
   id: string;
-  rule: Rule;
 };
 
 interface GetColumnsProps {
@@ -258,7 +257,7 @@ const getActionsColumns = ({
     : [];
 
 export const getRulesColumns = (columnsProps: GetColumnsProps): TableColumn[] => {
-  const cols: TableColumn[] = [
+  return [
     getColumnRuleName(columnsProps),
     getColumnTags(),
     {
@@ -339,14 +338,13 @@ export const getRulesColumns = (columnsProps: GetColumnsProps): TableColumn[] =>
       truncateText: true,
     },
     getColumnEnabled(columnsProps),
+    ...getActionsColumns(columnsProps),
   ];
-
-  return [...cols, ...getActionsColumns(columnsProps)];
 };
 
 export const getMonitoringColumns = (columnsProps: GetColumnsProps): TableColumn[] => {
   const { docLinks } = columnsProps;
-  const cols: TableColumn[] = [
+  return [
     { ...getColumnRuleName(columnsProps), width: '28%' },
     getColumnTags(),
     {
@@ -445,7 +443,6 @@ export const getMonitoringColumns = (columnsProps: GetColumnsProps): TableColumn
       truncateText: true,
     },
     getColumnEnabled(columnsProps),
+    ...getActionsColumns(columnsProps),
   ];
-
-  return [...cols, ...getActionsColumns(columnsProps)];
 };
diff --git a/...ins/security_solution/public/detections/pages/detection_engine/rules/all/rules_tables.tsx b/...ins/security_solution/public/detections/pages/detection_engine/rules/all/rules_tables.tsx
@@ -445,12 +445,14 @@ export const RulesTables = React.memo<RulesTableProps>(
     );
 
     const items = useMemo(() => {
-      const rulesMap = new Map(rules.map((item) => [item.id, item]));
-
-      return rulesStatuses.map(({ rule, ...rest }) => ({
-        ...rest,
-        ...(rulesMap.get(rule.id) ?? rule),
-      }));
+      const rulesStatusesMap = new Map(rulesStatuses.map((item) => [item.id, item]));
+
+      return rules.map((rule) => {
+        return {
+          ...rule,
+          ...rulesStatusesMap.get(rule.id),
+        };
+      });
     }, [rulesStatuses, rules]);
 
     const tableProps =
-Original file line number
+Diff line change
@@ Expand Up @@
                 rules.map((rule) => ({
                   id: rule.id,
                   ...ruleStatusesResponse[rule.id],
-                  rule,
                 }))
               );
             }
@@ Expand Down @@