[8.13] [Security Solution] Add dataViewId to filter actions (#177946) (…

…#178081) # Backport This will backport the following commits from `main` to `8.13`: - [[Security Solution] Add dataViewId to filter actions (#177946)](#177946)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  --------- Co-authored-by: Sergi Massaneda <[email protected]>
elastic · Mar 6, 2024 · d4ec567 · d4ec567
1 parent ae7c4da
commit d4ec567
Show file tree

Hide file tree

Showing 53 changed files with 364 additions and 928 deletions.
diff --git a/packages/kbn-cell-actions/src/actions/filter/create_filter.test.ts b/packages/kbn-cell-actions/src/actions/filter/create_filter.test.ts
@@ -12,21 +12,23 @@ const field = 'field.name';
 const value = 'the-value';
 const numberValue = 123;
 const booleanValue = true;
+const dataViewId = 'mock-data-view-id';
 
 describe('createFilter', () => {
   it.each([
     { caseName: 'string array', caseValue: [value] },
     { caseName: 'number array', caseValue: [numberValue], query: numberValue.toString() },
     { caseName: 'boolean array', caseValue: [booleanValue], query: booleanValue.toString() },
   ])('should return filter with $caseName value', ({ caseValue, query = value }) => {
-    expect(createFilter({ key: field, value: caseValue, negate: false })).toEqual({
+    expect(createFilter({ key: field, value: caseValue, negate: false, dataViewId })).toEqual({
       meta: {
         type: 'phrase',
         key: field,
         negate: false,
         params: {
           query,
         },
+        index: dataViewId,
       },
       query: {
         match_phrase: {
@@ -43,14 +45,15 @@ describe('createFilter', () => {
     { caseName: 'number array', caseValue: [numberValue], query: numberValue.toString() },
     { caseName: 'boolean array', caseValue: [booleanValue], query: booleanValue.toString() },
   ])('should return negate filter with $caseName value', ({ caseValue, query = value }) => {
-    expect(createFilter({ key: field, value: caseValue, negate: true })).toEqual({
+    expect(createFilter({ key: field, value: caseValue, negate: true, dataViewId })).toEqual({
       meta: {
         type: 'phrase',
         key: field,
         negate: true,
         params: {
           query,
         },
+        index: dataViewId,
       },
       query: {
         match_phrase: {
@@ -67,19 +70,20 @@ describe('createFilter', () => {
     { caseName: 'negated', negate: true },
   ])('should return combined filter with multiple $caseName values', ({ negate }) => {
     const value2 = 'the-value2';
-    expect(createFilter({ key: field, value: [value, value2], negate })).toEqual({
+    expect(createFilter({ key: field, value: [value, value2], negate, dataViewId })).toEqual({
       meta: {
         type: 'combined',
         relation: 'AND',
         key: field,
         negate,
+        index: dataViewId,
         params: [
           {
-            meta: { type: 'phrase', key: field, params: { query: value } },
+            meta: { type: 'phrase', key: field, params: { query: value }, index: dataViewId },
             query: { match_phrase: { [field]: { query: value } } },
           },
           {
-            meta: { type: 'phrase', key: field, params: { query: value2 } },
+            meta: { type: 'phrase', key: field, params: { query: value2 }, index: dataViewId },
             query: { match_phrase: { [field]: { query: value2 } } },
           },
         ],
@@ -90,13 +94,14 @@ describe('createFilter', () => {
   it.each([{ caseName: 'empty array', caseValue: [] }])(
     'should return exist filter with $caseName value',
     ({ caseValue }) => {
-      expect(createFilter({ key: field, value: caseValue, negate: false })).toEqual({
+      expect(createFilter({ key: field, value: caseValue, negate: false, dataViewId })).toEqual({
         query: {
           exists: {
             field,
           },
         },
         meta: {
+          index: dataViewId,
           key: field,
           negate: false,
           type: 'exists',
@@ -109,13 +114,14 @@ describe('createFilter', () => {
   it.each([{ caseName: 'empty array', caseValue: [] }])(
     'should return negate exist filter with $caseName value',
     ({ caseValue }) => {
-      expect(createFilter({ key: field, value: caseValue, negate: true })).toEqual({
+      expect(createFilter({ key: field, value: caseValue, negate: true, dataViewId })).toEqual({
         query: {
           exists: {
             field,
           },
         },
         meta: {
+          index: dataViewId,
           key: field,
           negate: true,
           type: 'exists',

diff --git a/packages/kbn-cell-actions/src/actions/filter/create_filter.ts b/packages/kbn-cell-actions/src/actions/filter/create_filter.ts
@@ -18,21 +18,32 @@ import { DefaultActionsSupportedValue } from '../types';
 export const isEmptyFilterValue = (value: Array<string | number | boolean>) =>
   value.length === 0 || value.every((v) => v === '');
 
-const createExistsFilter = ({ key, negate }: { key: string; negate: boolean }): ExistsFilter => ({
-  meta: { key, negate, type: FILTERS.EXISTS, value: 'exists' },
+const createExistsFilter = ({
+  key,
+  negate,
+  dataViewId,
+}: {
+  key: string;
+  negate: boolean;
+  dataViewId?: string;
+}): ExistsFilter => ({
+  meta: { key, negate, type: FILTERS.EXISTS, value: 'exists', index: dataViewId },
   query: { exists: { field: key } },
 });
 
 const createPhraseFilter = ({
   key,
   negate,
   value,
+  dataViewId,
 }: {
   value: string | number | boolean;
   key: string;
   negate?: boolean;
+  dataViewId?: string;
 }): PhraseFilter => ({
   meta: {
+    index: dataViewId,
     key,
     negate,
     type: FILTERS.PHRASE,
@@ -45,36 +56,41 @@ const createCombinedFilter = ({
   values,
   key,
   negate,
+  dataViewId,
 }: {
   values: DefaultActionsSupportedValue;
   key: string;
   negate: boolean;
+  dataViewId?: string;
 }): CombinedFilter => ({
   meta: {
+    index: dataViewId,
     key,
     negate,
     type: FILTERS.COMBINED,
     relation: BooleanRelation.AND,
-    params: values.map((value) => createPhraseFilter({ key, value })),
+    params: values.map((value) => createPhraseFilter({ key, value, dataViewId })),
   },
 });
 
 export const createFilter = ({
   key,
   value,
   negate,
+  dataViewId,
 }: {
   key: string;
   value: DefaultActionsSupportedValue;
   negate: boolean;
+  dataViewId?: string;
 }): Filter => {
   if (value.length === 0) {
-    return createExistsFilter({ key, negate });
+    return createExistsFilter({ key, negate, dataViewId });
   }
 
   if (value.length > 1) {
-    return createCombinedFilter({ key, negate, values: value });
+    return createCombinedFilter({ key, negate, values: value, dataViewId });
   } else {
-    return createPhraseFilter({ key, negate, value: value[0] });
+    return createPhraseFilter({ key, negate, value: value[0], dataViewId });
   }
 };
diff --git a/packages/kbn-cell-actions/src/actions/filter/filter_in.test.ts b/packages/kbn-cell-actions/src/actions/filter/filter_in.test.ts
@@ -20,6 +20,7 @@ jest.mock('./create_filter', () => ({
 
 const fieldName = 'user.name';
 const value = 'the value';
+const dataViewId = 'mockDataViewId';
 
 const mockWarningToast = jest.fn();
 
@@ -96,6 +97,7 @@ describe('createFilterInActionFactory', () => {
         key: fieldName,
         value: [value],
         negate: false,
+        dataViewId,
       });
     });
 
@@ -113,6 +115,7 @@ describe('createFilterInActionFactory', () => {
         key: fieldName,
         value: [value],
         negate: false,
+        dataViewId,
       });
     });
 
@@ -126,7 +129,12 @@ describe('createFilterInActionFactory', () => {
           },
         ],
       });
-      expect(mockCreateFilter).toHaveBeenCalledWith({ key: fieldName, value: [], negate: true });
+      expect(mockCreateFilter).toHaveBeenCalledWith({
+        key: fieldName,
+        value: [],
+        negate: true,
+        dataViewId,
+      });
     });
 
     it('should create negate filter query with undefined value', async () => {
@@ -143,6 +151,7 @@ describe('createFilterInActionFactory', () => {
         key: fieldName,
         value: [],
         negate: true,
+        dataViewId,
       });
     });
 
@@ -156,7 +165,12 @@ describe('createFilterInActionFactory', () => {
           },
         ],
       });
-      expect(mockCreateFilter).toHaveBeenCalledWith({ key: fieldName, value: [''], negate: true });
+      expect(mockCreateFilter).toHaveBeenCalledWith({
+        key: fieldName,
+        value: [''],
+        negate: true,
+        dataViewId,
+      });
     });
 
     it('should create negate filter query with empty array value', async () => {
@@ -169,7 +183,12 @@ describe('createFilterInActionFactory', () => {
           },
         ],
       });
-      expect(mockCreateFilter).toHaveBeenCalledWith({ key: fieldName, value: [], negate: true });
+      expect(mockCreateFilter).toHaveBeenCalledWith({
+        key: fieldName,
+        value: [],
+        negate: true,
+        dataViewId,
+      });
     });
 
     it('should notify the user when value type is unsupported', async () => {

diff --git a/packages/kbn-cell-actions/src/actions/filter/filter_in.ts b/packages/kbn-cell-actions/src/actions/filter/filter_in.ts
@@ -8,6 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import type { FilterManager, KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { NotificationsStart } from '@kbn/core-notifications-browser';
+
 import { createFilter, isEmptyFilterValue } from './create_filter';
 import { FILTER_CELL_ACTION_TYPE } from '../../constants';
 import { createCellActionFactory } from '../factory';
@@ -46,13 +47,15 @@ export const createFilterInActionFactory = createCellActionFactory(
         isTypeSupportedByDefaultActions(field.type as KBN_FIELD_TYPES)
       );
     },
-    execute: async ({ data }) => {
+    execute: async ({ data, metadata }) => {
       const field = data[0]?.field;
       const rawValue = data[0]?.value;
+      const dataViewId = typeof metadata?.dataViewId === 'string' ? metadata.dataViewId : undefined;
+
       const value = filterOutNullableValues(valueToArray(rawValue));
 
       if (isValueSupportedByDefaultActions(value)) {
-        addFilterIn({ filterManager, fieldName: field.name, value });
+        addFilterIn({ filterManager, fieldName: field.name, value, dataViewId });
       } else {
         toasts.addWarning({
           title: ACTION_INCOMPATIBLE_VALUE_WARNING,
@@ -66,16 +69,19 @@ export const addFilterIn = ({
   filterManager,
   fieldName,
   value,
+  dataViewId,
 }: {
   filterManager: FilterManager | undefined;
   fieldName: string;
   value: DefaultActionsSupportedValue;
+  dataViewId?: string;
 }) => {
   if (filterManager != null) {
     const filter = createFilter({
       key: fieldName,
       value,
       negate: isEmptyFilterValue(value),
+      dataViewId,
     });
     filterManager.addFilters(filter);
   }

diff --git a/packages/kbn-cell-actions/src/actions/filter/filter_out.test.ts b/packages/kbn-cell-actions/src/actions/filter/filter_out.test.ts
@@ -20,6 +20,7 @@ jest.mock('./create_filter', () => ({
 
 const fieldName = 'user.name';
 const value = 'the value';
+const dataViewId = 'mockDataViewId';
 
 const mockWarningToast = jest.fn();
 
@@ -95,6 +96,7 @@ describe('createFilterOutAction', () => {
         key: fieldName,
         value: [value],
         negate: true,
+        dataViewId,
       });
     });
 
@@ -112,6 +114,7 @@ describe('createFilterOutAction', () => {
         key: fieldName,
         value: [value],
         negate: true,
+        dataViewId,
       });
     });
 
@@ -125,7 +128,12 @@ describe('createFilterOutAction', () => {
           },
         ],
       });
-      expect(mockCreateFilter).toHaveBeenCalledWith({ key: fieldName, value: [], negate: false });
+      expect(mockCreateFilter).toHaveBeenCalledWith({
+        key: fieldName,
+        value: [],
+        negate: false,
+        dataViewId,
+      });
     });
 
     it('should create filter query with undefined value', async () => {
@@ -142,6 +150,7 @@ describe('createFilterOutAction', () => {
         key: fieldName,
         value: [],
         negate: false,
+        dataViewId,
       });
     });
 
@@ -155,7 +164,12 @@ describe('createFilterOutAction', () => {
           },
         ],
       });
-      expect(mockCreateFilter).toHaveBeenCalledWith({ key: fieldName, value: [''], negate: false });
+      expect(mockCreateFilter).toHaveBeenCalledWith({
+        key: fieldName,
+        value: [''],
+        negate: false,
+        dataViewId,
+      });
     });
 
     it('should create negate filter query with empty array value', async () => {
@@ -168,7 +182,12 @@ describe('createFilterOutAction', () => {
           },
         ],
       });
-      expect(mockCreateFilter).toHaveBeenCalledWith({ key: fieldName, value: [], negate: false });
+      expect(mockCreateFilter).toHaveBeenCalledWith({
+        key: fieldName,
+        value: [],
+        negate: false,
+        dataViewId,
+      });
     });
 
     it('should notify the user when value type is unsupported', async () => {