Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SecuritySolution] Global search bar Edit Additional Filter not working #168955

Merged
merged 10 commits into from
Oct 31, 2023
Merged

[SecuritySolution] Global search bar Edit Additional Filter not working #168955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1e199e3
fix siem search bar dataview
angorayc Oct 16, 2023
e1b2fff
revert
angorayc Oct 16, 2023
c64dcb1
add sourcererDataView
angorayc Oct 19, 2023
aedc086
unit tests
angorayc Oct 19, 2023
2e41d09
Merge branch 'main' into issue-164406
angorayc Oct 24, 2023
16db863
cypress
angorayc Oct 24, 2023
7f44091
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Oct 24, 2023
96ca01b
Merge branch 'main' into issue-164406
angorayc Oct 25, 2023
1817f38
review
angorayc Oct 27, 2023
b9dff90
Merge branch 'main' into issue-164406
angorayc Oct 27, 2023
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
1 change: 1 addition & 0 deletions x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ describe('SearchBarComponent', () => {
fields: [],
title: '',
},
sourcererDataView: {},
updateSearch: jest.fn(),
setSavedQuery: jest.fn(),
setSearchBarFilter: jest.fn(),
Expand Down
27 changes: 18 additions & 9 deletions x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ import type { Dispatch } from 'redux';
import { Subscription } from 'rxjs';
import deepEqual from 'fast-deep-equal';

import type { DataViewBase, Filter, Query, TimeRange } from '@kbn/es-query';
import type { Filter, Query, TimeRange } from '@kbn/es-query';
import type { FilterManager, SavedQuery } from '@kbn/data-plugin/public';
import type { DataView } from '@kbn/data-views-plugin/public';
import { DataView } from '@kbn/data-views-plugin/public';

import type { OnTimeChangeProps } from '@elastic/eui';
import type { DataViewSpec } from '@kbn/data-views-plugin/public';
import { inputsActions } from '../../store/inputs';
import type { InputsRange } from '../../store/inputs/model';
import type { InputsModelId } from '../../store/inputs/constants';
Expand All @@ -44,8 +45,8 @@ import { useSyncTimerangeUrlParam } from '../../hooks/search_bar/use_sync_timera

interface SiemSearchBarProps {
id: InputsModelId.global | InputsModelId.timeline;
indexPattern: DataViewBase;
pollForSignalIndex?: () => void;
sourcererDataView: DataViewSpec | undefined;
timelineId?: string;
dataTestSubj?: string;
hideFilterBar?: boolean;
Expand All @@ -60,13 +61,13 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
hideFilterBar = false,
hideQueryInput = false,
id,
indexPattern,
isLoading = false,
pollForSignalIndex,
queries,
savedQuery,
setSavedQuery,
setSearchBarFilter,
sourcererDataView,
start,
toStr,
updateSearch,
Expand All @@ -82,6 +83,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
unifiedSearch: {
ui: { SearchBar },
},
fieldFormats,
} = useKibana().services;

const dispatch = useDispatch();
Expand Down Expand Up @@ -294,7 +296,14 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

const indexPatterns = useMemo(() => [indexPattern], [indexPattern]);
const dataViews: DataView[] | null = useMemo(() => {
if (sourcererDataView != null) {
return [new DataView({ spec: sourcererDataView, fieldFormats })];
} else {
return null;
}
}, [sourcererDataView, fieldFormats]);

const onTimeRangeChange = useCallback(
({ query, dateRange }) => {
const isQuickSelection = dateRange.from.includes('now') || dateRange.to.includes('now');
Expand All @@ -312,12 +321,12 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
},
[filterManager, id, setTablesActivePageToZero, updateSearch]
);
return (
return dataViews ? (
<div data-test-subj={`${id}DatePicker`}>
<SearchBar
appName="siem"
isLoading={isLoading}
indexPatterns={indexPatterns as DataView[]}
indexPatterns={dataViews}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the type casting here by implementing Line 299-305, so we can get the exact DataView type. This allows Search Bar to receive the correct data view and fix #164406

query={filterQuery}
onClearSavedQuery={onClearSavedQuery}
onQuerySubmit={onQuerySubmit}
Expand All @@ -333,12 +342,13 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
dataTestSubj={dataTestSubj}
/>
</div>
);
) : null;
},
(prevProps, nextProps) =>
prevProps.end === nextProps.end &&
prevProps.filterQuery === nextProps.filterQuery &&
prevProps.fromStr === nextProps.fromStr &&
deepEqual(prevProps.sourcererDataView, nextProps.sourcererDataView) &&
prevProps.id === nextProps.id &&
prevProps.isLoading === nextProps.isLoading &&
prevProps.savedQuery === nextProps.savedQuery &&
Expand All @@ -348,7 +358,6 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
prevProps.toStr === nextProps.toStr &&
prevProps.updateSearch === nextProps.updateSearch &&
prevProps.dataTestSubj === nextProps.dataTestSubj &&
deepEqual(prevProps.indexPattern, nextProps.indexPattern) &&
deepEqual(prevProps.queries, nextProps.queries)
);

Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const DashboardViewComponent: React.FC<DashboardViewProps> = ({
);
const query = useDeepEqualSelector(getGlobalQuerySelector);
const filters = useDeepEqualSelector(getGlobalFiltersQuerySelector);
const { indexPattern } = useSourcererDataView();
const { sourcererDataView } = useSourcererDataView();

const { show: canReadDashboard } =
useCapabilities<DashboardCapabilities>(LEGACY_DASHBOARD_APP_ID);
Expand All @@ -72,7 +72,7 @@ const DashboardViewComponent: React.FC<DashboardViewProps> = ({
return (
<>
<FiltersGlobal>
<SiemSearchBar id={InputsModelId.global} indexPattern={indexPattern} />
<SiemSearchBar id={InputsModelId.global} sourcererDataView={sourcererDataView} />
</FiltersGlobal>
<SecuritySolutionPageWrapper>
<EuiFlexGroup
Expand Down
4 changes: 2 additions & 2 deletions ...ns/security_solution/public/detection_engine/rule_details_ui/pages/rule_details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ const RuleDetailsPageComponent: React.FC<DetectionEngineComponentProps> = ({
useListsConfig();

const {
indexPattern,
sourcererDataView,
runtimeMappings,
loading: isLoadingIndexPattern,
} = useSourcererDataView(SourcererScopeName.detections);
Expand Down Expand Up @@ -541,7 +541,7 @@ const RuleDetailsPageComponent: React.FC<DetectionEngineComponentProps> = ({
<SiemSearchBar
id={InputsModelId.global}
pollForSignalIndex={pollForSignalIndex}
indexPattern={indexPattern}
sourcererDataView={sourcererDataView}
/>
</FiltersGlobal>
<RuleDetailsContextProvider>
Expand Down
4 changes: 2 additions & 2 deletions ...k/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
>();

const {
indexPattern,
sourcererDataView,
runtimeMappings,
loading: isLoadingIndexPattern,
} = useSourcererDataView(SourcererScopeName.detections);
Expand Down Expand Up @@ -439,7 +439,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
<SiemSearchBar
id={InputsModelId.global}
pollForSignalIndex={pollForSignalIndex}
indexPattern={indexPattern}
sourcererDataView={sourcererDataView}
/>
</FiltersGlobal>
<SecuritySolutionPageWrapper
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/security_solution/public/explore/hosts/pages/details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ detailName, hostDeta
[dispatch]
);

const { indexPattern, indicesExist, selectedPatterns } = useSourcererDataView();
const { indexPattern, indicesExist, selectedPatterns, sourcererDataView } =
useSourcererDataView();
const [loading, { inspect, hostDetails: hostOverview, id, refetch }] = useHostDetails({
endDate: to,
startDate: from,
Expand Down Expand Up @@ -172,7 +173,7 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ detailName, hostDeta
<>
<EuiWindowEvent event="resize" handler={noop} />
<FiltersGlobal show={showGlobalFilters({ globalFullScreen, graphEventId })}>
<SiemSearchBar indexPattern={indexPattern} id={InputsModelId.global} />
<SiemSearchBar id={InputsModelId.global} sourcererDataView={sourcererDataView} />
</FiltersGlobal>

<SecuritySolutionPageWrapper
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/security_solution/public/explore/hosts/pages/hosts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ const HostsComponent = () => {
},
[dispatch]
);
const { indicesExist, indexPattern, selectedPatterns } = useSourcererDataView();
const { indicesExist, indexPattern, selectedPatterns, sourcererDataView } =
useSourcererDataView();
const [globalFilterQuery, kqlError] = useMemo(
() =>
convertToBuildEsQuery({
Expand Down Expand Up @@ -189,7 +190,7 @@ const HostsComponent = () => {
<StyledFullHeightContainer onKeyDown={onKeyDown} ref={containerElement}>
<EuiWindowEvent event="resize" handler={noop} />
<FiltersGlobal show={showGlobalFilters({ globalFullScreen, graphEventId })}>
<SiemSearchBar indexPattern={indexPattern} id={InputsModelId.global} />
<SiemSearchBar id={InputsModelId.global} sourcererDataView={sourcererDataView} />
</FiltersGlobal>

<SecuritySolutionPageWrapper noPadding={globalFullScreen}>
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/security_solution/public/explore/network/pages/details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ const NetworkDetailsComponent: React.FC = () => {
dispatch(setNetworkDetailsTablesActivePageToZero());
}, [detailName, dispatch]);

const { indicesExist, indexPattern, selectedPatterns } = useSourcererDataView();
const { indicesExist, indexPattern, selectedPatterns, sourcererDataView } =
useSourcererDataView();

const ip = decodeIpv6(detailName);
const networkDetailsFilter = useMemo(() => getNetworkDetailsPageFilter(ip), [ip]);
Expand Down Expand Up @@ -164,7 +165,7 @@ const NetworkDetailsComponent: React.FC = () => {
{indicesExist ? (
<>
<FiltersGlobal>
<SiemSearchBar indexPattern={indexPattern} id={InputsModelId.global} />
<SiemSearchBar sourcererDataView={sourcererDataView} id={InputsModelId.global} />
</FiltersGlobal>

<SecuritySolutionPageWrapper>
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/security_solution/public/explore/network/pages/network.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ const NetworkComponent = React.memo<NetworkComponentProps>(
[dispatch]
);

const { indicesExist, indexPattern, selectedPatterns } = useSourcererDataView();
const { indicesExist, indexPattern, selectedPatterns, sourcererDataView } =
useSourcererDataView();

const onSkipFocusBeforeEventsTable = useCallback(() => {
containerElement.current
Expand Down Expand Up @@ -157,7 +158,7 @@ const NetworkComponent = React.memo<NetworkComponentProps>(
<StyledFullHeightContainer onKeyDown={onKeyDown} ref={containerElement}>
<EuiWindowEvent event="resize" handler={noop} />
<FiltersGlobal show={showGlobalFilters({ globalFullScreen, graphEventId })}>
<SiemSearchBar indexPattern={indexPattern} id={InputsModelId.global} />
<SiemSearchBar sourcererDataView={sourcererDataView} id={InputsModelId.global} />
</FiltersGlobal>

<SecuritySolutionPageWrapper noPadding={globalFullScreen}>
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/security_solution/public/explore/users/pages/details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ const UsersDetailsComponent: React.FC<UsersDetailsProps> = ({
[detailName]
);

const { indicesExist, indexPattern, selectedPatterns } = useSourcererDataView();
const { indicesExist, indexPattern, selectedPatterns, sourcererDataView } =
useSourcererDataView();

const [rawFilteredQuery, kqlError] = useMemo(() => {
try {
Expand Down Expand Up @@ -175,7 +176,7 @@ const UsersDetailsComponent: React.FC<UsersDetailsProps> = ({
<>
<EuiWindowEvent event="resize" handler={noop} />
<FiltersGlobal show={showGlobalFilters({ globalFullScreen, graphEventId })}>
<SiemSearchBar indexPattern={indexPattern} id={InputsModelId.global} />
<SiemSearchBar sourcererDataView={sourcererDataView} id={InputsModelId.global} />
</FiltersGlobal>

<SecuritySolutionPageWrapper noPadding={globalFullScreen}>
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/security_solution/public/explore/users/pages/users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ const UsersComponent = () => {
return globalFilters;
}, [severitySelection, tabName, globalFilters]);

const { indicesExist, indexPattern, selectedPatterns } = useSourcererDataView();
const { indicesExist, indexPattern, selectedPatterns, sourcererDataView } =
useSourcererDataView();
const [globalFiltersQuery, kqlError] = useMemo(
() =>
convertToBuildEsQuery({
Expand Down Expand Up @@ -188,7 +189,7 @@ const UsersComponent = () => {
<StyledFullHeightContainer onKeyDown={onKeyDown} ref={containerElement}>
<EuiWindowEvent event="resize" handler={noop} />
<FiltersGlobal>
<SiemSearchBar indexPattern={indexPattern} id={InputsModelId.global} />
<SiemSearchBar sourcererDataView={sourcererDataView} id={InputsModelId.global} />
</FiltersGlobal>

<SecuritySolutionPageWrapper noPadding={globalFullScreen}>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/public/kubernetes/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const KubernetesContainer = React.memo(() => {
const { kubernetesSecurity, uiSettings } = useKibana().services;

const { globalFullScreen } = useGlobalFullScreen();
const { indexPattern } = useSourcererDataView();
const { indexPattern, sourcererDataView } = useSourcererDataView();
const { from, to } = useGlobalTime();

const getGlobalFiltersQuerySelector = useMemo(
Expand Down Expand Up @@ -81,7 +81,7 @@ export const KubernetesContainer = React.memo(() => {
{kubernetesSecurity.getKubernetesPage({
filter: (
<FiltersGlobal show={showGlobalFilters({ globalFullScreen, graphEventId: undefined })}>
<SiemSearchBar id={InputsModelId.global} indexPattern={indexPattern} />
<SiemSearchBar id={InputsModelId.global} sourcererDataView={sourcererDataView} />
</FiltersGlobal>
),
indexPattern,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { useGlobalFilterQuery } from '../../common/hooks/use_global_filter_query

const DetectionResponseComponent = () => {
const { filterQuery } = useGlobalFilterQuery();
const { indicesExist, indexPattern, loading: isSourcererLoading } = useSourcererDataView();
const { indicesExist, loading: isSourcererLoading, sourcererDataView } = useSourcererDataView();
const { signalIndexName } = useSignalIndex();
const { hasKibanaREAD, hasIndexRead } = useAlertsPrivileges();
const canReadCases = useGetUserCasesPermissions().read;
Expand All @@ -49,7 +49,7 @@ const DetectionResponseComponent = () => {
{indicesExist ? (
<>
<FiltersGlobal>
<SiemSearchBar id={InputsModelId.global} indexPattern={indexPattern} />
<SiemSearchBar id={InputsModelId.global} sourcererDataView={sourcererDataView} />
</FiltersGlobal>
<SecuritySolutionPageWrapper data-test-subj="detectionResponsePage">
<HeaderPage title={i18n.DETECTION_RESPONSE_TITLE} />
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/public/overview/pages/entity_analytics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ import { useHasSecurityCapability } from '../../helper_hooks';

const EntityAnalyticsComponent = () => {
const { data: riskScoreEngineStatus } = useRiskEngineStatus();
const { indicesExist, loading: isSourcererLoading, indexPattern } = useSourcererDataView();
const { indicesExist, loading: isSourcererLoading, sourcererDataView } = useSourcererDataView();
const isRiskScoreModuleLicenseAvailable = useHasSecurityCapability('entity-analytics');

return (
<>
{indicesExist ? (
<>
<FiltersGlobal>
<SiemSearchBar id={InputsModelId.global} indexPattern={indexPattern} />
<SiemSearchBar id={InputsModelId.global} sourcererDataView={sourcererDataView} />
</FiltersGlobal>

<SecuritySolutionPageWrapper data-test-subj="entityAnalyticsPage">
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/security_solution/public/overview/pages/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ const OverviewComponent = () => {
const filters = useDeepEqualSelector(getGlobalFiltersQuerySelector);

const { from, deleteQuery, setQuery, to } = useGlobalTime();
const { indicesExist, indexPattern, selectedPatterns } = useSourcererDataView();
const { indicesExist, sourcererDataView, indexPattern, selectedPatterns } =
useSourcererDataView();

const endpointMetadataIndex = useMemo<string[]>(() => {
return [ENDPOINT_METADATA_INDEX];
Expand Down Expand Up @@ -71,7 +72,7 @@ const OverviewComponent = () => {
{indicesExist ? (
<>
<FiltersGlobal>
<SiemSearchBar id={InputsModelId.global} indexPattern={indexPattern} />
<SiemSearchBar id={InputsModelId.global} sourcererDataView={sourcererDataView} />
</FiltersGlobal>

<SecuritySolutionPageWrapper>
Expand Down
4 changes: 3 additions & 1 deletion .../plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ export const useAggregatedIndicators = ({
const userTimeZone = useTimeZone();
const userFormat = useDateFormat();

const { selectedPatterns } = useSourcererDataView();
const {
sourcererDataView: { selectedPatterns },
} = useSourcererDataView();

const { inspectorAdapters } = useInspector();

Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ export const useIndicators = ({
data: { search: searchService },
},
} = useKibana();
const { selectedPatterns } = useSourcererDataView();
const {
sourcererDataView: { selectedPatterns },
} = useSourcererDataView();

const { inspectorAdapters } = useInspector();

Expand Down
2 changes: 1 addition & 1 deletion ...ck/plugins/threat_intelligence/public/modules/indicators/hooks/use_sourcerer_data_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const useSourcererDataView = () => {

return useMemo(
() => ({
...sourcererDataView,
sourcererDataView,
indexPatterns,
indexPattern: updatedPattern,
browserFields,
Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_total_count.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ export const useIndicatorsTotalCount = () => {
const [count, setCount] = useState<number>(0);
const [isLoading, setIsLoading] = useState<boolean>(true);

const { selectedPatterns, loading: loadingDataView } = useSourcererDataView();
const {
sourcererDataView: { selectedPatterns, loading: loadingDataView },
} = useSourcererDataView();

useEffect(() => {
const query = {
Expand Down
Loading