Skip to content

Commit f43dff3

Browse files
AxelRICHARDAxelRICHARD
committed
[releng] Switch to Sirius Web 2026.3.8
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 5be9962 commit f43dff3

18 files changed

Lines changed: 241 additions & 205 deletions

File tree

‎backend/views/syson-standard-diagrams-view/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@
6161
<artifactId>sirius-components-view-builder</artifactId>
6262
<version>${sirius.web.version}</version>
6363
</dependency>
64+
<dependency>
65+
<groupId>org.eclipse.sirius</groupId>
66+
<artifactId>sirius-components-collaborative</artifactId>
67+
<version>${sirius.web.version}</version>
68+
</dependency>
6469
<dependency>
6570
<groupId>org.eclipse.sirius</groupId>
6671
<artifactId>sirius-components-collaborative-diagrams</artifactId>

‎backend/views/syson-standard-diagrams-view/src/main/java/org/eclipse/syson/standard/diagrams/view/SysONRepresentationDescriptionMetadataSorter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2025 Obeo.
2+
* Copyright (c) 2025, 2026 Obeo.
33
* This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v2.0
55
* which accompanies this distribution, and is available at
@@ -15,7 +15,7 @@
1515
import java.util.ArrayList;
1616
import java.util.List;
1717

18-
import org.eclipse.sirius.components.collaborative.api.RepresentationDescriptionMetadata;
18+
import org.eclipse.sirius.components.collaborative.dto.RepresentationDescriptionMetadataDTO;
1919
import org.eclipse.sirius.components.emf.services.api.IRepresentationDescriptionMetadataSorter;
2020
import org.springframework.stereotype.Service;
2121

