Skip to content

Commit

Permalink
[8.x] [Detection Engine] Fix rule edit success toast (#190928) (#195530)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Detection Engine] Fix rule edit success toast
(#190928)](#190928)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https:/sqren/backport)

<!--BACKPORT [{"author":{"name":"Yara
Tercero","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-09T05:51:55Z","message":"[Detection
Engine] Fix rule edit success toast (#190928)\n\n##
Summary\r\n\r\nAddresses
https:/elastic/kibana/issues/122070","sha":"40471aedb9816a81e9ae6fcc143a96162068358d","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Detection
Engine","v8.16.0","backport:version"],"title":"[Detection Engine] Fix
rule edit success
toast","number":190928,"url":"https:/elastic/kibana/pull/190928","mergeCommit":{"message":"[Detection
Engine] Fix rule edit success toast (#190928)\n\n##
Summary\r\n\r\nAddresses
https:/elastic/kibana/issues/122070","sha":"40471aedb9816a81e9ae6fcc143a96162068358d"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https:/elastic/kibana/pull/190928","number":190928,"mergeCommit":{"message":"[Detection
Engine] Fix rule edit success toast (#190928)\n\n##
Summary\r\n\r\nAddresses
https:/elastic/kibana/issues/122070","sha":"40471aedb9816a81e9ae6fcc143a96162068358d"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Yara Tercero <[email protected]>
  • Loading branch information
kibanamachine and yctercero authored Oct 9, 2024
1 parent 8f9f106 commit aa0b7f6
Showing 1 changed file with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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<RuleUpdateProps>(
defineStepData,
aboutStepData,
Expand All @@ -406,19 +406,18 @@ 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 ?? ''),
});
}, [
aboutStepData,
actionsStepData,
addSuccess,
defineStepData,
dispatchToaster,
navigateToApp,
rule?.exceptions_list,
rule?.name,
ruleId,
scheduleStepData,
startTransaction,
Expand Down

0 comments on commit aa0b7f6

Please sign in to comment.