@gridsuite/commons-ui 0.183.0 → 0.184.0

package/dist/components/network-modifications/common/connectivity/ConnectivityForm.d.ts

@@ -1,6 +1,5 @@
 import { GridDirection } from '@mui/material';
 import { ConnectablePositionFormInfos, ConnectivityNetworkProps } from './connectivity.type';
-import { Option } from '../../../../utils';
 /**
  * Hook to handle a 'connectivity value' (voltage level, bus or bus bar section)
  * @param id optional id that has to be defined if the component is used more than once in a form
@@ -8,7 +7,6 @@ import { Option } from '../../../../utils';
  * @param direction direction of placement. Either 'row' or 'column', 'row' by default.
  * @param withDirectionsInfos
  * @param withPosition
- * @param newBusOrBusbarSectionOptions list of bus or bus bar sections for the newly created voltage level
  * @param onVoltageLevelChangeCallback callback to be called when the voltage level changes
  * @param isEquipmentModification connectivity form is used in a modification form or not
  * @param previousValues previous values of connectivity form's fields
@@ -23,7 +21,6 @@ interface ConnectivityFormProps extends ConnectivityNetworkProps {
     direction?: GridDirection;
     withDirectionsInfos?: boolean;
     withPosition: boolean;
-    newBusOrBusbarSectionOptions?: Option[];
     onVoltageLevelChangeCallback?: () => void;
     isEquipmentModification?: boolean;
     previousValues?: {
@@ -33,5 +30,5 @@ interface ConnectivityFormProps extends ConnectivityNetworkProps {
         terminalConnected?: boolean | null;
     };
 }
-export declare function ConnectivityForm({ id, voltageLevelSelectLabel, direction, withDirectionsInfos, withPosition, newBusOrBusbarSectionOptions, onVoltageLevelChangeCallback, isEquipmentModification, previousValues, voltageLevelOptions, PositionDiagramPane, fetchBusesOrBusbarSections, }: Readonly<ConnectivityFormProps>): import("react/jsx-runtime").JSX.Element;
+export declare function ConnectivityForm({ id, voltageLevelSelectLabel, direction, withDirectionsInfos, withPosition, onVoltageLevelChangeCallback, isEquipmentModification, previousValues, voltageLevelOptions, PositionDiagramPane, fetchBusesOrBusbarSections, }: Readonly<ConnectivityFormProps>): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/network-modifications/common/connectivity/ConnectivityForm.js

@@ -5,6 +5,7 @@ import { useState, useRef, useMemo, useEffect, useCallback } from "react";
 import { useWatch } from "react-hook-form";
 import { useIntl } from "react-intl";
 import { getConnectivityVoltageLevelData, getConnectivityBusBarSectionData } from "./connectivityForm.utils.js";
+import { fetchBusBarSectionsForNewCoupler } from "../../../../services/networkModification.js";
 import { FieldConstants } from "../../../../utils/constants/fieldConstants.js";
 import "../../../../utils/conversionUtils.js";
 import { getConnectionDirectionLabel, CONNECTION_DIRECTIONS } from "../../../../utils/types/equipmentType.js";
@@ -48,7 +49,6 @@ function ConnectivityForm({
   direction = "row",
   withDirectionsInfos = true,
   withPosition = false,
-  newBusOrBusbarSectionOptions = [],
   onVoltageLevelChangeCallback = void 0,
   isEquipmentModification = false,
   previousValues,
@@ -67,26 +67,42 @@ function ConnectivityForm({
   const vlOptions = useMemo(
     () => voltageLevelOptions.map((item) => ({
       id: item.id,
-      label: item.name ?? ""
+      label: item.name ?? "",
+      exist: item.exist
     })),
     [voltageLevelOptions]
   );
   useEffect(() => {
-    if (!fetchBusesOrBusbarSections) {
-      return;
-    }
     if (watchVoltageLevelId) {
-      const existingVoltageLevelOption = voltageLevelOptions.find((option) => option.id === watchVoltageLevelId);
-      if (existingVoltageLevelOption) {
-        fetchBusesOrBusbarSections(watchVoltageLevelId).then((busesOrbusbarSections) => {
-          lastFetchedBusesVlIds.current = watchVoltageLevelId;
-          setBusOrBusbarSectionOptions(
-            busesOrbusbarSections?.map((busesOrbusbarSection) => ({
-              id: busesOrbusbarSection.id,
-              label: busesOrbusbarSection?.name ?? ""
-            })) || []
-          );
-        });
+      const selectedOption = voltageLevelOptions.find((option) => option.id === watchVoltageLevelId);
+      if (selectedOption) {
+        if (selectedOption.exist === false) {
+          fetchBusBarSectionsForNewCoupler(
+            watchVoltageLevelId,
+            selectedOption.busbarCount,
+            selectedOption.sectionCount,
+            selectedOption.switchKinds
+          ).then((ids) => {
+            lastFetchedBusesVlIds.current = watchVoltageLevelId;
+            setBusOrBusbarSectionOptions(ids.map((bbsId) => ({ id: bbsId, label: "" })));
+          }).catch((error) => {
+            console.error("Failed to fetch busbar sections for new coupler:", error);
+            setBusOrBusbarSectionOptions([]);
+          });
+        } else if (fetchBusesOrBusbarSections) {
+          fetchBusesOrBusbarSections(watchVoltageLevelId).then((busesOrbusbarSections) => {
+            lastFetchedBusesVlIds.current = watchVoltageLevelId;
+            setBusOrBusbarSectionOptions(
+              busesOrbusbarSections?.map((busesOrbusbarSection) => ({
+                id: busesOrbusbarSection.id,
+                label: busesOrbusbarSection?.name ?? ""
+              })) || []
+            );
+          }).catch((error) => {
+            console.error("Failed to fetch buses or busbar sections:", error);
+            setBusOrBusbarSectionOptions([]);
+          });
+        }
       }
       if (watchVoltageLevelId !== lastFetchedBusesVlIds.current) {
         setBusOrBusbarSectionOptions([]);
@@ -94,12 +110,7 @@ function ConnectivityForm({
     } else {
       setBusOrBusbarSectionOptions([]);
     }
-  }, [id, fetchBusesOrBusbarSections, voltageLevelOptions, watchVoltageLevelId]);
-  useEffect(() => {
-    if (newBusOrBusbarSectionOptions?.length > 0) {
-      setBusOrBusbarSectionOptions(newBusOrBusbarSectionOptions);
-    }
-  }, [newBusOrBusbarSectionOptions]);
+  }, [fetchBusesOrBusbarSections, voltageLevelOptions, watchVoltageLevelId]);
   const handleChangeVoltageLevel = useCallback(() => {
     onVoltageLevelChangeCallback?.();
     setValue(`${id}.${FieldConstants.BUS_OR_BUSBAR_SECTION}`, null);

package/dist/components/network-modifications/common/connectivity/connectivity.type.d.ts

@@ -26,9 +26,19 @@ type PositionDiagramPaneType = React.ComponentType<{
     onClose: () => void;
     voltageLevelId: string;
 }>;
+interface NewVoltageLevelOption extends Identifiable {
+    exist: false;
+    busbarCount: number;
+    sectionCount: number;
+    switchKinds: string[];
+}
+interface ExistingVoltageLevelOption extends Identifiable {
+    exist?: true;
+}
+export type VoltageLevelOption = NewVoltageLevelOption | ExistingVoltageLevelOption;
 export interface ConnectivityNetworkProps {
-    voltageLevelOptions?: Identifiable[];
+    voltageLevelOptions: VoltageLevelOption[];
     PositionDiagramPane?: PositionDiagramPaneType;
-    fetchBusesOrBusbarSections?: (voltageLevelId: string) => Promise<Identifiable[]>;
+    fetchBusesOrBusbarSections: (voltageLevelId: string) => Promise<Identifiable[]>;
 }
 export {};

package/dist/components/network-modifications/voltage-level/creation/coupling-omnibus/CouplingOmnibusForm.js

@@ -1,14 +1,41 @@
 import { jsx } from "react/jsx-runtime";
-import { useState, useEffect } from "react";
+import { useState, useCallback, useEffect } from "react";
 import { useFormContext } from "react-hook-form";
 import { CouplingOmnibusCreation } from "./CouplingOmnibusCreation.js";
-import { ExpandableInput } from "../../../../inputs/reactHookForm/expandableInput/ExpandableInput.js";
+import "react-intl";
+import "@mui/material";
+import "../../../../overflowableText/OverflowableText.js";
 import { FieldConstants } from "../../../../../utils/constants/fieldConstants.js";
 import "../../../../../utils/conversionUtils.js";
 import "../../../../../utils/types/equipmentType.js";
 import "@mui/icons-material";
 import "../../../../../utils/yupConfig.js";
 import { fetchBusBarSectionsForNewCoupler } from "../../../../../services/networkModification.js";
+import "localized-countries";
+import "localized-countries/data/fr";
+import "localized-countries/data/en";
+import "notistack";
+import "../../../../inputs/reactHookForm/provider/CustomFormProvider.js";
+import "yup";
+import "../../../../treeViewFinder/TreeViewFinder.js";
+import "../../../../inputs/reactHookForm/agGridTable/BottomRightButtons.js";
+import "../../../../customAGGrid/customAggrid.js";
+import "ag-grid-community";
+import "react-papaparse";
+import "react-csv-downloader";
+import "../../../../inputs/reactHookForm/numbers/RangeInput.js";
+import "@material-symbols/svg-400/outlined/left_panel_open.svg?react";
+import "@material-symbols/svg-400/outlined/arrows_output.svg?react";
+import "@material-symbols/svg-400/outlined/left_panel_close.svg?react";
+import "@material-symbols/svg-400/outlined/add_notes.svg?react";
+import "../../../../dialogs/descriptionModificationDialog/DescriptionModificationDialog.js";
+import { ExpandableInput } from "../../../../inputs/reactHookForm/expandableInput/ExpandableInput.js";
+import "@react-querybuilder/material";
+import "../../../../filter/expert/expertFilterConstants.js";
+import "../../../../inputs/reactQueryBuilder/CustomReactQueryBuilder.js";
+import "uuid";
+import "../../../../inputs/reactQueryBuilder/PropertyValueEditor.js";
+import "react-querybuilder";
 function CouplingOmnibusForm() {
   const { setValue, subscribe, trigger, getValues, formState } = useFormContext();
   const couplingOmnibusCreation = {
@@ -16,19 +43,29 @@ function CouplingOmnibusForm() {
     [FieldConstants.BUS_BAR_SECTION_ID2]: null
   };
   const [sectionOptions, setSectionOptions] = useState([]);
+  const setBbsOptions = useCallback(
+    (onFetchSuccess) => {
+      const equipmentId = getValues(FieldConstants.EQUIPMENT_ID);
+      const busBarCount = getValues(FieldConstants.BUS_BAR_COUNT);
+      const sectionCount = getValues(FieldConstants.SECTION_COUNT);
+      if (!equipmentId || !busBarCount || !sectionCount) {
+        return;
+      }
+      const switchKinds = getValues(FieldConstants.SWITCH_KINDS).map(
+        (value) => value.switchKind
+      );
+      fetchBusBarSectionsForNewCoupler(equipmentId, busBarCount, sectionCount, switchKinds).then((bbsIds) => {
+        setSectionOptions(bbsIds);
+        if (onFetchSuccess) {
+          onFetchSuccess({ sectionOptions: bbsIds });
+        }
+      });
+    },
+    [getValues]
+  );
   useEffect(() => {
-    const switchKinds = getValues(FieldConstants.SWITCH_KINDS).map(
-      (value) => value.switchKind
-    );
-    fetchBusBarSectionsForNewCoupler(
-      getValues(FieldConstants.EQUIPMENT_ID),
-      getValues(FieldConstants.BUS_BAR_COUNT),
-      getValues(FieldConstants.SECTION_COUNT),
-      switchKinds
-    ).then((bbsIds) => {
-      setSectionOptions(bbsIds);
-    });
-  }, [getValues]);
+    setBbsOptions();
+  }, [setBbsOptions]);
   useEffect(() => {
     const unsubscribe = subscribe({
       name: [
@@ -41,22 +78,11 @@ function CouplingOmnibusForm() {
         values: true
       },
       callback: () => {
-        const switchKinds = getValues(FieldConstants.SWITCH_KINDS).map(
-          (value) => value.switchKind
-        );
-        fetchBusBarSectionsForNewCoupler(
-          getValues(FieldConstants.EQUIPMENT_ID),
-          getValues(FieldConstants.BUS_BAR_COUNT),
-          getValues(FieldConstants.SECTION_COUNT),
-          switchKinds
-        ).then((bbsIds) => {
-          setValue(FieldConstants.COUPLING_OMNIBUS, []);
-          setSectionOptions(bbsIds);
-        });
+        setBbsOptions(() => setValue(FieldConstants.COUPLING_OMNIBUS, []));
       }
     });
     return () => unsubscribe();
-  }, [subscribe, trigger, getValues, setValue, formState]);
+  }, [subscribe, trigger, setValue, formState, setBbsOptions]);
   return /* @__PURE__ */ jsx(
     ExpandableInput,
     {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.183.0",
+    "version": "0.184.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",