@@ -28,10 +28,10 @@
2828
public class SysONRepresentationDescriptionMetadataSorter implements IRepresentationDescriptionMetadataSorter {
2929

3030
@Override
31-
public List<RepresentationDescriptionMetadata> sort(List<RepresentationDescriptionMetadata> representationDescriptions) {
32-
List<RepresentationDescriptionMetadata> sortedRepresentationDescriptions = new ArrayList<>();
33-
for (RepresentationDescriptionMetadata representationDescriptionMetadata : representationDescriptions) {
34-
if (SDVDiagramDescriptionProvider.DESCRIPTION_NAME.equals(representationDescriptionMetadata.getLabel())) {
31+
public List<RepresentationDescriptionMetadataDTO> sort(List<RepresentationDescriptionMetadataDTO> representationDescriptions) {
32+
List<RepresentationDescriptionMetadataDTO> sortedRepresentationDescriptions = new ArrayList<>();
33+
for (RepresentationDescriptionMetadataDTO representationDescriptionMetadata : representationDescriptions) {
34+
if (SDVDiagramDescriptionProvider.DESCRIPTION_NAME.equals(representationDescriptionMetadata.label())) {
3535
sortedRepresentationDescriptions.add(0, representationDescriptionMetadata);
3636
} else {
3737
sortedRepresentationDescriptions.add(representationDescriptionMetadata);

‎frontend/syson-components/package.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@
3131
},
3232
"peerDependencies": {
3333
"@apollo/client": "3.10.4",
34-
"@eclipse-sirius/sirius-components-browser": "2026.3.3",
35-
"@eclipse-sirius/sirius-components-charts": "2026.3.3",
36-
"@eclipse-sirius/sirius-components-core": "2026.3.3",
37-
"@eclipse-sirius/sirius-components-datatree": "2026.3.3",
38-
"@eclipse-sirius/sirius-components-deck": "2026.3.3",
39-
"@eclipse-sirius/sirius-components-diagrams": "2026.3.3",
40-
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.3",
41-
"@eclipse-sirius/sirius-components-forms": "2026.3.3",
42-
"@eclipse-sirius/sirius-components-gantt": "2026.3.3",
43-
"@eclipse-sirius/sirius-components-impactanalysis": "2026.3.3",
44-
"@eclipse-sirius/sirius-components-omnibox": "2026.3.3",
45-
"@eclipse-sirius/sirius-components-palette": "2026.3.3",
46-
"@eclipse-sirius/sirius-components-portals": "2026.3.3",
47-
"@eclipse-sirius/sirius-components-selection": "2026.3.3",
48-
"@eclipse-sirius/sirius-components-tables": "2026.3.3",
49-
"@eclipse-sirius/sirius-components-trees": "2026.3.3",
50-
"@eclipse-sirius/sirius-components-tsconfig": "2026.3.3",
51-
"@eclipse-sirius/sirius-components-validation": "2026.3.3",
52-
"@eclipse-sirius/sirius-components-widget-reference": "2026.3.3",
53-
"@eclipse-sirius/sirius-components-widget-table": "2026.3.3",
54-
"@eclipse-sirius/sirius-web-application": "2026.3.3",
34+
"@eclipse-sirius/sirius-components-browser": "2026.3.8",
35+
"@eclipse-sirius/sirius-components-charts": "2026.3.8",
36+
"@eclipse-sirius/sirius-components-core": "2026.3.8",
37+
"@eclipse-sirius/sirius-components-datatree": "2026.3.8",
38+
"@eclipse-sirius/sirius-components-deck": "2026.3.8",
39+
"@eclipse-sirius/sirius-components-diagrams": "2026.3.8",
40+
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.8",
41+
"@eclipse-sirius/sirius-components-forms": "2026.3.8",
42+
"@eclipse-sirius/sirius-components-gantt": "2026.3.8",
43+
"@eclipse-sirius/sirius-components-impactanalysis": "2026.3.8",
44+
"@eclipse-sirius/sirius-components-omnibox": "2026.3.8",
45+
"@eclipse-sirius/sirius-components-palette": "2026.3.8",
46+
"@eclipse-sirius/sirius-components-portals": "2026.3.8",
47+
"@eclipse-sirius/sirius-components-selection": "2026.3.8",
48+
"@eclipse-sirius/sirius-components-tables": "2026.3.8",
49+
"@eclipse-sirius/sirius-components-trees": "2026.3.8",
50+
"@eclipse-sirius/sirius-components-tsconfig": "2026.3.8",
51+
"@eclipse-sirius/sirius-components-validation": "2026.3.8",
52+
"@eclipse-sirius/sirius-components-widget-reference": "2026.3.8",
53+
"@eclipse-sirius/sirius-components-widget-table": "2026.3.8",
54+
"@eclipse-sirius/sirius-web-application": "2026.3.8",
5555
"@lexical/code": "0.42.0",
5656
"@lexical/react": "0.42.0",
5757
"@mui/icons-material": "7.3.10",
@@ -85,27 +85,27 @@
8585
},
8686
"devDependencies": {
8787
"@apollo/client": "3.10.4",
88-
"@eclipse-sirius/sirius-components-browser": "2026.3.3",
89-
"@eclipse-sirius/sirius-components-charts": "2026.3.3",
90-
"@eclipse-sirius/sirius-components-core": "2026.3.3",
91-
"@eclipse-sirius/sirius-components-datatree": "2026.3.3",
92-
"@eclipse-sirius/sirius-components-deck": "2026.3.3",
93-
"@eclipse-sirius/sirius-components-diagrams": "2026.3.3",
94-
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.3",
95-
"@eclipse-sirius/sirius-components-forms": "2026.3.3",
96-
"@eclipse-sirius/sirius-components-gantt": "2026.3.3",
97-
"@eclipse-sirius/sirius-components-impactanalysis": "2026.3.3",
98-
"@eclipse-sirius/sirius-components-omnibox": "2026.3.3",
99-
"@eclipse-sirius/sirius-components-palette": "2026.3.3",
100-
"@eclipse-sirius/sirius-components-portals": "2026.3.3",
101-
"@eclipse-sirius/sirius-components-selection": "2026.3.3",
102-
"@eclipse-sirius/sirius-components-tables": "2026.3.3",
103-
"@eclipse-sirius/sirius-components-trees": "2026.3.3",
104-
"@eclipse-sirius/sirius-components-tsconfig": "2026.3.3",
105-
"@eclipse-sirius/sirius-components-validation": "2026.3.3",
106-
"@eclipse-sirius/sirius-components-widget-reference": "2026.3.3",
107-
"@eclipse-sirius/sirius-components-widget-table": "2026.3.3",
108-
"@eclipse-sirius/sirius-web-application": "2026.3.3",
88+
"@eclipse-sirius/sirius-components-browser": "2026.3.8",
89+
"@eclipse-sirius/sirius-components-charts": "2026.3.8",
90+
"@eclipse-sirius/sirius-components-core": "2026.3.8",
91+
"@eclipse-sirius/sirius-components-datatree": "2026.3.8",
92+
"@eclipse-sirius/sirius-components-deck": "2026.3.8",
93+
"@eclipse-sirius/sirius-components-diagrams": "2026.3.8",
94+
"@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.8",
95+
"@eclipse-sirius/sirius-components-forms": "2026.3.8",
96+
"@eclipse-sirius/sirius-components-gantt": "2026.3.8",
97+
"@eclipse-sirius/sirius-components-impactanalysis": "2026.3.8",
98+
"@eclipse-sirius/sirius-components-omnibox": "2026.3.8",
99+
"@eclipse-sirius/sirius-components-palette": "2026.3.8",
100+
"@eclipse-sirius/sirius-components-portals": "2026.3.8",
101+
"@eclipse-sirius/sirius-components-selection": "2026.3.8",
102+
"@eclipse-sirius/sirius-components-tables": "2026.3.8",
103+
"@eclipse-sirius/sirius-components-trees": "2026.3.8",
104+
"@eclipse-sirius/sirius-components-tsconfig": "2026.3.8",
105+
"@eclipse-sirius/sirius-components-validation": "2026.3.8",
106+
"@eclipse-sirius/sirius-components-widget-reference": "2026.3.8",
107+
"@eclipse-sirius/sirius-components-widget-table": "2026.3.8",
108+
"@eclipse-sirius/sirius-web-application": "2026.3.8",
109109
"@lexical/code": "0.42.0",
110110
"@lexical/react": "0.42.0",
111111
"@mui/icons-material": "7.3.10",

‎frontend/syson-components/src/nodes/imported_package/SysMLImportedPackageNode.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
ConnectionCreationHandles,
1919
ConnectionHandles,
2020
ConnectionTargetHandle,
21+
DecoratorContainer,
2122
Label,
2223
Resizer,
2324
useConnectionLineNodeStyle,
@@ -45,6 +46,7 @@ const sysMLImportedPackageNodeStyle = (
4546
padding: '0px',
4647
width: '100%',
4748
height: '100%',
49+
position: 'relative',
4850
opacity: faded ? '0.4' : '',
4951
...style,
5052
border: 'none',
@@ -194,6 +196,7 @@ export const SysMLImportedPackageNode: NodeComponentsMap['sysMLImportedPackageNo
194196
onDragOver={onDragOver}
195197
onDrop={handleOnDrop}
196198
data-testid={`SysMLImportedPackage - ${data?.insideLabel?.text}`}>
199+
<DecoratorContainer decorators={data.decorators}></DecoratorContainer>
197200
{!!selected ? <ConnectionCreationHandles nodeId={id} /> : null}
198201
<ConnectionTargetHandle nodeId={id} nodeDescription={data.nodeDescription} isHovered={data.isHovered} />
199202
<ConnectionHandles connectionHandles={data.connectionHandles} />

‎frontend/syson-components/src/nodes/imported_package/SysMLImportedPackageNodeConverter.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const toSysMLImportedPackageNode = (
6161
labelEditable,
6262
deletable,
6363
customizedStyleProperties,
64+
decorators,
6465
} = gqlNode;
6566

6667
const handleLayoutData: GQLHandleLayoutData[] = gqlDiagram.layoutData.nodeLayoutData
@@ -117,6 +118,8 @@ const toSysMLImportedPackageNode = (
117118
minComputedWidth: gqlNodeLayoutData?.minComputedSize.width ?? null,
118119
minComputedHeight: gqlNodeLayoutData?.minComputedSize.height ?? null,
119120
isLastNodeSelected: false,
121+
moving: false,
122+
decorators,
120123
};
121124

122125
data.insideLabel = convertInsideLabel(

‎frontend/syson-components/src/nodes/note/SysMLNoteNode.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
ConnectionCreationHandles,
1919
ConnectionHandles,
2020
ConnectionTargetHandle,
21+
DecoratorContainer,
2122
EdgeData,
2223
Label,
2324
NodeData,
@@ -46,6 +47,7 @@ const sysMLNoteNodeStyle = (
4647
padding: '0px',
4748
width: '100%',
4849
height: '100%',
50+
position: 'relative',
4951
opacity: faded ? '0.4' : '',
5052
...style,
5153
// No border nor background color: this is handled by the SVG image
@@ -148,6 +150,7 @@ export const SysMLNoteNode: NodeComponentsMap['sysMLNoteNode'] = memo(
148150
/>
149151
</svg>
150152
</div>
153+
<DecoratorContainer decorators={data.decorators}></DecoratorContainer>
151154
{data.insideLabel ? <Label diagramElementId={id} label={updatedLabel} faded={data.faded} /> : null}
152155
{!!selected ? <ConnectionCreationHandles nodeId={id} /> : null}
153156
<ConnectionTargetHandle nodeId={id} nodeDescription={data.nodeDescription} isHovered={data.isHovered} />

‎frontend/syson-components/src/nodes/note/SysMLNoteNodeConverter.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const toSysMLNoteNode = (
6161
labelEditable,
6262
deletable,
6363
customizedStyleProperties,
64+
decorators,
6465
} = gqlNode;
6566

6667
const handleLayoutData: GQLHandleLayoutData[] = gqlDiagram.layoutData.nodeLayoutData
@@ -117,6 +118,8 @@ const toSysMLNoteNode = (
117118
minComputedWidth: gqlNodeLayoutData?.minComputedSize.width ?? null,
118119
minComputedHeight: gqlNodeLayoutData?.minComputedSize.height ?? null,
119120
isLastNodeSelected: false,
121+
moving: false,
122+
decorators,
120123
};
121124

122125
data.insideLabel = convertInsideLabel(

‎frontend/syson-components/src/nodes/package/SysMLPackageNode.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
ConnectionCreationHandles,
1919
ConnectionHandles,
2020
ConnectionTargetHandle,
21+
DecoratorContainer,
2122
Label,
2223
Resizer,
2324
useConnectionLineNodeStyle,
@@ -100,6 +101,7 @@ const packageContainerStyle = (
100101
padding: '8px',
101102
width: '100%',
102103
height: '100%',
104+
position: 'relative',
103105
opacity: faded ? '0.4' : '',
104106
...style,
105107
background: getCSSColor(String(style.background), theme),
@@ -154,6 +156,7 @@ export const SysMLPackageNode: NodeComponentsMap['sysMLPackageNode'] = memo(
154156
onDragOver={onDragOver}
155157
onDrop={handleOnDrop}
156158
data-testid={`SysMLPackage - ${data?.insideLabel?.text}`}>
159+
<DecoratorContainer decorators={data.decorators}></DecoratorContainer>
157160
{!!selected ? <ConnectionCreationHandles nodeId={id} /> : null}
158161
<ConnectionTargetHandle nodeId={id} nodeDescription={data.nodeDescription} isHovered={data.isHovered} />
159162
<ConnectionHandles connectionHandles={data.connectionHandles} />

‎frontend/syson-components/src/nodes/package/SysMLPackageNodeConverter.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const toPackageNode = (
6161
labelEditable,
6262
deletable,
6363
customizedStyleProperties,
64+
decorators,
6465
} = gqlNode;
6566

6667
const handleLayoutData: GQLHandleLayoutData[] = gqlDiagram.layoutData.nodeLayoutData
@@ -117,6 +118,8 @@ const toPackageNode = (
117118
minComputedWidth: gqlNodeLayoutData?.minComputedSize.width ?? null,
118119
minComputedHeight: gqlNodeLayoutData?.minComputedSize.height ?? null,
119120
isLastNodeSelected: false,
121+
moving: false,
122+
decorators,
120123
};
121124

122125
data.insideLabel = convertInsideLabel(

‎frontend/syson-components/src/nodes/view_frame/SysMLViewFrameNode.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
ConnectionCreationHandles,
1616
ConnectionHandles,
1717
ConnectionTargetHandle,
18+
DecoratorContainer,
1819
Label,
1920
Resizer,
2021
useConnectionLineNodeStyle,
@@ -41,6 +42,7 @@ const sysMLViewFrameNodeStyle = (
4142
padding: '0px',
4243
width: '100%',
4344
height: '100%',
45+
position: 'relative',
4446
opacity: faded ? '0.4' : '',
4547
...style,
4648
backgroundColor: 'transparent',
@@ -129,7 +131,8 @@ export const SysMLViewFrameNode: NodeComponentsMap['sysMLViewFrameNode'] = memo(
129131
onDrop={handleOnDrop}
130132
data-testid={`SysMLViewFrame - ${data?.insideLabel?.text}`}
131133
data-svg="rect">
132-
{selected ? <ConnectionCreationHandles nodeId={id} /> : null}
134+
<DecoratorContainer decorators={data.decorators}></DecoratorContainer>
135+
{!!selected ? <ConnectionCreationHandles nodeId={id} /> : null}
133136
<ConnectionTargetHandle nodeId={id} nodeDescription={data.nodeDescription} isHovered={data.isHovered} />
134137
<ConnectionHandles connectionHandles={data.connectionHandles} />
135138
<div

0 commit comments

Comments
 (0)