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 @@ -82,6 +82,8 @@ export const DEFAULT_THREAT_INDEX_KEY = 'securitySolution:defaultThreatIndex' as
export const DEFAULT_THREAT_INDEX_VALUE = ['logs-ti_*'] as const;
export const DEFAULT_THREAT_MATCH_QUERY = '@timestamp >= "now-30d/d"' as const;

export const EXPLORE_DATA_VIEW_PREFIX = 'explore-data-view' as const;

export const EXPLORE_PATH = '/explore' as const;
export const DASHBOARDS_PATH = '/dashboards' as const;
export const MANAGE_PATH = '/manage' as const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import React, { useCallback, useRef, useMemo, memo } from 'react';
import { useDispatch, useSelector } from 'react-redux';

import { DataView } from '@kbn/data-views-plugin/public';
import { EXPLORE_DATA_VIEW_PREFIX } from '../../../../common/constants';
import type { SourcererUrlState } from '../../../sourcerer/store/model';
import { useUpdateUrlParam } from '../../../common/utils/global_query_string';
import { URL_PARAM_KEY } from '../../../common/hooks/use_url_state';
Expand Down Expand Up @@ -61,7 +62,9 @@ export const DataViewPicker = memo(({ scope, onClosePopover, disabled }: DataVie
const { adhocDataViews: adhocDataViewSpecs, defaultDataViewId } =
useSelector(sharedStateSelector);
const adhocDataViews = useMemo(() => {
return adhocDataViewSpecs.map((spec) => new DataView({ spec, fieldFormats }));
return adhocDataViewSpecs
.filter((spec) => !spec.id?.startsWith(EXPLORE_DATA_VIEW_PREFIX))
.map((spec) => new DataView({ spec, fieldFormats }));
}, [adhocDataViewSpecs, fieldFormats]);

const managedDataViews = useManagedDataViews();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('useManagedDataViews', () => {
// Mock the Redux selector
(useSelector as jest.Mock).mockReturnValue({
dataViews: mockDataViews,
adhocDataViews: [],
defaultDataViewId: DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID,
alertDataViewId: DEFAULT_ALERT_DATA_VIEW_ID,
});
Expand Down Expand Up @@ -101,6 +102,7 @@ describe('useManagedDataViews', () => {
];
(useSelector as jest.Mock).mockReturnValue({
dataViews: mockDataViews,
adhocDataViews: [],
defaultDataViewId: DEFAULT_SECURITY_SOLUTION_DATA_VIEW_ID,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import { DataView } from '@kbn/data-views-plugin/public';
import { useSelector } from 'react-redux';
import { useMemo } from 'react';
import { EXPLORE_DATA_VIEW_PREFIX } from '../../../common/constants';
import { useKibana } from '../../common/lib/kibana';
import { sharedStateSelector } from '../redux/selectors';

Expand All @@ -17,6 +18,7 @@ import { sharedStateSelector } from '../redux/selectors';
export const useManagedDataViews = (): DataView[] => {
const {
dataViews: dataViewSpecs,
adhocDataViews,
defaultDataViewId,
alertDataViewId,
} = useSelector(sharedStateSelector);
Expand All @@ -26,9 +28,14 @@ export const useManagedDataViews = (): DataView[] => {

return useMemo(
() =>
dataViewSpecs
.filter((dv) => dv.id === defaultDataViewId || dv.id === alertDataViewId)
[...dataViewSpecs, ...adhocDataViews]
.filter(
(dv) =>
dv.id === defaultDataViewId ||
dv.id === alertDataViewId ||
dv.id?.startsWith(EXPLORE_DATA_VIEW_PREFIX)
)
.map((spec) => new DataView({ spec, fieldFormats })),
[dataViewSpecs, defaultDataViewId, alertDataViewId, fieldFormats]
[dataViewSpecs, adhocDataViews, defaultDataViewId, alertDataViewId, fieldFormats]
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import type { DataViewsServicePublic, DataView } from '@kbn/data-views-plugin/public';
import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
import { EXPLORE_DATA_VIEW_PREFIX } from '../../../common/constants';

export const createExploreDataView = async (
dependencies: {
Expand All @@ -21,8 +22,8 @@ export const createExploreDataView = async (
.join();

return dependencies.dataViews.create({
id: `explore-data-view-${(await dependencies.spaces.getActiveSpace()).id}`,
name: 'Explore Data View',
id: `${EXPLORE_DATA_VIEW_PREFIX}-${(await dependencies.spaces.getActiveSpace()).id}`,
name: 'Explore data view',
title: exploreDataViewPattern,
});
};