[1741] Fix ELK border node placement not taken into account anymore

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

CHANGELOG.adoc

@@ -40,6 +40,7 @@ It was not actually used, as tools have long been found in `DiagramDescription.g
 - https://github.com/eclipse-sirius/sirius-components/issues/1686[#1686] [diagram] Fix SVG export of the wrapped labels
 - https://github.com/eclipse-sirius/sirius-components/issues/1692[#1692] [core] JPEG images where previously ignored if using a `.jpg` extension instead of `.jpeg`.
 They are now correctly supported
+- https://github.com/eclipse-sirius/sirius-components/issues/1741[#1741] [diagram] Border node placement specified with ELK configuration not taken into account anymore
 
 === New Features
 

packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/ELKDiagramConverter.java

@@ -121,7 +121,12 @@ private void convertNode(Node node, ElkNode parent, Map<String, ElkConnectableSh
 
         TextBounds textBounds = null;
         Label label = node.getLabel();
-        String labelType = this.elkPropertiesService.getNodeLabelType(node, layoutConfigurator);
+        String labelType;
+        if (node.isBorderNode()) {
+            labelType = this.elkPropertiesService.getBorderNodeLabelType(node, layoutConfigurator);
+        } else {
+            labelType = this.elkPropertiesService.getNodeLabelType(node, layoutConfigurator);
+        }
         if (labelType.startsWith("label:inside-v")) {
             double maxPadding = this.elkPropertiesService.getMaxPadding(node, layoutConfigurator);
             textBounds = this.textBoundsService.getAutoWrapBounds(label, node.getSize().getWidth() - maxPadding * 2);

packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/ELKLayoutedDiagramProvider.java

@@ -252,7 +252,12 @@ private Label getNodeLayoutedLabel(Node node, Map<String, ElkGraphElement> id2El
             ElkLabel elkLabel = optionalElkLabel.get();
 
             Size size = Size.of(elkLabel.getWidth(), elkLabel.getHeight());
-            String nodeLabelType = this.elkPropertiesService.getNodeLabelType(node, layoutConfigurator);
+            String nodeLabelType;
+            if (node.isBorderNode()) {
+                nodeLabelType = this.elkPropertiesService.getBorderNodeLabelType(node, layoutConfigurator);
+            } else {
+                nodeLabelType = this.elkPropertiesService.getNodeLabelType(node, layoutConfigurator);
+            }
 
             // @formatter:off
             Position position = Optional.of(elkLabel.getParent())

packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/ELKPropertiesService.java

@@ -17,6 +17,7 @@
 import org.eclipse.elk.core.math.ElkPadding;
 import org.eclipse.elk.core.options.CoreOptions;
 import org.eclipse.elk.core.options.NodeLabelPlacement;
+import org.eclipse.elk.core.options.PortLabelPlacement;
 import org.eclipse.sirius.components.diagrams.INodeStyle;
 import org.eclipse.sirius.components.diagrams.Node;
 import org.eclipse.sirius.components.diagrams.NodeType;
@@ -65,6 +66,19 @@ public String getNodeLabelType(Node node, ISiriusWebLayoutConfigurator layoutCon
         return labelType;
     }
 
+    public String getBorderNodeLabelType(Node node, ISiriusWebLayoutConfigurator layoutConfigurator) {
+        String labelType = "label:";
+        String nodeType = node.getType();
+        EnumSet<PortLabelPlacement> portLabelPlacementSet = layoutConfigurator.configureByType(nodeType).getProperty(CoreOptions.PORT_LABELS_PLACEMENT);
+        if (portLabelPlacementSet.contains(PortLabelPlacement.OUTSIDE)) {
+            labelType += "outside";
+        } else {
+            labelType += "inside";
+        }
+
+        return labelType;
+    }
+
     public boolean hasHeader(Node node) {
         INodeStyle nodeStyle = node.getStyle();
         if (nodeStyle instanceof RectangularNodeStyle rectangularNodeStyle) {

packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/IncrementalLayoutDiagramConverter.java

@@ -170,7 +170,12 @@ private LabelLayoutData convertNodeLabel(Node node, Map<String, ILayoutData> id2
         id2LayoutData.put(id, layoutData);
 
         layoutData.setPosition(label.getPosition());
-        String labelType = this.elkPropertiesService.getNodeLabelType(node, layoutConfigurator);
+        String labelType;
+        if (node.isBorderNode()) {
+            labelType = this.elkPropertiesService.getBorderNodeLabelType(node, layoutConfigurator);
+        } else {
+            labelType = this.elkPropertiesService.getNodeLabelType(node, layoutConfigurator);
+        }
         layoutData.setLabelType(labelType);
 
         TextBounds textBounds = null;

packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/BorderNodePositionTests.java

@@ -31,6 +31,7 @@
 import org.eclipse.sirius.components.diagrams.Position;
 import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.TextBounds;
+import org.eclipse.sirius.components.diagrams.components.LabelType;
 import org.eclipse.sirius.components.diagrams.events.IDiagramEvent;
 import org.eclipse.sirius.components.diagrams.events.MoveEvent;
 import org.eclipse.sirius.components.diagrams.events.ResizeEvent;
@@ -99,6 +100,7 @@ public void testSnap() {
     private void checkBorderNodeLabel(LabelLayoutData labelLayoutData, Position borderNodeLabelTextPosition, TextBounds borderNodeLabelTextBounds) {
         assertThat(labelLayoutData.getPosition()).isEqualTo(borderNodeLabelTextPosition);
         assertThat(labelLayoutData.getTextBounds()).isEqualTo(borderNodeLabelTextBounds);
+        assertThat(labelLayoutData.getLabelType()).isEqualTo(LabelType.OUTSIDE.getValue());
     }
 
     @Test
@@ -108,7 +110,7 @@ public void testBorderNodeCreationEvent() {
         List<NodeLayoutData> borderNodes = initializeDiagram.getChildrenNodes().get(0).getBorderNodes();
 
         // add a border node with an non positioned label
-        LabelLayoutData labelLayoutData = this.createLabelLayoutData(Position.at(-1, -1), "any", BORDER_NODE_LABEL_TEXT_BOUNDS);
+        LabelLayoutData labelLayoutData = this.createLabelLayoutData(Position.at(-1, -1), "label:outside", BORDER_NODE_LABEL_TEXT_BOUNDS);
         borderNodes.add(this.createBorderNodeLayoutData(BORDER_NODE_LABEL_TEXT_POSITION, DEFAULT_BORDER_NODE_SIZE, initializeDiagram, NodeType.NODE_RECTANGLE, labelLayoutData));
 
         ImageSizeProvider imageSizeProvider = new ImageSizeProvider();
@@ -387,7 +389,7 @@ private NodeLayoutData createBorderNodeLayoutData(Position position, Size size,
 
     private NodeLayoutData createBorderNodeLayoutData(Position position, Size size, IContainerLayoutData parent, String nodeType) {
         NodeLayoutData nodeLayoutData = this.createBorderNodeLayoutData(position, size, parent, nodeType,
-                this.createLabelLayoutData(BORDER_NODE_LABEL_TEXT_POSITION, "any", BORDER_NODE_LABEL_TEXT_BOUNDS));
+                this.createLabelLayoutData(BORDER_NODE_LABEL_TEXT_POSITION, "label:outside", BORDER_NODE_LABEL_TEXT_BOUNDS));
         return nodeLayoutData;
     }
 

packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DiagramConverterTests.java

@@ -21,6 +21,8 @@
 import org.assertj.core.data.Offset;
 import org.eclipse.elk.alg.layered.options.LayeredOptions;
 import org.eclipse.elk.core.data.LayoutMetaDataService;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.core.options.PortLabelPlacement;
 import org.eclipse.elk.graph.ElkEdge;
 import org.eclipse.elk.graph.ElkGraphElement;
 import org.eclipse.elk.graph.ElkLabel;
@@ -243,6 +245,7 @@ public void testDiagramOneNodeAndOneBorderNode() {
 
         ElkPort elkPort = elkNode.getPorts().get(0);
         assertThat(elkPort.getIdentifier()).isEqualTo(borderNode.getId().toString());
+        assertThat(elkPort.getLabels().get(0).getProperty(CoreOptions.PORT_LABELS_PLACEMENT)).isEqualTo(PortLabelPlacement.outside());
 
         imageSizeProvider.dispose();
     }