diff --git a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.test.tsx index 8faa073a7ca07..2054f8266edc3 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.test.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { render, screen, fireEvent, waitFor } from '@testing-library/react'; import { DataViewPicker } from '.'; -import { useDataView } from '../../hooks/use_data_view'; +import { useDataViewSpec } from '../../hooks/use_data_view_spec'; import { DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID, DataViewManagerScopeName } from '../../constants'; import { sharedDataViewManagerSlice } from '../../redux/slices'; import { useDispatch } from 'react-redux'; @@ -18,8 +18,8 @@ import { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common'; import { TestProviders } from '../../../common/mock/test_providers'; import { useSelectDataView } from '../../hooks/use_select_data_view'; -jest.mock('../../hooks/use_data_view', () => ({ - useDataView: jest.fn(), +jest.mock('../../hooks/use_data_view_spec', () => ({ + useDataViewSpec: jest.fn(), })); jest.mock('../../hooks/use_select_data_view', () => ({ @@ -66,8 +66,8 @@ describe('DataViewPicker', () => { let mockDispatch = jest.fn(); beforeEach(() => { - jest.mocked(useDataView).mockReturnValue({ - dataView: { + jest.mocked(useDataViewSpec).mockReturnValue({ + dataViewSpec: { id: DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID, name: 'Default Security Data View', }, diff --git a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.tsx index 6a171de12a4e4..24e70af54a7ae 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/components/data_view_picker/index.tsx @@ -13,7 +13,7 @@ import { DataView, type DataViewListItem } from '@kbn/data-views-plugin/public'; import type { DataViewManagerScopeName } from '../../constants'; import { useKibana } from '../../../common/lib/kibana'; import { DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID } from '../../constants'; -import { useDataView } from '../../hooks/use_data_view'; +import { useDataViewSpec } from '../../hooks/use_data_view_spec'; import { sharedStateSelector } from '../../redux/selectors'; import { sharedDataViewManagerSlice } from '../../redux/slices'; import { useSelectDataView } from '../../hooks/use_select_data_view'; @@ -28,9 +28,9 @@ export const DataViewPicker = memo((props: { scope: DataViewManagerScopeName }) const closeDataViewEditor = useRef<() => void | undefined>(); const closeFieldEditor = useRef<() => void | undefined>(); - const { dataView, status } = useDataView(props.scope); + const { dataViewSpec, status } = useDataViewSpec(props.scope); - const dataViewId = dataView?.id; + const dataViewId = dataViewSpec?.id; const createNewDataView = useCallback(() => { closeDataViewEditor.current = dataViewEditor.openEditor({ @@ -91,16 +91,16 @@ export const DataViewPicker = memo((props: { scope: DataViewManagerScopeName }) return { label: 'Loading' }; } - if (dataView.id === DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID) { + if (dataViewSpec.id === DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID) { return { label: 'Default Security Data View', }; } return { - label: dataView?.name || dataView?.id || 'Data view', + label: dataViewSpec?.name || dataViewSpec?.id || 'Data view', }; - }, [dataView.id, dataView?.name, status]); + }, [dataViewSpec.id, dataViewSpec?.name, status]); const { adhocDataViews: adhocDataViewSpecs, dataViews } = useSelector(sharedStateSelector); diff --git a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.test.ts b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.test.ts index 8dbb63912088f..d5fa20c2e058a 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.test.ts @@ -9,17 +9,17 @@ import { renderHook } from '@testing-library/react'; import { TestProviders } from '../../common/mock'; import { useBrowserFields } from './use_browser_fields'; import { DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID, DataViewManagerScopeName } from '../constants'; -import { useDataView } from './use_data_view'; +import { useDataViewSpec } from './use_data_view_spec'; import { type FieldSpec } from '@kbn/data-views-plugin/common'; -jest.mock('./use_data_view', () => ({ - useDataView: jest.fn(), +jest.mock('./use_data_view_spec', () => ({ + useDataViewSpec: jest.fn(), })); describe('useBrowserFields', () => { beforeAll(() => { - jest.mocked(useDataView).mockReturnValue({ - dataView: { + jest.mocked(useDataViewSpec).mockReturnValue({ + dataViewSpec: { id: DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID, fields: { '@timestamp': { diff --git a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.ts b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.ts index 63256e2907212..2d64c99575030 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_browser_fields.ts @@ -8,22 +8,22 @@ import { useMemo } from 'react'; import type { BrowserFields } from '@kbn/timelines-plugin/common'; import { type DataViewManagerScopeName } from '../constants'; -import { useDataView } from './use_data_view'; +import { useDataViewSpec } from './use_data_view_spec'; import { getDataViewStateFromIndexFields } from '../../common/containers/source/use_data_view'; export const useBrowserFields = (scope: DataViewManagerScopeName): BrowserFields => { - const { dataView } = useDataView(scope); + const { dataViewSpec } = useDataViewSpec(scope); return useMemo(() => { - if (!dataView) { + if (!dataViewSpec) { return {}; } const { browserFields } = getDataViewStateFromIndexFields( - dataView?.title ?? '', - dataView.fields + dataViewSpec?.title ?? '', + dataViewSpec.fields ); return browserFields; - }, [dataView]); + }, [dataViewSpec]); }; diff --git a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view.test.ts b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view_spec.test.ts similarity index 82% rename from x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view_spec.test.ts index 9d9be0284c222..431675ec6bc99 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view_spec.test.ts @@ -9,12 +9,12 @@ import { renderHook } from '@testing-library/react'; import { type DataView } from '@kbn/data-views-plugin/public'; import { DataViewManagerScopeName } from '../constants'; -import { useDataView } from './use_data_view'; +import { useDataViewSpec } from './use_data_view_spec'; import { useFullDataView } from './use_full_data_view'; jest.mock('./use_full_data_view'); -describe('useDataView', () => { +describe('useDataViewSpec', () => { beforeEach(() => { jest.mocked(useFullDataView).mockReturnValue({ dataView: { @@ -27,7 +27,7 @@ describe('useDataView', () => { }); it('should return correct dataView from the store, based on the provided scope', () => { - const wrapper = renderHook((scope) => useDataView(scope), { + const wrapper = renderHook((scope) => useDataViewSpec(scope), { initialProps: DataViewManagerScopeName.default, }); @@ -35,7 +35,7 @@ describe('useDataView', () => { expect(wrapper.result.current).toMatchObject({ status: expect.any(String), - dataView: expect.objectContaining({ id: expect.any(String) }), + dataViewSpec: expect.objectContaining({ id: expect.any(String) }), }); wrapper.rerender(DataViewManagerScopeName.timeline); @@ -43,7 +43,7 @@ describe('useDataView', () => { expect(wrapper.result.current).toMatchObject({ status: expect.any(String), - dataView: expect.objectContaining({ id: expect.any(String) }), + dataViewSpec: expect.objectContaining({ id: expect.any(String) }), }); }); }); diff --git a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view.ts b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view_spec.ts similarity index 84% rename from x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view.ts rename to x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view_spec.ts index 8f487269b9bda..4ceba3ba607b0 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_data_view_spec.ts @@ -12,7 +12,7 @@ import { useFullDataView } from './use_full_data_view'; /** * Returns data view selection for given scopeName */ -export const useDataView = (scopeName: DataViewManagerScopeName) => { +export const useDataViewSpec = (scopeName: DataViewManagerScopeName) => { const { dataView, status } = useFullDataView(scopeName); return useMemo(() => { @@ -20,7 +20,7 @@ export const useDataView = (scopeName: DataViewManagerScopeName) => { // https://github.com/elastic/security-team/issues/11959 if (!dataView) { return { - dataView: { + dataViewSpec: { id: '', title: '', }, @@ -28,6 +28,6 @@ export const useDataView = (scopeName: DataViewManagerScopeName) => { }; } - return { status, dataView: dataView?.toSpec?.() }; + return { status, dataViewSpec: dataView?.toSpec?.() }; }, [dataView, status]); }; diff --git a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_selected_patterns.ts b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_selected_patterns.ts index 5228f875c9935..d786150272653 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_selected_patterns.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/data_view_manager/hooks/use_selected_patterns.ts @@ -7,10 +7,10 @@ import { useMemo } from 'react'; import type { DataViewManagerScopeName } from '../constants'; -import { useDataView } from './use_data_view'; +import { useDataViewSpec } from './use_data_view_spec'; export const useSelectedPatterns = (scope: DataViewManagerScopeName): string[] => { - const { dataView } = useDataView(scope); + const { dataViewSpec } = useDataViewSpec(scope); - return useMemo(() => dataView?.title?.split(',') ?? [], [dataView?.title]); + return useMemo(() => dataViewSpec?.title?.split(',') ?? [], [dataViewSpec?.title]); }; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_bulk_to_timeline.tsx b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_bulk_to_timeline.tsx index 480d17fe79d0a..07b6f134fe2ce 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_bulk_to_timeline.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_bulk_to_timeline.tsx @@ -21,7 +21,7 @@ import type { RunTimeMappings } from '@kbn/timelines-plugin/common/search_strate import { useEnableExperimental } from '../../../../common/hooks/use_experimental_features'; import { useSelectedPatterns } from '../../../../data_view_manager/hooks/use_selected_patterns'; import { useBrowserFields } from '../../../../data_view_manager/hooks/use_browser_fields'; -import { useDataView } from '../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../data_view_manager/hooks/use_data_view_spec'; import type { CustomBulkAction } from '../../../../../common/types'; import { combineQueries } from '../../../../common/lib/kuery'; import { useKibana } from '../../../../common/lib/kibana'; @@ -74,7 +74,7 @@ export const useAddBulkToTimelineAction = ({ const [disableActionOnSelectAll, setDisabledActionOnSelectAll] = useState(false); const { newDataViewPickerEnabled } = useEnableExperimental(); - const { dataView: experimentalDataView } = useDataView(scopeId); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(scopeId); const experimentalBrowserFields = useBrowserFields(scopeId); const experimentalSelectedPatterns = useSelectedPatterns(scopeId); diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx index 57eab0e4b32c6..9934ee95c2ac6 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx @@ -22,7 +22,7 @@ import { useEnableExperimental } from '../../../../common/hooks/use_experimental import { useSourcererDataView } from '../../../../sourcerer/containers'; import { SourcererScopeName } from '../../../../sourcerer/store/model'; -import { useDataView } from '../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../data_view_manager/hooks/use_data_view_spec'; import { NewTimelineButton } from '../actions/new_timeline_button'; import { OpenTimelineButton } from '../actions/open_timeline_button'; import { APP_ID } from '../../../../../common'; @@ -81,7 +81,9 @@ export const TimelineModalHeader = React.memo( SourcererScopeName.timeline ); - const { dataView: experimentalDataView } = useDataView(DataViewManagerScopeName.timeline); + const { dataViewSpec: experimentalDataView } = useDataViewSpec( + DataViewManagerScopeName.timeline + ); const experimentalBrowserFields = useBrowserFields(DataViewManagerScopeName.timeline); const browserFields = useMemo(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/open_timeline/index.tsx index a7316579006c2..c9e16f47bd52f 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/open_timeline/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/open_timeline/index.tsx @@ -58,7 +58,7 @@ import { useStartTransaction } from '../../../common/lib/apm/use_start_transacti import { TIMELINE_ACTIONS } from '../../../common/lib/apm/user_actions'; import { defaultUdtHeaders } from '../timeline/body/column_headers/default_headers'; import { timelineDefaults } from '../../store/defaults'; -import { useDataView } from '../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../data_view_manager/hooks/use_data_view_spec'; interface OwnProps { /** Displays open timeline in modal */ @@ -163,7 +163,7 @@ export const StatefulOpenTimelineComponent = React.memo( let { dataViewId, selectedPatterns } = useSourcererDataView(SourcererScopeName.timeline); const { newDataViewPickerEnabled } = useEnableExperimental(); - const { dataView: experimentalDataView } = useDataView(SourcererScopeName.timeline); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.timeline); const experimentalSelectedPatterns = useSelectedPatterns(SourcererScopeName.timeline); if (newDataViewPickerEnabled) { diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/index.tsx index 632335a549c58..b085af7903f19 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/index.tsx @@ -32,7 +32,7 @@ import { useResolveConflict } from '../../../common/hooks/use_resolve_conflict'; import { sourcererSelectors } from '../../../common/store'; import { defaultUdtHeaders } from './body/column_headers/default_headers'; import { useSelectedPatterns } from '../../../data_view_manager/hooks/use_selected_patterns'; -import { useDataView } from '../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../data_view_manager/hooks/use_data_view_spec'; import { TimelineContext } from './context'; const TimelineBody = styled.div` @@ -106,10 +106,10 @@ const StatefulTimelineComponent: React.FC = ({ const newDataViewPickerEnabled = useIsExperimentalFeatureEnabled('newDataViewPickerEnabled'); const experimentalSelectedPatterns = useSelectedPatterns(SourcererScopeName.timeline); - const experimentalDataView = useDataView(SourcererScopeName.timeline); + const experimentalDataView = useDataViewSpec(SourcererScopeName.timeline); const selectedDataViewId = newDataViewPickerEnabled - ? experimentalDataView.dataView?.id ?? '' + ? experimentalDataView.dataViewSpec?.id ?? '' : selectedDataViewIdSourcerer; const selectedPatterns = newDataViewPickerEnabled diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx index 17f06f0bb415c..db9afe73c743d 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx @@ -29,7 +29,7 @@ import { startSelector, } from '../../../../common/components/super_date_picker/selectors'; import { useSelectedPatterns } from '../../../../data_view_manager/hooks/use_selected_patterns'; -import { useDataView } from '../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../data_view_manager/hooks/use_data_view_spec'; interface KpiExpandedProps { timelineId: string; @@ -38,7 +38,7 @@ interface KpiExpandedProps { export const TimelineKpisContainer = ({ timelineId }: KpiExpandedProps) => { const { newDataViewPickerEnabled } = useEnableExperimental(); const experimentalBrowserFields = useBrowserFields(SourcererScopeName.timeline); - const { dataView: experimentalDataView } = useDataView(SourcererScopeName.timeline); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.timeline); const experimentalSelectedPatterns = useSelectedPatterns(SourcererScopeName.timeline); let { browserFields, sourcererDataView, selectedPatterns } = useSourcererDataView( diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx index 8a4da610ed5e1..c4f918e0e68cb 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/eql/index.tsx @@ -12,7 +12,7 @@ import { useDispatch } from 'react-redux'; import { css } from '@emotion/css'; import { useEnableExperimental } from '../../../../../common/hooks/use_experimental_features'; -import { useDataView } from '../../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../../data_view_manager/hooks/use_data_view_spec'; import type { EqlOptions } from '../../../../../../common/search_strategy'; import { useDeepEqualSelector } from '../../../../../common/hooks/use_selector'; import { SourcererScopeName } from '../../../../../sourcerer/store/model'; @@ -70,7 +70,9 @@ export const EqlQueryBarTimeline = memo(({ timelineId }: { timelineId: string }) const { newDataViewPickerEnabled } = useEnableExperimental(); - const { dataView: experimentalDataView, status } = useDataView(SourcererScopeName.timeline); + const { dataViewSpec: experimentalDataView, status } = useDataViewSpec( + SourcererScopeName.timeline + ); const experimentalSelectedPatterns = useSelectedPatterns(SourcererScopeName.timeline); if (newDataViewPickerEnabled) { diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx index 4b5f73082d95e..ff3d32c09801c 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx @@ -14,7 +14,7 @@ import { FilterStateStore } from '@kbn/es-query'; import type { FilterManager, SavedQuery, SavedQueryTimeFilter } from '@kbn/data-plugin/public'; import styled from '@emotion/styled'; import { useEnableExperimental } from '../../../../common/hooks/use_experimental_features'; -import { useDataView } from '../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../data_view_manager/hooks/use_data_view_spec'; import { InputsModelId } from '../../../../common/store/inputs/constants'; import { SourcererScopeName } from '../../../../sourcerer/store/model'; @@ -116,7 +116,7 @@ export const QueryBarTimeline = memo( let { browserFields, sourcererDataView } = useSourcererDataView(SourcererScopeName.timeline); const { newDataViewPickerEnabled } = useEnableExperimental(); - const { dataView: experimentalDataView } = useDataView(SourcererScopeName.timeline); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.timeline); const experimentalBrowserFields = useBrowserFields(SourcererScopeName.timeline); if (newDataViewPickerEnabled) { diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx index 5c2c3b1cfeede..ce28a806b0f54 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx @@ -18,7 +18,7 @@ import type { DataView } from '@kbn/data-views-plugin/common'; import { FilterItems } from '@kbn/unified-search-plugin/public'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { useEnableExperimental } from '../../../../common/hooks/use_experimental_features'; -import { useDataView } from '../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../data_view_manager/hooks/use_data_view_spec'; import { useAppToasts } from '../../../../common/hooks/use_app_toasts'; import { useDeepEqualSelector } from '../../../../common/hooks/use_selector'; import { useKibana } from '../../../../common/lib/kibana'; @@ -77,7 +77,7 @@ const StatefulSearchOrFilterComponent = React.memo( let { sourcererDataView } = useSourcererDataView(SourcererScopeName.timeline); - const { dataView: experimentalDataView } = useDataView(SourcererScopeName.timeline); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.timeline); const { newDataViewPickerEnabled } = useEnableExperimental(); if (newDataViewPickerEnabled) { diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/esql/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/esql/index.tsx index d1ea840354173..76b56f9934cb7 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/esql/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/esql/index.tsx @@ -20,7 +20,7 @@ import { useDispatch } from 'react-redux'; import type { DataViewSpec } from '@kbn/data-views-plugin/common'; import { APP_STATE_URL_KEY } from '@kbn/discover-plugin/common'; import { useEnableExperimental } from '../../../../../common/hooks/use_experimental_features'; -import { useDataView } from '../../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../../data_view_manager/hooks/use_data_view_spec'; import { updateSavedSearchId } from '../../../../store/actions'; import { useDiscoverInTimelineContext } from '../../../../../common/components/discover_in_timeline/use_discover_in_timeline_context'; import { useKibana } from '../../../../../common/lib/kibana'; @@ -63,7 +63,7 @@ export const DiscoverTabContent: FC = ({ timelineId }) const dispatch = useDispatch(); const { newDataViewPickerEnabled } = useEnableExperimental(); - const { dataView: experimentalDataView } = useDataView(SourcererScopeName.detections); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.detections); const { dataViewId } = useSourcererDataView(SourcererScopeName.detections); diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx index 7fd82bb719e22..6b1264be2daaf 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx @@ -14,7 +14,7 @@ import type { EuiDataGridControlColumn } from '@elastic/eui'; import { useExpandableFlyoutApi } from '@kbn/expandable-flyout'; import type { RunTimeMappings } from '@kbn/timelines-plugin/common/search_strategy'; import { useSourcererDataView } from '../../../../../sourcerer/containers'; -import { useDataView } from '../../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../../data_view_manager/hooks/use_data_view_spec'; import { useSelectedPatterns } from '../../../../../data_view_manager/hooks/use_selected_patterns'; import { useFetchNotes } from '../../../../../notes/hooks/use_fetch_notes'; import { @@ -91,7 +91,7 @@ export const PinnedTabContentComponent: React.FC = ({ ); const experimentalSelectedPatterns = useSelectedPatterns(SourcererScopeName.timeline); - const { dataView: experimentalDataView } = useDataView(SourcererScopeName.timeline); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.timeline); if (newDataViewPickerEnabled) { selectedPatterns = experimentalSelectedPatterns; diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx index 3493a547a9d5b..453f7f378c77a 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx @@ -17,7 +17,7 @@ import { useExpandableFlyoutApi } from '@kbn/expandable-flyout'; import type { RunTimeMappings } from '@kbn/timelines-plugin/common/search_strategy'; import { useSelectedPatterns } from '../../../../../data_view_manager/hooks/use_selected_patterns'; import { useBrowserFields } from '../../../../../data_view_manager/hooks/use_browser_fields'; -import { useDataView } from '../../../../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../../../../data_view_manager/hooks/use_data_view_spec'; import { useFetchNotes } from '../../../../../notes/hooks/use_fetch_notes'; import { DocumentDetailsLeftPanelKey, @@ -91,7 +91,7 @@ export const QueryTabContentComponent: React.FC = ({ const dispatch = useDispatch(); const { newDataViewPickerEnabled } = useEnableExperimental(); - const { dataView: experimentalDataView, status: sourcererStatus } = useDataView( + const { dataViewSpec: experimentalDataView, status: sourcererStatus } = useDataViewSpec( SourcererScopeName.timeline ); const experimentalBrowserFields = useBrowserFields(SourcererScopeName.timeline); diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx index 596e036f3f1dc..eeffad6735d21 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx @@ -21,7 +21,7 @@ import { defaultUdtHeaders } from '../components/timeline/body/column_headers/de import { timelineDefaults } from '../store/defaults'; import { useSelectDataView } from '../../data_view_manager/hooks/use_select_data_view'; import { DataViewManagerScopeName } from '../../data_view_manager/constants'; -import { useDataView } from '../../data_view_manager/hooks/use_data_view'; +import { useDataViewSpec } from '../../data_view_manager/hooks/use_data_view_spec'; import { useSelectedPatterns } from '../../data_view_manager/hooks/use_selected_patterns'; import { sourcererActions, sourcererSelectors } from '../../sourcerer/store'; import { SourcererScopeName } from '../../sourcerer/store/model'; @@ -59,7 +59,7 @@ export const useCreateTimeline = ({ ) ?? { id: '', patternList: [] }; const { newDataViewPickerEnabled } = useEnableExperimental(); - const { dataView: experimentalDataView } = useDataView(DataViewManagerScopeName.default); + const { dataViewSpec: experimentalDataView } = useDataViewSpec(DataViewManagerScopeName.default); const experimentalSelectedPatterns = useSelectedPatterns(DataViewManagerScopeName.default);