[Security Solution] - Remove replace all (#114481)

* remove replace all * remove bang operator Co-authored-by: Kibana Machine <[email protected]>
elastic · Oct 22, 2021 · 9433e16 · 9433e16
1 parent de5ebc5
commit 9433e16
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 34 deletions.
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_info/query.dsl.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_info/query.dsl.ts
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
+import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
+
 export const buildLastAlertsQuery = (ruleId: string | undefined | null) => {
   const queryFilter = [
     {
-      bool: { should: [{ match: { 'signal.status': 'open' } }], minimum_should_match: 1 },
+      bool: { should: [{ match: { [ALERT_WORKFLOW_STATUS]: 'open' } }], minimum_should_match: 1 },
     },
   ];
 

diff --git a/...ugins/security_solution/public/detections/components/alerts_table/default_config.test.tsx b/...ugins/security_solution/public/detections/components/alerts_table/default_config.test.tsx
@@ -6,6 +6,7 @@
  */
 
 import { ExistsFilter, Filter } from '@kbn/es-query';
+import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 import {
   buildAlertsRuleIdFilter,
   buildAlertStatusesFilter,
@@ -73,7 +74,7 @@ describe('alerts default_config', () => {
         meta: {
           alias: null,
           disabled: false,
-          key: 'signal.status',
+          key: ALERT_WORKFLOW_STATUS,
           negate: false,
           params: {
             query: 'acknowledged',
@@ -85,12 +86,12 @@ describe('alerts default_config', () => {
             should: [
               {
                 term: {
-                  'signal.status': 'acknowledged',
+                  [ALERT_WORKFLOW_STATUS]: 'acknowledged',
                 },
               },
               {
                 term: {
-                  'signal.status': 'in-progress',
+                  [ALERT_WORKFLOW_STATUS]: 'in-progress',
                 },
               },
             ],
@@ -107,7 +108,7 @@ describe('alerts default_config', () => {
         meta: {
           alias: null,
           disabled: false,
-          key: 'signal.status',
+          key: ALERT_WORKFLOW_STATUS,
           negate: false,
           params: {
             query: 'open',
@@ -116,7 +117,7 @@ describe('alerts default_config', () => {
         },
         query: {
           term: {
-            'signal.status': 'open',
+            [ALERT_WORKFLOW_STATUS]: 'open',
           },
         },
       };
@@ -139,17 +140,17 @@ describe('alerts default_config', () => {
             should: [
               {
                 term: {
-                  'signal.status': 'open',
+                  [ALERT_WORKFLOW_STATUS]: 'open',
                 },
               },
               {
                 term: {
-                  'signal.status': 'acknowledged',
+                  [ALERT_WORKFLOW_STATUS]: 'acknowledged',
                 },
               },
               {
                 term: {
-                  'signal.status': 'in-progress',
+                  [ALERT_WORKFLOW_STATUS]: 'in-progress',
                 },
               },
             ],

diff --git a/...ck/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx b/...ck/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx
@@ -34,20 +34,20 @@ export const buildAlertStatusFilter = (status: Status): Filter[] => {
             should: [
               {
                 term: {
-                  'signal.status': status,
+                  [ALERT_WORKFLOW_STATUS]: status,
                 },
               },
               {
                 term: {
-                  'signal.status': 'in-progress',
+                  [ALERT_WORKFLOW_STATUS]: 'in-progress',
                 },
               },
             ],
           },
         }
       : {
           term: {
-            'signal.status': status,
+            [ALERT_WORKFLOW_STATUS]: status,
           },
         };
 
@@ -58,7 +58,7 @@ export const buildAlertStatusFilter = (status: Status): Filter[] => {
         negate: false,
         disabled: false,
         type: 'phrase',
-        key: 'signal.status',
+        key: ALERT_WORKFLOW_STATUS,
         params: {
           query: status,
         },
@@ -76,7 +76,7 @@ export const buildAlertStatusesFilter = (statuses: Status[]): Filter[] => {
     bool: {
       should: statuses.map((status) => ({
         term: {
-          'signal.status': status,
+          [ALERT_WORKFLOW_STATUS]: status,
         },
       })),
     },

diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -88,7 +88,7 @@ interface OwnProps {
   data: TimelineItem[];
   defaultCellActions?: TGridCellAction[];
   filters?: Filter[];
-  filterQuery: string;
+  filterQuery?: string;
   filterStatus?: AlertStatus;
   id: string;
   indexNames: string[];

diff --git a/x-pack/plugins/timelines/public/components/t_grid/helpers.tsx b/x-pack/plugins/timelines/public/components/t_grid/helpers.tsx
@@ -9,7 +9,6 @@ import type { Filter, EsQueryConfig, Query } from '@kbn/es-query';
 import { FilterStateStore } from '@kbn/es-query';
 import { isEmpty, get } from 'lodash/fp';
 import memoizeOne from 'memoize-one';
-import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 import {
   elementOrChildrenHasFocus,
   getFocusedAriaColindexCell,
@@ -190,9 +189,9 @@ export const combineQueries = ({
 
 export const buildCombinedQuery = (combineQueriesParams: CombineQueries) => {
   const combinedQuery = combineQueries(combineQueriesParams);
-  return combinedQuery
+  return combinedQuery?.filterQuery
     ? {
-        filterQuery: replaceStatusField(combinedQuery!.filterQuery),
+        filterQuery: combinedQuery.filterQuery,
       }
     : null;
 };
@@ -228,22 +227,14 @@ export const getCombinedFilterQuery = ({
   to,
   filters,
   ...combineQueriesParams
-}: CombineQueries & { from: string; to: string }): string =>
-  replaceStatusField(
-    combineQueries({
-      ...combineQueriesParams,
-      filters: [...filters, buildTimeRangeFilter(from, to)],
-    })?.filterQuery
-  );
+}: CombineQueries & { from: string; to: string }): string | undefined => {
+  const combinedQueries = combineQueries({
+    ...combineQueriesParams,
+    filters: [...filters, buildTimeRangeFilter(from, to)],
+  });
 
-/**
- * This function is a temporary patch to prevent queries using old `signal.status` field.
- * @todo The `signal.status` field should not be queried anymore and
- * must be replaced by `ALERT_WORKFLOW_STATUS` field name constant
- * @deprecated
- */
-const replaceStatusField = (filterQuery?: string): string =>
-  filterQuery?.replaceAll('signal.status', ALERT_WORKFLOW_STATUS) ?? '';
+  return combinedQueries ? combinedQueries.filterQuery : undefined;
+};
 
 /**
  * The CSS class name of a "stateful event", which appears in both

diff --git a/...ins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx b/...ins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
@@ -23,7 +23,7 @@ interface OwnProps {
   id: string;
   totalItems: number;
   filterStatus?: AlertStatus;
-  query: string;
+  query?: string;
   indexName: string;
   onActionSuccess?: OnUpdateAlertStatusSuccess;
   onActionFailure?: OnUpdateAlertStatusError;