[2154] Handle multi-selection for Duplicate element tool

AxelRICHARD · AxelRICHARD · commit f9477f4d6e1f · 2026-04-21T13:45:15.000+02:00
Bug: #2154 Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -77,6 +77,7 @@ Stakeholders are by default represented with a dedicated graphical node connecte
 Standard libraries are now cached between tests to speed up editing context creation.
 This feature can be de-activated by setting the property `org.eclipse.syson.test.cacheStandardLibraries` to `false` in `application.properties`.
 The cache holding standard libraries can be invalidated for a specific test method or test class by using the `@InvalidateStandardLibrariesCache` annotation, ensuring the editing contexts are loaded from scratch.
+- https://github.com/eclipse-syson/syson/issues/2154[#2154] [diagrams] Improve the _Duplicate Element_ diagram tool to support multi-selection in standard diagrams.
 
 === New features
 
diff --git a/backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVDuplicateNodeTest.java b/backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVDuplicateNodeTest.java
diff --git a/backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/testers/ToolTester.java b/backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/testers/ToolTester.java
@@ -77,11 +77,15 @@ public void invokeTool(String editingContextId, AtomicReference<Diagram> diagram
     }
 
     public void invokeTool(String editingContextId, String diagramId, String diagramElementId, String toolId, List<ToolVariable> variables) {
+        this.invokeTool(editingContextId, diagramId, List.of(diagramElementId), toolId, variables);
+    }
+
+    public void invokeTool(String editingContextId, String diagramId, List<String> diagramElementIds, String toolId, List<ToolVariable> variables) {
         var input = new InvokeSingleClickOnDiagramElementToolInput(
                 UUID.randomUUID(),
                 editingContextId,
                 diagramId,
-                List.of(diagramElementId),
+                diagramElementIds,
                 toolId,
                 0,
                 0,
diff --git a/backend/application/syson-application/src/test/java/org/eclipse/syson/services/diagrams/DiagramDescriptionIdProvider.java b/backend/application/syson-application/src/test/java/org/eclipse/syson/services/diagrams/DiagramDescriptionIdProvider.java
@@ -56,6 +56,17 @@ public String getDiagramCreationToolId(String toolName) {
         return creationToolId.get();
     }
 
+    public String getGroupNodeToolId(String toolName) {
+        Optional<String> creationToolId = Optional.ofNullable(this.diagramDescription.getGroupPalette())
+                .stream()
+                .flatMap(groupPalette -> EMFUtils.allContainedObjectOfType(groupPalette, NodeTool.class))
+                .filter(nodeTool -> nodeTool.getName().equals(toolName))
+                .map(nodeTool -> UUID.nameUUIDFromBytes(EcoreUtil.getURI(nodeTool).toString().getBytes()).toString())
+                .findFirst();
+        assertThat(creationToolId).as(this.shouldExist("Group tool " + toolName)).isPresent();
+        return creationToolId.get();
+    }
+
     public String getNodeToolId(String nodeDescriptionName, String toolName) {
         Optional<String> nodeToolId =  EMFUtils.allContainedObjectOfType(this.diagramDescription, NodeDescription.class)
                 .filter(nodeDescription -> nodeDescription.getName().equals(nodeDescriptionName))
diff --git a/backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/DiagramMutationDiagramService.java b/backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/DiagramMutationDiagramService.java
@@ -15,13 +15,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.IntStream;
 
 import org.eclipse.sirius.components.collaborative.api.IRepresentationMetadataPersistenceService;
 import org.eclipse.sirius.components.collaborative.api.IRepresentationPersistenceService;
 import org.eclipse.sirius.components.collaborative.diagrams.DiagramContext;
 import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramCreationService;
 import org.eclipse.sirius.components.core.RepresentationMetadata;
 import org.eclipse.sirius.components.core.api.IEditingContext;
+import org.eclipse.sirius.components.core.api.IIdentityService;
 import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
 import org.eclipse.sirius.components.diagrams.Diagram;
 import org.eclipse.sirius.components.diagrams.Node;
@@ -56,15 +58,18 @@ public class DiagramMutationDiagramService {
 
     private final ModelMutationElementService modelMutationElementService;
 
+    private final IIdentityService identityService;
+
     public DiagramMutationDiagramService(IDiagramCreationService diagramCreationService, IRepresentationDescriptionSearchService representationDescriptionSearchService,
             IRepresentationMetadataPersistenceService representationMetadataPersistenceService, IRepresentationPersistenceService representationPersistenceService,
-            DiagramMutationExposeService diagramMutationExposeService, ModelMutationElementService modelMutationElementService) {
+            DiagramMutationExposeService diagramMutationExposeService, ModelMutationElementService modelMutationElementService, IIdentityService identityService) {
         this.diagramCreationService = Objects.requireNonNull(diagramCreationService);
         this.representationDescriptionSearchService = Objects.requireNonNull(representationDescriptionSearchService);
         this.representationMetadataPersistenceService = Objects.requireNonNull(representationMetadataPersistenceService);
         this.representationPersistenceService = Objects.requireNonNull(representationPersistenceService);
         this.diagramMutationExposeService = Objects.requireNonNull(diagramMutationExposeService);
         this.modelMutationElementService = Objects.requireNonNull(modelMutationElementService);
+        this.identityService = Objects.requireNonNull(identityService);
     }
 
     /**
@@ -105,21 +110,61 @@ public Element createDiagram(Element element, IEditingContext editingContext, St
     }
 
     /**
-     * Duplicates the given element (with its owning Relationship) and exposes the duplicated element. Note that this method will do nothing on {@link org.eclipse.syson.sysml.Relationship}.
+     * Duplicates the given elements (with their owning Relationship) and exposes the duplicated elements. Note that
+     * this method will do nothing on {@link org.eclipse.syson.sysml.Relationship}.
+     *
+     * @param elements
+     *         the elements to duplicate
+     * @param editingContext
+     *         the {@link IEditingContext}
+     * @param diagramContext
+     *         the {@link DiagramContext}
+     * @param nodes
+     *         the nodes that will be duplicated
+     * @param convertedNodes
+     *         the map of the converted nodes for this diagram
+     * @return the duplicated elements if any
+     */
+    public List<Element> duplicateElementAndExpose(List<Element> elements, IEditingContext editingContext, DiagramContext diagramContext, List<Node> nodes,
+            Map<org.eclipse.sirius.components.view.diagram.NodeDescription, NodeDescription> convertedNodes) {
+        return IntStream.range(0, Math.min(elements.size(), nodes.size()))
+                .mapToObj(index -> this.duplicateElementAndExpose(elements.get(index), editingContext, diagramContext, nodes.get(index), convertedNodes))
+                .filter(Objects::nonNull)
+                .toList();
+    }
+
+    /**
+     * AQL-facing entry point for duplication.
+     * <p>
+     * Sirius invokes this service once per selected semantic receiver, while still providing the full selection in
+     * {@code nodes}. This method therefore resolves the node corresponding to the current semantic receiver and
+     * delegates to the list-based implementation with one semantic/node pair.
      *
      * @param element
-     *         the element to duplicate
+     *         the current semantic receiver
      * @param editingContext
      *         the {@link IEditingContext}
      * @param diagramContext
      *         the {@link DiagramContext}
-     * @param node
-     *         the node that will be duplicated
+     * @param nodes
+     *         the selected nodes
      * @param convertedNodes
      *         the map of the converted nodes for this diagram
-     * @return the duplicated element if any
+     * @return the current semantic receiver
      */
-    public Element duplicateElementAndExpose(Element element, IEditingContext editingContext, DiagramContext diagramContext, Node node, Map<org.eclipse.sirius.components.view.diagram.NodeDescription, NodeDescription> convertedNodes) {
+    public Element duplicateElementAndExpose(Element element, IEditingContext editingContext, DiagramContext diagramContext, List<Node> nodes,
+            Map<org.eclipse.sirius.components.view.diagram.NodeDescription, NodeDescription> convertedNodes) {
+        if (element != null && nodes != null) {
+            nodes.stream()
+                    .filter(node -> Objects.equals(this.identityService.getId(element), node.getTargetObjectId()))
+                    .findFirst()
+                    .ifPresent(node -> this.duplicateElementAndExpose(List.of(element), editingContext, diagramContext, List.of(node), convertedNodes));
+        }
+        return element;
+    }
+
+    private Element duplicateElementAndExpose(Element element, IEditingContext editingContext, DiagramContext diagramContext, Node node,
+            Map<org.eclipse.sirius.components.view.diagram.NodeDescription, NodeDescription> convertedNodes) {
         OwningMembership owningMembership = element.getOwningMembership();
         Element result = null;
         if (owningMembership != null) {
@@ -134,30 +179,33 @@ public Element duplicateElementAndExpose(Element element, IEditingContext editin
             }
         }
 
-        if (result != null) {
-            Node creationRequestSource = null;
-            // The expose API requires to pass the node used for a basic creation request.
-            // For a duplication, this node would either be the parent (bordered node) , grandparent (for list item) or the diagram
-            Object parent = new NodeFinder(diagramContext.diagram()).getParent(node);
-            if (parent instanceof Node parentNode) {
-                // In case the parent node is compartment go up once again
-                boolean isParentCompartment = convertedNodes.entrySet().stream()
-                        .filter(entry -> entry.getValue().getId().equals(parentNode.getDescriptionId()))
-                        .map(Map.Entry::getKey)
-                        .map(nodeDescription -> nodeDescription.getName().contains("Compartment"))
-                        .findFirst()
-                        .orElse(false);
-                if (isParentCompartment) {
-                    Object grandParent = new NodeFinder(diagramContext.diagram()).getParent(parentNode);
-                    if (grandParent instanceof Node grandParentNode) {
-                        creationRequestSource = grandParentNode;
-                    }
-                } else {
-                    creationRequestSource = parentNode;
+        if (result != null && node != null) {
+            this.diagramMutationExposeService.expose(result, editingContext, diagramContext, this.getCreationRequestSource(diagramContext, node, convertedNodes), convertedNodes);
+        }
+        return result;
+    }
+
+    private Node getCreationRequestSource(DiagramContext diagramContext, Node node, Map<org.eclipse.sirius.components.view.diagram.NodeDescription, NodeDescription> convertedNodes) {
+        Node creationRequestSource = null;
+        // The expose API requires to pass the node used for a basic creation request.
+        // For a duplication, this node would either be the parent (bordered node), grandparent (for list item) or the diagram.
+        Object parent = new NodeFinder(diagramContext.diagram()).getParent(node);
+        if (parent instanceof Node parentNode) {
+            boolean isParentCompartment = convertedNodes.entrySet().stream()
+                    .filter(entry -> entry.getValue().getId().equals(parentNode.getDescriptionId()))
+                    .map(Map.Entry::getKey)
+                    .map(nodeDescription -> nodeDescription.getName().contains("Compartment"))
+                    .findFirst()
+                    .orElse(false);
+            if (isParentCompartment) {
+                Object grandParent = new NodeFinder(diagramContext.diagram()).getParent(parentNode);
+                if (grandParent instanceof Node grandParentNode) {
+                    creationRequestSource = grandParentNode;
                 }
+            } else {
+                creationRequestSource = parentNode;
             }
-            this.diagramMutationExposeService.expose(result, editingContext, diagramContext, creationRequestSource, convertedNodes);
         }
-        return result;
+        return creationRequestSource;
     }
 }
diff --git a/backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/aql/DiagramMutationAQLService.java b/backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/aql/DiagramMutationAQLService.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.syson.diagram.services.aql;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -214,11 +215,11 @@ public Element dropSubjectFromDiagram(Element droppedElement, Node droppedNode,
     }
 
     /**
-     * {@link DiagramMutationDiagramService#duplicateElementAndExpose(Element, IEditingContext, DiagramContext, Node, Map)}.
+     * {@link DiagramMutationDiagramService#duplicateElementAndExpose(Element, IEditingContext, DiagramContext, List, Map)}.
      */
-    public Element duplicateElementAndExpose(Element element, IEditingContext editingContext, DiagramContext diagramContext, Node node,
+    public Element duplicateElementAndExpose(Element element, IEditingContext editingContext, DiagramContext diagramContext, List<Node> nodes,
             Map<org.eclipse.sirius.components.view.diagram.NodeDescription, NodeDescription> convertedNodes) {
-        return this.diagramMutationDiagramService.duplicateElementAndExpose(element, editingContext, diagramContext, node, convertedNodes);
+        return this.diagramMutationDiagramService.duplicateElementAndExpose(element, editingContext, diagramContext, nodes, convertedNodes);
     }
 
     /**
diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractNodeDescriptionProvider.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/nodes/AbstractNodeDescriptionProvider.java
@@ -14,6 +14,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import org.eclipse.emf.common.util.EList;
@@ -102,10 +103,29 @@ protected NodeTool getDuplicateElementAndNodeTool() {
                 .preconditionExpression(AQLConstants.AQL + "self.oclIsKindOf(sysml::Element) and not self.oclIsKindOf(sysml::Relationship)")
                 .body(this.viewBuilderHelper.newChangeContext()
                         .expression(
-                                ServiceMethod.of4(DiagramMutationAQLService::duplicateElementAndExpose)
+                                ServiceMethod.of4(DiagramMutationAQLService.class, DiagramMutationAQLService::duplicateElementAndExpose, Element.class, IEditingContext.class,
+                                                DiagramContext.class, List.class, Map.class)
                                         .aqlSelf(IEditingContext.EDITING_CONTEXT,
                                                 DiagramContext.DIAGRAM_CONTEXT,
-                                                Node.SELECTED_NODE,
+                                                "Sequence{selectedNode}",
+                                                ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))
+                        .build())
+                .build();
+    }
+
+    protected NodeTool getDuplicateElementsAndNodesTool() {
+        return this.diagramBuilderHelper.newNodeTool()
+                .name("Duplicate Element")
+                .iconURLsExpression("/images/content_copy.svg")
+                .preconditionExpression(AQLConstants.AQL
+                        + "selectedNodes->notEmpty() and selectedEdges->isEmpty() and self->forAll(e | e.oclIsKindOf(sysml::Element) and not e.oclIsKindOf(sysml::Relationship))")
+                .body(this.viewBuilderHelper.newChangeContext()
+                        .expression(
+                                ServiceMethod.of4(DiagramMutationAQLService.class, DiagramMutationAQLService::duplicateElementAndExpose, Element.class, IEditingContext.class,
+                                                DiagramContext.class, List.class, Map.class)
+                                        .aqlSelf(IEditingContext.EDITING_CONTEXT,
+                                                DiagramContext.DIAGRAM_CONTEXT,
+                                                "selectedNodes",
                                                 ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))
                         .build())
                 .build();
diff --git a/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SDVDiagramDescriptionProvider.java b/backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SDVDiagramDescriptionProvider.java
@@ -35,6 +35,7 @@
 import org.eclipse.sirius.components.view.diagram.DiagramPalette;
 import org.eclipse.sirius.components.view.diagram.DiagramToolSection;
 import org.eclipse.sirius.components.view.diagram.DropNodeTool;
+import org.eclipse.sirius.components.view.diagram.GroupPalette;
 import org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription;
 import org.eclipse.sirius.components.view.diagram.NodeDescription;
 import org.eclipse.sirius.components.view.diagram.NodeTool;
@@ -379,10 +380,27 @@ public RepresentationDescription create(IColorProvider colorProvider) {
 
         var palette = this.createDiagramPalette(cache);
         diagramDescription.setPalette(palette);
+        diagramDescription.setGroupPalette(this.createGroupPalette());
 
         return diagramDescription;
     }
 
+    private GroupPalette createGroupPalette() {
+        return this.diagramBuilderHelper.newGroupPalette()
+                .quickAccessTools(this.diagramBuilderHelper.newNodeTool()
+                        .name("Duplicate Element")
+                        .iconURLsExpression("/images/content_copy.svg")
+                        .preconditionExpression("aql:selectedNodes->notEmpty() and selectedEdges->isEmpty() and self->forAll(e | e.oclIsKindOf(sysml::Element) and not e.oclIsKindOf(sysml::Relationship))")
+                        .body(this.viewBuilderHelper.newChangeContext()
+                                .expression(ServiceMethod.of4(DiagramMutationAQLService.class, DiagramMutationAQLService::duplicateElementAndExpose, org.eclipse.syson.sysml.Element.class,
+                                                IEditingContext.class, DiagramContext.class, List.class, Map.class)
+                                        .aqlSelf(IEditingContext.EDITING_CONTEXT, DiagramContext.DIAGRAM_CONTEXT, "selectedNodes",
+                                                ViewDiagramDescriptionConverter.CONVERTED_NODES_VARIABLE))
+                                .build())
+                        .build())
+                .build();
+    }
+
     protected IDescriptionNameGenerator getDescriptionNameGenerator() {
         return this.descriptionNameGenerator;
     }
diff --git a/doc/content/modules/user-manual/pages/release-notes/2026.5.0.adoc b/doc/content/modules/user-manual/pages/release-notes/2026.5.0.adoc
@@ -37,6 +37,7 @@ image::release-notes-stakeholder-node.png[Default representation of Stakeholder
 ** Improve the tool to create a `Subject` graphical node by making specialization selection optional.
 ** Improve the tool to create a `FlowUsage` from a `ConnectionUsage` by making the payload selection optional.
 ** Merge the two objective creation tools into a single tool by leveraging the updated selection dialog which make the specialization selection optional.
+** Improve the _Duplicate Element_ tool to support multi-selection in standard diagrams.
 
 * In the _Explorer_ view:
 
