[3486] Do not open delete confirmation dialog when a node/edge is not deletable

Bug: #3486
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

Author: pcdavid

CHANGELOG.adoc

@@ -23,6 +23,9 @@
 Tools are no longer converted with the diagram.
 You can use `IViewToolFinder` to find a node or edge tool in a view dsl.
 `IToolDiagramExecutor` has been rename to `ISingleClickOnOneDiagramElementHandler` and `ISingleClickOnTwoDiagramElementHandler` has been added, these interface are used to execute a tool from the `InvokeSingleClickOnDiagramElementToolEventHandler` and `InvokeSingleClickOnTwoDiagramElementsToolEventHandler`
+- https://github.com/eclipse-sirius/sirius-web/issues/3486[#3486] Nodes and edges have a new `deletable` attribute in the GraphQL Schema that custom nodes must consider in their converter.
+On the backend, the node and edge's `deleteHandler` can now be `null` if no semantic deletion tool is defined for this element.
+`IViewNodeDeleteHandler`, which only existed to provide a non-null handler able to tell if there was a semantic deletion tool, has been removed.
 
 
 === Dependency update
@@ -60,6 +63,7 @@ Downstream applications can now implement the following interfaces:
 * `IIndexDeletionServiceDelegate` to customize how indexes are deleted
 * `IIndexUpdateServiceDelegate` to customize how the content of the indices is updated
 Sirius Web provides a default implementation for all these services, which creates an index per editing context, and indexes all the features of the elements in the editing context (this can be customized by implementing `IIndexEntryProviderDelegate`).
+- https://github.com/eclipse-sirius/sirius-web/issues/3486[#3486] [diagram] Do not open delete confirmation dialog when a node/edge is not deletable
 
 
 

integration-tests-playwright/playwright/e2e/delete-node-no-tool.spec.ts

@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2025 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
+ *******************************************************************************/
+
+import { expect, test } from '@playwright/test';
+import { PlaywrightExplorer } from '../helpers/PlaywrightExplorer';
+import { PlaywrightProject } from '../helpers/PlaywrightProject';
+
+test.describe('delete node without delete tool', () => {
+  let projectId;
+  test.beforeEach(async ({ page, request }) => {
+    await new PlaywrightProject(request).uploadProject(page, 'papayaBasicClassDiagram.zip');
+
+    await page.evaluate(() => {
+      window.localStorage.removeItem('sirius-confirmation-dialog-disabled');
+    });
+  });
+
+  test.afterEach(async ({ request }) => {
+    await new PlaywrightProject(request).deleteProject(projectId);
+  });
+
+  test("when hitting 'Del' on a node with no configured delete tool, no confirmation popup is shown ", async ({
+    page,
+  }) => {
+    let requestTriggered = false;
+    page.on('request', (request) => {
+      if (
+        request.url().includes('api/graphql') &&
+        request.method() === 'POST' &&
+        JSON.parse(request.postData()).operationName === 'deleteFromDiagram'
+      ) {
+        requestTriggered = true;
+      }
+    });
+
+    // Open the diagram
+    const playwrightExplorer = new PlaywrightExplorer(page);
+    await playwrightExplorer.expand('Papaya');
+    await playwrightExplorer.expand('Project');
+    await playwrightExplorer.expand('Component');
+    await playwrightExplorer.select('Component class diagram');
+
+    await expect(page.getByTestId('rf__wrapper')).toBeVisible();
+
+    // Select the semantic in the explorer
+    await playwrightExplorer.expand('package');
+    await playwrightExplorer.select('Class');
+    // And the corresponding node on the diagram
+    await page.getByTestId('diagram-reveal-selection').click();
+
+    // Try do delete from the keyboard
+    await page.keyboard.press('Delete');
+    // No dialog should open
+    await expect(page.getByTestId('confirmation-dialog')).not.toBeVisible();
+    // And no mutation invoked
+    expect(requestTriggered).toBe(false);
+  });
+});

integration-tests-playwright/playwright/resources/papayaBasicClassDiagram.zip

@@ -115,6 +115,7 @@ type Node {
   defaultWidth: Int
   defaultHeight: Int
   labelEditable: Boolean!
+  deletable: Boolean!
   customizedStyleProperties: [NodeStyleProperty!]!
   initialBorderNodePosition: BorderNodePosition!
 }
@@ -301,6 +302,7 @@ type Edge {
   state: ViewModifier!
   style: EdgeStyle!
   centerLabelEditable: Boolean!
+  deletable: Boolean!
   customizedStyleProperties: [EdgeStyleProperty!]!
 }
 

packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls

