[3647] Add support for diagram style with background customization

Bug: #3647 Signed-off-by: Florian ROUËNÉ <[email protected]>
eclipse-sirius · Sep 2, 2024 · 1920f68 · 1920f68
1 parent 5d6efa6
commit 1920f68
Show file tree

Hide file tree

Showing 86 changed files with 3,211 additions and 865 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -53,7 +53,7 @@ As a result, the following maven modules have been deleted: `sirius-web-sample-a
 
 * The `String` attribute `org.eclipse.sirius.components.collaborative.diagrams.dto.InvokeSingleClickOnDiagramElementToolInput#selectedObjectId` has been replaced by the attribute `variables` of type `List<ToolVariable>`
 - https://github.com/eclipse-sirius/sirius-web/issues/3437[#3437] [core] Migrate frontend to MUI 5, if you contributed React componenent that use MUI, you should upgrade them to use MUI 5.
-- https://github.com/eclipse-sirius/sirius-web/issues/2204[#2204] [core] Added `getStyledLabel` in `IDefaultLabelService` and `IObjectService`, you must implement this method if you have custom implementation of these interface. 
+- https://github.com/eclipse-sirius/sirius-web/issues/2204[#2204] [core] Add `getStyledLabel` in `IDefaultLabelService` and `IObjectService`, you must implement this method if you have custom implementation of these interface. 
 - https://github.com/eclipse-sirius/sirius-web/issues/3815[#3815] [core] Make child creation descriptions locale independent
 
 === Dependency update
