Merge branch '8.x' into backport/8.x/pr-199026

elastic · Nov 12, 2024 · 878ce80 · 878ce80
2 parents d3eabae + ee0934b
commit 878ce80
Show file tree

Hide file tree

Showing 166 changed files with 3,131 additions and 1,757 deletions.
diff --git a/packages/kbn-securitysolution-autocomplete/index.ts b/packages/kbn-securitysolution-autocomplete/index.ts
@@ -8,7 +8,7 @@
  */
 
 export * from './src/check_empty_value';
-export * from './src/field';
+export * from './src/es_field_selector';
 export * from './src/field_value_exists';
 export * from './src/field_value_lists';
 export * from './src/field_value_match';

diff --git a/...tests__/__snapshots__/index.test.tsx.snap → ...tests__/__snapshots__/index.test.tsx.snap b/...tests__/__snapshots__/index.test.tsx.snap → ...tests__/__snapshots__/index.test.tsx.snap
diff --git a/.../disabled_types_with_tooltip_text.test.ts → .../disabled_types_with_tooltip_text.test.ts b/.../disabled_types_with_tooltip_text.test.ts → .../disabled_types_with_tooltip_text.test.ts
diff --git a/...mplete/src/field/__tests__/index.test.tsx → ...s_field_selector/__tests__/index.test.tsx b/...mplete/src/field/__tests__/index.test.tsx → ...s_field_selector/__tests__/index.test.tsx
@@ -11,13 +11,13 @@ import React from 'react';
 import { fireEvent, render, waitFor, within } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
