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

[Security Solution] getDataViewStateFromIndexFields was using wrong type as part of a cast #158594

Merged
merged 12 commits into from
May 31, 2023
Merged

[Security Solution] getDataViewStateFromIndexFields was using wrong type as part of a cast #158594

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bd2078e
getDataViewStateFromIndexFields was using wrong type as part of a cast
kqualters-elastic May 26, 2023
e1a3ebb
Fix tests/mocks/type abuse
kqualters-elastic May 26, 2023
66535c4
Hide copypasta
kqualters-elastic May 26, 2023
b3c8b33
Update hot code path
kqualters-elastic May 30, 2023
2779cad
Fix mock
kqualters-elastic May 30, 2023
11efc57
Merge remote-tracking branch 'upstream/main' into fix-use-data-view-type
kqualters-elastic May 30, 2023
0b96341
Fix type errors
kqualters-elastic May 30, 2023
eb7e8aa
[CI] Auto-commit changed files from 'node scripts/lint_ts_projects --…
kibanamachine May 30, 2023
f183d8b
Update tests
kqualters-elastic May 31, 2023
3a5b902
Merge remote-tracking branch 'origin/fix-use-data-view-type' into fix…
kqualters-elastic May 31, 2023
8728576
Merge remote-tracking branch 'upstream/main' into fix-use-data-view-type
kqualters-elastic May 31, 2023
374164a
Fix bad merge
kqualters-elastic May 31, 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
10 changes: 3 additions & 7 deletions x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useDispatch } from 'react-redux';
import memoizeOne from 'memoize-one';
import type { BrowserField } from '@kbn/timelines-plugin/common';
import { getCategory } from '@kbn/triggers-actions-ui-plugin/public';
import type { DataViewFieldBase } from '@kbn/es-query';
import type { DataView } from '@kbn/data-views-plugin/public';

import { useKibana } from '../../lib/kibana';
import { sourcererActions } from '../../store/sourcerer';
Expand Down Expand Up @@ -48,11 +48,7 @@ interface DataViewInfo {
* VERY mutatious on purpose to improve the performance of the transform.
*/
export const getDataViewStateFromIndexFields = memoizeOne(
(
_title: string,
fields: DataViewFieldBase[],
_includeUnmapped: boolean = false
): DataViewInfo => {
(_title: string, fields: DataView['fields'], _includeUnmapped: boolean = false): DataViewInfo => {
// Adds two dangerous casts to allow for mutations within this function
type DangerCastForMutation = Record<string, {}>;

Expand All @@ -66,7 +62,7 @@ export const getDataViewStateFromIndexFields = memoizeOne(
if (acc.browserFields[category].fields == null) {
acc.browserFields[category].fields = {};
}
acc.browserFields[category].fields[field.name] = field as unknown as BrowserField;
acc.browserFields[category].fields[field.name] = field.spec as BrowserField;

return acc;
},
Expand Down