Remove usage of alertIds and dead code from cases

elastic · Feb 4, 2022 · 3250984 · 3250984
1 parent 1f5c879
commit 3250984
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 60 deletions.
diff --git a/x-pack/plugins/cases/public/components/__mock__/timeline.tsx b/x-pack/plugins/cases/public/components/__mock__/timeline.tsx
@@ -24,8 +24,6 @@ export const timelineIntegrationMock = {
  useInsertTimeline: jest.fn(),
  },
  ui: {
- renderInvestigateInTimelineActionComponent: () =>
- mockTimelineComponent('investigate-in-timeline'),
  renderTimelineDetailsPanel: () => mockTimelineComponent('timeline-details-panel'),
  },
 };

diff --git a/x-pack/plugins/cases/public/components/case_view/case_view_page.tsx b/x-pack/plugins/cases/public/components/case_view/case_view_page.tsx
@@ -356,9 +356,6 @@ export const CaseViewPage = React.memo<CaseViewPageProps>(
  isLoadingUserActions={isLoadingUserActions}
  onShowAlertDetails={onShowAlertDetails}
  onUpdateField={onUpdateField}
- renderInvestigateInTimelineActionComponent={
- timelineUi?.renderInvestigateInTimelineActionComponent
- }
  statusActionButton={
  userCanCrud ? (
  <StatusActionButton

diff --git a/x-pack/plugins/cases/public/components/timeline_context/index.tsx b/x-pack/plugins/cases/public/components/timeline_context/index.tsx
@@ -42,7 +42,6 @@ export interface CasesTimelineIntegration {
  ) => UseInsertTimelineReturn;
  };
  ui?: {
- renderInvestigateInTimelineActionComponent?: (alertIds: string[]) => JSX.Element;
  renderTimelineDetailsPanel?: () => JSX.Element;
  };
 }

diff --git a/x-pack/plugins/cases/public/components/user_actions/types.ts b/x-pack/plugins/cases/public/components/user_actions/types.ts
@@ -28,7 +28,6 @@ export interface UserActionTreeProps {
  onRuleDetailsClick?: RuleDetailsNavigation['onClick'];
  onShowAlertDetails: (alertId: string, index: string) => void;
  onUpdateField: ({ key, value, onSuccess, onError }: OnUpdateFields) => void;
- renderInvestigateInTimelineActionComponent?: (alertIds: string[]) => JSX.Element;
  statusActionButton: JSX.Element | null;
  updateCase: (newCase: Case) => void;
  useFetchAlertData: (alertIds: string[]) => [boolean, Record<string, Ecs>];

diff --git a/x-pack/plugins/security_solution/public/cases/pages/index.tsx b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
@@ -12,7 +12,6 @@ import { TimelineId } from '../../../common/types/timeline';
 
 import { getRuleDetailsUrl, useFormatUrl } from '../../common/components/link_to';
 
-import * as i18n from './translations';
 import { useGetUserCasesPermissions, useKibana, useNavigation } from '../../common/lib/kibana';
 import { APP_ID, CASES_PATH, SecurityPageName } from '../../../common/constants';
 import { timelineActions } from '../../timelines/store/timeline';
@@ -25,7 +24,6 @@ import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { useInsertTimeline } from '../components/use_insert_timeline';
 import * as timelineMarkdownPlugin from '../../common/components/markdown_editor/plugins/timeline';
 import { DetailsPanel } from '../../timelines/components/side_panel';
-import { InvestigateInTimelineAction } from '../../detections/components/alerts_table/timeline_actions/investigate_in_timeline_action';
 import { useFetchAlertData } from './use_fetch_alert_data';
 
 const TimelineDetailsPanel = () => {
@@ -44,17 +42,6 @@ const TimelineDetailsPanel = () => {
  );
 };
 
-const InvestigateInTimelineActionComponent = (alertIds: string[]) => {
- return (
- <InvestigateInTimelineAction
- ariaLabel={i18n.SEND_ALERT_TO_TIMELINE}
- alertIds={alertIds}
- key="investigate-in-timeline"
- ecsRowData={null}
- />
- );
-};
-
 const CaseContainerComponent: React.FC = () => {
  const { cases: casesUi } = useKibana().services;
  const { getAppUrl, navigateTo } = useNavigation();
@@ -163,7 +150,6 @@ const CaseContainerComponent: React.FC = () => {
  useInsertTimeline,
  },
  ui: {
- renderInvestigateInTimelineActionComponent: InvestigateInTimelineActionComponent,
  renderTimelineDetailsPanel: TimelineDetailsPanel,
  },
  },

diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
@@ -555,7 +555,7 @@ export const sendAlertToTimelineAction = async ({
  );
  // threshold with template
  if (isThresholdRule(ecsData)) {
- return await createThresholdTimeline(ecsData, createTimeline, noteContent, {
+ return createThresholdTimeline(ecsData, createTimeline, noteContent, {
  filters,
  query,
  dataProviders,

diff --git a/...ic/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx b/...ic/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx
@@ -19,21 +19,18 @@ import { useInvestigateInTimeline } from './use_investigate_in_timeline';
 interface InvestigateInTimelineActionProps {
  ecsRowData?: Ecs | Ecs[] | null;
  ariaLabel?: string;
- alertIds?: string[];
  buttonType?: 'text' | 'icon';
  onInvestigateInTimelineAlertClick?: () => void;
 }
 
 const InvestigateInTimelineActionComponent: React.FC<InvestigateInTimelineActionProps> = ({
  ariaLabel = ACTION_INVESTIGATE_IN_TIMELINE_ARIA_LABEL,
- alertIds,
  ecsRowData,
  buttonType,
  onInvestigateInTimelineAlertClick,
 }) => {
  const { investigateInTimelineAlertClick } = useInvestigateInTimeline({
  ecsRowData,
- alertIds,
  onInvestigateInTimelineAlertClick,
  });
 

diff --git a/...ublic/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.tsx b/...ublic/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.tsx
@@ -10,26 +10,23 @@ import { useDispatch } from 'react-redux';
 import { EuiContextMenuItem } from '@elastic/eui';
 import { useKibana } from '../../../../common/lib/kibana';
 
-import { TimelineId } from '../../../../../common/types/timeline';
+import { TimelineId, TimelineType } from '../../../../../common/types/timeline';
 import { Ecs } from '../../../../../common/ecs';
-import { TimelineNonEcsData } from '../../../../../common/search_strategy/timeline';
 import { timelineActions, timelineSelectors } from '../../../../timelines/store/timeline';
 import { sendAlertToTimelineAction } from '../actions';
 import { dispatchUpdateTimeline } from '../../../../timelines/components/open_timeline/helpers';
+import { useCreateTimeline } from '../../../../timelines/components/timeline/properties/use_create_timeline';
 import { CreateTimelineProps } from '../types';
 import { ACTION_INVESTIGATE_IN_TIMELINE } from '../translations';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 
 interface UseInvestigateInTimelineActionProps {
  ecsRowData?: Ecs | Ecs[] | null;
- nonEcsRowData?: TimelineNonEcsData[];
- alertIds?: string[] | null | undefined;
  onInvestigateInTimelineAlertClick?: () => void;
 }
 
 export const useInvestigateInTimeline = ({
  ecsRowData,
- alertIds,
  onInvestigateInTimelineAlertClick,
 }: UseInvestigateInTimelineActionProps) => {
  const {
@@ -52,8 +49,14 @@ export const useInvestigateInTimeline = ({
  [dispatch]
  );
 
+ const clearActiveTimeline = useCreateTimeline({
+ timelineId: TimelineId.active,
+ timelineType: TimelineType.default,
+ });
+
  const createTimeline = useCallback(
  ({ from: fromTimeline, timeline, to: toTimeline, ruleNote }: CreateTimelineProps) => {
+ clearActiveTimeline();
  updateTimelineIsLoading({ id: TimelineId.active, isLoading: false });
  dispatchUpdateTimeline(dispatch)({
  duplicate: true,
@@ -70,11 +73,9 @@ export const useInvestigateInTimeline = ({
  ruleNote,
  })();
  },
- [dispatch, filterManager, updateTimelineIsLoading]
+ [dispatch, filterManager, updateTimelineIsLoading, clearActiveTimeline]
  );
 
- const showInvestigateInTimelineAction = alertIds != null;
-
  const investigateInTimelineAlertClick = useCallback(async () => {
  if (onInvestigateInTimelineAlertClick) {
  onInvestigateInTimelineAlertClick();
@@ -95,22 +96,22 @@ export const useInvestigateInTimeline = ({
  updateTimelineIsLoading,
  ]);
 
- const investigateInTimelineActionItems = showInvestigateInTimelineAction
- ? [
- <EuiContextMenuItem
- key="investigate-in-timeline-action-item"
- data-test-subj="investigate-in-timeline-action-item"
- disabled={ecsRowData == null}
- onClick={investigateInTimelineAlertClick}
- >
- {ACTION_INVESTIGATE_IN_TIMELINE}
- </EuiContextMenuItem>,
- ]
- : [];
+ const investigateInTimelineActionItems = useMemo(
+ () => [
+ <EuiContextMenuItem
+ key="investigate-in-timeline-action-item"
+ data-test-subj="investigate-in-timeline-action-item"
+ disabled={ecsRowData == null}
+ onClick={investigateInTimelineAlertClick}
+ >
+ {ACTION_INVESTIGATE_IN_TIMELINE}
+ </EuiContextMenuItem>,
+ ],
+ [ecsRowData, investigateInTimelineAlertClick]
+ );
 
  return {
  investigateInTimelineActionItems,
  investigateInTimelineAlertClick,
- showInvestigateInTimelineAction,
  };
 };
diff --git a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx
@@ -8,7 +8,6 @@
 import React, { useState, useCallback, useMemo } from 'react';
 import { EuiContextMenuPanel, EuiButton, EuiPopover } from '@elastic/eui';
 import type { ExceptionListType } from '@kbn/securitysolution-io-ts-list-types';
-import { isEmpty } from 'lodash/fp';
 import { TimelineEventsDetailsItem } from '../../../../common/search_strategy';
 import { TAKE_ACTION } from '../alerts_table/alerts_utility_bar/translations';
 import { useExceptionActions } from '../alerts_table/timeline_actions/use_add_exception_actions';
@@ -81,10 +80,6 @@ export const TakeActionDropdown = React.memo(
  [detailsData]
  );
 
- const alertIds = useMemo(
- () => (isEmpty(actionsData.eventId) ? null : [actionsData.eventId]),
- [actionsData.eventId]
- );
  const isEvent = actionsData.eventKind === 'event';
 
  const isAgentEndpoint = useMemo(() => ecsData?.agent?.type?.includes('endpoint'), [ecsData]);
@@ -156,7 +151,6 @@ export const TakeActionDropdown = React.memo(
  });
 
  const { investigateInTimelineActionItems } = useInvestigateInTimeline({
- alertIds,
  ecsRowData: ecsData,
  onInvestigateInTimelineAlertClick: closePopoverHandler,
  });

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
@@ -48,7 +48,6 @@ const ActionsComponent: React.FC<ActionProps> = ({
  ariaRowindex,
  checked,
  columnValues,
- data,
  ecsData,
  eventId,
  eventIdToNoteIds,
@@ -68,7 +67,6 @@ const ActionsComponent: React.FC<ActionProps> = ({
  const tGridEnabled = useIsExperimentalFeatureEnabled('tGridEnabled');
  const emptyNotes: string[] = [];
  const getTimeline = useMemo(() => timelineSelectors.getTimelineByIdSelector(), []);
- const alertIds = useMemo(() => [ecsData._id], [ecsData]);
 
  const onPinEvent: OnPinEvent = useCallback(
  (evtId) => dispatch(timelineActions.pinEvent({ id: timelineId, eventId: evtId })),
@@ -167,7 +165,6 @@ const ActionsComponent: React.FC<ActionProps> = ({
  <InvestigateInTimelineAction
  ariaLabel={i18n.SEND_ALERT_TO_TIMELINE_FOR_ROW({ ariaRowindex, columnValues })}
  key="investigate-in-timeline"
- alertIds={alertIds}
  ecsRowData={ecsData}
  />
  )}

diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/control_columns/checkbox.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/control_columns/checkbox.tsx
@@ -7,7 +7,6 @@
 
 import { EuiCheckbox, EuiLoadingSpinner } from '@elastic/eui';
 import React, { useCallback } from 'react';
-import { ALERT_RULE_PRODUCER } from '@kbn/rule-data-utils';
 import type { ActionProps, HeaderActionProps } from '../../../../../common/types';
 import * as i18n from './translations';
 
@@ -19,10 +18,7 @@ export const RowCheckBox = ({
  columnValues,
  disabled,
  loadingEventIds,
- data,
 }: ActionProps) => {
- const ruleProducers = data.find((d) => d.field === ALERT_RULE_PRODUCER)?.value ?? [];
- const ruleProducer = ruleProducers[0];
  const handleSelectEvent = useCallback(
  (event: React.ChangeEvent<HTMLInputElement>) => {
  if (!disabled) {
@@ -39,7 +35,7 @@ export const RowCheckBox = ({
  <EuiLoadingSpinner size="m" data-test-subj="event-loader" />
  ) : (
  <EuiCheckbox
- data-test-subj={`select-event select-event-rule-producer-${ruleProducer}`}
+ data-test-subj={`select-event select-event-${eventId}`}
  id={eventId}
  checked={checked && !disabled}
  disabled={disabled}