Add default country of a new substation in voltage level creation (#3370)

---------

Signed-off-by: Thang PHAM <[email protected]>

Author: thangqp

src/components/dialogs/network-modifications/substation/creation/substation-creation-dialog.jsx

@@ -88,17 +88,19 @@ const SubstationCreationDialog = ({
         }
     }, [reset, editData]);
 
-    // We set the default country if there is one
+    // We set the default country only in creation mode
     useEffect(() => {
-        fetchDefaultCountry().then((country) => {
-            if (country) {
-                reset({
-                    ...getValues(),
-                    [COUNTRY]: country,
-                });
-            }
-        });
-    }, [reset, getValues]);
+        if (!isUpdate) {
+            fetchDefaultCountry().then((country) => {
+                if (country) {
+                    reset({
+                        ...getValues(),
+                        [COUNTRY]: country,
+                    });
+                }
+            });
+        }
+    }, [reset, getValues, isUpdate]);
 
     const clear = useCallback(() => {
         reset(emptyFormData);

src/components/dialogs/network-modifications/voltage-level/creation/voltage-level-creation-form.jsx

@@ -24,7 +24,7 @@ import {
 } from 'components/utils/field-constants';
 import { useCallback, useEffect, useState } from 'react';
 import { KiloAmpereAdornment, VoltageAdornment } from 'components/dialogs/dialog-utils';
-import { AutocompleteInput, FloatInput, IntegerInput, TextInput } from '@gridsuite/commons-ui';
+import { AutocompleteInput, fetchDefaultCountry, FloatInput, IntegerInput, TextInput } from '@gridsuite/commons-ui';
 import { Box, Grid, Paper, Tooltip } from '@mui/material';
 
 import { CouplingOmnibusForm } from '../coupling-omnibus/coupling-omnibus-form';
@@ -49,9 +49,17 @@ const VoltageLevelCreationForm = ({ currentNode, studyUuid, currentRootNetworkUu
     const watchBusBarCount = useWatch({ name: BUS_BAR_COUNT });
     const watchSectionCount = useWatch({ name: SECTION_COUNT });
     const watchAddSubstationCreation = useWatch({ name: ADD_SUBSTATION_CREATION });
+
     useEffect(() => {
-        setIsWithSubstationCreation(watchAddSubstationCreation);
-    }, [watchAddSubstationCreation]);
+        // in new substation mode, set the default country
+        if (isWithSubstationCreation) {
+            fetchDefaultCountry().then((country) => {
+                if (country) {
+                    setValue(COUNTRY, country);
+                }
+            });
+        }
+    }, [setValue, isWithSubstationCreation]);
 
     useEffect(() => {
         if (studyUuid && currentNodeUuid && currentRootNetworkUuid) {
@@ -149,6 +157,10 @@ const VoltageLevelCreationForm = ({ currentNode, studyUuid, currentRootNetworkUu
 
     const handleDeleteButton = useCallback(() => {
         setValue(ADD_SUBSTATION_CREATION, false);
+        // clear the fields of the new substation
+        setValue(SUBSTATION_CREATION_ID, null);
+        setValue(SUBSTATION_NAME, null);
+        setValue(COUNTRY, null);
         setIsWithSubstationCreation(false);
     }, [setValue]);
 
@@ -159,7 +171,7 @@ const VoltageLevelCreationForm = ({ currentNode, studyUuid, currentRootNetworkUu
                 <GridItem>{voltageLevelNameField}</GridItem>
             </Grid>
 
-            {isWithSubstationCreation ? (
+            {watchAddSubstationCreation ? (
                 <Grid>
                     <Grid item xs={12} container spacing={2}></Grid>
                     <GridSection title={intl.formatMessage({ id: 'CreateSubstation' })} />