change endpoint to get voltage level topology

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

@@ -234,7 +234,6 @@ const VoltageLevelCreationDialog = ({
                 voltageLevel.switchKinds?.map((switchKind) => ({
                     [SWITCH_KIND]: switchKind,
                 })) || [];
-
             const switchesBetweenSections =
                 voltageLevel.switchKinds?.map((switchKind) => intl.formatMessage({ id: switchKind })).join(' / ') || '';
 
@@ -283,7 +282,7 @@ const VoltageLevelCreationDialog = ({
             } else {
                 setValue(ADD_SUBSTATION_CREATION, false);
             }
-            if (!voltageLevel.isRetrievedBusbarSections && fromCopy) {
+            if (!voltageLevel.isSymmetrical && fromCopy) {
                 snackWarning({
                     messageId: 'BusBarSectionsCopyingNotSupported',
                 });

src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-dialog.tsx

@@ -33,13 +33,13 @@ import {
     MoveFeederBayInfos,
     MoveVoltageLevelFeederBaysInfos,
 } from '../../../../../services/network-modification-types';
-import { fetchNetworkElementInfos } from '../../../../../services/study/network';
+import { fetchVoltageLevelFeederBaysBusBarSectionsInformation } from '../../../../../services/study/network';
 import { EquipmentModificationDialogProps } from '../../../../graph/menus/network-modifications/network-modification-menu.type';
-import { EQUIPMENT_INFOS_TYPES, EQUIPMENT_TYPES } from '../../../../utils/equipment-types';
 import { DeepNullable } from '../../../../utils/ts-utils';
 import { FeederBayInfos, FeederBaysFormInfos, FeederBaysInfos } from './move-voltage-level-feeder-bays.type';
 import { moveVoltageLevelFeederBays } from '../../../../../services/study/network-modifications';
 import { AnyObject, TestFunction } from 'yup';
+import { FeederBaysBusBarSectionsInfos } from '../../../../../services/study/network-map.type';
 
 const isActiveRow = (row: FeederBaysFormInfos) => row && !row.isRemoved;
 const checkConnectionPositionField: TestFunction<string | undefined, AnyObject> = (currentPosition, context) => {
@@ -224,10 +224,12 @@ export default function MoveVoltageLevelFeederBaysDialog({
     );
 
     const handleVoltageLevelDataFetch = useCallback(
-        (voltageLevel: any) => {
-            const busBarSectionInfos = Object.values(voltageLevel?.busBarSectionInfos || {}).flat() as string[];
+        (feederBaysBusBarSectionInfo: FeederBaysBusBarSectionsInfos) => {
+            const busBarSectionInfos = Object.values(
+                feederBaysBusBarSectionInfo?.busBarSectionsInfos.busBarSections || {}
+            ).flat() as string[];
             const feederBaysInfos: FeederBaysInfos = (
-                Object.entries(voltageLevel?.feederBaysInfos || {}) as [string, FeederBayInfos[]][]
+                Object.entries(feederBaysBusBarSectionInfo?.feederBaysInfos || {}) as [string, FeederBayInfos[]][]
             ).flatMap(([equipmentId, feederBayInfos]) =>
                 feederBayInfos.map((feederBay) => ({
                     equipmentId,
@@ -255,21 +257,18 @@ export default function MoveVoltageLevelFeederBaysDialog({
     );
 
     const onEquipmentIdChange = useCallback(
-        (equipmentId: string) => {
-            if (equipmentId) {
+        (voltageLevelId: string) => {
+            if (voltageLevelId) {
                 setDataFetchStatus(FetchStatus.RUNNING);
-                fetchNetworkElementInfos(
+                fetchVoltageLevelFeederBaysBusBarSectionsInformation(
                     studyUuid,
                     currentNodeUuid,
                     currentRootNetworkUuid,
-                    EQUIPMENT_TYPES.VOLTAGE_LEVEL,
-                    EQUIPMENT_INFOS_TYPES.FORM.type,
-                    equipmentId,
-                    true
+                    voltageLevelId
                 )
-                    .then((voltageLevel) => {
-                        if (voltageLevel) {
-                            handleVoltageLevelDataFetch(voltageLevel);
+                    .then((feederBaysBusBarSectionInfo) => {
+                        if (feederBaysBusBarSectionInfo) {
+                            handleVoltageLevelDataFetch(feederBaysBusBarSectionInfo);
                         }
                     })
                     .catch(() => {

src/components/dialogs/network-modifications/voltage-level/section/create-voltage-level-section-dialog.tsx

@@ -29,12 +29,12 @@ import yup from '../../../../utils/yup-config';
 import { FetchStatus } from 'services/utils';
 import { EquipmentIdSelector } from 'components/dialogs/equipment-id/equipment-id-selector';
 import { CreateVoltageLevelSectionForm } from './create-voltage-level-section-form';
-import { BusBarSectionInfos, CreateVoltageLevelSectionDialogSchemaForm } from './voltage-level-section.type';
+import { CreateVoltageLevelSectionDialogSchemaForm } from './voltage-level-section.type';
 import { CreateVoltageLevelSectionInfos } from '../../../../../services/network-modification-types';
 import { createVoltageLevelSection } from '../../../../../services/study/network-modifications';
-import { EQUIPMENT_INFOS_TYPES } from '../../../../utils/equipment-types';
-import { fetchNetworkElementInfos } from '../../../../../services/study/network';
+import { fetchVoltageLevelBusBarSectionsInformation } from '../../../../../services/study/network';
 import { DeepNullable } from '../../../../utils/ts-utils';
+import { BusBarSectionsInfos } from '../../../../../services/study/network-map.type';
 
 const getBusBarIndexValue = ({ busbarIndex, allBusbars }: { busbarIndex: string | null; allBusbars: boolean }) => {
     if (!busbarIndex) {
@@ -131,7 +131,7 @@ export default function CreateVoltageLevelSectionDialog({
     const [isExtensionNotFoundOrNotSupportedTopology, setIsExtensionNotFoundOrNotSupportedTopology] =
         useState<boolean>(false);
     const [isSymmetricalNbBusBarSections, setIsSymmetricalNbBusBarSections] = useState<boolean>(false);
-    const [busBarSectionInfos, setBusBarSectionInfos] = useState<BusBarSectionInfos[]>();
+    const [busBarSectionInfos, setBusBarSectionInfos] = useState<Map<string, string[]>>();
     const [allBusbarSectionsList, setAllBusbarSectionsList] = useState<string[]>([]);
     const [dataFetchStatus, setDataFetchStatus] = useState<string>(FetchStatus.IDLE);
     const { snackError } = useSnackMessage();
@@ -152,26 +152,24 @@ export default function CreateVoltageLevelSectionDialog({
         (voltageLevelId: string) => {
             if (voltageLevelId) {
                 setDataFetchStatus(FetchStatus.RUNNING);
-                fetchNetworkElementInfos(
+                fetchVoltageLevelBusBarSectionsInformation(
                     studyUuid,
                     currentNodeUuid,
                     currentRootNetworkUuid,
-                    EquipmentType.VOLTAGE_LEVEL,
-                    EQUIPMENT_INFOS_TYPES.FORM.type,
-                    voltageLevelId,
-                    true
+                    voltageLevelId
                 )
-                    .then((voltageLevel) => {
-                        if (voltageLevel) {
-                            setBusBarSectionInfos(voltageLevel?.busBarSectionInfos || []);
+                    .then((busBarSectionsInfos: BusBarSectionsInfos) => {
+                        console.log('busBarSectionsInfos', busBarSectionsInfos);
+                        if (busBarSectionsInfos) {
+                            setBusBarSectionInfos(busBarSectionsInfos?.busBarSections || new Map());
                             setAllBusbarSectionsList(
-                                Object.values(voltageLevel?.busBarSectionInfos || {}).flat() as string[]
+                                Object.values(busBarSectionsInfos?.busBarSections || new Map()).flat() as string[]
                             );
                             setIsExtensionNotFoundOrNotSupportedTopology(
-                                !voltageLevel.isBusbarSectionPositionFound ||
-                                    voltageLevel?.topologyKind !== 'NODE_BREAKER'
+                                !busBarSectionsInfos.isBusbarSectionPositionFound ||
+                                    busBarSectionsInfos?.topologyKind !== 'NODE_BREAKER'
                             );
-                            setIsSymmetricalNbBusBarSections(voltageLevel.isRetrievedBusbarSections);
+                            setIsSymmetricalNbBusBarSections(busBarSectionsInfos.isSymmetrical);
                             setDataFetchStatus(FetchStatus.SUCCEED);
                         }
                     })
@@ -233,8 +231,11 @@ export default function CreateVoltageLevelSectionDialog({
 
     const findBusbarKeyForSection = useCallback(
         (sectionId: string) => {
-            const infos = busBarSectionInfos as unknown as BusBarSectionInfos;
-            return Object.keys(infos || {}).find((key) => infos[key]?.includes(sectionId)) || null;
+            const infos = busBarSectionInfos;
+            return (
+                Object.keys(infos || {}).find((key) => infos !== undefined && infos.get(key)?.includes(sectionId)) ||
+                null
+            );
         },
         [busBarSectionInfos]
     );

src/components/dialogs/network-modifications/voltage-level/section/create-voltage-level-section-form.tsx

@@ -27,10 +27,9 @@ import PositionDiagramPane from 'components/grid-layout/cards/diagrams/singleLin
 import type { UUID } from 'node:crypto';
 import { POSITION_NEW_SECTION_SIDE, SWITCH_TYPE } from '../../../../network/constants';
 import { useFormContext, useWatch } from 'react-hook-form';
-import { BusBarSectionInfos } from './voltage-level-section.type';
 import { areIdsEqual, getObjectId } from '../../../../utils/utils';
 
-const getArrayPosition = (data: BusBarSectionInfos[], selectedOptionId: string) => {
+const getArrayPosition = (data: Map<string, string[]>, selectedOptionId: string) => {
     if (!selectedOptionId || !data) {
         return { position: -1, length: 0 };
     }
@@ -49,7 +48,7 @@ const getArrayPosition = (data: BusBarSectionInfos[], selectedOptionId: string)
 type OptionWithDisabled = Option & { disabled?: boolean };
 
 interface VoltageLevelSectionsCreationFormProps {
-    busBarSectionInfos?: BusBarSectionInfos[];
+    busBarSectionInfos?: Map<string, string[]>;
     voltageLevelId: string;
     allBusbarSectionsList: string[];
     studyUuid: UUID;
@@ -113,6 +112,7 @@ export function CreateVoltageLevelSectionForm({
                 }
                 return;
             }
+            // @ts-ignore
             const sections = busBarSectionInfos[selectedKey];
             if (!sections || !Array.isArray(sections)) {
                 setBusBarSectionsIdOptions([]);

src/components/dialogs/network-modifications/voltage-level/section/voltage-level-section.type.ts

@@ -14,7 +14,3 @@ export type CreateVoltageLevelSectionDialogSchemaForm = {
     allBusbarSections?: boolean;
     newSwitchStates?: boolean;
 };
-
-export type BusBarSectionInfos = {
-    [key: string]: string[];
-};

src/services/study/network-map.type.ts

@@ -6,12 +6,27 @@
  */
 import { CurrentLimitsData } from '../network-modification-types';
 import { Equipment } from '../../components/dialogs/network-modifications/common/properties/property-utils';
+import { FeederBayInfos } from '../../components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays.type';
 
 export type SwitchInfos = {
     id: string;
     open: boolean;
 };
 
+export type BusBarSectionsInfos = {
+    topologyKind: string;
+    busbarCount: number;
+    sectionCount: number;
+    isSymmetrical: boolean;
+    isBusbarSectionPositionFound: boolean;
+    busBarSections: Map<string, string[]>;
+};
+
+export type FeederBaysBusBarSectionsInfos = {
+    feederBaysInfos: Map<string, FeederBayInfos[]>;
+    busBarSectionsInfos: BusBarSectionsInfos;
+};
+
 export type BranchInfos = Equipment & {
     name: string;
     voltageLevelId1: string;

src/services/study/network.ts

@@ -19,7 +19,7 @@ import type { MapHvdcLine, MapLine, MapSubstation, MapTieLine } from '@powsybl/n
 import { getStudyUrlWithNodeUuidAndRootNetworkUuid, PREFIX_STUDY_QUERIES, safeEncodeURIComponent } from './index';
 import { EQUIPMENT_INFOS_TYPES, EQUIPMENT_TYPES, type VoltageLevel } from '../../components/utils/equipment-types';
 import { getQueryParamsList, getUrlWithToken } from '../utils';
-import { SwitchInfos } from './network-map.type';
+import { BusBarSectionsInfos, FeederBaysBusBarSectionsInfos, SwitchInfos } from './network-map.type';
 import type { SpreadsheetEquipmentType } from '../../components/spreadsheet-view/types/spreadsheet.type';
 import { JSONSchema4 } from 'json-schema';
 
@@ -161,6 +161,54 @@ export function fetchSwitchesOfVoltageLevel(
     return backendFetchJson(fetchSwitchesUrl);
 }
 
+export function fetchVoltageLevelBusBarSectionsInformation(
+    studyUuid: UUID,
+    currentNodeUuid: UUID,
+    currentRootNetworkUuid: UUID,
+    voltageLevelId: string
+): Promise<BusBarSectionsInfos> {
+    console.info(
+        `Fetching bus bar sections information of study '${studyUuid}' on root network '${currentRootNetworkUuid}' and node '${currentNodeUuid}' + ' for voltage level '${voltageLevelId}'...`
+    );
+    const urlSearchParams = new URLSearchParams();
+    urlSearchParams.append('inUpstreamBuiltParentNode', 'true');
+
+    const fetchTopologyUrl =
+        getStudyUrlWithNodeUuidAndRootNetworkUuid(studyUuid, currentNodeUuid, currentRootNetworkUuid) +
+        '/network/voltage-levels/' +
+        encodeURIComponent(voltageLevelId) +
+        '/bus-bar-sections' +
+        '?' +
+        urlSearchParams.toString();
+
+    console.debug(fetchTopologyUrl);
+    return backendFetchJson(fetchTopologyUrl);
+}
+
+export function fetchVoltageLevelFeederBaysBusBarSectionsInformation(
+    studyUuid: UUID,
+    currentNodeUuid: UUID,
+    currentRootNetworkUuid: UUID,
+    voltageLevelId: string
+): Promise<FeederBaysBusBarSectionsInfos> {
+    console.info(
+        `Fetching feeder bays and bus bar sections information of study '${studyUuid}' on root network '${currentRootNetworkUuid}' and node '${currentNodeUuid}' + ' for voltage level '${voltageLevelId}'...`
+    );
+    const urlSearchParams = new URLSearchParams();
+    urlSearchParams.append('inUpstreamBuiltParentNode', 'true');
+
+    const fetchTopologyUrl =
+        getStudyUrlWithNodeUuidAndRootNetworkUuid(studyUuid, currentNodeUuid, currentRootNetworkUuid) +
+        '/network/voltage-levels/' +
+        encodeURIComponent(voltageLevelId) +
+        '/feeder-bays-and-bus-bar-sections' +
+        '?' +
+        urlSearchParams.toString();
+
+    console.debug(fetchTopologyUrl);
+    return backendFetchJson(fetchTopologyUrl);
+}
+
 /* substations */
 export function getSubstationSingleLineDiagram({
     studyUuid,