Skip to content

[Security Solution][Sourcerer] Rename index pattern props to data view #216542

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

Merged
christineweng merged 1 commit into from
Apr 1, 2025
Merged

[Security Solution][Sourcerer] Rename index pattern props to data view #216542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...tions/security/plugins/security_solution/public/common/components/events_viewer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ const StatefulEventsViewerComponent: React.FC<EventsViewerProps & PropsFromRedux
dataProviders: [],
filters: globalFilters,
from: start,
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
kqlMode: 'filter',
kqlQuery: query,
to: end,
Expand Down
2 changes: 1 addition & 1 deletion ...ty_solution/public/common/components/markdown_editor/plugins/insight/use_insight_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const useInsightQuery = ({
const parsedCombinedQueries = combineQueries({
config: esQueryConfig,
dataProviders,
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
browserFields,
filters,
kqlQuery: {
Expand Down
8 changes: 4 additions & 4 deletions x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
browserFields,
dataProviders,
field,
dataViewSpec: indexPattern,
dataViewSpec,
globalFilters = EMPTY_FILTERS,
globalQuery = EMPTY_QUERY,
kqlMode,
Expand All @@ -121,7 +121,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
config: getEsQueryConfig(uiSettings),
dataProviders,
filters: activeTimelineFilters,
indexPattern,
dataViewSpec,
kqlMode,
kqlQuery: {
language: 'kuery',
Expand All @@ -135,7 +135,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
uiSettings,
dataProviders,
activeTimelineFilters,
indexPattern,
dataViewSpec,
kqlMode,
activeTimelineKqlQueryExpression,
]
Expand All @@ -155,7 +155,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
field={field as AlertsStackByField}
filters={isActiveTimeline(scopeId ?? '') ? EMPTY_FILTERS : globalFilters}
from={isActiveTimeline(scopeId ?? '') ? activeTimelineFrom : from}
indexPattern={indexPattern}
dataViewSpec={dataViewSpec}
options={options}
paddingSize={paddingSize}
query={isActiveTimeline(scopeId ?? '') ? EMPTY_QUERY : globalQuery}
Expand Down
2 changes: 1 addition & 1 deletion ...olutions/security/plugins/security_solution/public/common/components/top_n/top_n.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe('TopN', () => {
field,
filters: [],
from: '2020-04-14T00:31:47.695Z',
indexPattern: mockDataViewSpec,
dataViewSpec: mockDataViewSpec,
options: defaultOptions,
query,
setAbsoluteRangeDatePickerTarget: InputsModelId.global,
Expand Down
6 changes: 3 additions & 3 deletions x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export interface Props extends Pick<GlobalTimeArgs, 'from' | 'to' | 'deleteQuery
defaultView: TimelineEventsType;
field: AlertsStackByField;
filters: Filter[];
indexPattern?: DataViewSpec;
dataViewSpec?: DataViewSpec;
options: TopNOption[];
paddingSize?: 's' | 'm' | 'l' | 'none';
query: Query;
Expand All @@ -70,7 +70,7 @@ const TopNComponent: React.FC<Props> = ({
filters,
field,
from,
indexPattern,
dataViewSpec,
options,
paddingSize,
query,
Expand Down Expand Up @@ -124,7 +124,7 @@ const TopNComponent: React.FC<Props> = ({
filters={applicableFilters}
from={from}
headerChildren={headerChildren}
dataViewSpec={indexPattern}
dataViewSpec={dataViewSpec}
onlyField={field}
paddingSize={paddingSize}
query={query}
Expand Down
8 changes: 4 additions & 4 deletions x-pack/solutions/security/plugins/security_solution/public/common/lib/kuery/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export type PrimitiveOrArrayOfPrimitives =
export interface CombineQueries {
config: EsQueryConfig;
dataProviders: DataProvider[];
indexPattern?: DataViewSpec;
dataViewSpec?: DataViewSpec;
browserFields: BrowserFields;
filters: Filter[];
kqlQuery: Query;
Expand Down Expand Up @@ -245,7 +245,7 @@ export interface CombinedQuery {
export const combineQueries = ({
config,
dataProviders = [],
indexPattern,
dataViewSpec,
browserFields,
filters = [],
kqlQuery,
Expand All @@ -258,7 +258,7 @@ export const combineQueries = ({
const [filterQuery, kqlError] = convertToBuildEsQuery({
config,
queries: [kuery],
dataViewSpec: indexPattern,
dataViewSpec,
filters,
});

Expand Down Expand Up @@ -286,7 +286,7 @@ export const combineQueries = ({
const [filterQuery, kqlError] = convertToBuildEsQuery({
config,
queries: [kuery],
dataViewSpec: indexPattern,
dataViewSpec,
filters,
});

Expand Down
2 changes: 1 addition & 1 deletion ...ugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const GroupedSubLevelComponent: React.FC<AlertsTableComponentProps> = ({
return combineQueries({
config: getEsQueryConfig(uiSettings),
dataProviders: [],
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
browserFields,
filters: [
...(defaultFilters ?? []),
Expand Down
2 changes: 1 addition & 1 deletion ...ns/security/plugins/security_solution/public/detections/components/alerts_table/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ const DetectionEngineAlertsTableComponent: FC<Omit<DetectionEngineAlertTableProp
return combineQueries({
config: getEsQueryConfig(uiSettings),
dataProviders: [],
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
browserFields,
filters: [...allFilters],
kqlQuery: globalQuery,
Expand Down
2 changes: 1 addition & 1 deletion ...n/public/detections/components/alerts_table/timeline_actions/use_add_bulk_to_timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const useAddBulkToTimelineAction = ({
return combineQueries({
config: esQueryConfig,
dataProviders: [],
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
filters: combinedFilters,
kqlQuery: { query: '', language: 'kuery' },
browserFields,
Expand Down
5 changes: 1 addition & 4 deletions ...curity_solution/public/explore/network/components/network_top_countries_table/columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import { get } from 'lodash/fp';
import numeral from '@elastic/numeral';
import React from 'react';
import type { DataViewBase } from '@kbn/es-query';
import {
SecurityCellActions,
CellActionsMode,
Expand Down Expand Up @@ -45,7 +44,6 @@ export type NetworkTopCountriesColumnsNetworkDetails = [
];

export const getNetworkTopCountriesColumns = (
indexPattern: DataViewBase,
Copy link
Copy Markdown
Contributor Author

@christineweng christineweng Mar 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

not used in this function anymore

flowTarget: FlowTargetSourceDest,
type: networkModel.NetworkType,
tableId: string
Expand Down Expand Up @@ -149,12 +147,11 @@ export const getNetworkTopCountriesColumns = (
];

export const getCountriesColumnsCurated = (
indexPattern: DataViewBase,
flowTarget: FlowTargetSourceDest,
type: networkModel.NetworkType,
tableId: string
): NetworkTopCountriesColumns | NetworkTopCountriesColumnsNetworkDetails => {
const columns = getNetworkTopCountriesColumns(indexPattern, flowTarget, type, tableId);
const columns = getNetworkTopCountriesColumns(flowTarget, type, tableId);

// Columns to exclude from host details pages
if (type === networkModel.NetworkType.details) {
Expand Down
7 changes: 2 additions & 5 deletions ...security_solution/public/explore/network/components/network_top_countries_table/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { last } from 'lodash/fp';
import React, { useCallback, useMemo } from 'react';
import { useDispatch } from 'react-redux';
import deepEqual from 'fast-deep-equal';
import type { DataViewBase } from '@kbn/es-query';

import { networkActions, networkModel, networkSelectors } from '../../store';
import type { NetworkTopCountriesEdges, SortField } from '../../../../../common/search_strategy';
Expand All @@ -31,7 +30,6 @@ interface NetworkTopCountriesTableProps {
fakeTotalCount: number;
flowTargeted: FlowTargetSourceDest;
id: string;
indexPattern: DataViewBase;
isInspect: boolean;
loading: boolean;
loadPage: (newActivePage: number) => void;
Expand Down Expand Up @@ -59,7 +57,6 @@ const NetworkTopCountriesTableComponent: React.FC<NetworkTopCountriesTableProps>
fakeTotalCount,
flowTargeted,
id,
indexPattern,
isInspect,
loading,
loadPage,
Expand Down Expand Up @@ -152,8 +149,8 @@ const NetworkTopCountriesTableComponent: React.FC<NetworkTopCountriesTableProps>
);

const columns = useMemo(
() => getCountriesColumnsCurated(indexPattern, flowTargeted, type, NetworkTopCountriesTableId),
[indexPattern, flowTargeted, type]
() => getCountriesColumnsCurated(flowTargeted, type, NetworkTopCountriesTableId),
[flowTargeted, type]
);

return (
Expand Down
1 change: 0 additions & 1 deletion ...ns/security_solution/public/explore/network/pages/navigation/countries_query_tab_body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ export const CountriesQueryTabBody = ({
fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
flowTargeted={flowTarget}
id={id}
indexPattern={indexPattern}
inspect={inspect}
isInspect={isInspected}
loading={loading}
Expand Down
1 change: 0 additions & 1 deletion .../security_solution/public/flyout/document_details/shared/hooks/use_event_details.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ describe('useEventDetails', () => {
expect(hookResult.result.current.dataAsNestedObject).toEqual({});
expect(hookResult.result.current.dataFormattedForFieldBrowser).toEqual([]);
expect(hookResult.result.current.getFieldsData('test')).toEqual('test');
expect('indexPattern' in hookResult.result.current).toEqual(true);
expect(hookResult.result.current.loading).toEqual(false);
expect(hookResult.result.current.refetchFlyoutData()).toEqual(undefined);
expect(hookResult.result.current.searchHit).toEqual({});
Expand Down
6 changes: 0 additions & 6 deletions ...lugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import type { BrowserFields, TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
import type { EcsSecurityExtension as Ecs } from '@kbn/securitysolution-ecs';
import { SecurityPageName } from '@kbn/security-solution-navigation';
import { type DataViewSpec } from '@kbn/data-plugin/common';
import { DEFAULT_ALERTS_INDEX, DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants';
import type { RunTimeMappings } from '../../../../../common/api/search_strategy';
import { useSpaceId } from '../../../../common/hooks/use_space_id';
Expand Down Expand Up @@ -63,10 +62,6 @@ export interface UseEventDetailsResult {
* Retrieves searchHit values for the provided field
*/
getFieldsData: GetFieldsData;
/**
* Index pattern for rule details
*/
indexPattern?: DataViewSpec;
/**
* Whether the data is loading
*/
Expand Down Expand Up @@ -112,7 +107,6 @@ export const useEventDetails = ({
dataAsNestedObject,
dataFormattedForFieldBrowser,
getFieldsData,
indexPattern: sourcererDataView.sourcererDataView,
Copy link
Copy Markdown
Contributor Author

@christineweng christineweng Mar 31, 2025

Choose a reason for hiding this comment

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

never used

loading,
refetchFlyoutData,
searchHit,
Expand Down
2 changes: 1 addition & 1 deletion ...ons/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const TimelineModalHeader = React.memo<FlyoutHeaderPanelProps>(
combineQueries({
config: esQueryConfig,
dataProviders,
indexPattern: dataView,
dataViewSpec: dataView,
browserFields,
filters: filters ? filters : [],
kqlQuery: kqlQueryObj,
Expand Down
2 changes: 1 addition & 1 deletion ...rity/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const TimelineKpisContainer = ({ timelineId }: KpiExpandedProps) => {
combineQueries({
config: esQueryConfig,
dataProviders,
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
browserFields,
filters: filters ? filters : [],
kqlQuery,
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/security_solution/public/timelines/components/timeline/tabs/query/events_count.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const TimelineQueryTabEventsCountComponent: React.FC<{ timelineId: string
return combineQueries({
config: esQueryConfig,
dataProviders,
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
browserFields,
filters,
kqlQuery,
Expand Down
2 changes: 1 addition & 1 deletion ...urity/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export const QueryTabContentComponent: React.FC<Props> = ({
return combineQueries({
config: esQueryConfig,
dataProviders,
indexPattern: sourcererDataView,
dataViewSpec: sourcererDataView,
browserFields,
filters,
kqlQuery,
Expand Down