changes count source

Author: dplumlee

x-pack/plugins/siem/public/alerts/components/signals/actions.tsx

@@ -23,8 +23,6 @@ import {
   replaceTemplateFieldFromMatchFilters,
   replaceTemplateFieldFromDataProviders,
 } from './helpers';
-import { displaySuccessToast, displayErrorToast } from '../../../common/components/toasters';
-import * as i18n from './translations';
 
 export const getUpdateSignalsQuery = (eventIds: Readonly<string[]>) => {
   return {
@@ -58,29 +56,21 @@ export const updateSignalStatusAction = async ({
   status,
   setEventsLoading,
   setEventsDeleted,
-  dispatchToaster,
+  onAlertStatusUpdateSuccess,
+  onAlertStatusUpdateFailure,
 }: UpdateSignalStatusActionProps) => {
   try {
     setEventsLoading({ eventIds: signalIds, isLoading: true });
 
     const queryObject = query ? { query: JSON.parse(query) } : getUpdateSignalsQuery(signalIds);
 
-    await updateSignalStatus({ query: queryObject, status });
+    const response = await updateSignalStatus({ query: queryObject, status });
     // TODO: Only delete those that were successfully updated from updatedRules
     setEventsDeleted({ eventIds: signalIds, isDeleted: true });
 
-    const successTitle =
-      status === 'closed'
-        ? i18n.CLOSED_ALERT_SUCCESS_TOAST(signalIds.length)
-        : i18n.OPENED_ALERT_SUCCESS_TOAST(signalIds.length);
-
-    displaySuccessToast(successTitle, dispatchToaster);
-  } catch (e) {
-    const errorTitle =
-      status === 'closed'
-        ? i18n.CLOSED_ALERT_FAILED_TOAST(signalIds.length)
-        : i18n.OPENED_ALERT_FAILED_TOAST(signalIds.length);
-    displayErrorToast(errorTitle, [e.message], dispatchToaster);
+    onAlertStatusUpdateSuccess(response.updated, status);
+  } catch (error) {
+    onAlertStatusUpdateFailure(status, error);
   } finally {
     setEventsLoading({ eventIds: signalIds, isLoading: false });
   }

x-pack/plugins/siem/public/alerts/components/signals/default_config.test.tsx

@@ -19,7 +19,6 @@ import {
 import { mockEcsDataWithSignal } from '../../../common/mock/mock_ecs';
 import { sendSignalToTimelineAction, updateSignalStatusAction } from './actions';
 import * as i18n from './translations';
-import { ActionToaster } from '../../../common/components/toasters';
 
 jest.mock('./actions');
 
@@ -54,14 +53,17 @@ describe('signals default_config', () => {
     let setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
     let createTimeline: CreateTimeline;
     let updateTimelineIsLoading: UpdateTimelineLoading;
-    let dispatchToaster: React.Dispatch<ActionToaster>;
+
+    let onAlertStatusUpdateSuccess: (count: number, status: string) => void;
+    let onAlertStatusUpdateFailure: (status: string, error: Error) => void;
 
     beforeEach(() => {
       setEventsLoading = jest.fn();
       setEventsDeleted = jest.fn();
       createTimeline = jest.fn();
       updateTimelineIsLoading = jest.fn();
-      dispatchToaster = jest.fn();
+      onAlertStatusUpdateSuccess = jest.fn();
+      onAlertStatusUpdateFailure = jest.fn();
     });
 
     describe('timeline tooltip', () => {
@@ -74,7 +76,8 @@ describe('signals default_config', () => {
           createTimeline,
           status: 'open',
           updateTimelineIsLoading,
-          dispatchToaster,
+          onAlertStatusUpdateSuccess,
+          onAlertStatusUpdateFailure,
         });
         const timelineAction = signalsActions[0].getAction({
           eventId: 'even-id',
@@ -101,7 +104,8 @@ describe('signals default_config', () => {
           createTimeline,
           status: 'open',
           updateTimelineIsLoading,
-          dispatchToaster,
+          onAlertStatusUpdateSuccess,
+          onAlertStatusUpdateFailure,
         });
 
         signalOpenAction = signalsActions[1].getAction({
@@ -124,7 +128,7 @@ describe('signals default_config', () => {
           status: 'open',
           setEventsLoading,
           setEventsDeleted,
-          dispatchToaster,
+          onAlertStatusUpdateSuccess,
         });
       });
 
@@ -157,7 +161,8 @@ describe('signals default_config', () => {
           createTimeline,
           status: 'closed',
           updateTimelineIsLoading,
-          dispatchToaster,
+          onAlertStatusUpdateSuccess,
+          onAlertStatusUpdateFailure,
         });
 
         signalCloseAction = signalsActions[1].getAction({
@@ -180,7 +185,7 @@ describe('signals default_config', () => {
           status: 'closed',
           setEventsLoading,
           setEventsDeleted,
-          dispatchToaster,
+          onAlertStatusUpdateSuccess,
         });
       });
 

x-pack/plugins/siem/public/alerts/components/signals/default_config.tsx

@@ -32,7 +32,6 @@ import {
   SetEventsLoadingProps,
   UpdateTimelineLoading,
 } from './types';
-import { ActionToaster } from '../../../common/components/toasters';
 
 export const signalsOpenFilters: Filter[] = [
   {
@@ -199,7 +198,8 @@ export const getSignalsActions = ({
   createTimeline,
   status,
   updateTimelineIsLoading,
-  dispatchToaster,
+  onAlertStatusUpdateSuccess,
+  onAlertStatusUpdateFailure,
 }: {
   apolloClient?: ApolloClient<{}>;
   canUserCRUD: boolean;
@@ -209,7 +209,8 @@ export const getSignalsActions = ({
   createTimeline: CreateTimeline;
   status: 'open' | 'closed';
   updateTimelineIsLoading: UpdateTimelineLoading;
-  dispatchToaster: React.Dispatch<ActionToaster>;
+  onAlertStatusUpdateSuccess: (count: number, status: string) => void;
+  onAlertStatusUpdateFailure: (status: string, error: Error) => void;
 }): TimelineAction[] => [
   {
     getAction: ({ ecsData }: TimelineActionProps): JSX.Element => (
@@ -249,7 +250,8 @@ export const getSignalsActions = ({
               status,
               setEventsLoading,
               setEventsDeleted,
-              dispatchToaster,
+              onAlertStatusUpdateSuccess,
+              onAlertStatusUpdateFailure,
             })
           }
           isDisabled={!canUserCRUD || !hasIndexWrite}

x-pack/plugins/siem/public/alerts/components/signals/index.tsx

@@ -46,7 +46,11 @@ import {
   UpdateSignalsStatusProps,
 } from './types';
 import { dispatchUpdateTimeline } from '../../../timelines/components/open_timeline/helpers';
-import { useStateToaster } from '../../../common/components/toasters';
+import {
+  useStateToaster,
+  displaySuccessToast,
+  displayErrorToast,
+} from '../../../common/components/toasters';
 
 export const SIGNALS_PAGE_TIMELINE_ID = 'signals-page';
 
@@ -148,6 +152,27 @@ export const SignalsTableComponent: React.FC<SignalsTableComponentProps> = ({
     [setEventsDeleted, SIGNALS_PAGE_TIMELINE_ID]
   );
 
+  const onAlertStatusUpdateSuccess = useCallback(
+    (count: number, status: string) => {
+      const title =
+        status === 'closed'
+          ? i18n.CLOSED_ALERT_SUCCESS_TOAST(count)
+          : i18n.OPENED_ALERT_SUCCESS_TOAST(count);
+
+      displaySuccessToast(title, dispatchToaster);
+    },
+    [dispatchToaster]
+  );
+
+  const onAlertStatusUpdateFailure = useCallback(
+    (status: string, error: Error) => {
+      const title =
+        status === 'closed' ? i18n.CLOSED_ALERT_FAILED_TOAST : i18n.OPENED_ALERT_FAILED_TOAST;
+      displayErrorToast(title, [error.message], dispatchToaster);
+    },
+    [dispatchToaster]
+  );
+
   // Catches state change isSelectAllChecked->false upon user selection change to reset utility bar
   useEffect(() => {
     if (!isSelectAllChecked) {
@@ -191,7 +216,8 @@ export const SignalsTableComponent: React.FC<SignalsTableComponentProps> = ({
         status,
         setEventsDeleted: setEventsDeletedCallback,
         setEventsLoading: setEventsLoadingCallback,
-        dispatchToaster,
+        onAlertStatusUpdateSuccess,
+        onAlertStatusUpdateFailure,
       });
       refetchQuery();
     },
@@ -201,7 +227,8 @@ export const SignalsTableComponent: React.FC<SignalsTableComponentProps> = ({
       setEventsDeletedCallback,
       setEventsLoadingCallback,
       showClearSelectionAction,
-      dispatchToaster,
+      onAlertStatusUpdateSuccess,
+      onAlertStatusUpdateFailure,
     ]
   );
 
@@ -248,7 +275,8 @@ export const SignalsTableComponent: React.FC<SignalsTableComponentProps> = ({
         setEventsDeleted: setEventsDeletedCallback,
         status: filterGroup === FILTER_OPEN ? FILTER_CLOSED : FILTER_OPEN,
         updateTimelineIsLoading,
-        dispatchToaster,
+        onAlertStatusUpdateSuccess,
+        onAlertStatusUpdateFailure,
       }),
     [
       apolloClient,
@@ -259,7 +287,8 @@ export const SignalsTableComponent: React.FC<SignalsTableComponentProps> = ({
       setEventsLoadingCallback,
       setEventsDeletedCallback,
       updateTimelineIsLoading,
-      dispatchToaster,
+      onAlertStatusUpdateSuccess,
+      onAlertStatusUpdateFailure,
     ]
   );
 

x-pack/plugins/siem/public/alerts/components/signals/translations.ts

@@ -116,16 +116,16 @@ export const OPENED_ALERT_SUCCESS_TOAST = (totalAlerts: number) =>
       'Successfully opened {totalAlerts} {totalAlerts, plural, =1 {alert} other {alerts}}.',
   });
 
-export const CLOSED_ALERT_FAILED_TOAST = (totalAlerts: number) =>
-  i18n.translate('xpack.siem.detectionEngine.signals.closedAlertFailedToastMessage', {
-    values: { totalAlerts },
-    defaultMessage:
-      'Failed to close {totalAlerts} {totalAlerts, plural, =1 {alert} other {alerts}}.',
-  });
+export const CLOSED_ALERT_FAILED_TOAST = i18n.translate(
+  'xpack.siem.detectionEngine.signals.closedAlertFailedToastMessage',
+  {
+    defaultMessage: 'Failed to close alert(s).',
+  }
+);
 
-export const OPENED_ALERT_FAILED_TOAST = (totalAlerts: number) =>
-  i18n.translate('xpack.siem.detectionEngine.signals.openedAlertFailedToastMessage', {
-    values: { totalAlerts },
-    defaultMessage:
-      'Failed to open {totalAlerts} {totalAlerts, plural, =1 {alert} other {alerts}}.',
-  });
+export const OPENED_ALERT_FAILED_TOAST = i18n.translate(
+  'xpack.siem.detectionEngine.signals.openedAlertFailedToastMessage',
+  {
+    defaultMessage: 'Failed to open alert(s)',
+  }
+);

x-pack/plugins/siem/public/alerts/components/signals/types.ts

@@ -9,7 +9,6 @@ import ApolloClient from 'apollo-client';
 import { Ecs } from '../../../graphql/types';
 import { TimelineModel } from '../../../timelines/store/timeline/model';
 import { inputsModel } from '../../../common/store';
-import { ActionToaster } from '../../../common/components/toasters';
 
 export interface SetEventsLoadingProps {
   eventIds: string[];
@@ -38,7 +37,8 @@ export interface UpdateSignalStatusActionProps {
   status: 'open' | 'closed';
   setEventsLoading: ({ eventIds, isLoading }: SetEventsLoadingProps) => void;
   setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
-  dispatchToaster: React.Dispatch<ActionToaster>;
+  onAlertStatusUpdateSuccess: (count: number, status: string) => void;
+  onAlertStatusUpdateFailure: (status: string, error: Error) => void;
 }
 
 export type SendSignalsToTimeline = () => void;

x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/api.ts

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ReindexResponse } from 'elasticsearch';
 import {
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
@@ -54,7 +55,7 @@ export const updateSignalStatus = async ({
   query,
   status,
   signal,
-}: UpdateSignalStatusProps): Promise<unknown> =>
+}: UpdateSignalStatusProps): Promise<ReindexResponse> =>
   KibanaServices.get().http.fetch(DETECTION_ENGINE_SIGNALS_STATUS_URL, {
     method: 'POST',
     body: JSON.stringify({ status, ...query }),