fix control for coupling creation and refactor labels (#3402)

Signed-off-by: Etienne LESOT <[email protected]>

Author: EtienneLt

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

@@ -8,9 +8,26 @@
 import { AutocompleteInput } from '@gridsuite/commons-ui';
 import { BUS_BAR_SECTION_ID1, BUS_BAR_SECTION_ID2, COUPLING_OMNIBUS } from 'components/utils/field-constants';
 import GridItem from '../../../commons/grid-item';
+import { useEffect } from 'react';
+import { useFormContext } from 'react-hook-form';
 
 // TODO should use "name" props instead of `${COUPLING_OMNIBUS}.(...)`
 export const CouplingOmnibusCreation = ({ index, sectionOptions }) => {
+    const { getValues, watch, trigger } = useFormContext();
+    // Watch BUS_BAR_SECTION_ID1 changed
+    useEffect(() => {
+        const subscription = watch((value, { name }) => {
+            // force trigger validation on BUS_BAR_SECTION_ID2 if it has a value
+            if (
+                name === `${COUPLING_OMNIBUS}.${index}.${BUS_BAR_SECTION_ID1}` &&
+                getValues(`${COUPLING_OMNIBUS}.${index}.${BUS_BAR_SECTION_ID2}`)
+            ) {
+                trigger(`${COUPLING_OMNIBUS}.${index}.${BUS_BAR_SECTION_ID2}`);
+            }
+        });
+        return () => subscription.unsubscribe();
+    }, [watch, trigger, getValues, index]);
+
     const busBarSectionId1Field = (
         <AutocompleteInput
             allowNewValue

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

@@ -51,7 +51,6 @@ import { useForm } from 'react-hook-form';
 import { ModificationDialog } from 'components/dialogs/commons/modificationDialog';
 
 import VoltageLevelCreationForm from './voltage-level-creation-form';
-import { controlCouplingOmnibusBetweenSections } from '../voltage-level-creation-utils';
 import { EQUIPMENT_TYPES } from 'components/utils/equipment-types';
 import { useIntl } from 'react-intl';
 import { FORM_LOADING_DELAY } from 'components/network/constants';
@@ -167,17 +166,16 @@ const formSchema = yup
                 is: (sectionCount) => sectionCount > 1,
                 then: (schema) => schema.required(),
             }),
-        [COUPLING_OMNIBUS]: yup
-            .array()
-            .of(
-                yup.object().shape({
-                    [BUS_BAR_SECTION_ID1]: yup.string().nullable().required(),
-                    [BUS_BAR_SECTION_ID2]: yup.string().nullable().required(),
-                })
-            )
-            .test('coupling-omnibus-between-sections', (values) =>
-                controlCouplingOmnibusBetweenSections(values, 'CouplingOmnibusBetweenSameBusbar')
-            ),
+        [COUPLING_OMNIBUS]: yup.array().of(
+            yup.object().shape({
+                [BUS_BAR_SECTION_ID1]: yup.string().nullable().required(),
+                [BUS_BAR_SECTION_ID2]: yup
+                    .string()
+                    .nullable()
+                    .required()
+                    .notOneOf([yup.ref(BUS_BAR_SECTION_ID1), null], 'CreateCouplingDeviceIdenticalBusBar'),
+            })
+        ),
     })
     .concat(creationPropertiesSchema);
 const VoltageLevelCreationDialog = ({

src/translations/en.json

@@ -857,7 +857,6 @@
     "DISCONNECTOR": "Disconnector",
     "SameHorizAndVertPos": "At least two bus bar sections have same horizontal and vertical position",
     "DuplicateId": "Duplicate id",
-    "CouplingOmnibusBetweenSameBusbar": "Forbidden to have a Coupler between the same bus bar section",
     "VoltageLevelModificationError": "Error while modifying a voltage level",
     "AddCouplingDeviceError": "Error while creating a coupling device",
     "BusBarSectionID1": "Bus bar section / bus 1",
@@ -1528,7 +1527,7 @@
     "CREATE_COUPLING_DEVICE": "Add a coupling device",
     "CreateVoltageLevelSection": "Add busbar section",
     "CreateCouplingDeviceDiagramButton": "Show voltage level",
-    "CreateCouplingDeviceIdenticalBusBar": "Busbar section 1 and 2 must be different",
+    "CreateCouplingDeviceIdenticalBusBar": "Bus bar section / bus 1 and 2 must be different",
     "builtNodeTooltipForDiagram": "Current diagram taking into account all applied modifications",
     "notBuiltNodeTooltipForDiagram": "Diagram from last build node in current branch",
     "CouplingDeviceText": "Bus bar sections",

src/translations/fr.json

@@ -850,7 +850,6 @@
     "DISCONNECTOR": "Sectionneur",
     "SameHorizAndVertPos": "Au moins deux SJBs ont les mêmes positions horizontale et verticale",
     "DuplicateId": "Identifiant non unique",
-    "CouplingOmnibusBetweenSameBusbar": "Couplage/omnibus interdit entre le même SJB",
     "VoltageLevelModificationError": "Erreur lors de la modification d'un poste",
     "AddCouplingDeviceError": "Erreur lors de l'ajout d'un omnibus/couplage",
     "BusBarSectionID1": "SJB / Nœud 1",
@@ -1527,7 +1526,7 @@
     "CREATE_COUPLING_DEVICE": "Ajouter un couplage ou un omnibus",
     "CreateVoltageLevelSection": "Ajouter un tronçon ou une section",
     "CreateCouplingDeviceDiagramButton": "Voir le poste",
-    "CreateCouplingDeviceIdenticalBusBar": "Les sections de barre 1 et 2 doivent être différentes",
+    "CreateCouplingDeviceIdenticalBusBar": "Les SJB / Nœuds 1 et 2 doivent être différents",
     "builtNodeTooltipForDiagram": "Diagramme courant prenant en compte toutes les modifications réalisées",
     "notBuiltNodeTooltipForDiagram": "Diagramme du dernier nœud réalisé de la branche courante",
     "CouplingDeviceText": "Sections de jeu de barre",