@@ -67,6 +67,8 @@ public final class Edge implements IDiagramElement {
 
     private boolean centerLabelEditable;
 
+    private boolean deletable;
+
     private Set<String> customizedStyleProperties;
 
     private Edge() {
@@ -145,6 +147,10 @@ public boolean isCenterLabelEditable() {
         return this.centerLabelEditable;
     }
 
+    public boolean isDeletable() {
+        return this.deletable;
+    }
+
     public Set<String> getCustomizedStyleProperties() {
         return this.customizedStyleProperties;
     }
@@ -194,6 +200,8 @@ public static final class Builder {
 
         private boolean centerLabelEditable;
 
+        private boolean deletable;
+
         private Set<String> customizedStyleProperties;
 
         private Builder(String id) {
@@ -216,6 +224,7 @@ private Builder(Edge edge) {
             this.state = edge.getState();
             this.style = edge.getStyle();
             this.centerLabelEditable = edge.isCenterLabelEditable();
+            this.deletable = edge.isDeletable();
             this.customizedStyleProperties = edge.getCustomizedStyleProperties();
         }
 
@@ -289,6 +298,11 @@ public Builder centerLabelEditable(boolean centerLabelEditable) {
             return this;
         }
 
+        public Builder deletable(boolean deletable) {
+            this.deletable = deletable;
+            return this;
+        }
+
         public Builder customizedStyleProperties(Set<String> customizedStyleProperties) {
             this.customizedStyleProperties = Objects.requireNonNull(customizedStyleProperties);
             return this;
@@ -311,6 +325,7 @@ public Edge build() {
             edge.state = Objects.requireNonNull(this.state);
             edge.style = Objects.requireNonNull(this.style);
             edge.centerLabelEditable = this.centerLabelEditable;
+            edge.deletable = this.deletable;
             edge.customizedStyleProperties = Objects.requireNonNull(this.customizedStyleProperties);
             return edge;
         }

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

@@ -70,6 +70,8 @@ public final class Node implements IDiagramElement {
 
     private boolean labelEditable;
 
+    private boolean deletable;
+
     private boolean pinned;
 
     private Set<String> customizedStyleProperties;
@@ -180,6 +182,10 @@ public boolean isLabelEditable() {
         return this.labelEditable;
     }
 
+    public boolean isDeletable() {
+        return this.deletable;
+    }
+
     public boolean isPinned() {
         return this.pinned;
     }
@@ -245,6 +251,8 @@ public static final class Builder {
 
         private boolean labelEditable;
 
+        private boolean deletable;
+
         private boolean pinned;
 
         private Set<String> customizedStyleProperties;
@@ -273,6 +281,7 @@ private Builder(Node node) {
             this.defaultWidth = node.getDefaultWidth();
             this.defaultHeight = node.getDefaultHeight();
             this.labelEditable = node.isLabelEditable();
+            this.deletable = node.isDeletable();
             this.pinned = node.isPinned();
             this.customizedStyleProperties = node.getCustomizedStyleProperties();
         }
@@ -367,6 +376,11 @@ public Builder labelEditable(boolean labelEditable) {
             return this;
         }
 
+        public Builder deletable(boolean deletable) {
+            this.deletable = deletable;
+            return this;
+        }
+
         public Builder pinned(boolean pinned) {
             this.pinned = pinned;
             return this;
@@ -398,9 +412,11 @@ public Node build() {
             node.defaultWidth = this.defaultWidth; // Optional on purpose
             node.defaultHeight = this.defaultHeight; // Optional on purpose
             node.labelEditable = this.labelEditable;
+            node.deletable = this.deletable;
             node.pinned = this.pinned;
             node.customizedStyleProperties = Objects.requireNonNull(this.customizedStyleProperties);
             return node;
         }
     }
 }
+

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

@@ -207,6 +207,7 @@ private Optional<Element> doRenderEdge(VariableManager edgeVariableManager, Edge
                     .style(appearance.style())
                     .children(labelChildren)
                     .centerLabelEditable(edgeDescription.getLabelEditHandler() != null)
+                    .deletable(edgeDescription.getDeleteHandler() != null)
                     .customizedStyleProperties(appearance.customizedStyleProperties())
                     .build();
 

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

@@ -223,6 +223,7 @@ private Element doRender(VariableManager nodeVariableManager, String targetObjec
                 .defaultWidth(defaultWidth)
                 .defaultHeight(defaultHeight)
                 .labelEditable(nodeDescription.getLabelEditHandler() != null)
+                .deletable(nodeDescription.getDeleteHandler() != null)
                 .customizedStyleProperties(appearance.customizedStyleProperties())
                 .build();
 

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

@@ -318,7 +318,7 @@ public EdgeDescription build() {
             edgeDescription.sourceProvider = Objects.requireNonNull(this.sourceProvider);
             edgeDescription.targetProvider = Objects.requireNonNull(this.targetProvider);
             edgeDescription.styleProvider = Objects.requireNonNull(this.styleProvider);
-            edgeDescription.deleteHandler = Objects.requireNonNull(this.deleteHandler);
+            edgeDescription.deleteHandler = this.deleteHandler; // Optional on purpose
             edgeDescription.labelEditHandler = this.labelEditHandler; // Optional on purpose
             return edgeDescription;
         }

packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java

@@ -559,7 +559,7 @@ public NodeDescription build() {
             nodeDescription.reusedBorderNodeDescriptionIds = Objects.requireNonNull(this.reusedBorderNodeDescriptionIds);
             nodeDescription.reusedChildNodeDescriptionIds = Objects.requireNonNull(this.reusedChildNodeDescriptionIds);
             nodeDescription.labelEditHandler = this.labelEditHandler; // Optional on purpose
-            nodeDescription.deleteHandler = Objects.requireNonNull(this.deleteHandler);
+            nodeDescription.deleteHandler = this.deleteHandler; // Optional on purpose
             nodeDescription.dropNodeHandler = this.dropNodeHandler; // Optional on purpose.
             nodeDescription.keepAspectRatio = this.keepAspectRatio;
             nodeDescription.isCollapsedByDefaultPredicate = Objects.requireNonNull(this.isCollapsedByDefaultPredicate);