From 2039a04d80c3ead32845abfab3739a9344994021 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Sat, 1 Mar 2025 23:22:09 +0100 Subject: [PATCH] [1077] Fix explorer in case of non-sysml domain Fix behavior of hasChildren management of syson explorer when handling model elements from non-sysml domains. It now falls back to SiriusWeb implementation when necessary. Bug: https://github.com/eclipse-syson/syson/issues/1077 Signed-off-by: Didier Vojtisek --- CHANGELOG.adoc | 2 ++ .../explorer/view/services/SysONDefaultExplorerServices.java | 3 +++ .../modules/user-manual/pages/release-notes/2025.4.0.adoc | 2 ++ 3 files changed, 7 insertions(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index bfc6ccb99..74caf2cda 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -15,6 +15,8 @@ === Bug fixes +- https://github.com/eclipse-syson/syson/issues/1077[#1077] [explorer] Fix navigation in case of project containing both sysml and non-sysml model elements + === Improvements - https://github.com/eclipse-syson/syson/issues/1061[#1061] [general-view] Add ellipsis on `Packages` label, to provide visual feedback on name overflow. diff --git a/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/services/SysONDefaultExplorerServices.java b/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/services/SysONDefaultExplorerServices.java index d9cda2cea..8f5dd124e 100644 --- a/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/services/SysONDefaultExplorerServices.java +++ b/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/services/SysONDefaultExplorerServices.java @@ -24,6 +24,7 @@ import org.eclipse.sirius.components.core.api.IIdentityService; import org.eclipse.sirius.web.application.UUIDParser; import org.eclipse.sirius.web.application.editingcontext.EditingContext; +import org.eclipse.sirius.web.application.views.explorer.services.ExplorerServices; import org.eclipse.sirius.web.application.views.explorer.services.api.IExplorerServices; import org.eclipse.sirius.web.domain.boundedcontexts.representationdata.services.api.IRepresentationMetadataSearchService; import org.eclipse.syson.services.UtilService; @@ -133,6 +134,8 @@ public boolean hasChildren(Object self, IEditingContext editingContext, List contents = this.filterService.applyFilters(this.contentService.getContents(self), activeFilterIds); hasChildren = !contents.isEmpty() && contents.stream().anyMatch(e -> !(e instanceof EAnnotation)) || this.hasRepresentation(element, editingContext); + } else { + explorerServices.hasChildren(self, editingContext); } return hasChildren; } diff --git a/doc/content/modules/user-manual/pages/release-notes/2025.4.0.adoc b/doc/content/modules/user-manual/pages/release-notes/2025.4.0.adoc index 774b0b964..1282fe6f5 100644 --- a/doc/content/modules/user-manual/pages/release-notes/2025.4.0.adoc +++ b/doc/content/modules/user-manual/pages/release-notes/2025.4.0.adoc @@ -4,6 +4,8 @@ == Bug fixes +- In `Explorer View`, the fold/unfold arrow is now also available for non-sysml model elements. + == New features == Improvements