-import { FieldComponent } from '..';
+import { EsFieldSelector } from '..';
 import { fields, getField } from '../../fields/index.mock';
 
 describe('FieldComponent', () => {
   it('should render the component enabled and displays the selected field correctly', () => {
     const wrapper = render(
-      <FieldComponent
+      <EsFieldSelector
         isClearable={false}
         isDisabled={false}
         isLoading={false}
@@ -38,7 +38,7 @@ describe('FieldComponent', () => {
   });
   it('should render the component disabled if isDisabled is true', () => {
     const wrapper = render(
-      <FieldComponent
+      <EsFieldSelector
         isClearable={false}
         isDisabled={true}
         isLoading={false}
@@ -57,7 +57,7 @@ describe('FieldComponent', () => {
   });
   it('should render the loading spinner if isLoading is true when clicked', () => {
     const wrapper = render(
-      <FieldComponent
+      <EsFieldSelector
         isClearable={false}
         isDisabled={true}
         isLoading={true}
@@ -78,7 +78,7 @@ describe('FieldComponent', () => {
   });
   it('should allow user to clear values if isClearable is true', () => {
     const wrapper = render(
-      <FieldComponent
+      <EsFieldSelector
         indexPattern={{
           fields,
           id: '1234',
@@ -97,7 +97,7 @@ describe('FieldComponent', () => {
   });
   it('should change the selected value', async () => {
     const wrapper = render(
-      <FieldComponent
+      <EsFieldSelector
         isClearable={false}
         isDisabled={true}
         isLoading={false}
@@ -119,7 +119,7 @@ describe('FieldComponent', () => {
   it('it allows custom user input if "acceptsCustomOptions" is "true"', async () => {
     const mockOnChange = jest.fn();
     const wrapper = render(
-      <FieldComponent
+      <EsFieldSelector
         indexPattern={{
           fields,
           id: '1234',

diff --git a/...ete/src/field/__tests__/use_field.test.ts → ...d_selector/__tests__/use_es_field.test.ts b/...ete/src/field/__tests__/use_field.test.ts → ...d_selector/__tests__/use_es_field.test.ts
@@ -16,7 +16,7 @@ import TestRenderer from 'react-test-renderer';
 const { act: actTestRenderer } = TestRenderer;
 
 import { fields } from '../../fields/index.mock';
-import { useField } from '../use_field';
+import { useEsField } from '../use_es_field';
 
 jest.mock('../../translations', () => ({
   BINARY_TYPE_NOT_SUPPORTED: 'Binary fields are currently unsupported',
@@ -33,7 +33,7 @@ describe('useField', () => {
 
   describe('comboOptions and selectedComboOptions', () => {
     it('should return default values', () => {
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
       const { isInvalid, comboOptions, selectedComboOptions, fieldWidth } = result.current;
       expect(isInvalid).toBeFalsy();
       expect(comboOptions.length).toEqual(30);
@@ -79,7 +79,7 @@ describe('useField', () => {
       };
 
       const { result } = renderHook(() =>
-        useField({ indexPattern: newIndexPattern, onChange: onChangeMock })
+        useEsField({ indexPattern: newIndexPattern, onChange: onChangeMock })
       );
       const { comboOptions, selectedComboOptions } = result.current;
       expect(comboOptions).toEqual([{ label: 'bytes' }, { label: 'ssl' }, { label: '@timestamp' }]);
@@ -124,7 +124,7 @@ describe('useField', () => {
       };
 
       const { result } = renderHook(() =>
-        useField({
+        useEsField({
           indexPattern: newIndexPattern,
           onChange: onChangeMock,
           selectedField: { name: '', type: 'keyword' },
@@ -173,7 +173,7 @@ describe('useField', () => {
       };
 
       const { result } = renderHook(() =>
-        useField({
+        useEsField({
           indexPattern: newIndexPattern,
           onChange: onChangeMock,
           selectedField: { name: ' ', type: 'keyword' },
@@ -222,7 +222,7 @@ describe('useField', () => {
       };
 
       const { result } = renderHook(() =>
-        useField({ indexPattern: newIndexPattern, onChange: onChangeMock, selectedField })
+        useEsField({ indexPattern: newIndexPattern, onChange: onChangeMock, selectedField })
       );
       const { comboOptions, selectedComboOptions } = result.current;
       expect(comboOptions).toEqual([{ label: 'bytes' }, { label: 'ssl' }, { label: '@timestamp' }]);
@@ -273,7 +273,7 @@ describe('useField', () => {
           readFromDocValues: true,
         },
       ] as unknown as DataViewFieldBase[];
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
       const { comboOptions, renderFields } = result.current;
       expect(comboOptions).toEqual([
         { label: 'blob' },
@@ -328,7 +328,7 @@ describe('useField', () => {
           readFromDocValues: true,
         },
       ] as unknown as DataViewFieldBase[];
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
       const { comboOptions, renderFields } = result.current;
       expect(comboOptions).toEqual([
         { label: 'blob' },
@@ -374,7 +374,7 @@ describe('useField', () => {
           readFromDocValues: true,
         },
       ] as unknown as DataViewFieldBase[];
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
       const { comboOptions, renderFields } = result.current;
       expect(comboOptions).toEqual([{ label: 'bytes' }, { label: 'ssl' }, { label: '@timestamp' }]);
       act(() => {
@@ -389,7 +389,7 @@ describe('useField', () => {
       jest.resetModules();
     });
     it('should invoke onChange with one value if one option is sent', () => {
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
       act(() => {
         result.current.handleValuesChange([
           {
@@ -411,7 +411,7 @@ describe('useField', () => {
       });
     });
     it('should invoke onChange with array value if more than an option', () => {
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
       act(() => {
         result.current.handleValuesChange([
           {
@@ -446,7 +446,7 @@ describe('useField', () => {
       });
     });
     it('should invoke onChange with custom option if one is sent', () => {
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
       act(() => {
         result.current.handleCreateCustomOption('madeUpField');
         expect(onChangeMock).toHaveBeenCalledWith([
@@ -462,13 +462,13 @@ describe('useField', () => {
   describe('fieldWidth', () => {
     it('should return object has width prop', () => {
       const { result } = renderHook(() =>
-        useField({ indexPattern, onChange: onChangeMock, fieldInputWidth: 100 })
+        useEsField({ indexPattern, onChange: onChangeMock, fieldInputWidth: 100 })
       );
       expect(result.current.fieldWidth).toEqual({ width: '100px' });
     });
     it('should return empty object', () => {
       const { result } = renderHook(() =>
-        useField({ indexPattern, onChange: onChangeMock, fieldInputWidth: 0 })
+        useEsField({ indexPattern, onChange: onChangeMock, fieldInputWidth: 0 })
       );
       expect(result.current.fieldWidth).toEqual({});
     });
@@ -477,7 +477,7 @@ describe('useField', () => {
   describe('isInvalid with handleTouch', () => {
     it('should return isInvalid equals true when calling with no selectedField and isRequired is true', () => {
       const { result } = renderHook(() =>
-        useField({ indexPattern, onChange: onChangeMock, isRequired: true })
+        useEsField({ indexPattern, onChange: onChangeMock, isRequired: true })
       );
 
       actTestRenderer(() => {
@@ -487,7 +487,7 @@ describe('useField', () => {
     });
     it('should return isInvalid equals false with selectedField and isRequired is true', () => {
       const { result } = renderHook(() =>
-        useField({ indexPattern, onChange: onChangeMock, isRequired: true, selectedField })
+        useEsField({ indexPattern, onChange: onChangeMock, isRequired: true, selectedField })
       );
 
       actTestRenderer(() => {
@@ -496,7 +496,7 @@ describe('useField', () => {
       expect(result.current.isInvalid).toBeFalsy();
     });
     it('should return isInvalid equals false when isRequired is false', () => {
-      const { result } = renderHook(() => useField({ indexPattern, onChange: onChangeMock }));
+      const { result } = renderHook(() => useEsField({ indexPattern, onChange: onChangeMock }));
 
       actTestRenderer(() => {
         result.current.handleTouch();

diff --git a/...field/disabled_types_with_tooltip_text.ts → ...ector/disabled_types_with_tooltip_text.ts b/...field/disabled_types_with_tooltip_text.ts → ...ector/disabled_types_with_tooltip_text.ts
diff --git a/...solution-autocomplete/src/field/index.tsx → ...ocomplete/src/es_field_selector/index.tsx b/...solution-autocomplete/src/field/index.tsx → ...ocomplete/src/es_field_selector/index.tsx
@@ -11,12 +11,22 @@ import React from 'react';
 import { EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { FieldProps } from './types';
-import { useField } from './use_field';
+import { FieldBaseProps } from './types';
+import { useEsField } from './use_es_field';
 
 const AS_PLAIN_TEXT = { asPlainText: true };
 
-export const FieldComponent: React.FC<FieldProps> = ({
+interface EsFieldSelectorProps extends FieldBaseProps {
+  isClearable?: boolean;
+  isDisabled?: boolean;
+  isLoading?: boolean;
+  placeholder: string;
+  acceptsCustomOptions?: boolean;
+  showMappingConflicts?: boolean;
+  'aria-label'?: string;
+}
+
+export function EsFieldSelector({
   fieldInputWidth,
   fieldTypeFilter = [],
   indexPattern,
@@ -30,18 +40,17 @@ export const FieldComponent: React.FC<FieldProps> = ({
   acceptsCustomOptions = false,
   showMappingConflicts = false,
   'aria-label': ariaLabel,
-}): JSX.Element => {
+}: EsFieldSelectorProps): JSX.Element {
   const {
     isInvalid,
     comboOptions,
     selectedComboOptions,
     fieldWidth,
-
     renderFields,
     handleTouch,
     handleValuesChange,
     handleCreateCustomOption,
-  } = useField({
+  } = useEsField({
     indexPattern,
     fieldTypeFilter,
     isRequired,
@@ -97,6 +106,4 @@ export const FieldComponent: React.FC<FieldProps> = ({
       aria-label={ariaLabel}
     />
   );
-};
-
-FieldComponent.displayName = 'Field';
+}
diff --git a/...ysolution-autocomplete/src/field/types.ts → ...tocomplete/src/es_field_selector/types.ts b/...ysolution-autocomplete/src/field/types.ts → ...tocomplete/src/es_field_selector/types.ts
@@ -11,15 +11,6 @@ import { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
 import { FieldConflictsInfo } from '@kbn/securitysolution-list-utils';
 import { GetGenericComboBoxPropsReturn } from '../get_generic_combo_box_props';
 
-export interface FieldProps extends FieldBaseProps {
-  isClearable: boolean;
-  isDisabled: boolean;
-  isLoading: boolean;
-  placeholder: string;
-  acceptsCustomOptions?: boolean;
-  showMappingConflicts?: boolean;
-  'aria-label'?: string;
-}
 export interface FieldBaseProps {
   indexPattern: DataViewBase | undefined;
   fieldTypeFilter?: string[];

diff --git a/...tion-autocomplete/src/field/use_field.tsx → ...te/src/es_field_selector/use_es_field.tsx b/...tion-autocomplete/src/field/use_field.tsx → ...te/src/es_field_selector/use_es_field.tsx
@@ -115,7 +115,7 @@ const getComboBoxProps = (fields: ComboBoxFields): GetFieldComboBoxPropsReturn =
   };
 };
 
-export const useField = ({
+export const useEsField = ({
   indexPattern,
   fieldTypeFilter,
   isRequired,

diff --git a/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.tsx b/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.tsx
@@ -48,9 +48,9 @@ interface AutocompleteFieldMatchProps {
   selectedField: DataViewFieldBase | undefined;
   selectedValue: string | undefined;
   indexPattern: DataViewBase | undefined;
-  isLoading: boolean;
-  isDisabled: boolean;
-  isClearable: boolean;
+  isLoading?: boolean;
+  isDisabled?: boolean;
+  isClearable?: boolean;
   isRequired?: boolean;
   fieldInputWidth?: number;
   rowLabel?: string;
@@ -68,7 +68,7 @@ export const AutocompleteFieldMatchComponent: React.FC<AutocompleteFieldMatchPro
   selectedField,
   selectedValue,
   indexPattern,
-  isLoading,
+  isLoading = false,
   isDisabled = false,
   isClearable = false,
   isRequired = false,

diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
@@ -48,7 +48,7 @@ import {
   AutocompleteFieldMatchAnyComponent,
   AutocompleteFieldMatchComponent,
   AutocompleteFieldWildcardComponent,
-  FieldComponent,
+  EsFieldSelector,
   OperatorComponent,
 } from '@kbn/securitysolution-autocomplete';
 import {
@@ -207,7 +207,7 @@ export const BuilderEntryItem: React.FC<EntryItemProps> = ({
     (isFirst: boolean): JSX.Element => {
       const filteredIndexPatterns = getFilteredIndexPatterns(indexPattern, entry);
       const comboBox = (
-        <FieldComponent
+        <EsFieldSelector
           placeholder={
             entry.nested != null
               ? i18n.EXCEPTION_FIELD_NESTED_PLACEHOLDER

diff --git a/x-pack/plugins/security_solution/public/app/actions/telemetry.test.ts b/x-pack/plugins/security_solution/public/app/actions/telemetry.test.ts
@@ -9,6 +9,7 @@ import type { StartServices } from '../../types';
 import { enhanceActionWithTelemetry } from './telemetry';
 import { createAction } from '@kbn/ui-actions-plugin/public';
 import type { CellActionExecutionContext } from '@kbn/cell-actions';
+import { AppEventTypes } from '../../common/lib/telemetry';
 
 const actionId = 'test_action_id';
 const displayName = 'test-actions';
@@ -29,13 +30,13 @@ const context = {
 
 describe('enhanceActionWithTelemetry', () => {
   it('calls telemetry report when the action is executed', () => {
-    const telemetry = { reportCellActionClicked: jest.fn() };
+    const telemetry = { reportEvent: jest.fn() };
     const services = { telemetry } as unknown as StartServices;
 
     const enhancedAction = enhanceActionWithTelemetry(action, services);
     enhancedAction.execute(context);
 
-    expect(telemetry.reportCellActionClicked).toHaveBeenCalledWith({
+    expect(telemetry.reportEvent).toHaveBeenCalledWith(AppEventTypes.CellActionClicked, {
       displayName,
       actionId,
       fieldName,

diff --git a/x-pack/plugins/security_solution/public/app/actions/telemetry.ts b/x-pack/plugins/security_solution/public/app/actions/telemetry.ts
@@ -9,6 +9,7 @@ import type { CellAction, CellActionExecutionContext } from '@kbn/cell-actions';
 import type { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import type { StartServices } from '../../types';
 import type { SecurityCellActionExecutionContext } from './types';
+import { AppEventTypes } from '../../common/lib/telemetry';
 
 export const enhanceActionWithTelemetry = (
   action: CellAction<CellActionExecutionContext>,
@@ -19,7 +20,7 @@ export const enhanceActionWithTelemetry = (
   const enhancedExecute = (
     context: ActionExecutionContext<SecurityCellActionExecutionContext>
   ): Promise<void> => {
-    telemetry.reportCellActionClicked({
+    telemetry.reportEvent(AppEventTypes.CellActionClicked, {
       actionId: rest.id,
       displayName: rest.getDisplayName(context),
       fieldName: context.data.map(({ field }) => field.name).join(', '),