@@ -88,9 +88,11 @@ As a result, the following maven modules have been deleted: `sirius-web-sample-a
 - https://github.com/eclipse-sirius/sirius-web/issues/3821[#3821] [sirius-web] Allow to filter resources in `RewriteProxiesEventHandler`.
 Introduce new `IRewriteProxiesResourceFilter` interface, to register resource filter for `RewriteProxiesEventHandler`.
 - https://github.com/eclipse-sirius/sirius-web/issues/3570[#3570] [diagram] Add max width expression in the View DSL for labels
-- https://github.com/eclipse-sirius/sirius-web/issues/2204[#2204] [core] Added `getStyledLabel` in `IDefaultLabelService` and `IObjectService` that can be used to display styled string in the explorer for example.
+- https://github.com/eclipse-sirius/sirius-web/issues/2204[#2204] [core] Add `getStyledLabel` in `IDefaultLabelService` and `IObjectService` that can be used to display styled string in the explorer for example.
 +
 image:doc/screenshots/treeItemLabelStyled.jpg[StyledString, 70%]
+- https://github.com/eclipse-sirius/sirius-web/issues/3647[#3647] [diagram] Add support for diagram style with background customization
+
 
 === Improvements
 
@@ -191,8 +193,7 @@ More existing APIs will be migrated to this new common pattern.
 - https://github.com/eclipse-sirius/sirius-web/issues/3616[#3616] [diagram] Fix potential exceptions due to duplicate keys in diagram event processing
 - https://github.com/eclipse-sirius/sirius-web/issues/3624[#3624] [diagram] Fix an issue where the header separator does not fill the entire width of the node
 - https://github.com/eclipse-sirius/sirius-web/issues/3531[#3531] [diagram] Fix unnecessary edges label re render
-- https://github.com/eclipse-sirius/sirius-web/issues/3650[#3650] [diagram] Fix potential NPE in DiagramNavigator and Node toString method
-- https://github.com/eclipse-sirius/sirius-web/issues/3649[#3649] [sirius-web] Restore support for Related elements view icons
+- https://github.com/eclipse-sirius/sirius-web/issues/3650[#3650] [diagram] Fix potential NPE in DiagramNavigator and Node toString method- https://github.com/eclipse-sirius/sirius-web/issues/3649[#3649] [sirius-web] Restore support for Related elements view icons
 - https://github.com/eclipse-sirius/sirius-web/issues/3630[#3630] [sirius-web] Restore support for the deletion of dangling representations
 - https://github.com/eclipse-sirius/sirius-web/issues/3666[#3666] [core] Enable EMF's intrinsicIDToEObjectMap for JSON resources to support languages which use modeled identifiers (e.g. SysMLv2).
 - https://github.com/eclipse-sirius/sirius-web/issues/3664[#3664] [core] The Default.svg image is no longer displayed with the new architecture.

diff --git a/...clipse/sirius/components/compatibility/emf/compatibility/diagrams/TestDiagramBuilder.java b/...clipse/sirius/components/compatibility/emf/compatibility/diagrams/TestDiagramBuilder.java
@@ -19,6 +19,7 @@
 import org.eclipse.sirius.components.diagrams.ArrowStyle;
 import org.eclipse.sirius.components.diagrams.CollapsingState;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.Edge;
 import org.eclipse.sirius.components.diagrams.EdgeStyle;
 import org.eclipse.sirius.components.diagrams.FreeFormLayoutStrategy;
@@ -59,6 +60,7 @@ public Diagram getDiagram(String id) {
                 .size(Size.UNDEFINED)
                 .nodes(List.of())
                 .edges(List.of())
+                .style(DiagramStyle.newDiagramStyle().build())
                 .build();
     }
 

diff --git a/...omponents/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java b/...omponents/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java
@@ -28,6 +28,7 @@
 import org.eclipse.sirius.components.compatibility.emf.modeloperations.CreateViewOperationHandler;
 import org.eclipse.sirius.components.core.api.IEditingContext;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.FreeFormLayoutStrategy;
 import org.eclipse.sirius.components.diagrams.INodeStyle;
 import org.eclipse.sirius.components.diagrams.InsideLabelLocation;
@@ -88,6 +89,7 @@ public void initialize() {
                 .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID().toString())))
                 .edgeDescriptions(List.of())
                 .dropHandler(variableManager -> new Failure(""))
+                .styleProvider(variableManager -> DiagramStyle.newDiagramStyle().build())
                 .build();
 
         Diagram diagram = Diagram.newDiagram(UUID.randomUUID().toString())
@@ -98,6 +100,7 @@ public void initialize() {
                 .size(Size.of(100, 100))
                 .nodes(new ArrayList<>())
                 .edges(List.of())
+                .style(DiagramStyle.newDiagramStyle().build())
                 .build();
 
         IDiagramContext diagramContext = new IDiagramContext.NoOp() {

diff --git a/...omponents/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java b/...omponents/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java
@@ -28,6 +28,7 @@
 import org.eclipse.sirius.components.core.api.IEditingContext;
 import org.eclipse.sirius.components.diagrams.CollapsingState;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.FreeFormLayoutStrategy;
 import org.eclipse.sirius.components.diagrams.INodeStyle;
 import org.eclipse.sirius.components.diagrams.ImageNodeStyle;
@@ -91,6 +92,7 @@ public void initialize() {
                 .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID().toString())))
                 .edgeDescriptions(List.of())
                 .dropHandler(variableManager -> new Failure(""))
+                .styleProvider(variableManager -> DiagramStyle.newDiagramStyle().build())
                 .build();
 
         Node node = Node.newNode(UUID.randomUUID().toString())
@@ -135,6 +137,7 @@ public void initialize() {
                 .size(Size.of(100, 100))
                 .nodes(List.of(node))
                 .edges(List.of())
+                .style(DiagramStyle.newDiagramStyle().build())
                 .build();
 
         IDiagramContext diagramContext = new IDiagramContext.NoOp() {

diff --git a/...clipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionConverter.java b/...clipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionConverter.java
@@ -24,6 +24,7 @@
 import org.eclipse.sirius.components.compatibility.diagrams.DiagramLabelProvider;
 import org.eclipse.sirius.components.compatibility.services.diagrams.api.IDiagramDescriptionConverter;
 import org.eclipse.sirius.components.diagrams.ArrangeLayoutDirection;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription.Builder;
 import org.eclipse.sirius.components.interpreter.AQLInterpreter;
@@ -41,6 +42,8 @@ public class DiagramDescriptionConverter implements IDiagramDescriptionConverter
 
     private static final String FORCE_AUTO_LAYOUT = "FORCE_AUTO_LAYOUT";
 
+    private static final String DEFAULT_BACKGROUND_COLOR = "transparent";
+
     private final List<IDiagramDescriptionPopulator> diagramDescriptionPopulators;
 
     private final IAQLInterpreterFactory interpreterFactory;
@@ -67,7 +70,8 @@ public DiagramDescription convert(org.eclipse.sirius.diagram.description.Diagram
                 .canCreatePredicate(canCreatePredicate)
                 .labelProvider(labelProvider)
                 .autoLayout(this.isAutoLayoutMode(siriusDiagramDescription))
-                .arrangeLayoutDirection(ArrangeLayoutDirection.UNDEFINED);
+                .arrangeLayoutDirection(ArrangeLayoutDirection.UNDEFINED)
+                .styleProvider(variableManager -> DiagramStyle.newDiagramStyle().background(DEFAULT_BACKGROUND_COLOR).build());
 
         for (IDiagramDescriptionPopulator diagramDescriptionPopulator : this.diagramDescriptionPopulators) {
             diagramDescriptionPopulator.populate(builder, siriusDiagramDescription, interpreter);

diff --git a/...s/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramServices.java b/...s/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramServices.java
@@ -109,4 +109,13 @@ public boolean isFaded(IDiagramElement diagramElement) {
         }
         return isFaded;
     }
+
+    @Override
+    public boolean isDiagramEmpty(IDiagramService diagramService) {
+        if (diagramService.getDiagramContext() != null) {
+            return diagramService.getDiagramContext().getDiagram().getNodes().isEmpty() && diagramService.getDiagramContext().getViewCreationRequests().isEmpty() ||
+                    diagramService.getDiagramContext().getDiagram().getNodes().size() == 1 && !diagramService.getDiagramContext().getViewDeletionRequests().isEmpty();
+        }
+        return false;
+    }
 }
diff --git a/.../main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramServices.java b/.../main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramServices.java
@@ -41,4 +41,6 @@ public interface IDiagramServices {
     boolean isHidden(IDiagramElement diagramElement);
 
     boolean isFaded(IDiagramElement diagramElement);
+
+    boolean isDiagramEmpty(IDiagramService diagramService);
 }
diff --git a/...ckend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls b/...ckend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls
@@ -35,9 +35,14 @@ type Diagram implements Representation {
   position: Position!
   nodes: [Node!]!
   edges: [Edge!]!
+  style: DiagramStyle!
   layoutData: DiagramLayoutData!
 }
 
+type DiagramStyle {
+  background: String
+}
+
 type DiagramLayoutData {
   nodeLayoutData: [NodeLayoutData!]!
 }

diff --git a/...java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessorTests.java b/...java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessorTests.java
@@ -31,6 +31,7 @@
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.Position;
 import org.eclipse.sirius.components.diagrams.Size;
 import org.junit.jupiter.api.Test;
@@ -56,6 +57,7 @@ public class DiagramEventProcessorTests {
             .size(Size.UNDEFINED)
             .nodes(List.of())
             .edges(List.of())
+            .style(DiagramStyle.newDiagramStyle().build())
             .build();
 
     private final IDiagramCreationService diagramCreationService = new MockDiagramCreationService(INITIAL_TEST_DIAGRAM);

diff --git a/...pse/sirius/components/collaborative/diagrams/handlers/CreateDiagramEventHandlerTests.java b/...pse/sirius/components/collaborative/diagrams/handlers/CreateDiagramEventHandlerTests.java
@@ -32,6 +32,7 @@
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
 import org.eclipse.sirius.components.representations.Failure;
 import org.eclipse.sirius.components.representations.IRepresentationDescription;
@@ -64,6 +65,7 @@ public Optional<IRepresentationDescription> findById(IEditingContext editingCont
                         .nodeDescriptions(new ArrayList<>())
                         .targetObjectIdProvider(variableManager -> "targetObjectId")
                         .dropHandler(variableManager -> new Failure(""))
+                        .styleProvider(variableManager -> DiagramStyle.newDiagramStyle().build())
                         .build();
                 // @formatter:on
 

diff --git a/...sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java b/...sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java
@@ -32,6 +32,7 @@
 import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
 import org.eclipse.sirius.components.diagrams.CollapsingState;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.FreeFormLayoutStrategy;
 import org.eclipse.sirius.components.diagrams.InsideLabel;
 import org.eclipse.sirius.components.diagrams.InsideLabelLocation;
@@ -171,6 +172,7 @@ public void testGetConnectorTools() {
                 .edgeDescriptions(new ArrayList<>())
                 .palettes(List.of(palette))
                 .dropHandler(variableManager -> new Failure(""))
+                .styleProvider(variableManager -> DiagramStyle.newDiagramStyle().build())
                 .build();
 
         Node sourceNode = this.getNode(SOURCE_NODE_ID, SOURCE_NODE_TARGET_ID);
@@ -237,6 +239,7 @@ private Diagram getDiagram(String id, List<Node> nodes) {
                 .size(Size.UNDEFINED)
                 .nodes(nodes)
                 .edges(List.of())
+                .style(DiagramStyle.newDiagramStyle().build())
                 .build();
     }
 }
diff --git a/...rius/components/collaborative/diagrams/handlers/GetNodeDescriptionsEventHandlerTests.java b/...rius/components/collaborative/diagrams/handlers/GetNodeDescriptionsEventHandlerTests.java
@@ -29,6 +29,7 @@
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.Position;
 import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.description.NodeDescription;
@@ -83,6 +84,7 @@ public Optional<IRepresentationDescription> findById(IEditingContext editingCont
                 }
                 return desc;
             }
+
             @Override
             public Map<String, IRepresentationDescription> findAll(IEditingContext editingContext) {
                 var descriptions = new HashMap<String, IRepresentationDescription>();
@@ -114,6 +116,7 @@ public Diagram getDiagram() {
                         .nodes(List.of())
                         .size(Size.UNDEFINED)
                         .targetObjectId("")
+                        .style(DiagramStyle.newDiagramStyle().build())
                         .build();
             }
         };

diff --git a/...pse/sirius/components/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java b/...pse/sirius/components/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java
@@ -30,6 +30,7 @@
 import org.eclipse.sirius.components.core.api.IEditingContext;
 import org.eclipse.sirius.components.core.api.IPayload;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.Position;
 import org.eclipse.sirius.components.diagrams.Size;
 import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
@@ -47,6 +48,7 @@
  * @author arichard
  */
 public class RenameDiagramEventHandlerTests {
+
     private static final String OLD_LABEL = "oldLabel";
 
     private static final String NEW_LABEL = "newLabel";
@@ -59,7 +61,6 @@ public void testRenameRepresentation() {
 
         DiagramDescription diagramDescription = new TestDiagramDescriptionBuilder().getDiagramDescription(UUID.randomUUID().toString(), List.of(), List.of(), List.of());
 
-        // @formatter:off
         Diagram diagram = Diagram.newDiagram(representationId)
                 .label(OLD_LABEL)
                 .descriptionId(diagramDescription.getId())
@@ -68,8 +69,8 @@ public void testRenameRepresentation() {
                 .position(Position.at(0, 0))
                 .nodes(Collections.emptyList())
                 .edges(Collections.emptyList())
+                .style(DiagramStyle.newDiagramStyle().build())
                 .build();
-        // @formatter:on
         IRepresentationSearchService representationSearchService = new IRepresentationSearchService() {
 
             @Override

diff --git a/...ava/org/eclipse/sirius/components/collaborative/diagrams/handlers/TestDiagramBuilder.java b/...ava/org/eclipse/sirius/components/collaborative/diagrams/handlers/TestDiagramBuilder.java
@@ -19,6 +19,7 @@
 import org.eclipse.sirius.components.diagrams.ArrowStyle;
 import org.eclipse.sirius.components.diagrams.CollapsingState;
 import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.Edge;
 import org.eclipse.sirius.components.diagrams.EdgeStyle;
 import org.eclipse.sirius.components.diagrams.FreeFormLayoutStrategy;
@@ -62,9 +63,14 @@ public Diagram getDiagram(String id) {
                 .size(Size.UNDEFINED)
                 .nodes(List.of())
                 .edges(List.of())
+                .style(this.getDiagramStyle())
                 .build();
     }
 
+    public DiagramStyle getDiagramStyle() {
+        return DiagramStyle.newDiagramStyle().build();
+    }
+
     public RectangularNodeStyle getRectangularNodeStyle() {
         return RectangularNodeStyle.newRectangularNodeStyle()
                 .borderColor("#000000")

diff --git a/...ipse/sirius/components/collaborative/diagrams/handlers/TestDiagramDescriptionBuilder.java b/...ipse/sirius/components/collaborative/diagrams/handlers/TestDiagramDescriptionBuilder.java
@@ -17,6 +17,7 @@
 import java.util.function.Function;
 
 import org.eclipse.sirius.components.diagrams.ArrowStyle;
+import org.eclipse.sirius.components.diagrams.DiagramStyle;
 import org.eclipse.sirius.components.diagrams.EdgeStyle;
 import org.eclipse.sirius.components.diagrams.FreeFormLayoutStrategy;
 import org.eclipse.sirius.components.diagrams.INodeStyle;
@@ -55,6 +56,7 @@ public DiagramDescription getDiagramDescription(String diagramDescriptionId, Lis
                 .edgeDescriptions(edgeDescriptions)
                 .palettes(palettes)
                 .dropHandler(variableManager -> new Failure(""))
+                .styleProvider(variableManager -> DiagramStyle.newDiagramStyle().build())
                 .build();
     }
 

diff --git a/...ius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Diagram.java b/...ius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Diagram.java
@@ -28,6 +28,7 @@
  */
 @Immutable
 public final class Diagram implements IRepresentation {
+
     public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Diagram";
 
     private String id;
@@ -50,6 +51,8 @@ public final class Diagram implements IRepresentation {
 
     private DiagramLayoutData layoutData;
 
+    private DiagramStyle style;
+
     private Diagram() {
         // Prevent instantiation
     }
@@ -99,6 +102,10 @@ public DiagramLayoutData getLayoutData() {
         return this.layoutData;
     }
 
+    public DiagramStyle getStyle() {
+        return this.style;
+    }
+
     public static Builder newDiagram(String id) {
         return new Builder(id);
     }
@@ -120,9 +127,10 @@ public String toString() {
      */
     @SuppressWarnings("checkstyle:HiddenField")
     public static final class Builder {
-        private String id;
 
-        private String kind = KIND;
+        private final String id;
+
+        private final String kind = KIND;
 
         private String targetObjectId;
 
@@ -138,6 +146,8 @@ public static final class Builder {
 
         private List<Edge> edges;
 
+        private DiagramStyle style;
+
         private DiagramLayoutData layoutData = new DiagramLayoutData(Map.of(), Map.of(), Map.of());
 
         private Builder(String id) {
@@ -153,6 +163,7 @@ private Builder(Diagram diagram) {
             this.size = diagram.getSize();
             this.nodes = diagram.getNodes();
             this.edges = diagram.getEdges();
+            this.style = diagram.getStyle();
             this.layoutData = diagram.getLayoutData();
         }
 
@@ -191,6 +202,11 @@ public Builder edges(List<Edge> edges) {
             return this;
         }
 
+        public Builder style(DiagramStyle style) {
+            this.style = Objects.requireNonNull(style);
+            return this;
+        }
+
         public Builder layoutData(DiagramLayoutData layoutData) {
             this.layoutData = Objects.requireNonNull(layoutData);
             return this;
@@ -207,6 +223,7 @@ public Diagram build() {
             diagram.size = Objects.requireNonNull(this.size);
             diagram.nodes = Objects.requireNonNull(this.nodes);
             diagram.edges = Objects.requireNonNull(this.edges);
+            diagram.style = Objects.requireNonNull(this.style);
             diagram.layoutData = Objects.requireNonNull(this.layoutData);
             return diagram;
         }