fix reset for modification dialog

Signed-off-by: Etienne LESOT <[email protected]>
gridsuite · Jul 9, 2024 · 4567f43 · 4567f43
1 parent c387aca
commit 4567f43
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/...onents/dialogs/network-modifications/battery/modification/battery-modification-dialog.jsx b/...onents/dialogs/network-modifications/battery/modification/battery-modification-dialog.jsx
@@ -256,9 +256,11 @@ const BatteryModificationDialog = ({
                         setDataFetchStatus(FetchStatus.SUCCEED);
                     })
                     .catch(() => {
-                        setBatteryToModify(null);
                         setDataFetchStatus(FetchStatus.FAILED);
-                        reset(emptyFormData);
+                        if (editData?.equipmentId !== equipmentId) {
+                            setBatteryToModify(null);
+                            reset(emptyFormData);
+                        }
                     });
             } else {
                 setValuesAndEmptyOthers();
@@ -272,6 +274,7 @@ const BatteryModificationDialog = ({
             setValue,
             setValuesAndEmptyOthers,
             reset,
+            editData
         ]
     );
 

diff --git a/...ts/dialogs/network-modifications/generator/modification/generator-modification-dialog.jsx b/...ts/dialogs/network-modifications/generator/modification/generator-modification-dialog.jsx
@@ -310,9 +310,11 @@ const GeneratorModificationDialog = ({
                         setDataFetchStatus(FetchStatus.SUCCEED);
                     })
                     .catch(() => {
-                        setGeneratorToModify(null);
-                        reset(emptyFormData);
                         setDataFetchStatus(FetchStatus.FAILED);
+                        if (editData?.equipmentId !== equipmentId) {
+                            setGeneratorToModify(null);
+                            reset(emptyFormData);
+                        }
                     });
             } else {
                 setValuesAndEmptyOthers();
@@ -326,6 +328,7 @@ const GeneratorModificationDialog = ({
             getValues,
             setValue,
             setValuesAndEmptyOthers,
+            editData
         ]
     );
 

diff --git a/src/components/dialogs/network-modifications/line/modification/line-modification-dialog.jsx b/src/components/dialogs/network-modifications/line/modification/line-modification-dialog.jsx
@@ -328,9 +328,11 @@ const LineModificationDialog = ({
                         setDataFetchStatus(FetchStatus.SUCCEED);
                     })
                     .catch(() => {
-                        setLineToModify(null);
                         setDataFetchStatus(FetchStatus.FAILED);
-                        reset(emptyFormData);
+                        if (editData?.equipmentId !== equipmentId) {
+                            setLineToModify(null);
+                            reset(emptyFormData);
+                        }
                     });
             } else {
                 setLineToModify(null);

diff --git a/...rk-modifications/shunt-compensator/modification/shunt-compensator-modification-dialog.jsx b/...rk-modifications/shunt-compensator/modification/shunt-compensator-modification-dialog.jsx
@@ -177,19 +177,21 @@ const ShuntCompensatorModificationDialog = ({
                         setLoading(false);
                     })
                     .catch((error) => {
-                        setShuntCompensatorInfos(null);
                         setDataFetchStatus(FetchStatus.FAILED);
                         if (error.status === 404) {
                             setIdExists(true);
                         }
                         setLoading(false);
-                        reset(emptyFormData);
+                        if (editData?.equipmentId !== equipmentId) {
+                            setShuntCompensatorInfos(null);
+                            reset(emptyFormData);
+                        }
                     });
             } else {
                 setShuntCompensatorInfos(null);
             }
         },
-        [currentNode.id, snackError, studyUuid, reset, getValues]
+        [currentNode.id, snackError, studyUuid, reset, getValues, editData]
     );
 
     useEffect(() => {

diff --git a/...ns/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx b/...ns/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx
@@ -760,15 +760,18 @@ const TwoWindingsTransformerModificationDialog = ({
                         setDataFetchStatus(FetchStatus.SUCCEED);
                     })
                     .catch(() => {
-                        setTwtToModify(null);
                         setDataFetchStatus(FetchStatus.FAILED);
+                        if (editData?.equipmentId !== equipmentId) {
+                            setTwtToModify(null);
+                            reset(emptyFormData)
+                        }
                     });
             } else {
                 setTwtToModify(null);
                 reset(emptyFormData, { keepDefaultValues: true });
             }
         },
-        [studyUuid, currentNodeUuid, selectedId, editData, reset, getValues]
+        [studyUuid, currentNodeUuid, selectedId, editData, reset, getValues, editData]
     );
 
     useEffect(() => {

diff --git a/...gs/network-modifications/voltage-level/modification/voltage-level-modification-dialog.jsx b/...gs/network-modifications/voltage-level/modification/voltage-level-modification-dialog.jsx
@@ -162,16 +162,18 @@ const VoltageLevelModificationDialog = ({
                         }
                     })
                     .catch(() => {
-                        setVoltageLevelInfos(null);
                         setDataFetchStatus(FetchStatus.FAILED);
-                        reset(emptyFormData);
+                        if (editData?.equipmentId !== equipmentId) {
+                            setVoltageLevelInfos(null);
+                            reset(emptyFormData);
+                        }
                     });
             } else {
                 setVoltageLevelInfos(null);
                 reset(emptyFormData, { keepDefaultValues: true });
             }
         },
-        [studyUuid, currentNodeUuid, reset, getValues]
+        [studyUuid, currentNodeUuid, reset, getValues, editData]
     );
 
     useEffect(() => {