Emit notif references

src/components/graph/menus/network-modifications/network-modification-menu.type.ts

@@ -9,6 +9,7 @@ import type { UUID } from 'node:crypto';
 import { CurrentTreeNode } from '../../tree-node.type';
 import { FetchStatus } from '../../../../services/utils.type';
 import { JSX } from 'react';
+import { ModificationContainer } from '@gridsuite/commons-ui';
 
 export interface RootNetworkMetadata {
     rootNetworkUuid: UUID;
@@ -49,6 +50,11 @@ export interface NetworkModificationCopyInfos {
     originNodeUuid?: UUID;
 }
 
+export interface ModificationMoveOrCopyInfos {
+    modificationUuid: UUID;
+    source?: ModificationContainer;
+}
+
 export interface MenuDefinitionSubItem {
     id: string;
     label: string;

src/components/graph/menus/network-modifications/network-modification-node-editor.tsx

@@ -22,6 +22,7 @@
     NetworkModificationMetadata,
     NetworkModificationsTable,
     NotificationsUrlKeys,
+    ReferenceModificationInfos,
     removeNullFields,
     setModificationMetadata,
     snackWithFallback,
@@ -99,6 +100,7 @@
     MenuDefinitionSubItem,
     MenuDefinitionWithoutSubItem,
     MenuSection,
+    ModificationMoveOrCopyInfos,
     NetworkModificationCopyInfos,
     NetworkModificationCopyType,
     NetworkModificationData,
@@ -114,6 +116,7 @@
     isModificationsDeleteFinishedNotification,
     isModificationsUpdateFinishedNotification,
     isNodeDeletedNotification,
+    isSharedElementUpdateNotification,
     parseEventData,
 } from 'types/notification-types';
 import { LccModificationDialog } from '../../../dialogs/network-modifications/hvdc-line/lcc/modification/lcc-modification-dialog';
@@ -169,7 +172,7 @@
         []
     );
 
-    // TODO : this is temporary, until copy/paste/save is done for the shared modifications in GRD-4785 :
+    // TODO : this is temporary, until merge/delete is done for the shared modification
     const selectionContainsShared: boolean = useMemo(() => {
         return selectedNetworkModifications.some(
             (modification: ComposedModificationMetadata) =>
@@ -218,7 +221,7 @@
     // a modification on a public study which is in the clipboard.
     // We don't have precision on notifications to do this for now.
     const handleValidatedDialog = () => {
-        if (editData?.uuid && networkModificationsToCopy.includes(editData?.uuid)) {
+        if (editData?.uuid && networkModificationsToCopy.some((m) => m.uuid === editData?.uuid)) {
             cleanClipboard();
         }
     };
@@ -799,6 +802,20 @@
                 }
                 dofetchNetworkModifications();
             }
+
+            // a shared (referenced) composite modification pointed at by this node was edited
+            // elsewhere. Re-fetching the group hands NetworkModificationsTable a fresh
+            // `modifications` identity, which makes it force-refresh the resolved content of every
+            // expanded composite / reference row (fetchSubModificationsForExpandedRows(..., force));
+            // a collapsed reference reloads its content the next time it is expanded.
+            if (isSharedElementUpdateNotification(eventData)) {
+                console.log("EVENT ??????????")
+                if (currentNodeIdRef.current !== eventData.headers.parentNode) {
+                    return;
+                }
+                dofetchNetworkModifications();
+                dofetchExcludedNetworkModifications();
+            }
         },
         [dofetchNetworkModifications, cleanClipboard, dofetchExcludedNetworkModifications]
     );
