fix errors

Signed-off-by: souissimai <[email protected]>
gridsuite · Jan 7, 2025 · 75f0e97 · 75f0e97
1 parent aa0f905
commit 75f0e97
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 21 deletions.
diff --git a/src/components/dialogs/dynamicsimulation/event/dynamic-simulation-event-dialog.tsx b/src/components/dialogs/dynamicsimulation/event/dynamic-simulation-event-dialog.tsx
@@ -38,6 +38,7 @@ export const DynamicSimulationEventDialog = (props: DynamicSimulationEventDialog
     const { snackError } = useSnackMessage();
     const studyUuid = useSelector((state: AppState) => state.studyUuid);
     const currentNode = useSelector((state: AppState) => state.currentTreeNode);
+    const currentRootNetworkUuid = useSelector((state: AppState) => state.currentRootNetwork);
     const currentNodeId = currentNode?.id;
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
     const [event, setEvent] = useState<Event>();
@@ -86,15 +87,15 @@ export const DynamicSimulationEventDialog = (props: DynamicSimulationEventDialog
 
     // load event for equipment
     useEffect(() => {
-        if (!studyUuid || !currentNodeId) {
+        if (!studyUuid || !currentNodeId || !currentRootNetworkUuid) {
             return;
         }
         setDataFetchStatus(FetchStatus.RUNNING);
-        fetchDynamicSimulationEvent(studyUuid, currentNodeId, equipmentId).then((event) => {
+        fetchDynamicSimulationEvent(studyUuid, currentNodeId, currentRootNetworkUuid, equipmentId).then((event) => {
             setDataFetchStatus(FetchStatus.SUCCEED);
             setEvent(event);
         });
-    }, [currentNodeId, equipmentId, studyUuid, reset]);
+    }, [currentNodeId, equipmentId, currentRootNetworkUuid, studyUuid, reset]);
 
     // reset form data when event available after fetch
     useEffect(() => {
@@ -117,7 +118,7 @@ export const DynamicSimulationEventDialog = (props: DynamicSimulationEventDialog
     // submit form
     const handleSubmit = useCallback(
         (formObj: { [KEY in EventPropertyName]: any }) => {
-            if (!studyUuid || !currentNodeId) {
+            if (!studyUuid || !currentNodeId || !currentRootNetworkUuid) {
                 return;
             }
             // formObj to EventProperty[]
@@ -160,14 +161,24 @@ export const DynamicSimulationEventDialog = (props: DynamicSimulationEventDialog
                       properties,
                   };
 
-            saveDynamicSimulationEvent(studyUuid, currentNodeId, submitEvent).catch((error) => {
+            saveDynamicSimulationEvent(studyUuid, currentNodeId, currentRootNetworkUuid, submitEvent).catch((error) => {
                 snackError({
                     messageTxt: error.message,
                     headerId: 'DynamicSimulationEventSaveError',
                 });
             });
         },
-        [currentNodeId, equipmentId, equipmentType, snackError, studyUuid, eventType, event, eventDefinition]
+        [
+            currentNodeId,
+            equipmentId,
+            currentRootNetworkUuid,
+            equipmentType,
+            snackError,
+            studyUuid,
+            eventType,
+            event,
+            eventDefinition,
+        ]
     );
 
     const waitingOpen = useOpenShortWaitFetching({

diff --git a/src/components/dialogs/network-modifications/hvdc-line/lcc/creation/lcc-creation-dialog.tsx b/src/components/dialogs/network-modifications/hvdc-line/lcc/creation/lcc-creation-dialog.tsx
@@ -270,7 +270,12 @@ export function LccCreationDialog({
                 }}
                 {...dialogProps}
             >
-                <LccCreationForm studyUuid={studyUuid} currentNode={currentNode} tabIndex={tabIndex} />
+                <LccCreationForm
+                    studyUuid={studyUuid}
+                    currentNode={currentNode}
+                    currentRootNetworkUuid={currentRootNetworkUuid}
+                    tabIndex={tabIndex}
+                />
                 <EquipmentSearchDialog
                     open={searchCopy.isDialogSearchOpen}
                     onClose={searchCopy.handleCloseSearchDialog}

diff --git a/src/components/dialogs/network-modifications/hvdc-line/lcc/creation/lcc-creation-form.tsx b/src/components/dialogs/network-modifications/hvdc-line/lcc/creation/lcc-creation-form.tsx
@@ -16,8 +16,14 @@ interface LccCreationFormProps {
     tabIndex: number;
     studyUuid: UUID;
     currentNode: CurrentTreeNode;
+    currentRootNetworkUuid: UUID;
 }
-export default function LccCreationForm({ tabIndex, studyUuid, currentNode }: Readonly<LccCreationFormProps>) {
+export default function LccCreationForm({
+    tabIndex,
+    studyUuid,
+    currentRootNetworkUuid,
+    currentNode,
+}: Readonly<LccCreationFormProps>) {
     return (
         <>
             <Box hidden={tabIndex !== LccCreationDialogTab.HVDC_LINE_TAB} p={1}>
@@ -27,6 +33,7 @@ export default function LccCreationForm({ tabIndex, studyUuid, currentNode }: Re
                 <LccConverterStation
                     studyUuid={studyUuid}
                     currentNode={currentNode}
+                    currentRootNetworkUuid={currentRootNetworkUuid}
                     id={CONVERTER_STATION_1}
                     stationLabel={'converterStation1'}
                 />
@@ -35,6 +42,7 @@ export default function LccCreationForm({ tabIndex, studyUuid, currentNode }: Re
                 <LccConverterStation
                     studyUuid={studyUuid}
                     currentNode={currentNode}
+                    currentRootNetworkUuid={currentRootNetworkUuid}
                     id={CONVERTER_STATION_2}
                     stationLabel={'converterStation2'}
                 />

diff --git a/src/components/dialogs/network-modifications/hvdc-line/vsc/creation/vsc-creation-form.tsx b/src/components/dialogs/network-modifications/hvdc-line/vsc/creation/vsc-creation-form.tsx
@@ -17,9 +17,15 @@ import { Box } from '@mui/material';
 interface VscCreationFormProps {
     tabIndex: number;
     studyUuid: UUID;
+    currentRootNetworkUuid: UUID;
     currentNode: CurrentTreeNode;
 }
-const VscCreationForm: FunctionComponent<VscCreationFormProps> = ({ tabIndex, studyUuid, currentNode }) => {
+const VscCreationForm: FunctionComponent<VscCreationFormProps> = ({
+    tabIndex,
+    studyUuid,
+    currentNode,
+    currentRootNetworkUuid,
+}) => {
     return (
         <>
             <Box hidden={tabIndex !== VSC_CREATION_TABS.HVDC_LINE_TAB} p={1}>
@@ -29,6 +35,7 @@ const VscCreationForm: FunctionComponent<VscCreationFormProps> = ({ tabIndex, st
                 <ConverterStationPane
                     studyUuid={studyUuid}
                     currentNode={currentNode}
+                    currentRootNetworkUuid={currentRootNetworkUuid}
                     id={CONVERTER_STATION_1}
                     stationLabel={'converterStation1'}
                 />
@@ -37,6 +44,7 @@ const VscCreationForm: FunctionComponent<VscCreationFormProps> = ({ tabIndex, st
                 <ConverterStationPane
                     studyUuid={studyUuid}
                     currentNode={currentNode}
+                    currentRootNetworkUuid={currentRootNetworkUuid}
                     id={CONVERTER_STATION_2}
                     stationLabel={'converterStation2'}
                 />

diff --git a/...ents/dialogs/network-modifications/hvdc-line/vsc/modification/vsc-modification-dialog.tsx b/...ents/dialogs/network-modifications/hvdc-line/vsc/modification/vsc-modification-dialog.tsx
@@ -363,6 +363,7 @@ const VscModificationDialog: React.FC<any> = ({
                         tabIndex={tabIndex}
                         studyUuid={studyUuid}
                         currentNode={currentNode}
+                        currentRootNetworkUuid={currentRootNetworkUuid}
                         equipmentId={equipmentId}
                         setTabIndex={setTabIndex}
                         vscToModify={vscToModify}

diff --git a/...onents/dialogs/network-modifications/hvdc-line/vsc/modification/vsc-modification-from.tsx b/...onents/dialogs/network-modifications/hvdc-line/vsc/modification/vsc-modification-from.tsx
@@ -28,6 +28,7 @@ interface VscModificationFormProps {
     tabIndex: number;
     studyUuid: UUID;
     currentNode: CurrentTreeNode;
+    currentRootNetworkUuid: UUID;
     equipmentId: string;
     vscToModify: VscModificationInfo | null;
     setTabIndex: React.Dispatch<React.SetStateAction<number>>;
@@ -40,6 +41,7 @@ export const VscModificationForm: FunctionComponent<VscModificationFormProps> =
     setTabIndex,
     studyUuid,
     currentNode,
+    currentRootNetworkUuid,
     equipmentId,
     vscToModify,
     tabIndexesWithError,
@@ -95,6 +97,7 @@ export const VscModificationForm: FunctionComponent<VscModificationFormProps> =
                 <ConverterStationPane
                     studyUuid={studyUuid}
                     currentNode={currentNode}
+                    currentRootNetworkUuid={currentRootNetworkUuid}
                     id={CONVERTER_STATION_1}
                     stationLabel={'converterStation1'}
                     isModification
@@ -108,6 +111,7 @@ export const VscModificationForm: FunctionComponent<VscModificationFormProps> =
                 <ConverterStationPane
                     studyUuid={studyUuid}
                     currentNode={currentNode}
+                    currentRootNetworkUuid={currentRootNetworkUuid}
                     id={CONVERTER_STATION_2}
                     stationLabel={'converterStation2'}
                     isModification

diff --git a/src/components/dialogs/parameters/dynamicsimulation/curve/dialog/model-filter.tsx b/src/components/dialogs/parameters/dynamicsimulation/curve/dialog/model-filter.tsx
@@ -219,7 +219,7 @@ const ModelFilter = forwardRef<GetSelectedVariablesHandle, ModelFilterProps>(
 
         // fetch all associated models and variables for current node and study
         useEffect(() => {
-            if (!currentNode?.id) {
+            if (!currentNode?.id || !currentRootNetworkUuid) {
                 return;
             }
             fetchDynamicSimulationModels(studyUuid, currentNode.id, currentRootNetworkUuid).then(

diff --git a/src/components/dialogs/parameters/sensi/sensitivity-analysis-parameters.tsx b/src/components/dialogs/parameters/sensi/sensitivity-analysis-parameters.tsx
@@ -225,7 +225,7 @@ export const SensitivityAnalysisParameters: FunctionComponent<SensitivityAnalysi
         (row: any, arrayFormName: SubTabsValues, index: number) => {
             // TODO: not easy to fix any here since values[SubTabsValues] have each time different type which causes problems with "filter"
             // "none of those signatures are compatible with each other
-            if (!currentNode) {
+            if (!currentNode || !currentRootNetworkUuid) {
                 return;
             }
             setLaunchLoader(true);

diff --git a/src/components/dialogs/root-network-creation-dialog.tsx b/src/components/dialogs/root-network-creation-dialog.tsx
@@ -93,6 +93,9 @@ const RootNetworkCreationDialog: React.FC<RootNetworkCreationDialogProps> = ({
 
     // Fetch default directory based on study UUID
     const fetchDefaultDirectoryForStudy = useCallback(() => {
+        if (!studyUuid) {
+            return;
+        }
         fetchDirectoryElementPath(studyUuid).then((res) => {
             if (!res || res.length < 2) {
                 snackError({

diff --git a/src/components/graph/menus/editable-title.tsx b/src/components/graph/menus/editable-title.tsx
@@ -40,12 +40,12 @@ interface EditableTitleProps {
     name: string;
     onClose: () => void;
     onChange?: (value: string) => void;
-    isCloseIconVisible: boolean;
+    isCloseIconVisible?: boolean;
 }
 
 export const EditableTitle: FunctionComponent<EditableTitleProps> = ({
     name,
-    isCloseIconVisible,
+    isCloseIconVisible = true,
     onClose,
     onChange,
 }) => {

diff --git a/src/components/graph/menus/root-network-node-editor.tsx b/src/components/graph/menus/root-network-node-editor.tsx
@@ -368,7 +368,7 @@ const RootNetworkNodeEditor = () => {
                 });
             })
             .finally(() => {
-                setSaveInProgress(false);
+                //    setSaveInProgress(false);
             });
     };
     const renderPaneSubtitle = () => {

diff --git a/src/components/results/securityanalysis/use-security-analysis-column-defs.tsx b/src/components/results/securityanalysis/use-security-analysis-column-defs.tsx
@@ -54,7 +54,7 @@ export const useSecurityAnalysisColumnsDefs: UseSecurityAnalysisColumnsDefsProps
     const { snackError } = useSnackMessage();
     const studyUuid = useSelector((state: AppState) => state.studyUuid);
     const currentNode = useSelector((state: AppState) => state.currentTreeNode);
-
+    const currentRootNetworkUuid = useSelector((state: AppState) => state.currentRootNetwork);
     const nodeUuid = currentNode?.id;
 
     const getEnumLabel = useCallback(
@@ -69,7 +69,7 @@ export const useSecurityAnalysisColumnsDefs: UseSecurityAnalysisColumnsDefsProps
     // for nmk views, click handler on subjectId cell
     const onClickNmKConstraint = useCallback(
         (row: SecurityAnalysisNmkTableRow, column?: ColDef) => {
-            if (studyUuid && nodeUuid) {
+            if (studyUuid && nodeUuid && currentRootNetworkUuid) {
                 if (column?.field === 'subjectId') {
                     let vlId: string | undefined = '';
                     const { subjectId, side } = row || {};
@@ -86,6 +86,7 @@ export const useSecurityAnalysisColumnsDefs: UseSecurityAnalysisColumnsDefsProps
                     fetchVoltageLevelIdForLineOrTransformerBySide(
                         studyUuid,
                         nodeUuid,
+                        currentRootNetworkUuid,
                         subjectId ?? '',
                         getBranchSide(side) ?? BranchSide.ONE
                     )
@@ -115,7 +116,7 @@ export const useSecurityAnalysisColumnsDefs: UseSecurityAnalysisColumnsDefsProps
                 }
             }
         },
-        [nodeUuid, openVoltageLevelDiagram, snackError, studyUuid, intl]
+        [nodeUuid, currentRootNetworkUuid, openVoltageLevelDiagram, snackError, studyUuid, intl]
     );
 
     // for nmk views, custom view for subjectId cell

diff --git a/src/components/results/shortcircuit/shortcircuit-analysis-result.tsx b/src/components/results/shortcircuit/shortcircuit-analysis-result.tsx
@@ -120,7 +120,9 @@ export const ShortCircuitAnalysisResult: FunctionComponent<IShortCircuitAnalysis
         if (analysisStatus !== RunningStatus.SUCCEED) {
             return;
         }
-
+        if (!currentRootNetworkUuid) {
+            return;
+        }
         let active = true; // to manage race condition
         setIsFetching(true);
         updateResult(null);

diff --git a/src/components/spreadsheet/utils/equipment-table-editors.tsx b/src/components/spreadsheet/utils/equipment-table-editors.tsx
@@ -111,6 +111,7 @@ export const GeneratorRegulatingTerminalEditor = forwardRef(
                 open={openGeneratorPopup}
                 onClose={handleCancelRegulatingTerminalPopup}
                 currentNode={gridContext.currentNode}
+                currentRootNetworkUuid={gridContext.currentRootNetworkUuid}
                 studyUuid={gridContext.studyUuid}
                 onModifyRegulatingTerminalGenerator={(updatedRegulatedTerminal: any) => {
                     handleSaveRegulatingTerminalPopup(updatedRegulatedTerminal);
@@ -188,6 +189,7 @@ export const TWTRegulatingTerminalEditor = forwardRef(
                 open={openTWTRegulatingTerminalPopup}
                 onClose={handleCancelRegulatingTerminalPopup}
                 currentNode={gridContext.currentNode}
+                currentRootNetworkUuid={gridContext.currentRootNetworkUuid}
                 studyUuid={gridContext.studyUuid}
                 onModifyRegulatingTerminalGenerator={(updatedRegulatedTerminal: any) => {
                     handleSaveRegulatingTerminalPopup(updatedRegulatedTerminal);

diff --git a/src/components/top-bar-equipment-seach-dialog/custom-suffix-renderer.tsx b/src/components/top-bar-equipment-seach-dialog/custom-suffix-renderer.tsx
@@ -28,29 +28,35 @@ export const CustomSuffixRenderer: FunctionComponent<CustomSuffixRendererProps>
     const dispatch = useDispatch<AppDispatch>();
     const studyUuid = useSelector((state: AppState) => state.studyUuid);
     const currentNode = useSelector((state: AppState) => state.currentTreeNode);
+    const currentRootNetworkUuid = useSelector((state: AppState) => state.currentRootNetwork);
     const networkAreaDiagramNbVoltageLevels = useSelector((state: AppState) => state.networkAreaDiagramNbVoltageLevels);
     const networkAreaDiagramDepth = useSelector((state: AppState) => state.networkAreaDiagramDepth);
 
     const centerOnSubstationCB = useCallback(
         (e: ReactMouseEvent<HTMLButtonElement, MouseEvent>) => {
             e.stopPropagation();
-            if (!studyUuid || !currentNode) {
+            if (!studyUuid || !currentNode || !currentRootNetworkUuid) {
                 return;
             }
             let substationIdPromise;
             // @ts-expect-error: conflicts between commons-ui's EquipmentType and gridstudy's EQUIPMENT_TYPE
             if (element.type === EQUIPMENT_TYPES.SUBSTATION) {
                 substationIdPromise = Promise.resolve(element.id);
             } else {
-                substationIdPromise = fetchSubstationIdForVoltageLevel(studyUuid, currentNode.id, element.id);
+                substationIdPromise = fetchSubstationIdForVoltageLevel(
+                    studyUuid,
+                    currentNode.id,
+                    currentRootNetworkUuid,
+                    element.id
+                );
             }
             substationIdPromise.then((substationId) => {
                 dispatch(centerOnSubstation(substationId));
                 onClose?.();
                 e.stopPropagation();
             });
         },
-        [studyUuid, currentNode, element.type, element.id, dispatch, onClose]
+        [studyUuid, currentNode, currentRootNetworkUuid, element.type, element.id, dispatch, onClose]
     );
 
     const openNetworkAreaDiagramCB = useCallback(