[2059] Fix Add existing elements tool

Bug: #2059
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>

Author: AxelRICHARD

CHANGELOG.adoc

@@ -98,8 +98,9 @@ Now the _end_ keyword is not displayed anymore in the label of these graphical n
 - https://github.com/eclipse-syson/syson/issues/2054[#2054] [diagrams] Fix an error when invoking the tools _New Start Action_ or _New Done Action_ from inside a package named `Actions`.
 - https://github.com/eclipse-syson/syson/issues/2057[#2057] [diagrams] Fix the support for removing the multiplicity using the direct edit.
 - https://github.com/eclipse-syson/syson/issues/1938[#1938] [diagrams] Fix an issue where the _New Flow (flow)_ tool between two parameters was broken.
-- https://github.com/eclipse-syson/syson/issues/2058[#2058] [diagrams] Fix error when importing SysML snippets referencing unknown units which could make the resluting model inconsistent
-- https://github.com/eclipse-syson/syson/issues/2053[#2053] [diagrams] Prevent incoming and outgoing graphical edges of a graphical `ForkNode` or `JoindNode` to point empty space.
+- https://github.com/eclipse-syson/syson/issues/2058[#2058] [diagrams] Fix error when importing SysML snippets referencing unknown units which could make the resulting model inconsistent
+- https://github.com/eclipse-syson/syson/issues/2053[#2053] [diagrams] Prevent incoming and outgoing graphical edges of a graphical `ForkNode` or `JoinNode` to point empty space.
+- https://github.com/eclipse-syson/syson/issues/2059[#2059] [diagrams] Fix an issue where the _Add existing elements_ tool was not working correctly on the _action flow_ compartment of `ActionUsage` graphical nodes.
 
 === Improvements
 

backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVAddExistingElementsTests.java

@@ -17,6 +17,7 @@
 
 import java.text.MessageFormat;
 import java.time.Duration;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -28,17 +29,24 @@
 import org.eclipse.sirius.components.diagrams.Diagram;
 import org.eclipse.sirius.components.diagrams.Node;
 import org.eclipse.sirius.components.diagrams.ViewModifier;
+import org.eclipse.sirius.components.diagrams.tests.navigation.DiagramNavigator;
 import org.eclipse.sirius.components.view.emf.diagram.IDiagramIdProvider;
 import org.eclipse.sirius.web.tests.services.api.IGivenInitialServerState;
 import org.eclipse.syson.AbstractIntegrationTests;
 import org.eclipse.syson.GivenSysONServer;
 import org.eclipse.syson.application.controllers.diagrams.testers.ToolTester;
+import org.eclipse.syson.application.data.GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData;
 import org.eclipse.syson.application.data.GeneralViewAddExistingElementsTestProjectData;
 import org.eclipse.syson.services.diagrams.DiagramDescriptionIdProvider;
 import org.eclipse.syson.services.diagrams.api.IGivenDiagramDescription;
 import org.eclipse.syson.services.diagrams.api.IGivenDiagramSubscription;
