github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Security Solution][Investigations] - Fix replace all on main (#117680) (#117848)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Michael Olorunnisola <michael.olorunnisola@elastic.co>
This commit is contained in:
Kibana Machine 2021-11-08 10:07:41 -05:00 • committed by GitHub
parent 370bee29d0
commit 57febcecfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
View file

@ -89,7 +89,7 @@ interface OwnProps {
data: TimelineItem[];
defaultCellActions?: TGridCellAction[];
filters?: Filter[];
filterQuery: string;
filterQuery?: string;
filterStatus?: AlertStatus;
id: string;
indexNames: string[];

28
x-pack/plugins/timelines/public/components/t_grid/helpers.tsx
View file

@ -9,7 +9,6 @@ import type { Filter, EsQueryConfig, Query } from '@kbn/es-query';
import { FilterStateStore } from '@kbn/es-query';
import { isEmpty, get } from 'lodash/fp';
import memoizeOne from 'memoize-one';
import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
import {
elementOrChildrenHasFocus,
getFocusedAriaColindexCell,
@ -190,10 +189,9 @@ export const combineQueries = ({
export const buildCombinedQuery = (combineQueriesParams: CombineQueries) => {
const combinedQuery = combineQueries(combineQueriesParams);
return combinedQuery
return combinedQuery?.filterQuery
? {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
filterQuery: replaceStatusField(combinedQuery!.filterQuery),
filterQuery: combinedQuery.filterQuery,
}
: null;
};
@ -229,22 +227,14 @@ export const getCombinedFilterQuery = ({
to,
filters,
...combineQueriesParams
}: CombineQueries & { from: string; to: string }): string =>
replaceStatusField(
combineQueries({
...combineQueriesParams,
filters: [...filters, buildTimeRangeFilter(from, to)],
})?.filterQuery
);
}: CombineQueries & { from: string; to: string }): string | undefined => {
const combinedQueries = combineQueries({
...combineQueriesParams,
filters: [...filters, buildTimeRangeFilter(from, to)],
});
/**
* This function is a temporary patch to prevent queries using old `signal.status` field.
* @todo The `signal.status` field should not be queried anymore and
* must be replaced by `ALERT_WORKFLOW_STATUS` field name constant
* @deprecated
*/
const replaceStatusField = (filterQuery?: string): string =>
filterQuery?.replaceAll('signal.status', ALERT_WORKFLOW_STATUS) ?? '';
return combinedQueries ? combinedQueries.filterQuery : undefined;
};
/**
* The CSS class name of a "stateful event", which appears in both

2
x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
View file

@ -23,7 +23,7 @@ interface OwnProps {
id: string;
totalItems: number;
filterStatus?: AlertStatus;
query: string;
query?: string;
indexName: string;
onActionSuccess?: OnUpdateAlertStatusSuccess;
onActionFailure?: OnUpdateAlertStatusError;