[8.19] [Security Solution] Remove index pattern field from Sourcerer (#190113) And other sourcerer clean ups

x-pack/solutions/security/plugins/security_solution/public/app/components/top_values_popover/top_values_popover.tsx

@@ -16,7 +16,7 @@ import { useKibana } from '../../../common/lib/kibana';
 
 export const TopValuesPopover = React.memo(() => {
   const { pathname } = useLocation();
-  const { browserFields, indexPattern } = useSourcererDataView(getScopeFromPath(pathname));
+  const { browserFields, sourcererDataView } = useSourcererDataView(getScopeFromPath(pathname));
   const {
     services: { topValuesPopover },
   } = useKibana();
@@ -43,7 +43,7 @@ export const TopValuesPopover = React.memo(() => {
         field={data.fieldName}
         scopeId={data.scopeId}
         toggleTopN={onClose}
-        indexPattern={indexPattern}
+        dataViewSpec={sourcererDataView}
         browserFields={browserFields}
       />
     </EuiWrappingPopover>

x-pack/solutions/security/plugins/security_solution/public/attack_discovery/pages/index.tsx

@@ -189,18 +189,18 @@ const AttackDiscoveryPageComponent: React.FC = () => {
 
   const pageTitle = useMemo(() => <PageTitle />, []);
 
-  const { indexPattern } = useSourcererDataView();
+  const { sourcererDataView } = useSourcererDataView();
 
   // filterQuery is the combined search bar query and filters in ES format:
   const [filterQuery, kqlError] = useMemo(
     () =>
       convertToBuildEsQuery({
         config: getEsQueryConfig(uiSettings),
-        indexPattern,
+        dataViewSpec: sourcererDataView,
         queries: [query ?? getDefaultQuery()], // <-- search bar query
         filters: filters ?? [], // <-- search bar filters
       }),
-    [filters, indexPattern, query, uiSettings]
+    [filters, sourcererDataView, query, uiSettings]
   );
 
   // renders a toast if the filter query is invalid:

x-pack/solutions/security/plugins/security_solution/public/attack_discovery/pages/settings_flyout/schedule/create_flyout/index.tsx

@@ -45,7 +45,7 @@ export const CreateFlyout: React.FC<Props> = React.memo(({ onClose }) => {
     http,
   });
 
-  const { indexPattern } = useSourcererDataView();
+  const { sourcererDataView } = useSourcererDataView();
 
   const { mutateAsync: createAttackDiscoverySchedule, isLoading: isLoadingQuery } =
     useCreateAttackDiscoverySchedule();
@@ -62,7 +62,7 @@ export const CreateFlyout: React.FC<Props> = React.memo(({ onClose }) => {
           scheduleData,
           alertsIndexPattern ?? '',
           connector,
-          indexPattern,
+          sourcererDataView,
           uiSettings
         );
         await createAttackDiscoverySchedule({ scheduleToCreate });
@@ -76,7 +76,7 @@ export const CreateFlyout: React.FC<Props> = React.memo(({ onClose }) => {
       alertsIndexPattern,
       createAttackDiscoverySchedule,
       onClose,
-      indexPattern,
+      sourcererDataView,
       uiSettings,
     ]
   );

x-pack/solutions/security/plugins/security_solution/public/attack_discovery/pages/settings_flyout/schedule/details_flyout/index.tsx

@@ -64,7 +64,7 @@ export const DetailsFlyout: React.FC<Props> = React.memo(({ scheduleId, onClose
       id: scheduleId,
     });
 
-  const { indexPattern } = useSourcererDataView();
+  const { sourcererDataView } = useSourcererDataView();
 
   const [isEditing, setIsEditing] = useState(false);
 
@@ -83,7 +83,7 @@ export const DetailsFlyout: React.FC<Props> = React.memo(({ scheduleId, onClose
           scheduleData,
           alertsIndexPattern ?? '',
           connector,
-          indexPattern,
+          sourcererDataView,
           uiSettings
         );
         await updateAttackDiscoverySchedule({ id: scheduleId, scheduleToUpdate });
@@ -95,7 +95,7 @@ export const DetailsFlyout: React.FC<Props> = React.memo(({ scheduleId, onClose
     [
       aiConnectors,
       uiSettings,
-      indexPattern,
+      sourcererDataView,
       scheduleId,
       alertsIndexPattern,
       updateAttackDiscoverySchedule,

x-pack/solutions/security/plugins/security_solution/public/attack_discovery/pages/settings_flyout/schedule/utils/convert_form_data.test.ts

@@ -6,8 +6,8 @@
  */
 
 import type { IUiSettingsClient } from '@kbn/core/public';
+import type { DataViewSpec } from '@kbn/data-plugin/common';
 import type { AIConnector } from '@kbn/elastic-assistant';
-import type { DataViewBase } from '@kbn/es-query';
 
 import { convertFormDataInBaseSchedule } from './convert_form_data';
 import { convertToBuildEsQuery } from '../../../../../common/lib/kuery';
@@ -47,7 +47,7 @@ describe('convertFormDataInBaseSchedule', () => {
       },
       '.alert-*',
       {} as AIConnector,
-      {} as DataViewBase,
+      {} as DataViewSpec,
       {
         get: jest.fn(),
       } as unknown as IUiSettingsClient

x-pack/solutions/security/plugins/security_solution/public/attack_discovery/pages/settings_flyout/schedule/utils/convert_form_data.ts

@@ -6,9 +6,9 @@
  */
 
 import type { IUiSettingsClient } from '@kbn/core/public';
+import type { DataViewSpec } from '@kbn/data-plugin/common';
 import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import type { AIConnector } from '@kbn/elastic-assistant';
-import type { DataViewBase } from '@kbn/es-query';
 
 import { convertToBuildEsQuery } from '../../../../../common/lib/kuery';
 import type { AttackDiscoveryScheduleSchema } from '../edit_form/types';
@@ -19,14 +19,14 @@ export const convertFormDataInBaseSchedule = (
   scheduleData: AttackDiscoveryScheduleSchema,
   alertsIndexPattern: string,
   connector: AIConnector,
-  indexPattern: DataViewBase,
+  dataViewSpec: DataViewSpec,
   uiSettings: IUiSettingsClient
 ) => {
   const alertsSelectionSettings = scheduleData.alertsSelectionSettings;
 
   const [filterQuery, kqlError] = convertToBuildEsQuery({
     config: getEsQueryConfig(uiSettings),
-    indexPattern,
+    dataViewSpec,
     queries: [alertsSelectionSettings.query],
     filters: alertsSelectionSettings.filters,
   });

x-pack/solutions/security/plugins/security_solution/public/common/components/events_viewer/index.tsx

@@ -145,9 +145,8 @@ const StatefulEventsViewerComponent: React.FC<EventsViewerProps & PropsFromRedux
   const {
     browserFields,
     dataViewId,
-    indexPattern,
-    sourcererDataView,
     selectedPatterns,
+    sourcererDataView,
     dataViewId: selectedDataViewId,
     loading: isLoadingIndexPattern,
   } = useSourcererDataView(sourcererScope);
@@ -234,12 +233,12 @@ const StatefulEventsViewerComponent: React.FC<EventsViewerProps & PropsFromRedux
         dataProviders: [],
         filters: globalFilters,
         from: start,
-        indexPattern,
+        dataViewSpec: sourcererDataView,
         kqlMode: 'filter',
         kqlQuery: query,
         to: end,
       }),
-    [esQueryConfig, browserFields, globalFilters, start, indexPattern, query, end]
+    [esQueryConfig, browserFields, globalFilters, start, sourcererDataView, query, end]
   );
 
   const canQueryTimeline = useMemo(
@@ -281,7 +280,7 @@ const StatefulEventsViewerComponent: React.FC<EventsViewerProps & PropsFromRedux
       id: tableId,
       indexNames: indexNames ?? selectedPatterns,
       limit: itemsPerPage,
-      runtimeMappings: sourcererDataView?.runtimeFieldMap as RunTimeMappings,
+      runtimeMappings: sourcererDataView.runtimeFieldMap as RunTimeMappings,
       skip: !canQueryTimeline,
       sort: sortField,
       startDate: start,

x-pack/solutions/security/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/index.tsx

@@ -281,7 +281,7 @@ const InsightEditorComponent = ({
   onCancel,
 }: EuiMarkdownEditorUiPluginEditorProps<InsightComponentProps & { relativeTimerange: string }>) => {
   const isEditMode = node != null;
-  const { indexPattern } = useSourcererDataView(SourcererScopeName.default);
+  const { sourcererDataView } = useSourcererDataView(SourcererScopeName.default);
   const {
     unifiedSearch: {
       ui: { FiltersBuilderLazy },
@@ -400,7 +400,7 @@ const InsightEditorComponent = ({
     );
   }, [labelController.field.value, providers, dataView]);
   const filtersStub = useMemo(() => {
-    const index = indexPattern && indexPattern.getName ? indexPattern.getName() : '*';
+    const index = sourcererDataView.name ?? '*';
     return [
       {
         $state: {
@@ -414,7 +414,7 @@ const InsightEditorComponent = ({
         },
       },
     ];
-  }, [indexPattern]);
+  }, [sourcererDataView]);
   const isPlatinum = useLicense().isAtLeast('platinum');
 
   return (

x-pack/solutions/security/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/use_insight_query.ts

@@ -41,7 +41,7 @@ export const useInsightQuery = ({
 }: UseInsightQuery): UseInsightQueryResult => {
   const { uiSettings } = useKibana().services;
   const esQueryConfig = useMemo(() => getEsQueryConfig(uiSettings), [uiSettings]);
-  const { browserFields, selectedPatterns, indexPattern, dataViewId } = useSourcererDataView(
+  const { browserFields, selectedPatterns, sourcererDataView, dataViewId } = useSourcererDataView(
     SourcererScopeName.timeline
   );
   const [hasError, setHasError] = useState(false);
@@ -51,7 +51,7 @@ export const useInsightQuery = ({
         const parsedCombinedQueries = combineQueries({
           config: esQueryConfig,
           dataProviders,
-          indexPattern,
+          dataViewSpec: sourcererDataView,
           browserFields,
           filters,
           kqlQuery: {
@@ -66,7 +66,7 @@ export const useInsightQuery = ({
       setHasError(true);
       return null;
     }
-  }, [browserFields, dataProviders, esQueryConfig, hasError, indexPattern, filters]);
+  }, [browserFields, dataProviders, esQueryConfig, hasError, sourcererDataView, filters]);
 
   const [dataLoadingState, { events, totalCount }] = useTimelineEvents({
     dataViewId,

x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/index.test.tsx

@@ -11,7 +11,7 @@ import { TableId } from '@kbn/securitysolution-data-table';
 
 import { TimelineId } from '../../../../common/types/timeline';
 import { mockBrowserFields } from '../../containers/source/mock';
-import { mockGlobalState, TestProviders, mockIndexPattern, createMockStore } from '../../mock';
+import { mockGlobalState, TestProviders, createMockStore, mockDataViewSpec } from '../../mock';
 import type { State } from '../../store';
 import { TopN } from './top_n';
 import { detectionAlertsTables } from './helpers';
@@ -153,7 +153,7 @@ const store = createMockStore(state);
 const testProps = {
   browserFields: mockBrowserFields,
   field,
-  indexPattern: mockIndexPattern,
+  indexPattern: mockDataViewSpec,
   scopeId: TableId.hostsPageEvents,
   toggleTopN: jest.fn(),
   onFilterAdded: jest.fn(),

x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/index.tsx

@@ -9,8 +9,8 @@ import React, { useMemo } from 'react';
 import type { ConnectedProps } from 'react-redux';
 import { connect } from 'react-redux';
 
-import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import { getEsQueryConfig } from '@kbn/data-plugin/common';
+import type { Filter, Query } from '@kbn/es-query';
+import { type DataViewSpec, getEsQueryConfig } from '@kbn/data-plugin/common';
 import { isActiveTimeline } from '../../../helpers';
 import { InputsModelId } from '../../store/inputs/constants';
 import { useGlobalTime } from '../../containers/use_global_time';
@@ -77,7 +77,7 @@ const connector = connect(makeMapStateToProps);
 export interface OwnProps {
   browserFields: BrowserFields;
   field: string;
-  indexPattern: DataViewBase;
+  dataViewSpec?: DataViewSpec;
   scopeId?: string;
   toggleTopN: () => void;
   onFilterAdded?: () => void;
@@ -96,7 +96,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
   browserFields,
   dataProviders,
   field,
-  indexPattern,
+  dataViewSpec,
   globalFilters = EMPTY_FILTERS,
   globalQuery = EMPTY_QUERY,
   kqlMode,
@@ -119,7 +119,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
             config: getEsQueryConfig(uiSettings),
             dataProviders,
             filters: activeTimelineFilters,
-            indexPattern,
+            dataViewSpec,
             kqlMode,
             kqlQuery: {
               language: 'kuery',
@@ -133,7 +133,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
       uiSettings,
       dataProviders,
       activeTimelineFilters,
-      indexPattern,
+      dataViewSpec,
       kqlMode,
       activeTimelineKqlQueryExpression,
     ]
@@ -152,7 +152,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
       field={field as AlertsStackByField}
       filters={isActiveTimeline(scopeId ?? '') ? EMPTY_FILTERS : globalFilters}
       from={isActiveTimeline(scopeId ?? '') ? activeTimelineFrom : from}
-      indexPattern={indexPattern}
+      dataViewSpec={dataViewSpec}
       options={options}
       paddingSize={paddingSize}
       query={isActiveTimeline(scopeId ?? '') ? EMPTY_QUERY : globalQuery}

x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.test.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { screen, render, waitFor, fireEvent } from '@testing-library/react';
 
-import { TestProviders, mockIndexPattern } from '../../mock';
+import { TestProviders, mockDataViewSpec } from '../../mock';
 
 import { allEvents, defaultOptions } from './helpers';
 import type { Props as TopNProps } from './top_n';
@@ -105,7 +105,7 @@ describe('TopN', () => {
     field,
     filters: [],
     from: '2020-04-14T00:31:47.695Z',
-    indexPattern: mockIndexPattern,
+    dataViewSpec: mockDataViewSpec,
     options: defaultOptions,
     query,
     setAbsoluteRangeDatePickerTarget: InputsModelId.global,

x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.tsx

@@ -9,7 +9,8 @@ import { EuiButtonIcon, EuiSuperSelect, useEuiTheme } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css } from '@emotion/react';
 
-import type { DataViewBase, Filter, Query } from '@kbn/es-query';
+import type { Filter, Query } from '@kbn/es-query';
+import type { DataViewSpec } from '@kbn/data-plugin/common';
 import type { GlobalTimeArgs } from '../../containers/use_global_time';
 import { EventsByDataset } from '../../../overview/components/events_by_dataset';
 import { SignalsByCategory } from '../../../overview/components/signals_by_category';
@@ -51,7 +52,7 @@ export interface Props extends Pick<GlobalTimeArgs, 'from' | 'to' | 'deleteQuery
   defaultView: TimelineEventsType;
   field: AlertsStackByField;
   filters: Filter[];
-  indexPattern: DataViewBase;
+  dataViewSpec?: DataViewSpec;
   options: TopNOption[];
   paddingSize?: 's' | 'm' | 'l' | 'none';
   query: Query;
@@ -69,7 +70,7 @@ const TopNComponent: React.FC<Props> = ({
   filters,
   field,
   from,
-  indexPattern,
+  dataViewSpec,
   options,
   paddingSize,
   query,
@@ -122,7 +123,7 @@ const TopNComponent: React.FC<Props> = ({
             filters={applicableFilters}
             from={from}
             headerChildren={headerChildren}
-            indexPattern={indexPattern}
+            dataViewSpec={dataViewSpec}
             onlyField={field}
             paddingSize={paddingSize}
             query={query}

x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/alerts_by_status_donut.test.ts

@@ -21,6 +21,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/alerts_histogram.test.ts

@@ -21,6 +21,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/alerts_table.test.ts

@@ -29,6 +29,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/rule_preview.test.ts

@@ -24,6 +24,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.test.ts

@@ -21,6 +21,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));