+import org.eclipse.syson.standard.diagrams.view.SDVDescriptionNameGenerator;
+import org.eclipse.syson.sysml.SysmlPackage;
+import org.eclipse.syson.sysml.helper.LabelConstants;
+import org.eclipse.syson.util.IDescriptionNameGenerator;
 import org.eclipse.syson.util.SysONRepresentationDescriptionIdentifiers;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -87,6 +95,8 @@ public class GVAddExistingElementsTests extends AbstractIntegrationTests {
     @Autowired
     private ToolTester nodeCreationTester;
 
+    private final IDescriptionNameGenerator descriptionNameGenerator = new SDVDescriptionNameGenerator();
+
     private Flux<DiagramRefreshedEventPayload> givenSubscriptionToDiagram() {
         var diagramEventInput = new DiagramEventInput(UUID.randomUUID(),
                 GeneralViewAddExistingElementsTestProjectData.EDITING_CONTEXT_ID,
@@ -153,10 +163,10 @@ public void addExistingElementsRecursiveOnDiagram() {
 
         Consumer<Object> initialDiagramContentConsumer = assertRefreshedDiagramThat(diagram::set);
 
-        String creationToolId = diagramDescriptionIdProvider.getDiagramCreationToolId("Add existing elements (recursive)");
-        assertThat(creationToolId).as("The tool 'Add existing elements (recursive)' should exist on the diagram").isNotNull();
+        String addExistingElementToolId = diagramDescriptionIdProvider.getDiagramCreationToolId("Add existing elements (recursive)");
+        assertThat(addExistingElementToolId).as("The tool 'Add existing elements (recursive)' should exist on the diagram").isNotNull();
 
-        Runnable nodeCreationRunner = () -> this.nodeCreationTester.invokeTool(GeneralViewAddExistingElementsTestProjectData.EDITING_CONTEXT_ID, diagram, creationToolId);
+        Runnable addExistingElementTool = () -> this.nodeCreationTester.invokeTool(GeneralViewAddExistingElementsTestProjectData.EDITING_CONTEXT_ID, diagram, addExistingElementToolId);
 
         Consumer<Object> updatedDiagramConsumer = assertRefreshedDiagramThat(newDiagram -> {
             assertThat(newDiagram.getNodes()).as("6 nodes should be visible on the diagram").hasSize(7);
@@ -196,7 +206,56 @@ public void addExistingElementsRecursiveOnDiagram() {
 
         StepVerifier.create(flux)
                 .consumeNextWith(initialDiagramContentConsumer)
-                .then(nodeCreationRunner)
+                .then(addExistingElementTool)
+                .consumeNextWith(updatedDiagramConsumer)
+                .thenCancel()
+                .verify(Duration.ofSeconds(10));
+    }
+
+    @DisplayName("GIVEN an ActionUsage with its action flow compartment displayed and a nested ActionUsage in it, WHEN Delete from diagram the nested ActionUsage then use the Add existing element tool on the action flow compartment, THEN the nested ActionUsage should only be displayed in the action flow compartment")
+    @GivenSysONServer({ GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData.SCRIPT_PATH })
+    @Test
+    public void addExistingElementsOnActionFlowCompartment() {
+        var flux = this.givenSubscriptionToDiagram();
+
+        var diagramDescription = this.givenDiagramDescription.getDiagramDescription(GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData.EDITING_CONTEXT_ID,
+                SysONRepresentationDescriptionIdentifiers.GENERAL_VIEW_DIAGRAM_DESCRIPTION_ID);
+        var diagramDescriptionIdProvider = new DiagramDescriptionIdProvider(diagramDescription, this.diagramIdProvider);
+
+        AtomicReference<Diagram> diagram = new AtomicReference<>();
+
+        Consumer<Object> initialDiagramContentConsumer = assertRefreshedDiagramThat(initialDiagram -> {
+            diagram.set(initialDiagram);
+
+            assertThat(initialDiagram.getNodes()).hasSize(1);
+
+            var action1ActionFlowCompartmentNode = new DiagramNavigator(initialDiagram).nodeWithLabel(LabelConstants.OPEN_QUOTE + "action" + LabelConstants.CLOSE_QUOTE + LabelConstants.CR + "action1")
+                    .childNodeWithLabel("action flow").getNode();
+            assertThat(action1ActionFlowCompartmentNode.getChildNodes()).isEmpty();
+        });
+
+        String addExistingElementToolId = diagramDescriptionIdProvider.getNodeToolId(
+                this.descriptionNameGenerator.getFreeFormCompartmentName(SysmlPackage.eINSTANCE.getActionUsage(), SysmlPackage.eINSTANCE.getUsage_NestedAction()), "Add existing elements");
+
+        Runnable addExistingElementTool = () -> this.nodeCreationTester.invokeTool(GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData.EDITING_CONTEXT_ID, diagram.get().getId(),
+                GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData.GraphicalIds.ACTION_1_ACTIONFLOW_COMPARTMENT_NODE_ID, addExistingElementToolId, List.of());
+
+        Consumer<Object> updatedDiagramConsumer = assertRefreshedDiagramThat(newDiagram -> {
+            assertThat(newDiagram.getNodes()).hasSize(2);
+
+            var action1ActionFlowCompartmentNode = new DiagramNavigator(newDiagram).nodeWithLabel(LabelConstants.OPEN_QUOTE + "action" + LabelConstants.CLOSE_QUOTE + LabelConstants.CR + "action1")
+                    .childNodeWithLabel("action flow").getNode();
+            var childNodes = action1ActionFlowCompartmentNode.getChildNodes();
+            assertThat(childNodes).hasSize(1);
+            assertThat(childNodes.get(0).getTargetObjectId()).isEqualTo(GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData.SemanticIds.ACTION_2_ID);
+
+            var action2HiddenNode = new DiagramNavigator(newDiagram).nodeWithLabel(LabelConstants.OPEN_QUOTE + "action" + LabelConstants.CLOSE_QUOTE + LabelConstants.CR + "action2").getNode();
+            assertThat(action2HiddenNode.getModifiers()).contains(ViewModifier.Hidden);
+        });
+
+        StepVerifier.create(flux)
+                .consumeNextWith(initialDiagramContentConsumer)
+                .then(addExistingElementTool)
                 .consumeNextWith(updatedDiagramConsumer)
                 .thenCancel()
                 .verify(Duration.ofSeconds(10));

backend/application/syson-application/src/test/java/org/eclipse/syson/application/data/GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData.java

@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Obeo.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.syson.application.data;
+
+/**
+ * Project data for the "GeneralView-AddExistingElements-ActionFlow-Compartment" project.
+ *
+ * @author arichard
+ */
+public class GeneralViewAddExistingElementsActionFlowCompartmentTestProjectData {
+
+    public static final String SCRIPT_PATH = "/scripts/database-content/GeneralView-AddExistingElements-ActionFlow-Compartment.sql";
+
+    public static final String EDITING_CONTEXT_ID = "cbb4b3b4-af8e-4a05-a419-19dbfd1cc94d";
+
+    /**
+     * Ids of graphical elements.
+     */
+    public static class GraphicalIds {
+
+        public static final String DIAGRAM_ID = "a0ca6720-66e0-40b7-a761-807474c0d773";
+
+        public static final String ACTION_1_NODE_ID = "62fff9fd-9f02-39e3-8446-1d638b9b053c";
+
+        public static final String ACTION_1_ACTIONFLOW_COMPARTMENT_NODE_ID = "f394cff3-b994-3b34-97c7-7d1a6807093e";
+    }
+
+    /**
+     * Ids for the semantic elements.
+     */
+    public static final class SemanticIds {
+
+        public static final String PACKAGE_1_ID = "8d4123ac-3ac5-412d-90f2-49282b923003";
+
+        public static final String GENERAL_VIEW_VIEW_USAGE_ID = "b67872fa-5900-48d3-88f0-e6ced193c8ec";
+
+        public static final String ACTION_1_ID = "40d86f92-e400-413d-8ec6-09fcf179b396";
+
+        public static final String ACTION_2_ID = "f0a37795-69e1-4ffe-becc-e55c20c70ac3";
+    }
+
+}

backend/application/syson-application/src/test/resources/scripts/database-content/GeneralView-AddExistingElements-ActionFlow-Compartment.sql

@@ -191,6 +191,14 @@ public Element addToExposedElements(Element element, boolean recursive, IEditing
                     if (recursive) {
                         membershipExpose.setIsRecursive(true);
                     }
+                    // if it is the General View, ActionFlow View or StateTrabnsition View, we want to hide tree
+                    // elements if a compartment containing the same
+                    // element is displayed or it is displayed as border node
+                    if (selectedNode != null && !ViewDefinitionKind.isInterconnectionView(this.utilService.getViewDefinitionKind(childElement, List.of(), editingContext))) {
+                        this.hideNodeIfVisibleCompartmentCouldHostTheFutureNode(childElement, editingContext, diagramContext, selectedNode, convertedNodes);
+                        this.hideNodeIfBorderNodeCouldHostTheFutureNode(childElement, editingContext, diagramContext, selectedNode, convertedNodes);
+                        this.hideNodeIfNestedIsDefault(childElement, editingContext, diagramContext, selectedNode, convertedNodes);
+                    }
                 }
             }
         }

backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/DiagramMutationExposeService.java

@@ -38,6 +38,7 @@ Now the _end_ keyword is not displayed anymore in the label of these graphical n
 ** Fix an issue where the _New Flow (flow)_ tool between two parameters was broken.
 ** The `ForkNode` and `JoinNode` graphical nodes style have been updated and are restricted to horizontal resizing.
 + Consequently, their entire footprint is filled with black, ensuring that all incoming and outgoing edges maintain a valid connection point.
+** Fix an issue where the _Add existing elements_ tool was not working correctly on the _action flow_ compartment of `ActionUsage` graphical nodes.
 
 * In textual import/export: