fix(diagram): class context menu actions (#114, RDFA-529)

spah-soptim · web-flow · commit 6cbdd1ef5c98 · 2026-05-12T08:01:24.000Z
* fix: Fixed class context menu move actions opening delete dialog
* feat: Add support for initial class diagram positioning

Signed-off-by: Jan-Hendrik Spahn &lt;jan-hendrik.spahn@soptim.de&gt;
diff --git a/backend/src/main/java/org/rdfarchitect/api/controller/datasets/graphs/classes/AllClassesRESTController.java b/backend/src/main/java/org/rdfarchitect/api/controller/datasets/graphs/classes/AllClassesRESTController.java
@@ -27,6 +27,7 @@
 import lombok.RequiredArgsConstructor;
 
 import org.rdfarchitect.api.dto.ClassUMLAdaptedDTO;
+import org.rdfarchitect.api.dto.dl.ClassLayoutPositionDTO;
 import org.rdfarchitect.api.dto.packages.PackageDTO;
 import org.rdfarchitect.database.GraphIdentifier;
 import org.rdfarchitect.services.ExpandURIUseCase;
@@ -65,9 +66,13 @@ public class AllClassesRESTController {
      *     added
      * @param classURIPrefix URI Prefix of the new class
      * @param className Label of the new class
+     * @param classLayoutPosition Initial position of the new class in the diagram
      */
     public record AddNewClassRequest(
-            PackageDTO packageDTO, String classURIPrefix, String className) {}
+            PackageDTO packageDTO,
+            String classURIPrefix,
+            String className,
+            ClassLayoutPositionDTO classLayoutPosition) {}
 
     @Operation(
             summary = "create new class",
@@ -112,7 +117,8 @@ public String addClass(
                         graphIdentifier,
                         addNewClassRequest.packageDTO,
                         extendedClassURIPrefix,
-                        addNewClassRequest.className);
+                        addNewClassRequest.className,
+                        addNewClassRequest.classLayoutPosition);
 
         logger.info(
                 "Sending response to POST request: \"/api/datasets/{{}}/graphs/{{}}/classes\" to \"{}\".",
diff --git a/backend/src/main/java/org/rdfarchitect/api/dto/dl/ClassLayoutPositionDTO.java b/backend/src/main/java/org/rdfarchitect/api/dto/dl/ClassLayoutPositionDTO.java
@@ -0,0 +1,30 @@
+/*
+ *    Copyright (c) 2024-2026 SOPTIM AG
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ */
+
+package org.rdfarchitect.api.dto.dl;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ClassLayoutPositionDTO {
+
+    private float xPosition;
+
+    private float yPosition;
+}
diff --git a/backend/src/main/java/org/rdfarchitect/services/dl/update/DiagramLayoutServiceUtils.java b/backend/src/main/java/org/rdfarchitect/services/dl/update/DiagramLayoutServiceUtils.java
@@ -84,6 +84,19 @@ public MRID insertDiagramObject(
      * @param diagramObjectMRID the mRID of the diagram object the point belongs to
      */
     public void insertDiagramObjectPoint(Model diagramLayoutModel, MRID diagramObjectMRID) {
+        insertDiagramObjectPoint(diagramLayoutModel, diagramObjectMRID, 0, 0);
+    }
+
+    /**
+     * Helper method for creating and inserting a {@link DiagramObjectPoint} at a given position.
+     *
+     * @param diagramLayoutModel the model into which the diagram object point is inserted
+     * @param diagramObjectMRID the mRID of the diagram object the point belongs to
+     * @param xPosition the x position of the diagram object point
+     * @param yPosition the y position of the diagram object point
+     */
+    public void insertDiagramObjectPoint(
+            Model diagramLayoutModel, MRID diagramObjectMRID, float xPosition, float yPosition) {
         var maxZPosition =
                 diagramLayoutModel.listObjectsOfProperty(DL.zPosition).toSet().stream()
                         .max(
@@ -97,7 +110,7 @@ public void insertDiagramObjectPoint(Model diagramLayoutModel, MRID diagramObjec
         var diagramObjectPoint =
                 DiagramObjectPoint.builder()
                         .mRID(new MRID(UUID.randomUUID()))
-                        .position(new XYZPosition(0, 0, maxZPosition + 1))
+                        .position(new XYZPosition(xPosition, yPosition, maxZPosition + 1))
                         .belongsToDiagramObject(diagramObjectMRID)
                         .build();
         DLUpdates.insertDiagramObjectPoint(diagramLayoutModel, diagramObjectPoint);
diff --git a/backend/src/main/java/org/rdfarchitect/services/dl/update/classlayout/CreateClassLayoutDataUseCase.java b/backend/src/main/java/org/rdfarchitect/services/dl/update/classlayout/CreateClassLayoutDataUseCase.java
@@ -17,6 +17,7 @@
 
 package org.rdfarchitect.services.dl.update.classlayout;
 
+import org.rdfarchitect.api.dto.dl.ClassLayoutPositionDTO;
 import org.rdfarchitect.api.dto.packages.PackageDTO;
 import org.rdfarchitect.database.GraphIdentifier;
 
@@ -25,16 +26,20 @@
 public interface CreateClassLayoutDataUseCase {
 
     /**
-     * Creates the diagram layout data for a newly created class
+     * Creates the diagram layout data for a newly created class, optionally at a given initial
+     * position.
      *
      * @param graphIdentifier the identifier of the graph
      * @param packageDTO the DTO used for creating the new class
      * @param className the name of the newly created class
      * @param classUUID the UUID of the newly created class
+     * @param classLayoutPosition the initial diagram position of the newly created class, or {@code
+     *     null} to place the class at the origin
      */
     void createClassLayoutData(
             GraphIdentifier graphIdentifier,
             PackageDTO packageDTO,
             String className,
-            UUID classUUID);
+            UUID classUUID,
+            ClassLayoutPositionDTO classLayoutPosition);
 }
diff --git a/backend/src/main/java/org/rdfarchitect/services/dl/update/classlayout/UpdateClassLayoutService.java b/backend/src/main/java/org/rdfarchitect/services/dl/update/classlayout/UpdateClassLayoutService.java
@@ -19,6 +19,7 @@
 
 import lombok.RequiredArgsConstructor;
 
+import org.rdfarchitect.api.dto.dl.ClassLayoutPositionDTO;
 import org.rdfarchitect.api.dto.dl.ClassPositionDTO;
 import org.rdfarchitect.api.dto.packages.PackageDTO;
 import org.rdfarchitect.api.dto.packages.PackageMapper;
@@ -50,7 +51,8 @@ public void createClassLayoutData(
             GraphIdentifier graphIdentifier,
             PackageDTO packageDTO,
             String className,
-            UUID classUUID) {
+            UUID classUUID,
+            ClassLayoutPositionDTO classLayoutPosition) {
         var diagramLayout = databasePort.getGraphWithContext(graphIdentifier).getDiagramLayout();
         var diagramLayoutModel = diagramLayout.getDiagramLayoutModel();
         UUID packageUUID;
@@ -65,7 +67,10 @@ public void createClassLayoutData(
         MRID doMRID =
                 DiagramLayoutServiceUtils.insertDiagramObject(
                         diagramLayoutModel, packageUUID, className, classUUID);
-        DiagramLayoutServiceUtils.insertDiagramObjectPoint(diagramLayoutModel, doMRID);
+        float xPosition = classLayoutPosition != null ? classLayoutPosition.getXPosition() : 0;
+        float yPosition = classLayoutPosition != null ? classLayoutPosition.getYPosition() : 0;
+        DiagramLayoutServiceUtils.insertDiagramObjectPoint(
+                diagramLayoutModel, doMRID, xPosition, yPosition);
     }
 
     @Override
diff --git a/backend/src/main/java/org/rdfarchitect/services/update/classes/AddClassUseCase.java b/backend/src/main/java/org/rdfarchitect/services/update/classes/AddClassUseCase.java
@@ -17,6 +17,7 @@
 
 package org.rdfarchitect.services.update.classes;
 
+import org.rdfarchitect.api.dto.dl.ClassLayoutPositionDTO;
 import org.rdfarchitect.api.dto.packages.PackageDTO;
 import org.rdfarchitect.database.GraphIdentifier;
 
@@ -25,19 +26,21 @@
 public interface AddClassUseCase {
 
     /**
-     * Constructs a new class and adds it to the specified graph. All optional parameters are set to
-     * null. The label of the class is set to NewClass with an index number appended if a NewClass
-     * already exists in the graph.
+     * Constructs a new class and adds it to the specified graph, optionally at a given initial
+     * diagram layout position.
      *
      * @param graphIdentifier The graph URI and database name of the graph to add the class to.
      * @param packageDTO The Package to which the class will be added.
      * @param classURIPrefix The prefix of the class to be added.
      * @param className The name of the class to be added.
+     * @param classLayoutPosition The initial diagram position of the class, or {@code null} to
+     *     place the class at the origin.
      * @return The UUID of the newly created class.
      */
     UUID addClass(
             GraphIdentifier graphIdentifier,
             PackageDTO packageDTO,
             String classURIPrefix,
-            String className);
+            String className,
+            ClassLayoutPositionDTO classLayoutPosition);
 }
diff --git a/backend/src/main/java/org/rdfarchitect/services/update/classes/UpdateClassService.java b/backend/src/main/java/org/rdfarchitect/services/update/classes/UpdateClassService.java
@@ -21,6 +21,7 @@
 import org.apache.jena.vocabulary.RDF;
 import org.rdfarchitect.api.dto.ClassUMLAdaptedDTO;
 import org.rdfarchitect.api.dto.ClassUMLAdaptedMapper;
+import org.rdfarchitect.api.dto.dl.ClassLayoutPositionDTO;
 import org.rdfarchitect.api.dto.packages.PackageDTO;
 import org.rdfarchitect.api.dto.packages.PackageMapper;
 import org.rdfarchitect.database.DatabasePort;
@@ -110,7 +111,8 @@ public UUID addClass(
             GraphIdentifier graphIdentifier,
             PackageDTO packageDTO,
             String classURIPrefix,
-            String className) {
+            String className,
+            ClassLayoutPositionDTO classLayoutPosition) {
         var cimPackage = packageMapper.toCIMObject(packageDTO);
         GraphRewindableWithUUIDs graph = null;
         UUID newClassUUID;
@@ -133,7 +135,7 @@ public UUID addClass(
         }
 
         createClassLayoutDataUseCase.createClassLayoutData(
-                graphIdentifier, packageDTO, className, newClassUUID);
+                graphIdentifier, packageDTO, className, newClassUUID, classLayoutPosition);
 
         changeLogUseCase.recordChange(
                 graphIdentifier,
diff --git a/backend/src/test/java/org/rdfarchitect/services/dl/update/UpdateClassLayoutServiceTest.java b/backend/src/test/java/org/rdfarchitect/services/dl/update/UpdateClassLayoutServiceTest.java
@@ -20,6 +20,7 @@
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.rdfarchitect.api.dto.dl.ClassLayoutPositionDTO;
 import org.rdfarchitect.api.dto.dl.ClassPositionDTO;
 import org.rdfarchitect.api.dto.packages.PackageDTO;
 import org.rdfarchitect.dl.data.DLUtils;
@@ -51,12 +52,36 @@ void createClassLayoutData_diagramExists_createsClassLayoutData() {
                         .label(PACKAGE_A_LABEL)
                         .prefix("ex")
                         .build();
-        service.createClassLayoutData(graphIdentifier, packageDTO, CLASS_A_LABEL, CLASS_A_UUID);
+        service.createClassLayoutData(
+                graphIdentifier, packageDTO, CLASS_A_LABEL, CLASS_A_UUID, null);
 
         // Assert
         assertInitialClassLayoutData(CLASS_A_UUID, PACKAGE_A_UUID, CLASS_A_LABEL);
     }
 
+    @Test
+    void createClassLayoutData_withInitialPosition_createsClassLayoutDataAtPosition() {
+        // Arrange
+        addGraphFromFile("package.ttl");
+        var packageDTO =
+                PackageDTO.builder()
+                        .uuid(PACKAGE_A_UUID)
+                        .label(PACKAGE_A_LABEL)
+                        .prefix("ex")
+                        .build();
+        var classLayoutPosition = new ClassLayoutPositionDTO();
+        classLayoutPosition.setXPosition(123.0F);
+        classLayoutPosition.setYPosition(456.0F);
+
+        // Act
+        service.createClassLayoutData(
+                graphIdentifier, packageDTO, CLASS_A_LABEL, CLASS_A_UUID, classLayoutPosition);
+
+        // Assert
+        assertDiagramObject(CLASS_A_UUID, PACKAGE_A_UUID, CLASS_A_LABEL);
+        assertDiagramObjectCoordinates(CLASS_A_UUID, 123.0F, 456.0F);
+    }
+
     @Test
     void updateClassPositions_fullGraph_repositionsClasses() {
         // Arrange
diff --git a/backend/src/test/java/org/rdfarchitect/services/update/UpdateClassServiceTest.java b/backend/src/test/java/org/rdfarchitect/services/update/UpdateClassServiceTest.java
@@ -103,7 +103,7 @@ void addClass_createsNewClass() {
                         .label("default")
                         .build();
 
-        updateClassService.addClass(graphIdentifier, packageDTO, PREFIX, "newClass");
+        updateClassService.addClass(graphIdentifier, packageDTO, PREFIX, "newClass", null);
 
         var graph = databasePort.getGraphWithContext(graphIdentifier).getRdfGraph();
         try {
@@ -150,7 +150,11 @@ void addClass_packageWithSameIriExists_throwsConflict() {
         assertThatThrownBy(
                         () ->
                                 updateClassService.addClass(
-                                        graphIdentifier, packageDTO, PREFIX, "packageCollision"))
+                                        graphIdentifier,
+                                        packageDTO,
+                                        PREFIX,
+                                        "packageCollision",
+                                        null))
                 .isInstanceOf(ResourceConflictException.class)
                 .hasMessageContaining("package with the same IRI");
 
diff --git a/frontend/src/lib/rendering/svelteflow/components/SvelteFlowPaneContextMenu.svelte b/frontend/src/lib/rendering/svelteflow/components/SvelteFlowPaneContextMenu.svelte
@@ -39,6 +39,7 @@
     let triggerRef = $state(null);
     let open = $state(false);
     let showNewClassDialog = $state(false);
+    let classLayoutPosition = $state(null);
 
     let triggerStyle = $derived(getContextMenuTriggerStyle(request));
 
@@ -56,6 +57,12 @@
     }
 
     function openNewClassDialog() {
+        classLayoutPosition = request?.flowPosition
+            ? {
+                  xPosition: request.flowPosition.x,
+                  yPosition: request.flowPosition.y,
+              }
+            : null;
         showNewClassDialog = true;
         onClose();
     }
@@ -83,5 +90,6 @@
     bind:showDialog={showNewClassDialog}
     {lockedDatasetName}
     {lockedGraphUri}
+    {classLayoutPosition}
     {onClassCreated}
 />
diff --git a/frontend/src/lib/rendering/svelteflow/svelteFlowWrapper.svelte b/frontend/src/lib/rendering/svelteflow/svelteFlowWrapper.svelte
diff --git a/frontend/src/routes/NewClassDialog.svelte b/frontend/src/routes/NewClassDialog.svelte
