Merge branch 'main'

Author: Slimane AMAR

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

@@ -33,6 +33,7 @@ export type NetworkAreaDiagramParams = DiagramBaseParams & {
     nadConfigUuid: UUID | undefined;
     initializationNadConfigUuid?: UUID; // used for initialization, not saved
     filterUuid: UUID | undefined;
+    currentFilterUuid?: UUID; // used for initialization, not saved
     voltageLevelIds: string[];
     voltageLevelToExpandIds: string[];
     voltageLevelToOmitIds: string[];
@@ -59,6 +60,7 @@ export type NetworkAreaDiagram = DiagramBase & {
     type: DiagramType.NETWORK_AREA_DIAGRAM;
     nadConfigUuid: UUID | undefined;
     filterUuid: UUID | undefined;
+    currentFilterUuid: UUID | undefined;
     voltageLevelIds: string[];
     voltageLevelToExpandIds: string[];
     voltageLevelToOmitIds: string[];

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

@@ -65,13 +65,15 @@ type NetworkAreaDiagramContentProps = {
     readonly svgScalingFactor?: number;
     readonly svgVoltageLevels?: string[];
     readonly loadingState: boolean;
+    readonly isNadCreationFromFilter: boolean;
     readonly visible: boolean;
     readonly onVoltageLevelClick: (diagramParams: VoltageLevelDiagramParams) => void;
     readonly onUpdateVoltageLevels: (params: {
         voltageLevelIds: string[];
         voltageLevelToExpandIds: string[];
         voltageLevelToOmitIds: string[];
     }) => void;
+    readonly onUpdateVoltageLevelsFromFilter: (filterUuid: UUID) => void;
     readonly onUpdatePositions: (positions: DiagramConfigPosition[]) => void;
     readonly onReplaceNad: (name: string, nadConfigUuid?: UUID, filterUuid?: UUID) => void;
     readonly onSaveNad?: () => void;
@@ -86,13 +88,15 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {
         positions,
         onVoltageLevelClick,
         onUpdateVoltageLevels,
+        onUpdateVoltageLevelsFromFilter,
         onUpdatePositions,
         onReplaceNad,
         svg,
         svgMetadata,
         svgScalingFactor,
         svgVoltageLevels,
         loadingState,
+        isNadCreationFromFilter,
         showInSpreadsheet,
         onSaveNad,
     } = props;
@@ -317,6 +321,13 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {
         [voltageLevelIds, voltageLevelToExpandIds, voltageLevelToOmitIds, onUpdateVoltageLevels]
     );
 
+    const handleAddVoltageLevelsFromFilter = useCallback(
+        (filterUuid: UUID) => {
+            onUpdateVoltageLevelsFromFilter(filterUuid);
+        },
+        [onUpdateVoltageLevelsFromFilter]
+    );
+
     const handleExpandVoltageLevelId = useCallback(
         (voltageLevelIdToExpand: string) => {
             onUpdateVoltageLevels({
@@ -516,9 +527,11 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {
                 onToggleEditNadMode={handleSetIsEditNadMode}
                 onExpandAllVoltageLevels={handleExpandAllVoltageLevels}
                 onAddVoltageLevel={handleAddVoltageLevel}
+                onAddVoltageLevelsFromFilter={handleAddVoltageLevelsFromFilter}
                 onToggleShowLabels={handleToggleShowLabels}
                 isShowLabels={showLabels}
                 isDiagramLoading={loadingState}
+                isNadCreationFromFilter={isNadCreationFromFilter}
                 svgVoltageLevels={svgVoltageLevels}
                 onFocusVoltageLevel={handleFocusVoltageLevel}
             />

src/components/workspace/diagrams/nad/use-nad-diagram.ts

@@ -46,6 +46,7 @@ export const useNadDiagram = ({
         svg: null,
         nadConfigUuid: diagramMetadata.nadConfigUuid,
         filterUuid: diagramMetadata.filterUuid,
+        currentFilterUuid: diagramMetadata.currentFilterUuid,
         voltageLevelIds: diagramMetadata.initialVoltageLevelIds || [],
         positions: [],
         voltageLevelToExpandIds: [],
@@ -197,7 +198,7 @@ export const useNadDiagram = ({
                         nadConfigUuid: useSavedConfig
                             ? diagramMetadata.savedWorkspaceConfigUuid
                             : currentDiagram.nadConfigUuid,
-                        filterUuid: currentDiagram.filterUuid,
+                        filterUuid: currentDiagram.currentFilterUuid ?? currentDiagram.filterUuid,
                         ...(useSavedConfig
                             ? {}
                             : {
@@ -262,6 +263,7 @@ export const useNadDiagram = ({
             type: DiagramType.NETWORK_AREA_DIAGRAM,
             nadConfigUuid: diagramMetadata.nadConfigUuid,
             filterUuid: diagramMetadata.filterUuid,
+            currentFilterUuid: diagramMetadata.currentFilterUuid,
             voltageLevelIds: diagramMetadata.initialVoltageLevelIds || [],
             positions: [],
             voltageLevelToExpandIds: [],
@@ -278,6 +280,7 @@ export const useNadDiagram = ({
         currentRootNetworkUuid,
         diagramMetadata.nadConfigUuid,
         diagramMetadata.filterUuid,
+        diagramMetadata.currentFilterUuid,
     ]);
 
     // Listen for notifications and refetch

src/components/workspace/panel-contents/diagrams/nad/nad-panel-content.tsx

@@ -56,6 +56,21 @@ export const NadPanelContent = ({
         [updateDiagram]
     );
 
+    // Update voltage levels from a filter in local state only - no Redux dispatch
+    const handleUpdateVoltageLevelsFromFilter = useCallback(
+        (filterUuid?: UUID) => {
+            dispatch(
+                updatePanelMetadata({
+                    panelId,
+                    metadata: {
+                        currentFilterUuid: filterUuid,
+                    },
+                })
+            );
+        },
+        [dispatch, panelId]
+    );
+
     // Update positions in local state only - no Redux dispatch, no fetch
     const handleUpdatePositions = useCallback(
         (positions: DiagramConfigPosition[]) => {
@@ -103,9 +118,11 @@ export const NadPanelContent = ({
                 }
                 svgVoltageLevels={diagram.voltageLevelIds}
                 loadingState={loading}
+                isNadCreationFromFilter={!!diagram.filterUuid}
                 visible
                 onVoltageLevelClick={handleOpenDiagram}
                 onUpdateVoltageLevels={handleUpdateVoltageLevels}
+                onUpdateVoltageLevelsFromFilter={handleUpdateVoltageLevelsFromFilter}
                 onUpdatePositions={handleUpdatePositions}
                 onReplaceNad={handleReplaceNad}
                 onSaveNad={handleSaveNad}

src/components/workspace/types/workspace.types.ts

@@ -27,6 +27,7 @@ export interface SLDPanelMetadata {
 export interface NADPanelMetadata {
     nadConfigUuid?: UUID;
     filterUuid?: UUID;
+    currentFilterUuid?: UUID;
     savedWorkspaceConfigUuid?: UUID;
     initialVoltageLevelIds?: string[];
 }