From 005a428ed650d7dbf18b4b5c23c2c08730686ba2 Mon Sep 17 00:00:00 2001 From: Yara Tercero Date: Tue, 8 Oct 2024 22:51:55 -0700 Subject: [PATCH] [Detection Engine] Fix rule edit success toast (#190928) ## Summary Addresses https://github.com/elastic/kibana/issues/122070 (cherry picked from commit 40471aedb9816a81e9ae6fcc143a96162068358d) --- .../rule_creation_ui/pages/rule_editing/index.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/pages/rule_editing/index.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/pages/rule_editing/index.tsx index 6c139acbbdbff..f8db919ff9416 100644 --- a/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/pages/rule_editing/index.tsx +++ b/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/pages/rule_editing/index.tsx @@ -23,6 +23,7 @@ import { useParams } from 'react-router-dom'; import type { DataViewListItem } from '@kbn/data-views-plugin/common'; +import { useAppToasts } from '../../../../common/hooks/use_app_toasts'; import { isEsqlRule } from '../../../../../common/detection_engine/utils'; import { RulePreview } from '../../components/rule_preview'; import { getIsRulePreviewDisabled } from '../../components/rule_preview/helpers'; @@ -38,7 +39,6 @@ import { getRuleDetailsUrl, getDetectionEngineUrl, } from '../../../../common/components/link_to/redirect_to_detection_engine'; -import { displaySuccessToast, useStateToaster } from '../../../../common/components/toasters'; import { SpyRoute } from '../../../../common/utils/route/spy_routes'; import { useUserData } from '../../../../detections/components/user_info'; import { StepPanel } from '../../../rule_creation/components/step_panel'; @@ -73,7 +73,7 @@ import { CustomHeaderPageMemo } from '..'; import { SaveWithErrorsModal } from '../../components/save_with_errors_confirmation'; const EditRulePageComponent: FC<{ rule: RuleResponse }> = ({ rule }) => { - const [, dispatchToaster] = useStateToaster(); + const { addSuccess } = useAppToasts(); const [ { loading: userInfoLoading, @@ -394,7 +394,7 @@ const EditRulePageComponent: FC<{ rule: RuleResponse }> = ({ rule }) => { const saveChanges = useCallback(async () => { startTransaction({ name: SINGLE_RULE_ACTIONS.SAVE }); - await updateRule({ + const updatedRule = await updateRule({ ...formatRule( defineStepData, aboutStepData, @@ -406,7 +406,7 @@ const EditRulePageComponent: FC<{ rule: RuleResponse }> = ({ rule }) => { ...(ruleId ? { id: ruleId } : {}), }); - displaySuccessToast(i18n.SUCCESSFULLY_SAVED_RULE(rule?.name ?? ''), dispatchToaster); + addSuccess(i18n.SUCCESSFULLY_SAVED_RULE(updatedRule?.name ?? '')); navigateToApp(APP_UI_ID, { deepLinkId: SecurityPageName.rules, path: getRuleDetailsUrl(ruleId ?? ''), @@ -414,11 +414,10 @@ const EditRulePageComponent: FC<{ rule: RuleResponse }> = ({ rule }) => { }, [ aboutStepData, actionsStepData, + addSuccess, defineStepData, - dispatchToaster, navigateToApp, rule?.exceptions_list, - rule?.name, ruleId, scheduleStepData, startTransaction,