@@ -845,7 +862,7 @@
                 //if one of the deleted element was in the clipboard we invalidate the clipboard
                 if (
                     networkModificationsToCopy.some((aCopiedModification) =>
-                        selectedModificationsUuid.includes(aCopiedModification)
+                        selectedModificationsUuid.includes(aCopiedModification.uuid)
                     )
                 ) {
                     cleanClipboard();
@@ -886,10 +903,25 @@
         folderName,
         folderId,
     }: IElementCreationDialog) => {
-        const selectedModificationsUuid = selectedNetworkModifications.map((item) => item.uuid);
-
         setSaveInProgress(true);
-        createCompositeModifications(name, description, folderId, selectedModificationsUuid)
+
+        Promise.all(
+            selectedNetworkModifications.map((item) =>
+                item.type === MODIFICATION_TYPES.MODIFICATION_REFERENCE.type
+                    ? fetchNetworkModification(item.uuid as UUID)
+                          .then((res) => res.json())
+                          .then((detail: ReferenceModificationInfos) => {
+                              if (detail.referenceId == null) {
+                                  throw new Error(`Missing referenceId for modification reference ${item.uuid}`);
+                              }
+                              return detail.referenceId;
+                          })
+                    : Promise.resolve(item.uuid)
+            )
+        )
+            .then((selectedModificationsUuid) =>
+                createCompositeModifications(name, description, folderId, selectedModificationsUuid)
+            )
             .then(() => {
                 snackInfo({
                     headerId: 'infoCreateModificationsMsg',
@@ -939,39 +971,43 @@
             });
     };
 
-    const selectedModificationsIds = useMemo(
-        () => selectedNetworkModifications.map((m) => m.uuid),
-        [selectedNetworkModifications]
-    );
-
     const doCutModifications = useCallback(() => {
         cutNetworkModifications({
-            networkModificationUuids: selectedModificationsIds,
+            networkModifications: selectedNetworkModifications,
             copyInfos: {
                 copyType: NetworkModificationCopyType.MOVE,
                 originStudyUuid: studyUuid ?? undefined,
                 originNodeUuid: currentNode?.id,
             },
         });
-    }, [cutNetworkModifications, currentNode?.id, selectedModificationsIds, studyUuid]);
+    }, [cutNetworkModifications, currentNode?.id, selectedNetworkModifications, studyUuid]);
 
     const doCopyModifications = useCallback(() => {
         copyNetworkModifications({
-            networkModificationUuids: selectedModificationsIds,
+            networkModifications: selectedNetworkModifications,
             copyInfos: {
                 copyType: NetworkModificationCopyType.COPY,
                 originStudyUuid: studyUuid ?? undefined,
                 originNodeUuid: currentNode?.id,
             },
         });
-    }, [copyNetworkModifications, currentNode?.id, selectedModificationsIds, studyUuid]);
+    }, [copyNetworkModifications, currentNode?.id, selectedNetworkModifications, studyUuid]);
 
     const doPasteModifications = useCallback(() => {
         if (!copyInfos || !studyUuid || !currentNode?.id) {
             return;
         }
+        // no source hint: study-server now looks up each modification's real container itself
+        // (network-modification-server owns that data), instead of this having to guess it from
+        // whatever the table's selection happens to expose
+        const modificationsToMoveOrCopy: ModificationMoveOrCopyInfos[] = networkModificationsToCopy.map(
+            (modification) => ({
+                modificationUuid: modification.uuid,
+            })
+        );
+
         if (copyInfos.copyType === NetworkModificationCopyType.MOVE) {
-            copyOrMoveModifications(studyUuid, currentNode.id, networkModificationsToCopy, copyInfos)
+            copyOrMoveModifications(studyUuid, currentNode.id, modificationsToMoveOrCopy, copyInfos)
                 .then(() => {
                     cleanClipboard(false);
                 })
@@ -981,7 +1017,7 @@
                     });
                 });
         } else {
-            copyOrMoveModifications(studyUuid, currentNode.id, networkModificationsToCopy, copyInfos).catch((error) => {
+            copyOrMoveModifications(studyUuid, currentNode.id, modificationsToMoveOrCopy, copyInfos).catch((error) => {
                 snackWithFallback(snackError, error, {
                     headerId: 'errDuplicateModificationMsg',
                 });
@@ -1168,9 +1204,17 @@
             saveInProgress ||
             isRootNode ||
             isAssemblyDepthExceeded ||
-            isEditBlocked
+            isEditBlocked ||
+            selectionContainsShared
         );
-    }, [selectedNetworkModifications, saveInProgress, isRootNode, isAssemblyDepthExceeded, isEditBlocked]);
+    }, [
+        selectedNetworkModifications?.length,
+        saveInProgress,
+        isRootNode,
+        isAssemblyDepthExceeded,
+        isEditBlocked,
+        selectionContainsShared,
+    ]);
 
     const disabledCompositeExport: boolean = useMemo(() => {
         return (
@@ -1275,8 +1319,7 @@
                                 isEditBlocked ||
                                 mapDataLoading ||
                                 !currentNode ||
-                                isRootNode ||
-                                selectionContainsShared
+                                isRootNode
                             }
                             data-testid="CutModification"
                         >
@@ -1293,8 +1336,7 @@
                                 selectedNetworkModifications.length === 0 ||
                                 isEditBlocked ||
                                 mapDataLoading ||
-                                isRootNode ||
-                                selectionContainsShared
+                                isRootNode
                             }
                             data-testid="CopyModification"
                         >
@@ -1317,7 +1359,7 @@
                         <IconButton
                             onClick={doPasteModifications}
                             size={'small'}
-                            disabled={isPasteButtonDisabled || isRootNode || selectionContainsShared}
+                            disabled={isPasteButtonDisabled || isRootNode}
                             data-testid="PasteModification"
                         >
                             <ContentPasteIcon />

src/components/graph/menus/root-network/use-root-network-search-notifications.ts

@@ -18,6 +18,7 @@ import {
     isNodeEditedNotification,
     isNodeSubTreeCreatedNotification,
     isRootNetworksUpdatedNotification,
+    isSharedElementUpdateNotification,
 } from 'types/notification-types';
 
 type UseRootNetworkNotificationsProps = {
@@ -39,7 +40,8 @@ export const useRootNetworkSearchNotifications = ({
             const rootNetworksStatus = isRootNetworksUpdatedNotification(eventData);
             const networkModificationsStatus =
                 isModificationsDeleteFinishedNotification(eventData) ||
-                isModificationsUpdateFinishedNotification(eventData);
+                isModificationsUpdateFinishedNotification(eventData) ||
+                isSharedElementUpdateNotification(eventData);
             const nodeDeleted = isNodeDeletedNotification(eventData);
             const nodeCreated = isNodeCreatedNotification(eventData);
             const nodeEdited = isNodeEditedNotification(eventData);

src/hooks/copy-paste/use-copied-network-modifications.ts

@@ -14,7 +14,7 @@ import { setCopiedNetworkModifications } from 'redux/actions';
 const networkModificationsCopyChannel = new BroadcastChannel('NetworkModificationsCopyBroadcastChannel');
 
 const emptyCopiedNetworkModificationsSelection: CopiedNetworkModifications = {
-    networkModificationUuids: [],
+    networkModifications: [],
     copyInfos: null,
 };
 
@@ -23,7 +23,7 @@ export const useCopiedNetworkModifications = () => {
     const { snackInfo } = useSnackMessage();
 
     const networkModificationsToCopy = useSelector(
-        (state: AppState) => state.copiedNetworkModifications.networkModificationUuids
+        (state: AppState) => state.copiedNetworkModifications.networkModifications
     );
     const copyInfos = useSelector((state: AppState) => state.copiedNetworkModifications.copyInfos);
     const isInitiatingCopyTab = useRef(false);

src/redux/reducer.ts

@@ -483,7 +483,7 @@ const initialState: AppState = {
         allChildren: null,
     },
     copiedNetworkModifications: {
-        networkModificationUuids: [],
+        networkModifications: [],
         copyInfos: null,
     },
     tables: initialTablesState,

src/redux/reducer.type.ts

@@ -9,6 +9,7 @@ import type {
     AuthenticationRouterErrorState,
     BaseVoltage,
     CommonStoreState,
+    ComposedModificationMetadata,
     ComputingType,
     GsLang,
     GsLangUser,
@@ -186,7 +187,9 @@ export type NodeSelectionForCopy = {
 };
 
 export type CopiedNetworkModifications = {
-    networkModificationUuids: UUID[];
+    // the raw selection snapshot at copy/cut time; doPasteModifications resolves it into
+    // ModificationMoveOrCopyInfos (per-item source container) right before sending the request
+    networkModifications: ComposedModificationMetadata[];
     copyInfos: NetworkModificationCopyInfos | null;
 };
 

src/services/study/index.ts

@@ -21,6 +21,7 @@ import {
 } from '@gridsuite/commons-ui';
 import {
     CompositeModificationAction,
+    ModificationMoveOrCopyInfos,
     NetworkModificationCopyInfos,
 } from 'components/graph/menus/network-modifications/network-modification-menu.type';
 import type { Svg } from 'components/grid-layout/cards/diagrams/diagram.type';
@@ -256,7 +257,7 @@ export function executeCompositeModificationAction(
 export function copyOrMoveModifications(
     studyUuid: UUID,
     targetNodeId: UUID,
-    modificationToCutUuidList: UUID[],
+    modificationsToCopyOrMove: ModificationMoveOrCopyInfos[],
     copyInfos: NetworkModificationCopyInfos
 ) {
     console.info(copyInfos.copyType + ' modifications');
@@ -279,7 +280,7 @@ export function copyOrMoveModifications(
             Accept: 'application/json',
             'Content-Type': 'application/json',
         },
-        body: JSON.stringify(modificationToCutUuidList),
+        body: JSON.stringify(modificationsToCopyOrMove),
     });
 }
 

src/types/notification-types.ts

@@ -41,6 +41,7 @@ export enum NotificationType {
     // Modifications
     MODIFICATIONS_UPDATE_FINISHED = 'UPDATE_FINISHED',
     MODIFICATIONS_DELETE_FINISHED = 'DELETE_FINISHED',
+    SHARED_ELEMENT_UPDATE = 'sharedElementUpdate',
     // Events
     EVENT_CRUD_FINISHED = 'EVENT_CRUD_FINISHED',
 
@@ -279,6 +280,16 @@ interface ModificationsDeleteFinishedEventDataHeaders extends CommonStudyEventDa
     nodes: UUID[];
 }
 
+// Emitted by study-server (ConsumerService.consumeSharedElementUpdate) once per invalidated node
+// when a shared (referenced) composite modification pointed at by that node was edited elsewhere.
+// `parentNode` is the impacted node; `networkModificationUuids` are the reference modifications
+// (across all impacted nodes) that point at the edited shared element.
+interface SharedElementUpdateEventDataHeaders extends CommonStudyEventDataHeaders {
+    updateType: NotificationType.SHARED_ELEMENT_UPDATE;
+    parentNode: UUID;
+    networkModificationUuids?: UUID[];
+}
+
 interface EventCrudFinishedEventDataHeaders extends CommonStudyEventDataHeaders {
     updateType: NotificationType.EVENT_CRUD_FINISHED;
     parentNode: UUID;
@@ -484,6 +495,11 @@ export interface ModificationsUpdateFinishedEventData extends CommonStudyEventDa
     payload: undefined;
 }
 
+export interface SharedElementUpdateEventData extends CommonStudyEventData {
+    headers: SharedElementUpdateEventDataHeaders;
+    payload: undefined;
+}
+
 export interface ModificationsDeleteFinishedEventData extends CommonStudyEventData {
     headers: ModificationsDeleteFinishedEventDataHeaders;
     payload: undefined;
@@ -674,6 +690,10 @@ export function isModificationsDeleteFinishedNotification(
     return notif.headers?.updateType === NotificationType.MODIFICATIONS_DELETE_FINISHED;
 }
 
+export function isSharedElementUpdateNotification(notif: CommonStudyEventData): notif is SharedElementUpdateEventData {
+    return notif.headers?.updateType === NotificationType.SHARED_ELEMENT_UPDATE;
+}
+
 export function isIndexationStatusNotification(notif: CommonStudyEventData): notif is IndexationStatusEventData {
     return notif.headers?.updateType === NotificationType.INDEXATION_STATUS;
 }