Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ describe('EventsQueryTabBody', () => {
type: HostsType.page,
endDate: new Date('2000').toISOString(),
startDate: new Date('2000').toISOString(),
additionalFilters: [],
};

beforeEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,21 @@ export const ALERTS_EVENTS_HISTOGRAM_ID = 'alertsOrEventsHistogramQuery';
type QueryTabBodyProps = UserQueryTabBodyProps | HostQueryTabBodyProps | NetworkQueryTabBodyProps;

export type EventsQueryTabBodyComponentProps = QueryTabBodyProps & {
additionalFilters: Filter[];
deleteQuery?: GlobalTimeArgs['deleteQuery'];
indexNames: string[];
pageFilters?: Filter[];
externalAlertPageFilters?: Filter[];
setQuery: GlobalTimeArgs['setQuery'];
tableId: TableId;
};

const EXTERNAL_ALERTS_URL_PARAM = 'onlyExternalAlerts';

const EventsQueryTabBodyComponent: React.FC<EventsQueryTabBodyComponentProps> = ({
additionalFilters,
deleteQuery,
endDate,
filterQuery,
indexNames,
externalAlertPageFilters = [],
pageFilters = [],
setQuery,
startDate,
tableId,
Expand Down Expand Up @@ -122,7 +120,7 @@ const EventsQueryTabBodyComponent: React.FC<EventsQueryTabBodyComponentProps> =
};
}, [deleteQuery]);

const additionalFilters = useMemo(
const toggleExternalAlertsCheckbox = useMemo(
() => (
<EuiCheckbox
id="showExternalAlertsCheckbox"
Expand All @@ -146,11 +144,8 @@ const EventsQueryTabBodyComponent: React.FC<EventsQueryTabBodyComponentProps> =
);

const composedPageFilters = useMemo(
() => [
...pageFilters,
...(showExternalAlerts ? [defaultAlertsFilters, ...externalAlertPageFilters] : []),
],
[showExternalAlerts, externalAlertPageFilters, pageFilters]
() => (showExternalAlerts ? [defaultAlertsFilters, ...additionalFilters] : additionalFilters),
[additionalFilters, showExternalAlerts]
);

return (
Expand All @@ -168,7 +163,7 @@ const EventsQueryTabBodyComponent: React.FC<EventsQueryTabBodyComponentProps> =
/>
)}
<StatefulEventsViewer
additionalFilters={additionalFilters}
additionalFilters={toggleExternalAlertsCheckbox}
defaultCellActions={defaultCellActions}
start={startDate}
end={endDate}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading