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

Jump to bottom

[Security Solutions] Reverts PR 124310 #124736

Merged
merged 4 commits into from
Feb 5, 2022
Merged

[Security Solutions] Reverts PR 124310 #124736

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8a62d0
Reverts PR 124310
FrankHassanabad Feb 4, 2022
7c39e51
Merge branch 'main' into revert-124310
FrankHassanabad Feb 4, 2022
0c67fd6
Merge branch 'main' into revert-124310
kibanamachine Feb 4, 2022
0de7783
Merge branch 'main' into revert-124310
kibanamachine Feb 5, 2022
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
3 changes: 0 additions & 3 deletions ...ic/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ interface InvestigateInTimelineActionProps {
alertIds?: string[];
buttonType?: 'text' | 'icon';
onInvestigateInTimelineAlertClick?: () => void;
timelineId?: string;
}

const InvestigateInTimelineActionComponent: React.FC<InvestigateInTimelineActionProps> = ({
Expand All @@ -31,13 +30,11 @@ const InvestigateInTimelineActionComponent: React.FC<InvestigateInTimelineAction
ecsRowData,
buttonType,
onInvestigateInTimelineAlertClick,
timelineId,
}) => {
const { investigateInTimelineAlertClick } = useInvestigateInTimeline({
ecsRowData,
alertIds,
onInvestigateInTimelineAlertClick,
timelineId,
});

return (
Expand Down
4 changes: 1 addition & 3 deletions ...ublic/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@ interface UseInvestigateInTimelineActionProps {
nonEcsRowData?: TimelineNonEcsData[];
alertIds?: string[] | null | undefined;
onInvestigateInTimelineAlertClick?: () => void;
timelineId?: string;
}

export const useInvestigateInTimeline = ({
ecsRowData,
alertIds,
onInvestigateInTimelineAlertClick,
timelineId,
}: UseInvestigateInTimelineActionProps) => {
const {
data: { search: searchStrategyClient, query },
Expand Down Expand Up @@ -80,7 +78,7 @@ export const useInvestigateInTimeline = ({
const showInvestigateInTimelineAction = alertIds != null;
const { isLoading: isFetchingAlertEcs, alertsEcsData } = useFetchEcsAlertsData({
alertIds,
skip: alertIds == null || timelineId !== undefined,
skip: alertIds == null,
});

const investigateInTimelineAlertClick = useCallback(async () => {
Expand Down
7 changes: 3 additions & 4 deletions ...olution/public/detections/containers/detection_engine/alerts/use_fetch_ecs_alerts_data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { useEffect, useState, useRef } from 'react';
import { useEffect, useState } from 'react';
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { isEmpty } from 'lodash';

Expand All @@ -25,11 +25,10 @@ export const useFetchEcsAlertsData = ({
}): { isLoading: boolean | null; alertsEcsData: Ecs[] | null } => {
const [isLoading, setIsLoading] = useState<boolean | null>(null);
const [alertsEcsData, setAlertEcsData] = useState<Ecs[] | null>(null);
const abortCtrl = useRef(new AbortController());

useEffect(() => {
let isSubscribed = true;
const controller = abortCtrl.current;
const abortCtrl = new AbortController();

const fetchAlert = async () => {
try {
Expand Down Expand Up @@ -73,7 +72,7 @@ export const useFetchEcsAlertsData = ({

return (): void => {
isSubscribed = false;
controller.abort();
abortCtrl.abort();
};
}, [alertIds, onError, skip]);

Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ const ActionsComponent: React.FC<ActionProps> = ({
key="investigate-in-timeline"
alertIds={alertIds}
ecsRowData={ecsData}
timelineId={timelineId}
/>
)}

Expand Down