@centreon/ui 25.1.8 → 25.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "25.1.8",
+  "version": "25.1.9",
   "description": "Centreon UI Components",
   "scripts": {
     "update:deps": "pnpx npm-check-updates -i --format group",

package/src/Dialog/UnsavedChanges/index.tsx

@@ -5,13 +5,13 @@ import { Modal } from '../../components/Modal';
 
 import {
   labelDiscard,
-  labelDoYouWantToQuitWithoutResolving,
-  labelDoYouWantToResolveErrors,
+  labelDoYouWantToQuit,
   labelDoYouWantToSaveChanges,
   labelIfYouClickOnDiscard,
-  labelResolve,
+  labelLeave,
   labelSave,
-  labelThereAreErrorsInTheForm
+  labelStay,
+  labelYourFormHasUnsavedChanges
 } from './translatedLabels';
 
 interface Props {
@@ -32,15 +32,17 @@ const UnsavedChangesDialog = ({
   dialogOpened
 }: Props): JSX.Element | null => {
   const { t } = useTranslation();
+
   const labelTitle = isValidForm
     ? labelDoYouWantToSaveChanges
-    : labelDoYouWantToResolveErrors;
+    : labelDoYouWantToQuit;
 
-  const labelConfirm = isValidForm ? labelSave : labelResolve;
+  const lebelConfirm = isValidForm ? labelSave : labelLeave;
+  const labelCancel = isValidForm ? labelDiscard : labelStay;
 
   const labelMessage = isValidForm
     ? labelIfYouClickOnDiscard
-    : `${labelThereAreErrorsInTheForm} ${labelDoYouWantToQuitWithoutResolving}`;
+    : labelYourFormHasUnsavedChanges;
 
   if (not(dialogOpened)) {
     return null;
@@ -58,11 +60,11 @@ const UnsavedChangesDialog = ({
       <Modal.Actions
         disabled={isSubmitting}
         labels={{
-          cancel: t(labelDiscard),
-          confirm: t(labelConfirm)
+          cancel: t(labelCancel),
+          confirm: t(lebelConfirm)
         }}
-        onCancel={discardChanges}
-        onConfirm={isValidForm ? saveChanges : closeDialog}
+        onCancel={isValidForm ? discardChanges : closeDialog}
+        onConfirm={isValidForm ? saveChanges : discardChanges}
       />
     </Modal>
   );

package/src/Dialog/UnsavedChanges/translatedLabels.ts

@@ -1,22 +1,24 @@
 export const labelDiscard = 'Discard';
-export const labelResolve = 'Resolve';
+export const labelSave = 'Save';
+
+export const labelLeave = 'Leave';
+export const labelStay = 'Stay';
+
 export const labelIfYouClickOnDiscard =
   'If you click on Discard, your changes will not be saved.';
-export const labelThereAreErrorsInTheForm = 'There are errors in the form.';
-export const labelDoYouWantToQuitWithoutResolving =
-  'Do you want to quit the form without resolving the errors?';
+export const labelDoYouWantToQuit = 'Do you want to leave this page?';
+
+export const labelYourFormHasUnsavedChanges =
+  'Your changes will not be saved if you leave this page.';
 export const labelDoYouWantToSaveChanges = 'Do you want to save the changes?';
-export const labelDoYouWantToResolveErrors =
-  'Do you want to resolve the errors?';
-export const labelSave = 'Save';
 
 export default {
   labelDiscard,
-  labelDoYouWantToQuitWithoutResolving,
-  labelDoYouWantToResolveErrors,
-  labelDoYouWantToSaveChanges,
-  labelIfYouClickOnDiscard,
-  labelResolve,
   labelSave,
-  labelThereAreErrorsInTheForm
+  labelLeave,
+  labelStay,
+  labelIfYouClickOnDiscard,
+  labelDoYouWantToQuit,
+  labelYourFormHasUnsavedChanges,
+  labelDoYouWantToSaveChanges
 };