feat: class multi select (#189, RDFA-546)

Author: rema-soptim

.github/FEATURE_CHECKLIST.md

@@ -46,6 +46,7 @@ Reference document for manual testing. Verify the areas relevant to your change
 - Schema context menu: New package, New Profile Diagram, Undo/Redo, Create/Edit/Delete profile header, Changelog, Compare, Migrate schema, Constraints import/export/full view, Export schema, Delete schema
 - Package context menu: Create class, Add to Profile/Dataset Diagram, Paste class, View/Edit package, Copy URL, Delete package
 - Class context menu: Show in diagram, Copy class, Constraints, Add to Profile/Dataset Diagram, Delete class
+- Multi-select classes: Ctrl/Cmd+click toggles a class, Shift+click selects a range
 - Diagram context menu: Edit diagram, Delete diagram
 
 ## Editor – Package View
@@ -57,7 +58,8 @@ Reference document for manual testing. Verify the areas relevant to your change
 - Drag and zoom
 - Reset View, Filter View, Reset Layout buttons
 - Click on class opens class editor
-- Class context menu: Copy class, Delete class, Move between layers
+- Multi-select: Ctrl/Cmd+click toggles a class, Shift+click adds a class, Ctrl/Cmd+drag toggles a selection box, Shift+drag adds, plain drag on the pane replaces the selection
+- Right-drag pans the diagram, right-click opens the context menu without selecting the class
 - Pane context menu: Add class, Paste class
 
 ## Editor – Class Editor
@@ -72,6 +74,7 @@ Reference document for manual testing. Verify the areas relevant to your change
 ## Editor – Delete Dialog
 
 - Package, Classes, Attributes and Associations listed correctly
+- Deleting a multi-selection lists all selected classes with their dependencies
 - Delete, Keep, Move to default actions
 - Set all
 
@@ -84,6 +87,7 @@ Reference document for manual testing. Verify the areas relevant to your change
 - Drag and zoom
 - Reset View, Filter View, Reset Layout buttons
 - Click on class opens class editor
+- Multi-select: works the same as in the package view
 - Class context menu: Delete class, Remove from diagram, Move between layers
 - Pane context menu: Add class
 

backend/src/main/java/org/rdfarchitect/api/controller/datasets/diagrams/CustomDatasetDiagramAllClassesRESTController.java

@@ -27,6 +27,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -62,14 +63,46 @@ public String addToDiagram(
                     @RequestBody
                     List<ClassInDiagram> classes) {
         logger.info(
-                "Received DELETE request: \"/api/datasets/{{}}/diagrams/{{}}/classes\" from \"{}\"",
+                "Received POST request: \"/api/datasets/{{}}/diagrams/{{}}/classes\" from \"{}\"",
                 datasetName,
                 diagramId,
                 originURL);
 
         customDiagramLayoutUseCase.addClassesToCustomDatasetDiagram(
                 datasetName, UUID.fromString(diagramId), classes);
 
+        logger.info(
+                "Sending response to POST request: \"/api/datasets/{{}}/diagrams/{{}}/classes\" from \"{}\"",
+                datasetName,
+                diagramId,
+                originURL);
+        return Response.SUCCESS;
+    }
+
+    @DeleteMapping
+    public String removeFromDiagram(
+            @Parameter(description = "The name/url of the inquirer.")
+                    @RequestHeader(
+                            value = HttpHeaders.ORIGIN,
+                            required = false,
+                            defaultValue = "unknown")
+                    String originURL,
+            @Parameter(description = "The literal name of the dataset.") @PathVariable
+                    String datasetName,
+            @Parameter(description = "The uuid of the diagram.") @PathVariable String diagramId,
+            @Parameter(description = "The list of class uuids to be removed from the diagram")
+                    @RequestBody
+                    List<UUID> classIds) {
+        logger.info(
+                "Received DELETE request: \"/api/datasets/{{}}/diagrams/{{}}/classes\" for {} class(es) from \"{}\"",
+                datasetName,
+                diagramId,
+                classIds.size(),
+                originURL);
+
+        customDiagramLayoutUseCase.removeClassesFromCustomDatasetDiagram(
+                datasetName, UUID.fromString(diagramId), classIds);
+
         logger.info(
                 "Sending response to DELETE request: \"/api/datasets/{{}}/diagrams/{{}}/classes\" from \"{}\"",
                 datasetName,

backend/src/main/java/org/rdfarchitect/api/controller/datasets/diagrams/CustomDatasetDiagramClassRESTController.java

@@ -32,7 +32,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,6 +40,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 @RestController
@@ -57,11 +57,11 @@ public class DeleteRESTController {
     @Operation(
             summary = "Get deletion impact",
             description =
-                    "Returns a tree of affected resources for deleting the resource with the given UUID.",
+                    "Returns, per requested UUID, a tree of affected resources for deleting that resource.",
             tags = {"graph"},
             responses = {@ApiResponse(responseCode = "200")})
-    @GetMapping("/uuid/{uuid}/deletion-impact")
-    public AffectedResource getDeletionImpact(
+    @PostMapping("/deletion-impact")
+    public Map<UUID, AffectedResource> getDeletionImpact(
             @Parameter(description = "The name/url of the inquirer.")
                     @RequestHeader(
                             value = HttpHeaders.ORIGIN,
@@ -75,29 +75,26 @@ public AffectedResource getDeletionImpact(
                                     "The url encoded uri of the graph, or \"default\" to access the default graph.")
                     @PathVariable
                     String graphURI,
-            @Parameter(description = "The url encoded iri identifier of the cim resource.")
-                    @PathVariable
-                    String uuid) {
+            @Parameter(description = "The uuids of the cim resources to analyse.") @RequestBody
+                    List<UUID> uuids) {
         logger.info(
-                "Received GET request: \"/api/datasets/{{}}/graphs/{{}}/uuid/{{}/deletion-impact\" from \"{}\".",
+                "Received POST request: \"/api/datasets/{{}}/graphs/{{}}/deletion-impact\" for {} resource(s) from \"{}\".",
                 datasetName,
                 graphURI,
-                uuid,
+                uuids.size(),
                 originURL);
 
         var extendedGraphURI = expandURIUseCase.expandUri(datasetName, graphURI);
+        var graphIdentifier = new GraphIdentifier(datasetName, extendedGraphURI);
 
-        var resultObj =
-                findDeleteDependenciesUseCase.getDeleteDependencies(
-                        new GraphIdentifier(datasetName, extendedGraphURI), UUID.fromString(uuid));
+        var result = findDeleteDependenciesUseCase.getDeleteDependencies(graphIdentifier, uuids);
 
         logger.info(
-                "Sending response to GET request: \"/api/datasets/{{}}/graphs/{{}}/uuid/{{}/deletion-impact\" from \"{}\".",
+                "Sending response to POST request: \"/api/datasets/{{}}/graphs/{{}}/deletion-impact\" from \"{}\".",
                 datasetName,
                 graphURI,
-                uuid,
                 originURL);
-        return resultObj;
+        return result;
     }
 
     @Operation(

backend/src/main/java/org/rdfarchitect/api/controller/datasets/graphs/DeleteRESTController.java

@@ -15,15 +15,15 @@
  *
  */
 
-package org.rdfarchitect.api.controller.datasets.graphs.classes.copy;
+package org.rdfarchitect.api.controller.datasets.graphs.classes.paste;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 
 import lombok.RequiredArgsConstructor;
 
-import org.rdfarchitect.api.dto.CopyClassRequestDTO;
 import org.rdfarchitect.api.dto.CopyClassResponseDTO;
+import org.rdfarchitect.api.dto.PasteClassesRequestDTO;
 import org.rdfarchitect.database.GraphIdentifier;
 import org.rdfarchitect.services.ExpandURIUseCase;
 import org.rdfarchitect.services.update.classes.CopyClassUseCase;
@@ -37,76 +37,60 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.UUID;
+import java.util.List;
 
 @RestController
-@RequestMapping("api/datasets/{datasetName}/graphs/{graphURI}/classes/{classUUID}/copy")
+@RequestMapping("api/datasets/{targetDatasetName}/graphs/{targetGraphURI}/paste")
 @RequiredArgsConstructor
-public class CopyClassRESTController {
+public class PasteRESTController {
 
-    private static final Logger logger = LoggerFactory.getLogger(CopyClassRESTController.class);
+    private static final Logger logger = LoggerFactory.getLogger(PasteRESTController.class);
 
     private final ExpandURIUseCase expandURIUseCase;
     private final CopyClassUseCase copyClassUseCase;
 
     @Operation(
-            summary = "copy a class",
-            description = "Create a copy of a class in the specified graph")
+            summary = "paste classes",
+            description =
+                    "Create copies of one or more previously copied classes in the target graph.")
     @PostMapping
-    public CopyClassResponseDTO copyClass(
+    public List<CopyClassResponseDTO> pasteClasses(
             @Parameter(description = "The name/url of the inquirer.")
                     @RequestHeader(
                             value = HttpHeaders.ORIGIN,
                             required = false,
                             defaultValue = "unknown")
                     String originURL,
-            @Parameter(description = "The literal name of the dataset.") @PathVariable
-                    String datasetName,
+            @Parameter(description = "The literal name of the target dataset.") @PathVariable
+                    String targetDatasetName,
             @Parameter(
                             description =
-                                    "The url encoded uri of the graph, or \"default\" to access the default graph.")
+                                    "The url encoded uri of the target graph, or \"default\" to access the default graph.")
                     @PathVariable
-                    String graphURI,
-            @Parameter(description = "The uuid of the class.") @PathVariable String classUUID,
+                    String targetGraphURI,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(
                             required = true,
                             description =
-                                    "Contains the information of the target where the class should be copied to. Also includes if the class should be copied only abstract or "
-                                            + "fully.")
+                                    "The target package, copy options and the list of source classes to paste.")
                     @RequestBody
-                    CopyClassRequestDTO copyClassRequest) {
+                    PasteClassesRequestDTO pasteRequest) {
         logger.info(
-                "Received POST request: \"/api/datasets/{{}}/graphs/{{}}/classes/{{}}/copy\" from \"{}\".",
-                datasetName,
-                graphURI,
-                classUUID,
+                "Received POST request: \"/api/datasets/{{}}/graphs/{{}}/paste\" for {} class(es) from \"{}\".",
+                targetDatasetName,
+                targetGraphURI,
+                pasteRequest.getSources() == null ? 0 : pasteRequest.getSources().size(),
                 originURL);
 
-        var extendedGraphURI = expandURIUseCase.expandUri(datasetName, graphURI);
-        var graphIdentifier = new GraphIdentifier(datasetName, extendedGraphURI);
+        var targetExtendedGraphURI = expandURIUseCase.expandUri(targetDatasetName, targetGraphURI);
+        var targetGraphIdentifier = new GraphIdentifier(targetDatasetName, targetExtendedGraphURI);
 
-        var targetExtendedGraphURI =
-                expandURIUseCase.expandUri(
-                        copyClassRequest.getTargetDatasetName(),
-                        copyClassRequest.getTargetGraphURI());
-        var targetGraphIdentifier =
-                new GraphIdentifier(
-                        copyClassRequest.getTargetDatasetName(), targetExtendedGraphURI);
-
-        var response =
-                copyClassUseCase.copyClass(
-                        graphIdentifier,
-                        UUID.fromString(classUUID),
-                        targetGraphIdentifier,
-                        copyClassRequest);
+        var responses = copyClassUseCase.copyClasses(pasteRequest, targetGraphIdentifier);
 
         logger.info(
-                "Sending response to POST request: \"/api/datasets/{{}}/graphs/{{}}/classes/{{}}/copy\" to \"{}\".",
-                datasetName,
-                graphURI,
-                classUUID,
+                "Sending response to POST request: \"/api/datasets/{{}}/graphs/{{}}/paste\" to \"{}\".",
+                targetDatasetName,
+                targetGraphURI,
                 originURL);
-
-        return response;
+        return responses;
     }
 }