From 0cc70f833fe6f79b563b8105fb508ea73bbb5533 Mon Sep 17 00:00:00 2001 From: Axel RICHARD Date: Wed, 1 Jul 2026 09:14:51 +0200 Subject: [PATCH] [releng] Switch to Sirius Web 2026.5.4 Signed-off-by: Axel RICHARD --- CHANGELOG.adoc | 2 +- .../syson-application/docker-compose.yml | 1 + frontend/syson-components/package.json | 84 +++--- ...MLv2ExplorerToolOverriddenContribution.tsx | 62 +++++ .../InsertTextualSysMLv2MenuContribution.tsx | 2 +- .../SysONExtensionRegistryMergeStrategy.ts | 30 +++ ...ssionDiagramToolOverriddenContribution.tsx | 6 +- ...sionExplorerToolOverriddenContribution.tsx | 59 ++++ ...ssionDiagramToolOverriddenContribution.tsx | 10 +- ...sionExplorerToolOverriddenContribution.tsx | 68 +++++ .../EditSysMLExpressionMenuContribution.tsx | 2 +- ...ssionDiagramToolOverriddenContribution.tsx | 10 +- ...sionExplorerToolOverriddenContribution.tsx | 68 +++++ .../registry/SysONExtensionRegistry.tsx | 50 +++- frontend/syson-components/src/index.ts | 8 + frontend/syson/package.json | 42 +-- package-lock.json | 252 +++++++++--------- pom.xml | 2 +- 18 files changed, 547 insertions(+), 211 deletions(-) create mode 100644 frontend/syson-components/src/extensions/InsertTextualSysMLv2ExplorerToolOverriddenContribution.tsx create mode 100644 frontend/syson-components/src/extensions/expressions/DeleteExpressionExplorerToolOverriddenContribution.tsx create mode 100644 frontend/syson-components/src/extensions/expressions/EditExpressionExplorerToolOverriddenContribution.tsx create mode 100644 frontend/syson-components/src/extensions/expressions/NewExpressionExplorerToolOverriddenContribution.tsx diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 7bac2220a..006d11fa3 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -18,7 +18,7 @@ It has long been unused by Sirius Web itself (since the transition to MUI). === Dependency update -- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.5.3]. +- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.5.4]. - [releng] Update to https://github.com/spring-projects/spring-boot/releases/tag/v4.0.7[Spring Boot 4.0.7]. - [releng] Update to https://github.com/xyflow/xyflow/releases/tag/@xyflow/react@12.10.2[xyflow 12.10.2]. - [releng] Update to https://github.com/vitejs/vite/releases/tag/v8.0.14[Vite 8.0.14] and https://github.com/vitejs/vite-plugin-react/releases/tag/plugin-react%406.0.2[`@vitejs/plugin-react` 6.0.2]. diff --git a/backend/application/syson-application/docker-compose.yml b/backend/application/syson-application/docker-compose.yml index a3f60b3fa..495ac739f 100644 --- a/backend/application/syson-application/docker-compose.yml +++ b/backend/application/syson-application/docker-compose.yml @@ -18,6 +18,7 @@ services: SPRING_DATASOURCE_USERNAME: test_username SPRING_DATASOURCE_PASSWORD: test_password SIRIUS_COMPONENTS_CORS_ALLOWEDORIGINPATTERNS: "*" + SIRIUS_WEB_TREE_NEW-PALETTE_ENABLED: false SERVER_PORT: 8080 depends_on: - database diff --git a/frontend/syson-components/package.json b/frontend/syson-components/package.json index 8ec703e8a..343b519cb 100644 --- a/frontend/syson-components/package.json +++ b/frontend/syson-components/package.json @@ -31,27 +31,27 @@ }, "peerDependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.5.3", - "@eclipse-sirius/sirius-components-charts": "2026.5.3", - "@eclipse-sirius/sirius-components-core": "2026.5.3", - "@eclipse-sirius/sirius-components-datatree": "2026.5.3", - "@eclipse-sirius/sirius-components-deck": "2026.5.3", - "@eclipse-sirius/sirius-components-diagrams": "2026.5.3", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.3", - "@eclipse-sirius/sirius-components-forms": "2026.5.3", - "@eclipse-sirius/sirius-components-gantt": "2026.5.3", - "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.3", - "@eclipse-sirius/sirius-components-omnibox": "2026.5.3", - "@eclipse-sirius/sirius-components-palette": "2026.5.3", - "@eclipse-sirius/sirius-components-portals": "2026.5.3", - "@eclipse-sirius/sirius-components-selection": "2026.5.3", - "@eclipse-sirius/sirius-components-tables": "2026.5.3", - "@eclipse-sirius/sirius-components-trees": "2026.5.3", - "@eclipse-sirius/sirius-components-tsconfig": "2026.5.3", - "@eclipse-sirius/sirius-components-validation": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-reference": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-table": "2026.5.3", - "@eclipse-sirius/sirius-web-application": "2026.5.3", + "@eclipse-sirius/sirius-components-browser": "2026.5.4", + "@eclipse-sirius/sirius-components-charts": "2026.5.4", + "@eclipse-sirius/sirius-components-core": "2026.5.4", + "@eclipse-sirius/sirius-components-datatree": "2026.5.4", + "@eclipse-sirius/sirius-components-deck": "2026.5.4", + "@eclipse-sirius/sirius-components-diagrams": "2026.5.4", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.4", + "@eclipse-sirius/sirius-components-forms": "2026.5.4", + "@eclipse-sirius/sirius-components-gantt": "2026.5.4", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.4", + "@eclipse-sirius/sirius-components-omnibox": "2026.5.4", + "@eclipse-sirius/sirius-components-palette": "2026.5.4", + "@eclipse-sirius/sirius-components-portals": "2026.5.4", + "@eclipse-sirius/sirius-components-selection": "2026.5.4", + "@eclipse-sirius/sirius-components-tables": "2026.5.4", + "@eclipse-sirius/sirius-components-trees": "2026.5.4", + "@eclipse-sirius/sirius-components-tsconfig": "2026.5.4", + "@eclipse-sirius/sirius-components-validation": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-reference": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-table": "2026.5.4", + "@eclipse-sirius/sirius-web-application": "2026.5.4", "@lexical/code": "0.42.0", "@lexical/react": "0.42.0", "@mui/icons-material": "7.3.10", @@ -85,27 +85,27 @@ }, "devDependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.5.3", - "@eclipse-sirius/sirius-components-charts": "2026.5.3", - "@eclipse-sirius/sirius-components-core": "2026.5.3", - "@eclipse-sirius/sirius-components-datatree": "2026.5.3", - "@eclipse-sirius/sirius-components-deck": "2026.5.3", - "@eclipse-sirius/sirius-components-diagrams": "2026.5.3", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.3", - "@eclipse-sirius/sirius-components-forms": "2026.5.3", - "@eclipse-sirius/sirius-components-gantt": "2026.5.3", - "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.3", - "@eclipse-sirius/sirius-components-omnibox": "2026.5.3", - "@eclipse-sirius/sirius-components-palette": "2026.5.3", - "@eclipse-sirius/sirius-components-portals": "2026.5.3", - "@eclipse-sirius/sirius-components-selection": "2026.5.3", - "@eclipse-sirius/sirius-components-tables": "2026.5.3", - "@eclipse-sirius/sirius-components-trees": "2026.5.3", - "@eclipse-sirius/sirius-components-tsconfig": "2026.5.3", - "@eclipse-sirius/sirius-components-validation": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-reference": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-table": "2026.5.3", - "@eclipse-sirius/sirius-web-application": "2026.5.3", + "@eclipse-sirius/sirius-components-browser": "2026.5.4", + "@eclipse-sirius/sirius-components-charts": "2026.5.4", + "@eclipse-sirius/sirius-components-core": "2026.5.4", + "@eclipse-sirius/sirius-components-datatree": "2026.5.4", + "@eclipse-sirius/sirius-components-deck": "2026.5.4", + "@eclipse-sirius/sirius-components-diagrams": "2026.5.4", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.4", + "@eclipse-sirius/sirius-components-forms": "2026.5.4", + "@eclipse-sirius/sirius-components-gantt": "2026.5.4", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.4", + "@eclipse-sirius/sirius-components-omnibox": "2026.5.4", + "@eclipse-sirius/sirius-components-palette": "2026.5.4", + "@eclipse-sirius/sirius-components-portals": "2026.5.4", + "@eclipse-sirius/sirius-components-selection": "2026.5.4", + "@eclipse-sirius/sirius-components-tables": "2026.5.4", + "@eclipse-sirius/sirius-components-trees": "2026.5.4", + "@eclipse-sirius/sirius-components-tsconfig": "2026.5.4", + "@eclipse-sirius/sirius-components-validation": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-reference": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-table": "2026.5.4", + "@eclipse-sirius/sirius-web-application": "2026.5.4", "@lexical/code": "0.42.0", "@lexical/react": "0.42.0", "@mui/icons-material": "7.3.10", diff --git a/frontend/syson-components/src/extensions/InsertTextualSysMLv2ExplorerToolOverriddenContribution.tsx b/frontend/syson-components/src/extensions/InsertTextualSysMLv2ExplorerToolOverriddenContribution.tsx new file mode 100644 index 000000000..5a7b9fa53 --- /dev/null +++ b/frontend/syson-components/src/extensions/InsertTextualSysMLv2ExplorerToolOverriddenContribution.tsx @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2026 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 { PaletteToolOverriddenContributionComponentProps } from '@eclipse-sirius/sirius-components-palette'; +import { TreePaletteContext, TreePaletteContextValue } from '@eclipse-sirius/sirius-components-trees'; +import AddIcon from '@mui/icons-material/Add'; +import ListItemIcon from '@mui/material/ListItemIcon'; +import ListItemText from '@mui/material/ListItemText'; +import MenuItem from '@mui/material/MenuItem'; +import { forwardRef, Fragment, useContext, useState } from 'react'; +import { InsertTextualSysMLv2Modal } from './InsertTextualSysMLv2Modal'; + +export const InsertTextualSysMLv2ExplorerToolOverriddenContribution = forwardRef( + ({}: PaletteToolOverriddenContributionComponentProps, ref: React.ForwardedRef) => { + const { editingContextId, item, treeId, readOnly, expandItem, onClose } = + useContext(TreePaletteContext); + + const [modal, setModal] = useState(false); + + if (!treeId.startsWith('explorer://') || readOnly) { + return null; + } + const onDialogClose = () => { + onClose(); + expandItem(); + }; + + let modalElement: JSX.Element | null = null; + if (modal === true) { + modalElement = ( + + ); + } + + return ( + + setModal(true)} + data-testid="insert-textual-sysmlv2-menu" + disabled={readOnly} + ref={ref} + aria-disabled> + + + + + + {modalElement} + + ); + } +); diff --git a/frontend/syson-components/src/extensions/InsertTextualSysMLv2MenuContribution.tsx b/frontend/syson-components/src/extensions/InsertTextualSysMLv2MenuContribution.tsx index 91629f874..f83eee8fb 100644 --- a/frontend/syson-components/src/extensions/InsertTextualSysMLv2MenuContribution.tsx +++ b/frontend/syson-components/src/extensions/InsertTextualSysMLv2MenuContribution.tsx @@ -26,7 +26,7 @@ export const InsertTextualSysMLMenuContribution = forwardRef( ) => { const [modal, setModal] = useState(false); - if (!treeId.startsWith('explorer://') || !item.editable) { + if (!treeId.startsWith('explorer://') || readOnly) { return null; } const onDialogClose = () => { diff --git a/frontend/syson-components/src/extensions/SysONExtensionRegistryMergeStrategy.ts b/frontend/syson-components/src/extensions/SysONExtensionRegistryMergeStrategy.ts index 97fe7e724..9b25b581c 100644 --- a/frontend/syson-components/src/extensions/SysONExtensionRegistryMergeStrategy.ts +++ b/frontend/syson-components/src/extensions/SysONExtensionRegistryMergeStrategy.ts @@ -14,6 +14,10 @@ import { DataExtension, ExtensionRegistryMergeStrategy } from '@eclipse-sirius/sirius-components-core'; import { widgetContributionExtensionPoint } from '@eclipse-sirius/sirius-components-forms'; import { omniboxCommandOverrideContributionExtensionPoint } from '@eclipse-sirius/sirius-components-omnibox'; +import { + paletteToolExtensionPoint, + paletteToolOverrideExtensionPoint, +} from '@eclipse-sirius/sirius-components-palette'; import { treeItemContextMenuEntryOverrideExtensionPoint } from '@eclipse-sirius/sirius-components-trees'; import { apolloClientOptionsConfigurersExtensionPoint, @@ -41,6 +45,12 @@ export class SysONExtensionRegistryMergeStrategy if (identifier === widgetContributionExtensionPoint.identifier) { return this.mergeWidgetContributions(existingValues, newValues); } + if (identifier === paletteToolOverrideExtensionPoint.identifier) { + return this.mergePaletteOverrideContributions(existingValues, newValues); + } + if (identifier === paletteToolExtensionPoint.identifier) { + return this.mergePaletteContributions(existingValues, newValues); + } return newValues; } @@ -83,4 +93,24 @@ export class SysONExtensionRegistryMergeStrategy data: [...existingContributions.data, ...newContributions.data], }; } + + private mergePaletteOverrideContributions( + existingContributions: DataExtension, + newContributions: DataExtension + ): DataExtension { + return { + identifier: `syson_${paletteToolOverrideExtensionPoint.identifier}`, + data: [...existingContributions.data, ...newContributions.data], + }; + } + + private mergePaletteContributions( + existingContributions: DataExtension, + newContributions: DataExtension + ): DataExtension { + return { + identifier: `syson_${paletteToolExtensionPoint.identifier}`, + data: [...existingContributions.data, ...newContributions.data], + }; + } } diff --git a/frontend/syson-components/src/extensions/expressions/DeleteExpressionDiagramToolOverriddenContribution.tsx b/frontend/syson-components/src/extensions/expressions/DeleteExpressionDiagramToolOverriddenContribution.tsx index dc1a22741..2547bad82 100644 --- a/frontend/syson-components/src/extensions/expressions/DeleteExpressionDiagramToolOverriddenContribution.tsx +++ b/frontend/syson-components/src/extensions/expressions/DeleteExpressionDiagramToolOverriddenContribution.tsx @@ -12,7 +12,7 @@ *******************************************************************************/ import { IconOverlay, useDeletionConfirmationDialog } from '@eclipse-sirius/sirius-components-core'; import { DiagramContext, DiagramContextValue, EdgeData, NodeData } from '@eclipse-sirius/sirius-components-diagrams'; -import { PaletteToolContributionComponentProps, usePalette } from '@eclipse-sirius/sirius-components-palette'; +import { PaletteToolOverriddenContributionComponentProps, usePalette } from '@eclipse-sirius/sirius-components-palette'; import ListItemButton from '@mui/material/ListItemButton'; import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; @@ -41,7 +41,8 @@ const useStyle = makeStyles()((theme) => ({ export const DeleteExpressionDiagramToolOverriddenContribution = ({ representationElementIds, -}: PaletteToolContributionComponentProps) => { + onInvoked, +}: PaletteToolOverriddenContributionComponentProps) => { const { classes } = useStyle(); const { editingContextId, readOnly } = useContext(DiagramContext); const store = useStoreApi, Edge>(); @@ -73,6 +74,7 @@ export const DeleteExpressionDiagramToolOverriddenContribution = ({ deleteExpression(editingContextId, elementId); hidePalette(); }); + onInvoked(); }; const toolLabel = 'Delete Expression'; diff --git a/frontend/syson-components/src/extensions/expressions/DeleteExpressionExplorerToolOverriddenContribution.tsx b/frontend/syson-components/src/extensions/expressions/DeleteExpressionExplorerToolOverriddenContribution.tsx new file mode 100644 index 000000000..d72f83be8 --- /dev/null +++ b/frontend/syson-components/src/extensions/expressions/DeleteExpressionExplorerToolOverriddenContribution.tsx @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2026 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 { useDeletionConfirmationDialog } from '@eclipse-sirius/sirius-components-core'; +import { PaletteToolOverriddenContributionComponentProps } from '@eclipse-sirius/sirius-components-palette'; +import { TreePaletteContext, TreePaletteContextValue } from '@eclipse-sirius/sirius-components-trees'; +import DeleteIcon from '@mui/icons-material/Delete'; +import ListItemIcon from '@mui/material/ListItemIcon'; +import ListItemText from '@mui/material/ListItemText'; +import MenuItem from '@mui/material/MenuItem'; +import React, { forwardRef, Fragment, useContext } from 'react'; +import { useDeleteExpression } from './useDeleteExpression'; + +export const DeleteExpressionExplorerToolOverriddenContribution = forwardRef( + ({}: PaletteToolOverriddenContributionComponentProps, ref: React.ForwardedRef) => { + const { editingContextId, item, treeId, readOnly, onClose } = + useContext(TreePaletteContext); + const { deleteExpression } = useDeleteExpression(); + const { showDeletionConfirmation } = useDeletionConfirmationDialog(); + + if (!treeId.startsWith('explorer://') || item === null || readOnly) { + return null; + } + + const handleDeleteExpression = () => { + showDeletionConfirmation(() => { + deleteExpression(editingContextId, item.id); + onClose(); + }); + }; + + return ( + + + + + + + + + ); + } +); diff --git a/frontend/syson-components/src/extensions/expressions/EditExpressionDiagramToolOverriddenContribution.tsx b/frontend/syson-components/src/extensions/expressions/EditExpressionDiagramToolOverriddenContribution.tsx index 2b003c016..2cc3a9c03 100644 --- a/frontend/syson-components/src/extensions/expressions/EditExpressionDiagramToolOverriddenContribution.tsx +++ b/frontend/syson-components/src/extensions/expressions/EditExpressionDiagramToolOverriddenContribution.tsx @@ -12,7 +12,7 @@ *******************************************************************************/ import { IconOverlay } from '@eclipse-sirius/sirius-components-core'; import { DiagramContext, DiagramContextValue, EdgeData, NodeData } from '@eclipse-sirius/sirius-components-diagrams'; -import { PaletteToolContributionComponentProps, usePalette } from '@eclipse-sirius/sirius-components-palette'; +import { PaletteToolOverriddenContributionComponentProps, usePalette } from '@eclipse-sirius/sirius-components-palette'; import ListItemButton from '@mui/material/ListItemButton'; import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; @@ -41,7 +41,8 @@ const useStyle = makeStyles()((theme) => ({ export const EditExpressionDiagramToolOverriddenContribution = ({ representationElementIds, -}: PaletteToolContributionComponentProps) => { + onInvoked, +}: PaletteToolOverriddenContributionComponentProps) => { const { classes } = useStyle(); const { editingContextId, readOnly } = useContext(DiagramContext); const store = useStoreApi, Edge>(); @@ -90,7 +91,10 @@ export const EditExpressionDiagramToolOverriddenContribution = ({ return ( setModalVisible(true)} + onClick={() => { + setModalVisible(true); + onInvoked(); + }} data-testid="overridden_tool_edit_expression" disabled={readOnly} className={classes.listItemButton}> diff --git a/frontend/syson-components/src/extensions/expressions/EditExpressionExplorerToolOverriddenContribution.tsx b/frontend/syson-components/src/extensions/expressions/EditExpressionExplorerToolOverriddenContribution.tsx new file mode 100644 index 000000000..35aebbb98 --- /dev/null +++ b/frontend/syson-components/src/extensions/expressions/EditExpressionExplorerToolOverriddenContribution.tsx @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2026 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 { PaletteToolOverriddenContributionComponentProps } from '@eclipse-sirius/sirius-components-palette'; +import { TreePaletteContext, TreePaletteContextValue } from '@eclipse-sirius/sirius-components-trees'; +import EditIcon from '@mui/icons-material/Edit'; +import ListItemIcon from '@mui/material/ListItemIcon'; +import ListItemText from '@mui/material/ListItemText'; +import MenuItem from '@mui/material/MenuItem'; +import React, { forwardRef, Fragment, useContext, useState } from 'react'; +import { EditSysMLExpressionModal } from './EditSysMLExpressionModal'; + +export const EditExpressionExplorerToolOverriddenContribution = forwardRef( + ({}: PaletteToolOverriddenContributionComponentProps, ref: React.ForwardedRef) => { + const { editingContextId, item, treeId, readOnly, onClose } = + useContext(TreePaletteContext); + const [modalOpened, setModalOpened] = useState(false); + + if (!treeId.startsWith('explorer://') || item === null || readOnly) { + return null; + } + + const onCloseModal = () => { + setModalOpened(false); + onClose(); + }; + + let modalElement: JSX.Element | null = null; + if (modalOpened === true) { + modalElement = ( + + ); + } + + return ( + + setModalOpened(true)} + data-testid="edit-sysml-expression-menu" + disabled={readOnly} + ref={ref} + aria-disabled> + + + + + + {modalElement} + + ); + } +); diff --git a/frontend/syson-components/src/extensions/expressions/EditSysMLExpressionMenuContribution.tsx b/frontend/syson-components/src/extensions/expressions/EditSysMLExpressionMenuContribution.tsx index d6827cb06..e65e30f92 100644 --- a/frontend/syson-components/src/extensions/expressions/EditSysMLExpressionMenuContribution.tsx +++ b/frontend/syson-components/src/extensions/expressions/EditSysMLExpressionMenuContribution.tsx @@ -31,7 +31,7 @@ export const EditSysMLExpressionMenuContribution = forwardRef( onClose(); }; - if (!treeId.startsWith('explorer://')) { + if (!treeId.startsWith('explorer://') || readOnly) { return null; } diff --git a/frontend/syson-components/src/extensions/expressions/NewExpressionDiagramToolOverriddenContribution.tsx b/frontend/syson-components/src/extensions/expressions/NewExpressionDiagramToolOverriddenContribution.tsx index 0f837d9fb..f91d6f53e 100644 --- a/frontend/syson-components/src/extensions/expressions/NewExpressionDiagramToolOverriddenContribution.tsx +++ b/frontend/syson-components/src/extensions/expressions/NewExpressionDiagramToolOverriddenContribution.tsx @@ -12,7 +12,7 @@ *******************************************************************************/ import { IconOverlay } from '@eclipse-sirius/sirius-components-core'; import { DiagramContext, DiagramContextValue, EdgeData, NodeData } from '@eclipse-sirius/sirius-components-diagrams'; -import { PaletteToolContributionComponentProps, usePalette } from '@eclipse-sirius/sirius-components-palette'; +import { PaletteToolOverriddenContributionComponentProps, usePalette } from '@eclipse-sirius/sirius-components-palette'; import ListItemButton from '@mui/material/ListItemButton'; import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; @@ -41,7 +41,8 @@ const useStyle = makeStyles()((theme) => ({ export const NewExpressionDiagramToolOverriddenContribution = ({ representationElementIds, -}: PaletteToolContributionComponentProps) => { + onInvoked, +}: PaletteToolOverriddenContributionComponentProps) => { const { classes } = useStyle(); const { editingContextId, readOnly } = useContext(DiagramContext); const store = useStoreApi, Edge>(); @@ -90,7 +91,10 @@ export const NewExpressionDiagramToolOverriddenContribution = ({ return ( setModalVisible(true)} + onClick={() => { + setModalVisible(true); + onInvoked(); + }} data-testid="overridden_tool_new_expression" disabled={readOnly} className={classes.listItemButton}> diff --git a/frontend/syson-components/src/extensions/expressions/NewExpressionExplorerToolOverriddenContribution.tsx b/frontend/syson-components/src/extensions/expressions/NewExpressionExplorerToolOverriddenContribution.tsx new file mode 100644 index 000000000..244ed051e --- /dev/null +++ b/frontend/syson-components/src/extensions/expressions/NewExpressionExplorerToolOverriddenContribution.tsx @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2026 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 { PaletteToolOverriddenContributionComponentProps } from '@eclipse-sirius/sirius-components-palette'; +import { TreePaletteContext, TreePaletteContextValue } from '@eclipse-sirius/sirius-components-trees'; +import AddIcon from '@mui/icons-material/Add'; +import ListItemIcon from '@mui/material/ListItemIcon'; +import ListItemText from '@mui/material/ListItemText'; +import MenuItem from '@mui/material/MenuItem'; +import { forwardRef, Fragment, useContext, useState } from 'react'; +import { EditSysMLExpressionModal } from './EditSysMLExpressionModal'; + +export const NewExpressionExplorerToolOverriddenContribution = forwardRef( + ({}: PaletteToolOverriddenContributionComponentProps, ref: React.ForwardedRef) => { + const { editingContextId, item, treeId, readOnly, onClose } = + useContext(TreePaletteContext); + + const [modalOpened, setModalOpened] = useState(false); + + if (!treeId.startsWith('explorer://') || item === null || readOnly) { + return null; + } + + const onCloseModal = () => { + setModalOpened(false); + onClose(); + }; + + let modalElement: JSX.Element | null = null; + if (modalOpened === true) { + modalElement = ( + + ); + } + + return ( + + setModalOpened(true)} + data-testid="new-sysml-expression-menu" + disabled={readOnly} + ref={ref} + aria-disabled> + + + + + + {modalElement} + + ); + } +); diff --git a/frontend/syson-components/src/extensions/registry/SysONExtensionRegistry.tsx b/frontend/syson-components/src/extensions/registry/SysONExtensionRegistry.tsx index c0cb7e4ff..db4acf939 100644 --- a/frontend/syson-components/src/extensions/registry/SysONExtensionRegistry.tsx +++ b/frontend/syson-components/src/extensions/registry/SysONExtensionRegistry.tsx @@ -13,6 +13,7 @@ import { ExtensionRegistry } from '@eclipse-sirius/sirius-components-core'; import { + DIAGRAM_REPRESENTATION_KIND, diagramToolbarActionExtensionPoint, EdgeAppearanceSection, EdgeData, @@ -39,6 +40,7 @@ import { } from '@eclipse-sirius/sirius-components-palette'; import { GQLTreeItemContextMenuEntry, + TREE_REPRESENTATION_KIND, treeItemContextMenuEntryOverrideExtensionPoint, TreeItemContextMenuOverrideContribution, } from '@eclipse-sirius/sirius-components-trees'; @@ -56,12 +58,16 @@ import { SysMLPackageNodePaletteAppearanceSection } from '../../nodes/package/Sy import { sysMLNodesStyleDocumentTransform } from '../../nodes/SysMLNodesDocumentTransform'; import { SysMLViewFrameNodePaletteAppearanceSection } from '../../nodes/view_frame/SysMLViewFrameNodePaletteAppearanceSection'; import { DeleteExpressionDiagramToolOverriddenContribution } from '../expressions/DeleteExpressionDiagramToolOverriddenContribution'; +import { DeleteExpressionExplorerToolOverriddenContribution } from '../expressions/DeleteExpressionExplorerToolOverriddenContribution'; import { DeleteSysMLExpressionMenuContribution } from '../expressions/DeleteSysMLExpressionMenuContribution'; import { EditExpressionDiagramToolOverriddenContribution } from '../expressions/EditExpressionDiagramToolOverriddenContribution'; +import { EditExpressionExplorerToolOverriddenContribution } from '../expressions/EditExpressionExplorerToolOverriddenContribution'; import { EditSysMLExpressionMenuContribution } from '../expressions/EditSysMLExpressionMenuContribution'; import { ExpressionPropertySection } from '../expressions/ExpressionPropertySection'; import { NewExpressionDiagramToolOverriddenContribution } from '../expressions/NewExpressionDiagramToolOverriddenContribution'; +import { NewExpressionExplorerToolOverriddenContribution } from '../expressions/NewExpressionExplorerToolOverriddenContribution'; import { NewSysMLExpressionMenuContribution } from '../expressions/NewSysMLExpressionMenuContribution'; +import { InsertTextualSysMLv2ExplorerToolOverriddenContribution } from '../InsertTextualSysMLv2ExplorerToolOverriddenContribution'; import { InsertTextualSysMLMenuContribution } from '../InsertTextualSysMLv2MenuContribution'; import { SysONNavigationBarMenuIcon } from '../navigationBarMenu/SysONNavigationBarMenuIcon'; import { PublishProjectSysMLContentsAsLibraryCommand } from '../omnibox/PublishProjectSysMLContentsAsLibraryCommand'; @@ -254,28 +260,52 @@ sysONExtensionRegistry.putData(widgetContributionExtensionPoint, { ], }); -const diagramPaletteToolOverriddenContributions: PaletteToolOverriddenContributionProps[] = [ +const paletteToolOverriddenContributions: PaletteToolOverriddenContributionProps[] = [ { - canHandle: (tool: GQLTool) => { - return tool.id === 'tool_new_expression'; + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === TREE_REPRESENTATION_KIND && tool.id === 'newObjectsFromText'; + }, + component: InsertTextualSysMLv2ExplorerToolOverriddenContribution, + }, + { + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === TREE_REPRESENTATION_KIND && tool.id === 'createExpression'; + }, + component: NewExpressionExplorerToolOverriddenContribution, + }, + { + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === TREE_REPRESENTATION_KIND && tool.id === 'editExpression'; + }, + component: EditExpressionExplorerToolOverriddenContribution, + }, + { + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === TREE_REPRESENTATION_KIND && tool.id === 'deleteExpression'; + }, + component: DeleteExpressionExplorerToolOverriddenContribution, + }, + { + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === DIAGRAM_REPRESENTATION_KIND && tool.id === 'tool_new_expression'; }, component: NewExpressionDiagramToolOverriddenContribution, }, { - canHandle: (tool: GQLTool) => { - return tool.id === 'tool_edit_expression'; + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === DIAGRAM_REPRESENTATION_KIND && tool.id === 'tool_edit_expression'; }, component: EditExpressionDiagramToolOverriddenContribution, }, { - canHandle: (tool: GQLTool) => { - return tool.id === 'tool_delete_expression'; + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === DIAGRAM_REPRESENTATION_KIND && tool.id === 'tool_delete_expression'; }, component: DeleteExpressionDiagramToolOverriddenContribution, }, { - canHandle: (tool: GQLTool) => { - return tool.id === 'fork_join_node_rotate_tool'; + canHandle: (representationDescriptionId: string, tool: GQLTool) => { + return representationDescriptionId === DIAGRAM_REPRESENTATION_KIND && tool.id === 'fork_join_node_rotate_tool'; }, component: RotateNodeToolOverriddenContribution, }, @@ -283,7 +313,7 @@ const diagramPaletteToolOverriddenContributions: PaletteToolOverriddenContributi sysONExtensionRegistry.putData(paletteToolOverrideExtensionPoint, { identifier: `syson_${paletteToolOverrideExtensionPoint.identifier}`, - data: diagramPaletteToolOverriddenContributions, + data: paletteToolOverriddenContributions, }); export { sysONExtensionRegistry }; diff --git a/frontend/syson-components/src/index.ts b/frontend/syson-components/src/index.ts index cb63ea516..5dc3a9c9d 100644 --- a/frontend/syson-components/src/index.ts +++ b/frontend/syson-components/src/index.ts @@ -10,6 +10,13 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ +export { DeleteExpressionDiagramToolOverriddenContribution } from './extensions/expressions/DeleteExpressionDiagramToolOverriddenContribution'; +export { DeleteExpressionExplorerToolOverriddenContribution } from './extensions/expressions/DeleteExpressionExplorerToolOverriddenContribution'; +export { EditExpressionDiagramToolOverriddenContribution } from './extensions/expressions/EditExpressionDiagramToolOverriddenContribution'; +export { EditExpressionExplorerToolOverriddenContribution } from './extensions/expressions/EditExpressionExplorerToolOverriddenContribution'; +export { NewExpressionDiagramToolOverriddenContribution } from './extensions/expressions/NewExpressionDiagramToolOverriddenContribution'; +export { NewExpressionExplorerToolOverriddenContribution } from './extensions/expressions/NewExpressionExplorerToolOverriddenContribution'; +export { InsertTextualSysMLv2ExplorerToolOverriddenContribution } from './extensions/InsertTextualSysMLv2ExplorerToolOverriddenContribution'; export { InsertTextualSysMLMenuContribution } from './extensions/InsertTextualSysMLv2MenuContribution'; export { InsertTextualSysMLv2Modal } from './extensions/InsertTextualSysMLv2Modal'; export { SysONNavigationBarMenuIcon } from './extensions/navigationBarMenu/SysONNavigationBarMenuIcon'; @@ -17,6 +24,7 @@ export { PublishProjectSysMLContentsAsLibraryCommand } from './extensions/omnibo export type { PublishProjectSysMLContentsAsLibraryCommandState } from './extensions/omnibox/PublishProjectSysMLContentsAsLibraryCommand.types'; export { sysONExtensionRegistry } from './extensions/registry/SysONExtensionRegistry'; export { sysONNodeTypeRegistry } from './extensions/registry/SysONNodeTypeRegistry'; +export { RotateNodeToolOverriddenContribution } from './extensions/rotateNodeTool/RotateNodeToolOverriddenContribution'; export { ShowHideDiagramsIcons } from './extensions/ShowHideDiagramsIcons'; export { ShowHideDiagramsInheritedMembers } from './extensions/ShowHideDiagramsInheritedMembers'; export { ShowHideDiagramsInheritedMembersFromStandardLibraries } from './extensions/ShowHideDiagramsInheritedMembersFromStandardLibraries'; diff --git a/frontend/syson/package.json b/frontend/syson/package.json index 16119ef91..a728c7f2f 100644 --- a/frontend/syson/package.json +++ b/frontend/syson/package.json @@ -13,27 +13,27 @@ "private": true, "dependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.5.3", - "@eclipse-sirius/sirius-components-charts": "2026.5.3", - "@eclipse-sirius/sirius-components-core": "2026.5.3", - "@eclipse-sirius/sirius-components-datatree": "2026.5.3", - "@eclipse-sirius/sirius-components-deck": "2026.5.3", - "@eclipse-sirius/sirius-components-diagrams": "2026.5.3", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.3", - "@eclipse-sirius/sirius-components-forms": "2026.5.3", - "@eclipse-sirius/sirius-components-gantt": "2026.5.3", - "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.3", - "@eclipse-sirius/sirius-components-omnibox": "2026.5.3", - "@eclipse-sirius/sirius-components-palette": "2026.5.3", - "@eclipse-sirius/sirius-components-portals": "2026.5.3", - "@eclipse-sirius/sirius-components-selection": "2026.5.3", - "@eclipse-sirius/sirius-components-tables": "2026.5.3", - "@eclipse-sirius/sirius-components-trees": "2026.5.3", - "@eclipse-sirius/sirius-components-tsconfig": "2026.5.3", - "@eclipse-sirius/sirius-components-validation": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-reference": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-table": "2026.5.3", - "@eclipse-sirius/sirius-web-application": "2026.5.3", + "@eclipse-sirius/sirius-components-browser": "2026.5.4", + "@eclipse-sirius/sirius-components-charts": "2026.5.4", + "@eclipse-sirius/sirius-components-core": "2026.5.4", + "@eclipse-sirius/sirius-components-datatree": "2026.5.4", + "@eclipse-sirius/sirius-components-deck": "2026.5.4", + "@eclipse-sirius/sirius-components-diagrams": "2026.5.4", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.4", + "@eclipse-sirius/sirius-components-forms": "2026.5.4", + "@eclipse-sirius/sirius-components-gantt": "2026.5.4", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.4", + "@eclipse-sirius/sirius-components-omnibox": "2026.5.4", + "@eclipse-sirius/sirius-components-palette": "2026.5.4", + "@eclipse-sirius/sirius-components-portals": "2026.5.4", + "@eclipse-sirius/sirius-components-selection": "2026.5.4", + "@eclipse-sirius/sirius-components-tables": "2026.5.4", + "@eclipse-sirius/sirius-components-trees": "2026.5.4", + "@eclipse-sirius/sirius-components-tsconfig": "2026.5.4", + "@eclipse-sirius/sirius-components-validation": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-reference": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-table": "2026.5.4", + "@eclipse-sirius/sirius-web-application": "2026.5.4", "@eclipse-syson/syson-components": "2026.5.3", "@fontsource/roboto": "5.2.10", "@lexical/code": "0.42.0", diff --git a/package-lock.json b/package-lock.json index bec68dbfd..df3dd1c90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,27 +25,27 @@ "license": "EPL-2.0", "dependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.5.3", - "@eclipse-sirius/sirius-components-charts": "2026.5.3", - "@eclipse-sirius/sirius-components-core": "2026.5.3", - "@eclipse-sirius/sirius-components-datatree": "2026.5.3", - "@eclipse-sirius/sirius-components-deck": "2026.5.3", - "@eclipse-sirius/sirius-components-diagrams": "2026.5.3", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.3", - "@eclipse-sirius/sirius-components-forms": "2026.5.3", - "@eclipse-sirius/sirius-components-gantt": "2026.5.3", - "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.3", - "@eclipse-sirius/sirius-components-omnibox": "2026.5.3", - "@eclipse-sirius/sirius-components-palette": "2026.5.3", - "@eclipse-sirius/sirius-components-portals": "2026.5.3", - "@eclipse-sirius/sirius-components-selection": "2026.5.3", - "@eclipse-sirius/sirius-components-tables": "2026.5.3", - "@eclipse-sirius/sirius-components-trees": "2026.5.3", - "@eclipse-sirius/sirius-components-tsconfig": "2026.5.3", - "@eclipse-sirius/sirius-components-validation": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-reference": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-table": "2026.5.3", - "@eclipse-sirius/sirius-web-application": "2026.5.3", + "@eclipse-sirius/sirius-components-browser": "2026.5.4", + "@eclipse-sirius/sirius-components-charts": "2026.5.4", + "@eclipse-sirius/sirius-components-core": "2026.5.4", + "@eclipse-sirius/sirius-components-datatree": "2026.5.4", + "@eclipse-sirius/sirius-components-deck": "2026.5.4", + "@eclipse-sirius/sirius-components-diagrams": "2026.5.4", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.4", + "@eclipse-sirius/sirius-components-forms": "2026.5.4", + "@eclipse-sirius/sirius-components-gantt": "2026.5.4", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.4", + "@eclipse-sirius/sirius-components-omnibox": "2026.5.4", + "@eclipse-sirius/sirius-components-palette": "2026.5.4", + "@eclipse-sirius/sirius-components-portals": "2026.5.4", + "@eclipse-sirius/sirius-components-selection": "2026.5.4", + "@eclipse-sirius/sirius-components-tables": "2026.5.4", + "@eclipse-sirius/sirius-components-trees": "2026.5.4", + "@eclipse-sirius/sirius-components-tsconfig": "2026.5.4", + "@eclipse-sirius/sirius-components-validation": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-reference": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-table": "2026.5.4", + "@eclipse-sirius/sirius-web-application": "2026.5.4", "@eclipse-syson/syson-components": "2026.5.3", "@fontsource/roboto": "5.2.10", "@lexical/code": "0.42.0", @@ -108,27 +108,27 @@ "license": "EPL-2.0", "devDependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.5.3", - "@eclipse-sirius/sirius-components-charts": "2026.5.3", - "@eclipse-sirius/sirius-components-core": "2026.5.3", - "@eclipse-sirius/sirius-components-datatree": "2026.5.3", - "@eclipse-sirius/sirius-components-deck": "2026.5.3", - "@eclipse-sirius/sirius-components-diagrams": "2026.5.3", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.3", - "@eclipse-sirius/sirius-components-forms": "2026.5.3", - "@eclipse-sirius/sirius-components-gantt": "2026.5.3", - "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.3", - "@eclipse-sirius/sirius-components-omnibox": "2026.5.3", - "@eclipse-sirius/sirius-components-palette": "2026.5.3", - "@eclipse-sirius/sirius-components-portals": "2026.5.3", - "@eclipse-sirius/sirius-components-selection": "2026.5.3", - "@eclipse-sirius/sirius-components-tables": "2026.5.3", - "@eclipse-sirius/sirius-components-trees": "2026.5.3", - "@eclipse-sirius/sirius-components-tsconfig": "2026.5.3", - "@eclipse-sirius/sirius-components-validation": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-reference": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-table": "2026.5.3", - "@eclipse-sirius/sirius-web-application": "2026.5.3", + "@eclipse-sirius/sirius-components-browser": "2026.5.4", + "@eclipse-sirius/sirius-components-charts": "2026.5.4", + "@eclipse-sirius/sirius-components-core": "2026.5.4", + "@eclipse-sirius/sirius-components-datatree": "2026.5.4", + "@eclipse-sirius/sirius-components-deck": "2026.5.4", + "@eclipse-sirius/sirius-components-diagrams": "2026.5.4", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.4", + "@eclipse-sirius/sirius-components-forms": "2026.5.4", + "@eclipse-sirius/sirius-components-gantt": "2026.5.4", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.4", + "@eclipse-sirius/sirius-components-omnibox": "2026.5.4", + "@eclipse-sirius/sirius-components-palette": "2026.5.4", + "@eclipse-sirius/sirius-components-portals": "2026.5.4", + "@eclipse-sirius/sirius-components-selection": "2026.5.4", + "@eclipse-sirius/sirius-components-tables": "2026.5.4", + "@eclipse-sirius/sirius-components-trees": "2026.5.4", + "@eclipse-sirius/sirius-components-tsconfig": "2026.5.4", + "@eclipse-sirius/sirius-components-validation": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-reference": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-table": "2026.5.4", + "@eclipse-sirius/sirius-web-application": "2026.5.4", "@lexical/code": "0.42.0", "@lexical/react": "0.42.0", "@mui/icons-material": "7.3.10", @@ -172,27 +172,27 @@ }, "peerDependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.5.3", - "@eclipse-sirius/sirius-components-charts": "2026.5.3", - "@eclipse-sirius/sirius-components-core": "2026.5.3", - "@eclipse-sirius/sirius-components-datatree": "2026.5.3", - "@eclipse-sirius/sirius-components-deck": "2026.5.3", - "@eclipse-sirius/sirius-components-diagrams": "2026.5.3", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.3", - "@eclipse-sirius/sirius-components-forms": "2026.5.3", - "@eclipse-sirius/sirius-components-gantt": "2026.5.3", - "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.3", - "@eclipse-sirius/sirius-components-omnibox": "2026.5.3", - "@eclipse-sirius/sirius-components-palette": "2026.5.3", - "@eclipse-sirius/sirius-components-portals": "2026.5.3", - "@eclipse-sirius/sirius-components-selection": "2026.5.3", - "@eclipse-sirius/sirius-components-tables": "2026.5.3", - "@eclipse-sirius/sirius-components-trees": "2026.5.3", - "@eclipse-sirius/sirius-components-tsconfig": "2026.5.3", - "@eclipse-sirius/sirius-components-validation": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-reference": "2026.5.3", - "@eclipse-sirius/sirius-components-widget-table": "2026.5.3", - "@eclipse-sirius/sirius-web-application": "2026.5.3", + "@eclipse-sirius/sirius-components-browser": "2026.5.4", + "@eclipse-sirius/sirius-components-charts": "2026.5.4", + "@eclipse-sirius/sirius-components-core": "2026.5.4", + "@eclipse-sirius/sirius-components-datatree": "2026.5.4", + "@eclipse-sirius/sirius-components-deck": "2026.5.4", + "@eclipse-sirius/sirius-components-diagrams": "2026.5.4", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.5.4", + "@eclipse-sirius/sirius-components-forms": "2026.5.4", + "@eclipse-sirius/sirius-components-gantt": "2026.5.4", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.5.4", + "@eclipse-sirius/sirius-components-omnibox": "2026.5.4", + "@eclipse-sirius/sirius-components-palette": "2026.5.4", + "@eclipse-sirius/sirius-components-portals": "2026.5.4", + "@eclipse-sirius/sirius-components-selection": "2026.5.4", + "@eclipse-sirius/sirius-components-tables": "2026.5.4", + "@eclipse-sirius/sirius-components-trees": "2026.5.4", + "@eclipse-sirius/sirius-components-tsconfig": "2026.5.4", + "@eclipse-sirius/sirius-components-validation": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-reference": "2026.5.4", + "@eclipse-sirius/sirius-components-widget-table": "2026.5.4", + "@eclipse-sirius/sirius-web-application": "2026.5.4", "@lexical/code": "0.42.0", "@lexical/react": "0.42.0", "@mui/icons-material": "7.3.10", @@ -473,9 +473,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-browser": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-browser/2026.5.3/acf93d22adc1e05833b22ce00f7555f785e0cb8a", - "integrity": "sha512-ErmTKs8F5XwHn3kj2GrtoMlygRWSb+FIowToYJu+bO6NvnqOFFknX1XO4RTB0XNINDI2yQZupzFfqAL6QlRXuQ==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-browser/2026.5.4/575d1000fd81318153bf523af380ce16ff2a6030", + "integrity": "sha512-/Etm0AFatYXxKfEKqop1UTDQQaEVXHT11cYWh4nfl0afdNg2i8Hk655DZyVzoWusxlx6eK9avVjhnH742/N9+Q==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -498,9 +498,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-charts": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-charts/2026.5.3/2703345fb7da9de69dd1a8929a00b5f00f45682e", - "integrity": "sha512-TKevfmLjdRBOSJdmfv+F/dBrdmworIbAPJwBOYq5ezqAS48IX1lWhkJj0Es2lK+sxVnOOvE2UdNvhdyhFobiCw==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-charts/2026.5.4/de089c7d13919d1a8681305aeee41541a2db3e6d", + "integrity": "sha512-xLHlc7SLZqOQGWvtvP80DVyHZ4a15moK7AI4guCcIJzqv3k6enbaC8VVVZN9xQ+zNcGMTG2bfXRUntazWWJOzA==", "license": "EPL-2.0", "peerDependencies": { "d3": "7.0.0", @@ -508,9 +508,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-core": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-core/2026.5.3/177703dbf1172b168521297de1ecf4de0498dca1", - "integrity": "sha512-wQ0QlqYVFLo1F8OBMHxJAYfXmoS7vbpm5iS6dzwptx86EW10PxvGC+2iKAI9sRIxKWa6gR/oDxUIuivEVf38Aw==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-core/2026.5.4/6f2d8da4ea6774b00ec73ee1ef6d73e4f4d11edc", + "integrity": "sha512-D8uPCswLmv4dWVH7gW3lv9ww7K4u19iDXAFkcpuVzbj1oSIvCDb7733SvplV6G/AcVPh2HbleGAHmJ1OgvTkRw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -525,9 +525,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-datatree": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-datatree/2026.5.3/6a7529ffaab2665e79ff7dbe05d6d161da589313", - "integrity": "sha512-FTJ0eX0tiLgYhtOTjlNR0DhN+nODicHfHf9d0OtWvqqa8y+1jaUF99ek7kYO/FWtGFD//j3YcWjhfspjNoGNiQ==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-datatree/2026.5.4/7ee1aafacb50aacfa7b45c8e9741c4c254788dc6", + "integrity": "sha512-cmjiFnpeWJfGSjF9UYMVcNY7Cz3qaKXF/UCP4lBqNs7yTIjexignsDpVxh/TCu/zHsBjSjFvyjnPUFd8uVLsLA==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -543,9 +543,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-deck": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-deck/2026.5.3/5311ee9b3f14ad7f9e1d265090c013dd612630b5", - "integrity": "sha512-oGQHtuuHgnXxo7ur+6M7Mx6ylUCNKBntaKBkWpAtxpQL0V8WASVdneH2duwXD0qiD9DeWuAAYWGYQHTeOMeS3A==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-deck/2026.5.4/f1fd527a96ab9f1e86bd888d48c0498f95d389cf", + "integrity": "sha512-ztzn2HD+RMYuz0/XFllW6VOiWgiEXg9G2WKTWnHjaChyko3+yl+dIxi0cjZvcbuv+ZoQfyWdcg9aOEPftvZsJQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -562,9 +562,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-diagrams": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-diagrams/2026.5.3/03a2dc62e2c2bb3225ec700a2de1b2819e4de43f", - "integrity": "sha512-n8zkXrjShmpPmGbZijWiEKj+Vlyvgo9N7b03Yvq3c7DWgTpLlV+DXusGplfg9tEUORISa7EAOlEFgbbJarM/hg==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-diagrams/2026.5.4/df69220aa3f0d5ee378a44a6e65788e5ed34df07", + "integrity": "sha512-olludmiZAtzbjKjYzCktkBCu5quGtfiX9sJB0ZJ5S/gBDcERa4UoNheqDnwh9eI0bOK7xqAAZXtZyKr8jUU4HA==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -590,9 +590,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-formdescriptioneditors": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-formdescriptioneditors/2026.5.3/395a881db168d943d1f391bb198fd1bd4a056bd3", - "integrity": "sha512-5mZENh7dyWaBBpZmphWgwhbFalp8lv+s0tG/qrmhAplZXFnw0NdvqqF/oi1J/PRM9FKFvBBozmh4WWV0FCG2HA==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-formdescriptioneditors/2026.5.4/0439029f7a5c4f4771e74efd83766b52947ba869", + "integrity": "sha512-Bq5g2WKPsfwG+TMZj5Syyfx7DA4NGwJrnLnO+9VJ/Kicvz/cgBPPy0X2cNL0nJOuXTVxOUMpwrR4TAIr9vJsSg==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -617,9 +617,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-forms": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-forms/2026.5.3/80f5351d29db1cea3031d9da74e8a5ccd963a949", - "integrity": "sha512-cnbKtNbvK/yj75YKMwPnqPhx53d0/mXc0EZ9XKDW2u4dIc7j/dOv2KToaEdtD+/yKmh0xl1ZeSGPw0G1qPnzkA==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-forms/2026.5.4/802308faf320042868043896a27f916237187c7b", + "integrity": "sha512-aZInDVZbaKy0W/IgL8VyCOLqURMUAwhY1mtZbcWU4XEP3aw55RtGbMAo0L4Lnxu7NGwfrY6CXdJ508gd6L/0qQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -643,9 +643,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-gantt": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-gantt/2026.5.3/071dbe52f8b30c73e4452b193eef7fbab7dcc475", - "integrity": "sha512-CxawMOPuzvGlo0caT0HSvDGLEOCZ/Ny3kTs3+B1eyK4RX+/WvWsLqqOQPPvxo1n6kg7mWFyEG730nrEaPQtKwA==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-gantt/2026.5.4/5676f41f16e622162ee6254d919ac7899aa91ca7", + "integrity": "sha512-JfUYiksjnt1dMBHSsPtOPQJl41ftQ5sgP9yEUyhrYkUMVu0sgheCsavAsKSs9m0+c3FR1pkURHuI6mR3mxRsDQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -662,9 +662,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-impactanalysis": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-impactanalysis/2026.5.3/c485373962cbfe565b1b0ae82f232212c61f482c", - "integrity": "sha512-6e4a7AXJpL2KpR2zJJQQNxFs2tjEaVjKjIhD7aZxidmRb0ZvIgqWEpmzSJ32RcJeiQ6LZp7OmyUkF6+rrq8JUQ==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-impactanalysis/2026.5.4/a5f067e349206081e6d7e1a44d308bb1d0d47a7b", + "integrity": "sha512-eBcnAzznyTPRjHoXZ6gclio41uIPqSX4NXeZzswvZjojhOvG9mLPyxUnGtQLT9MieZmL2PS5fxHzWdPhJ2WEjw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -681,9 +681,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-omnibox": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-omnibox/2026.5.3/7cd41b9a5227151b6e9f919d4e57795602d07c53", - "integrity": "sha512-MH7gsT2qOzU4JdEbbLsJfa+mSJR1lat7+kA8ZlENnVOd8Me3lYidJBtPmyuik/br2XmXPBg3y4PeX3g4mb1hQQ==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-omnibox/2026.5.4/13f62cc9207fde54747cc59b12025094bfbeaadb", + "integrity": "sha512-Njns2VPpQA4GsembU2+mg0/sddoX4dhqCEqPAxt5qvTlDlTQRk8Ww4zAFxy7or9hhoIMvGfCZe+xQVlN3aR7UQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -699,9 +699,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-palette": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-palette/2026.5.3/567055cf689e303f54a44df9acdd55930c82cbcf", - "integrity": "sha512-naemsTUxoorA99dl2KmNq5I4bBLsD/O6MgsIDrZQxTdPlrOJTGD/JSU3s8ajT6qZ6dV8TcKkmOljyE8s2Ysq+A==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-palette/2026.5.4/2c611dd8e715ec29523ad81ac746f186724472c5", + "integrity": "sha512-shOUPt4z16firJ1udaueN0uhSlxlRnGqgaW+ep/N00OuJ7Dv5ZL5eG8ZE4qTTaMhJHCsS2ajWmbCP35MakrIXw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -717,9 +717,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-portals": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-portals/2026.5.3/8b954f720d14bd38f07da74f5ee3601f3a7f0124", - "integrity": "sha512-P+0vkCnMI/6Ef0M80s81v1que14Yn0LeCWwgNs1X9uBV01ceOijl8MoOw+tk4LosYyf2XX8HKNwN2p+5lN7FeA==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-portals/2026.5.4/740ec109ad7d6736a13a163d004f7177bdab4620", + "integrity": "sha512-eY1C+UbfnN42c61HGb5YqzzjBUci922Xz5SlKSZ7804AQIxY+25U0yoHZXknwFXsA3P2c9fRU3chMIGg+UmZoA==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -736,9 +736,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-selection": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-selection/2026.5.3/7a644ed43b702ef2d434640abe98983880868837", - "integrity": "sha512-nY0zW7NK3TzcFCvIqSI8lJcmIbPE7AuV9FJ3ciUx1kyTveHeWogBQNN3CY9ozZE+rVp691RmsrEdpm6IhX5d3g==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-selection/2026.5.4/3b27ac95eb59ce3d47a2d0fa8639d80adc700607", + "integrity": "sha512-bFnXPKP22g6c271ea5x3MCPrs3N3s9kKFGZZ+kF/1R5Oy179HgGIaaDdCbgI/UyAlq/ihBoag2veIIgspmG7SQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -766,9 +766,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-tables": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-tables/2026.5.3/ca89e9f3a655842dd01dc4a9077930dbd8d0727f", - "integrity": "sha512-sDfZxDQv0wqaY9SaNOMkpwcCNWN9a77wa6f05mrFp+RzUSFSyzRA1PzQPkGYvnICq5oNEA1Zs4a5DB1dGWs/Bw==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-tables/2026.5.4/08916d8d7c29a47fe1dc80ff52bffe1121eb404a", + "integrity": "sha512-otfOrl8pD5YNB94ttM+kvJmAcH+iuFHdjhf7lH0KR9Tzs2fZMDyReFUwbCJ3LcXy0jGjiSUjMSghhln23NCnIQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -786,9 +786,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-trees": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-trees/2026.5.3/9e9db1088b99515b9e603553e27203ad12a4b93e", - "integrity": "sha512-b2WAPpep1Gufnm7u2ViPE/cdFzlID8hJy0AyNWiA8lzUXk8E1Hxl47TZ6rjnR6tkSeI+DL57VrZWEdOgKXDczQ==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-trees/2026.5.4/266737fb1b0cf8c13cd520d8d063bfaada61fb43", + "integrity": "sha512-C2X8qPasruD7ddq462Z3Yaiyh6fODsFYYDsOm4XBH/FqvyRH4QgXVkr7UCbw9s7YyQgcOrZwrrpCExMtB0n65w==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -806,15 +806,15 @@ } }, "node_modules/@eclipse-sirius/sirius-components-tsconfig": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-tsconfig/2026.5.3/fd7499ecc2d0411404294f8b55ca673d8fc27a74", - "integrity": "sha512-4F4ZmoruUMkYFLJf/UyyElZ8kV6KTQqhG7Z+Ls5eJvDeXWDnR0SAm8C8LiovOvVJ28zs7pqzYzgVGFTKx18rbA==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-tsconfig/2026.5.4/61a756073c1cc2743e5ab37b9c5d151e8e2c9146", + "integrity": "sha512-OtRsrlEBrGtYeCDtsJCOeFD9j5iMaXZJt96cko8EO2AcAXFklnpYF0e7wTDEsT3SgtHHe37qN1m1gwPbGumrQw==", "license": "EPL-2.0" }, "node_modules/@eclipse-sirius/sirius-components-validation": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-validation/2026.5.3/ed22d4f7bc5f1420fa099576ddd5827d9d510712", - "integrity": "sha512-vG8SgWYW41pppmJ+WY4HB4yimk7aVu6x88Nj0Dt3xZ0ZqjI+dQPB2/YMZTLNSbhxDdpqk2ENJ5wZZ0JhQCQC+g==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-validation/2026.5.4/e297de738a35f0491a1cd616674aa15f30005b71", + "integrity": "sha512-FSF2Ul7xtqtcVtSEw4429s7E5HFKPOgXks4CoyzZnwR7XcHFFDffXQr4YP/BEVWPbbkEBI+qjQKdOxDKLF3Bcg==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -830,9 +830,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-widget-reference": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-reference/2026.5.3/c5b2ad982d8e76dcb5382e569df953d141ea7671", - "integrity": "sha512-FdwY1rrZ2V6T+6yhkmjA65I/Uq7hD6WLE3OdlEO1ndZgConM0TG0oO8J2KvzHYjTm7BfTaXC55T9/Y/1vr1NPg==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-reference/2026.5.4/9d3e015970bdbfdf26b625fdfc4da360544f5d64", + "integrity": "sha512-jssAXp/4MX3Ci59V1u3ciu55wYzhOtFjQemf03VjS1a1J0INGz1dnQ7QxUk8LSP0iO6HQFajoGdTGz8sUGWtvQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -861,9 +861,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-widget-table": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-table/2026.5.3/0b8cbb16a58b29ee89ad65c5a738a7c33abdc86e", - "integrity": "sha512-rE3paA+rPwL366iugxvBZmsfLEs6c1B+WEQGLJkn3RboHX3QSgZTKd7TmjmkEIQhXOabAul0ElofZHtfRidhww==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-table/2026.5.4/7492085cd69b4d9bd56e948d8947fb0b5e77435f", + "integrity": "sha512-/CTMhlROqDjA9nph5Rwn5Gi8xoUtXa5monfdK9Nm371hx/7f/NnPAo7RHPxB3t3S2C34agaZs0IHN2SVbK+bSg==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -889,9 +889,9 @@ } }, "node_modules/@eclipse-sirius/sirius-web-application": { - "version": "2026.5.3", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-web-application/2026.5.3/24004d91dae8789e36ea8fb72d253697ecb24cdf", - "integrity": "sha512-NzPgXN9e7fLu8vYx+ImvykMP6CvmCIcW9TspAJbEKOjmrbrNnpPVRlF/5r8BnfTL9wrv0kUymzqaQG6eIYwDiA==", + "version": "2026.5.4", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-web-application/2026.5.4/f0d18b9328a1a95f8fc2bcf61ddebc915d353b74", + "integrity": "sha512-zXfMoaaxVHV7zTX0/iym1HD5gnsK0lEBXuU79AsR3z75aZ2rpzD4FrZKEdF0cn0cOsXzdcwFLl2YJYeAqadApQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", diff --git a/pom.xml b/pom.xml index 4f4df54ac..026cadcbb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 21 - 2026.5.3 + 2026.5.4 2026.5.3 ${project.basedir}/releng/backend/releng/syson-test-coverage/target/site/jacoco-aggregate/jacoco.xml