SLD navigation system (#3501)

Signed-off-by: Ayoub LABIDI <ayoub.labidi@protonmail.com>

Author: ayolab

src/components/grid-layout/cards/diagrams/diagram.type.ts

@@ -49,11 +49,11 @@ export type DiagramBase = {
 
 export type VoltageLevelDiagram = DiagramBase & {
     type: DiagramType.VOLTAGE_LEVEL;
-    voltageLevelId: string;
+    diagramId: string;
 };
 export type SubstationDiagram = DiagramBase & {
     type: DiagramType.SUBSTATION;
-    substationId: string;
+    diagramId: string;
 };
 export type NetworkAreaDiagram = DiagramBase & {
     type: DiagramType.NETWORK_AREA_DIAGRAM;

src/components/grid-layout/cards/diagrams/networkAreaDiagram/network-area-diagram-content.tsx

@@ -45,7 +45,6 @@ import {
 } from '@gridsuite/commons-ui';
 import DiagramControls from './diagram-controls';
 import { createDiagramConfig, updateDiagramConfig, type DiagramConfigPosition } from 'services/explore';
-import { DiagramType, type VoltageLevelDiagramParams } from '../diagram.type';
 import NodeContextMenu from './node-context-menu';
 import useEquipmentMenu from 'hooks/use-equipment-menu';
 import { MapEquipment } from 'components/menus/base-equipment-menu';
@@ -66,7 +65,7 @@ type NetworkAreaDiagramContentProps = {
     readonly svgVoltageLevels?: string[];
     readonly loadingState: boolean;
     readonly visible: boolean;
-    readonly onVoltageLevelClick: (diagramParams: VoltageLevelDiagramParams) => void;
+    readonly onVoltageLevelClick: (voltageLevelId: string) => void;
     readonly onUpdateVoltageLevels: (params: {
         voltageLevelIds: string[];
         voltageLevelToExpandIds: string[];
@@ -165,10 +164,7 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {
                     setShouldDisplayMenu(true);
                     setMenuAnchorPosition(mousePosition ? { mouseX: mousePosition.x, mouseY: mousePosition.y } : null);
                 } else {
-                    onVoltageLevelClick({
-                        type: DiagramType.VOLTAGE_LEVEL,
-                        voltageLevelId: equipmentId,
-                    });
+                    onVoltageLevelClick(equipmentId);
                 }
             }
         },

src/components/grid-layout/cards/diagrams/singleLineDiagram/single-line-diagram-content.tsx

@@ -56,8 +56,8 @@ interface SingleLineDiagramContentProps {
     readonly loadingState: boolean;
     readonly visible: boolean;
     readonly diagramParams: VoltageLevelDiagramParams | SubstationDiagramParams;
-    readonly onNextVoltageLevelDiagram?: (diagramParams: VoltageLevelDiagramParams) => void;
-    readonly onNewVoltageLevelDiagram?: (diagramParams: VoltageLevelDiagramParams) => void;
+    readonly onNextVoltageLevelDiagram?: (voltageLevelId: string) => void;
+    readonly onNewVoltageLevelDiagram?: (voltageLevelId: string) => void;
 }
 
 type BusMenuState = {
@@ -196,15 +196,9 @@ function SingleLineDiagramContent(props: SingleLineDiagramContentProps) {
     const handleNextVoltageLevelClick: OnNextVoltageCallbackType = useCallback(
         (vlId, event) => {
             if (event.ctrlKey) {
-                onNewVoltageLevelDiagram?.({
-                    type: DiagramType.VOLTAGE_LEVEL,
-                    voltageLevelId: vlId,
-                });
+                onNewVoltageLevelDiagram?.(vlId);
             } else {
-                onNextVoltageLevelDiagram?.({
-                    type: DiagramType.VOLTAGE_LEVEL,
-                    voltageLevelId: vlId,
-                });
+                onNextVoltageLevelDiagram?.(vlId);
             }
         },
         [onNewVoltageLevelDiagram, onNextVoltageLevelDiagram]

src/components/network/network-map-panel.tsx

@@ -47,6 +47,7 @@ import {
 import { isNodeBuilt, isNodeEdited, isSameNodeAndBuilt } from '../graph/util/model-functions';
 import { resetMapEquipment, setMapDataLoading, setReloadMapNeeded } from '../../redux/actions';
 import { openSLD, showInSpreadsheet } from '../../redux/slices/workspace-slice';
+import { PanelType } from '../workspace/types/workspace.types';
 import GSMapEquipments from './gs-map-equipments';
 import { Box, Button, LinearProgress, Tooltip, useTheme } from '@mui/material';
 import { EQUIPMENT_TYPES } from '../utils/equipment-types';
@@ -65,7 +66,6 @@ import { CurrentTreeNode } from 'components/graph/tree-node.type';
 import { FormattedMessage } from 'react-intl';
 import { Search } from '@mui/icons-material';
 import { TopBarEquipmentSearchDialog } from 'components/top-bar-equipment-seach-dialog/top-bar-equipment-search-dialog';
-import { DiagramType } from 'components/grid-layout/cards/diagrams/diagram.type';
 import GuidancePopup from './guidance-popup';
 import SelectionCreationPanel from './selection-creation-panel/selection-creation-panel';
 import { useEquipmentMenu } from '../../hooks/use-equipment-menu';
@@ -991,21 +991,14 @@ export const NetworkMapPanel = ({
         [isInDrawingMode, leaveDrawingMode]
     );
 
-    const openSLDInTheGrid = useCallback(
-        (equipmentId: string, diagramType: DiagramType.VOLTAGE_LEVEL | DiagramType.SUBSTATION) => {
-            dispatch(openSLD({ id: equipmentId, diagramType }));
-        },
-        [dispatch]
-    );
-
     const handleOpenVoltageLevel = useCallback(
         (vlId: string) => {
             // don't open the sld if the drawing mode is activated
             if (!isInDrawingMode.value) {
-                openSLDInTheGrid(vlId, DiagramType.VOLTAGE_LEVEL);
+                dispatch(openSLD({ id: vlId, panelType: PanelType.SLD_VOLTAGE_LEVEL }));
             }
         },
-        [isInDrawingMode, openSLDInTheGrid]
+        [dispatch, isInDrawingMode]
     );
 
     const getHvdcExtendedEquipmentType = (hvdcType: string): ExtendedEquipmentType | null => {
@@ -1184,10 +1177,10 @@ export const NetworkMapPanel = ({
             if (!id) {
                 return;
             }
-            const diagramType = isSubstation ? DiagramType.SUBSTATION : DiagramType.VOLTAGE_LEVEL;
-            openSLDInTheGrid(id, diagramType);
+            const panelType = isSubstation ? PanelType.SLD_SUBSTATION : PanelType.SLD_VOLTAGE_LEVEL;
+            dispatch(openSLD({ id, panelType }));
         },
-        [openSLDInTheGrid]
+        [dispatch]
     );
 
     return (

src/components/results/loadflow/use-load-flow-result-column-actions.ts

@@ -14,7 +14,7 @@ import type { UUID } from 'node:crypto';
 import { useSnackMessage } from '@gridsuite/commons-ui';
 import { useIntl } from 'react-intl';
 import { openSLD } from '../../../redux/slices/workspace-slice';
-import { DiagramType } from '../../grid-layout/cards/diagrams/diagram.type';
+import { PanelType } from '../../workspace/types/workspace.types';
 import { useDispatch } from 'react-redux';
 
 type UseLoadFlowResultColumnActionsProps = {
@@ -67,7 +67,7 @@ export const useLoadFlowResultColumnActions = ({
                         })
                         .finally(() => {
                             if (vlId) {
-                                dispatch(openSLD({ id: vlId, diagramType: DiagramType.VOLTAGE_LEVEL }));
+                                dispatch(openSLD({ id: vlId, panelType: PanelType.SLD_VOLTAGE_LEVEL }));
                                 return;
                             }
                             snackError({

src/components/results/pccmin/pcc-min-result-table.tsx

@@ -23,7 +23,7 @@ import { GridReadyEvent, ICellRendererParams, RowDataUpdatedEvent } from 'ag-gri
 import { getColumnHeaderDisplayNames } from 'components/utils/column-constant';
 import { resultsStyles } from '../common/utils';
 import { openSLD } from '../../../redux/slices/workspace-slice';
-import { DiagramType } from '../../grid-layout/cards/diagrams/diagram.type';
+import { PanelType } from 'components/workspace/types/workspace.types';
 
 const styles = {
     gridContainer: { display: 'flex', flexDirection: 'column', height: '100%' },
@@ -49,7 +49,7 @@ const PccMinResultTable: FunctionComponent<PccMinResultTableProps> = ({
             const onClick = () => {
                 const vlId = node?.data?.voltageLevelId;
                 if (vlId) {
-                    dispatch(openSLD({ id: vlId, diagramType: DiagramType.VOLTAGE_LEVEL }));
+                    dispatch(openSLD({ id: vlId, panelType: PanelType.SLD_VOLTAGE_LEVEL }));
                 }
             };
             if (value) {

src/components/results/securityanalysis/use-security-analysis-column-defs.tsx

@@ -24,7 +24,7 @@ import { AppState } from 'redux/reducer';
 import { resultsStyles } from '../common/utils';
 import { FilterEnumsType } from '../../custom-aggrid/custom-aggrid-filters/custom-aggrid-filter.type';
 import { openSLD } from '../../../redux/slices/workspace-slice';
-import { DiagramType } from '../../grid-layout/cards/diagrams/diagram.type';
+import { PanelType } from '../../workspace/types/workspace.types';
 
 export interface SecurityAnalysisFilterEnumsType {
     n: FilterEnumsType;
@@ -95,7 +95,7 @@ export const useSecurityAnalysisColumnsDefs: UseSecurityAnalysisColumnsDefsProps
                         })
                         .finally(() => {
                             if (vlId) {
-                                dispatch(openSLD({ id: vlId, diagramType: DiagramType.VOLTAGE_LEVEL }));
+                                dispatch(openSLD({ id: vlId, panelType: PanelType.SLD_VOLTAGE_LEVEL }));
                                 return;
                             }
                             console.error(`Impossible to open the SLD for equipment ID '${row.subjectId}'`);

src/components/results/shortcircuit/shortcircuit-analysis-result-table.tsx

@@ -27,6 +27,7 @@ import { CustomAggridComparatorFilter } from '../../custom-aggrid/custom-aggrid-
 import { openSLD } from '../../../redux/slices/workspace-slice';
 import { CustomAggridAutocompleteFilter } from '../../custom-aggrid/custom-aggrid-filters/custom-aggrid-autocomplete-filter';
 import { SHORTCIRCUIT_ANALYSIS_RESULT_SORT_STORE } from '../../../utils/store-sort-filter-fields';
+import { PanelType } from '../../workspace/types/workspace.types';
 import {
     FilterType as AgGridFilterType,
     FilterConfig,
@@ -35,7 +36,6 @@ import {
 } from '../../../types/custom-aggrid-types';
 import { mappingTabs } from './shortcircuit-analysis-result-content';
 import { resultsStyles } from '../common/utils';
-import { DiagramType } from '../../grid-layout/cards/diagrams/diagram.type';
 import {
     ColumnContext,
     FILTER_DATA_TYPES,
@@ -105,7 +105,7 @@ const ShortCircuitAnalysisResultTable: FunctionComponent<ShortCircuitAnalysisRes
         (props: ICellRendererParams) => {
             const { value } = props || {};
             const onClick = () => {
-                dispatch(openSLD({ id: value, diagramType: DiagramType.VOLTAGE_LEVEL }));
+                dispatch(openSLD({ id: value, panelType: PanelType.SLD_VOLTAGE_LEVEL }));
             };
             if (value) {
                 return (

src/components/spreadsheet-view/spreadsheet/spreadsheet-content/spreadsheet-content.tsx

@@ -21,7 +21,7 @@ import { FilterType } from 'types/custom-aggrid-types';
 import { updateFilters } from 'components/custom-aggrid/custom-aggrid-filters/utils/aggrid-filters-utils';
 import { useGridCalculations } from 'components/spreadsheet-view/spreadsheet/spreadsheet-content/hooks/use-grid-calculations';
 import { useColumnManagement } from './hooks/use-column-management';
-import { DiagramType } from 'components/grid-layout/cards/diagrams/diagram.type';
+import { PanelType } from 'components/workspace/types/workspace.types';
 import { type RowDataUpdatedEvent } from 'ag-grid-community';
 import { useNodeAliases } from '../../hooks/use-node-aliases';
 import { useSelector, useDispatch } from 'react-redux';
@@ -202,11 +202,11 @@ export const SpreadsheetContent = memo(
 
         const handleOpenDiagram = useCallback(
             (equipmentId: string) => {
-                const diagramType =
+                const panelType =
                     tableDefinition?.type === SpreadsheetEquipmentType.SUBSTATION
-                        ? DiagramType.SUBSTATION
-                        : DiagramType.VOLTAGE_LEVEL;
-                dispatch(openSLD({ id: equipmentId, diagramType }));
+                        ? PanelType.SLD_SUBSTATION
+                        : PanelType.SLD_VOLTAGE_LEVEL;
+                dispatch(openSLD({ id: equipmentId, panelType }));
             },
             [dispatch, tableDefinition?.type]
         );

src/components/study-container.jsx

@@ -23,7 +23,7 @@ import {
     setRootNetworks,
     studyUpdated,
 } from '../redux/actions';
-import { initializeWorkspaces, loadWorkspacesFromStorage } from '../redux/slices/workspace-slice';
+import { initializeWorkspaces } from '../redux/slices/workspace-slice';
 import { fetchRootNetworks } from 'services/root-network';
 
 import WaitingLoader from './utils/waiting-loader';
@@ -53,6 +53,7 @@ import {
     RootNetworkIndexationStatus,
 } from 'types/notification-types';
 import useExportNotification from '../hooks/use-export-notification.js';
+import { loadWorkspacesFromStorage } from 'redux/slices/workspace-storage';
 
 function useStudy(studyUuidRequest) {
     const dispatch = useDispatch();