From 1b43118a39e341b01aeb8b207baa8b063d3e7f18 Mon Sep 17 00:00:00 2001 From: VincentD06 Date: Fri, 19 Jul 2024 22:29:38 +0200 Subject: [PATCH] Unselect after Bulk Action --- src/web/translations/fr.json | 2 ++ .../components/rules/AlertRuleBulkActions.jsx | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/web/translations/fr.json b/src/web/translations/fr.json index 04fab12..0a92678 100755 --- a/src/web/translations/fr.json +++ b/src/web/translations/fr.json @@ -191,6 +191,8 @@ "wizard.confirmDeletionPlural": "Souhaitez-vous vraiment supprimer les règles d'alerte", "wizard.confirmDisable": "Souhaitez-vous vraiment désactiver la règle d'alerte", "wizard.confirmDisablePlural": "Souhaitez-vous vraiment désactiver les règles d'alerte", + "wizard.confirmEnable": "Souhaitez-vous vraiment activer la règle d'alerte", + "wizard.confirmEnablePlural": "Souhaitez-vous vraiment activer les règles d'alerte", "wizard.ruleType": "Type de règle", "wizard.tooltipCountCondition": "Condition de comptage", "wizard.tooltipGroupDistinctCondition": "Condition de type Group / Distinct", diff --git a/src/web/wizard/components/rules/AlertRuleBulkActions.jsx b/src/web/wizard/components/rules/AlertRuleBulkActions.jsx index 05a8727..d1b6cb7 100644 --- a/src/web/wizard/components/rules/AlertRuleBulkActions.jsx +++ b/src/web/wizard/components/rules/AlertRuleBulkActions.jsx @@ -35,15 +35,21 @@ const AlertRuleBulkActions = ({ selectedAlertRuleIds, setSelectedAlertRuleIds, d const ACTION_TEXT = { [ACTION_TYPES.DELETE]: { dialogTitle: intl.formatMessage({id: 'wizard.delete', defaultMessage: 'Delete'}), - dialogBody: (count) => `${count > 1 ? intl.formatMessage({id: "wizard.confirmDeletionPlural", defaultMessage: "Are you sure you want to delete alert rules"}) : intl.formatMessage({id: "wizard.confirmDeletion", defaultMessage: "Are you sure you want to delete alert rule"})}?` + dialogBody: (count) => `${count > 1 ? + intl.formatMessage({id: "wizard.confirmDeletionPlural", defaultMessage: "Are you sure you want to delete alert rules"}) : + intl.formatMessage({id: "wizard.confirmDeletion", defaultMessage: "Are you sure you want to delete alert rule"})}?` }, [ACTION_TYPES.DISABLE]: { dialogTitle: intl.formatMessage({id: 'wizard.disable', defaultMessage: 'Disable'}), - dialogBody: (count) => `${count > 1 ? intl.formatMessage({id: "wizard.confirmDisablePlural", defaultMessage: "Are you sure you want to disable alert rules"}) : intl.formatMessage({id: "wizard.confirmDisable", defaultMessage: "Are you sure you want to disable alert rule"})}?` + dialogBody: (count) => `${count > 1 ? + intl.formatMessage({id: "wizard.confirmDisablePlural", defaultMessage: "Are you sure you want to disable alert rules"}) : + intl.formatMessage({id: "wizard.confirmDisable", defaultMessage: "Are you sure you want to disable alert rule"})}?` }, [ACTION_TYPES.ENABLE]: { dialogTitle: intl.formatMessage({id: 'wizard.enable', defaultMessage: 'Enable'}), - dialogBody: (count) => `Are you sure you want to enable alert rule?` + dialogBody: (count) => `${count > 1 ? + intl.formatMessage({id: "wizard.confirmEnablePlural", defaultMessage: "Are you sure you want to enable alert rules"}) : + intl.formatMessage({id: "wizard.confirmEnable", defaultMessage: "Are you sure you want to enable alert rule"})}?` } }; @@ -62,8 +68,7 @@ const AlertRuleBulkActions = ({ selectedAlertRuleIds, setSelectedAlertRuleIds, d updateState({ show: true, type: ACTION_TYPES.DELETE }); break; case ACTION_TYPES.ENABLE: - updateState({ show: false, type: ACTION_TYPES.ENABLE }); - onAction(); + updateState({ show: true, type: ACTION_TYPES.ENABLE }); break; case ACTION_TYPES.DISABLE: updateState({ show: true, type: ACTION_TYPES.DISABLE }); @@ -91,7 +96,8 @@ const AlertRuleBulkActions = ({ selectedAlertRuleIds, setSelectedAlertRuleIds, d default: break; } - }, [actionType, selectedAlertRuleIds]); + setSelectedAlertRuleIds([]); + }, [actionType, selectedAlertRuleIds, setSelectedAlertRuleIds]); const handleConfirm = () => { onAction();