Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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', () => ({
Expand Down Expand Up @@ -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',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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({
Expand Down Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
};
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -27,23 +27,23 @@ 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,
});

expect(jest.mocked(useFullDataView)).toHaveBeenCalledWith(DataViewManagerScopeName.default);

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);
expect(jest.mocked(useFullDataView)).toHaveBeenCalledWith(DataViewManagerScopeName.timeline);

expect(wrapper.result.current).toMatchObject({
status: expect.any(String),
dataView: expect.objectContaining({ id: expect.any(String) }),
dataViewSpec: expect.objectContaining({ id: expect.any(String) }),
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ 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(() => {
// NOTE: remove this after we are ready for undefined (lazy) data view everywhere in the app
// https://github.com/elastic/security-team/issues/11959
if (!dataView) {
return {
dataView: {
dataViewSpec: {
id: '',
title: '',
},
status,
};
}

return { status, dataView: dataView?.toSpec?.() };
return { status, dataViewSpec: dataView?.toSpec?.() };
}, [dataView, status]);
};
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
};
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -81,7 +81,9 @@ export const TimelineModalHeader = React.memo<FlyoutHeaderPanelProps>(
SourcererScopeName.timeline
);

const { dataView: experimentalDataView } = useDataView(DataViewManagerScopeName.timeline);
const { dataViewSpec: experimentalDataView } = useDataViewSpec(
DataViewManagerScopeName.timeline
);
const experimentalBrowserFields = useBrowserFields(DataViewManagerScopeName.timeline);

const browserFields = useMemo(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<TCache = object> {
/** Displays open timeline in modal */
Expand Down Expand Up @@ -163,7 +163,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -106,10 +106,10 @@ const StatefulTimelineComponent: React.FC<Props> = ({

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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -116,7 +116,7 @@ export const QueryBarTimeline = memo<QueryBarTimelineComponentProps>(
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -77,7 +77,7 @@ const StatefulSearchOrFilterComponent = React.memo<Props>(

let { sourcererDataView } = useSourcererDataView(SourcererScopeName.timeline);

const { dataView: experimentalDataView } = useDataView(SourcererScopeName.timeline);
const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.timeline);
const { newDataViewPickerEnabled } = useEnableExperimental();

if (newDataViewPickerEnabled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -63,7 +63,7 @@ export const DiscoverTabContent: FC<DiscoverTabContentProps> = ({ timelineId })
const dispatch = useDispatch();

const { newDataViewPickerEnabled } = useEnableExperimental();
const { dataView: experimentalDataView } = useDataView(SourcererScopeName.detections);
const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.detections);

const { dataViewId } = useSourcererDataView(SourcererScopeName.detections);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -91,7 +91,7 @@ export const PinnedTabContentComponent: React.FC<Props> = ({
);

const experimentalSelectedPatterns = useSelectedPatterns(SourcererScopeName.timeline);
const { dataView: experimentalDataView } = useDataView(SourcererScopeName.timeline);
const { dataViewSpec: experimentalDataView } = useDataViewSpec(SourcererScopeName.timeline);

if (newDataViewPickerEnabled) {
selectedPatterns = experimentalSelectedPatterns;
Expand Down
Loading