[1077] Fix explorer in case of non-sysml domain #1071

dvojtise · 2025-03-01T22:25:10Z

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.

PLEASE READ ALL ITEMS AND CHECK ONLY RELEVANT CHECKBOXES BELOW

Project management

Has the pull request been added to the relevant milestone?
Have the priority: and pr: labels been added to the pull request? (In case of doubt, start with the labels priority: low and pr: to review later)
Have the relevant issues been added to the pull request?
Have the relevant labels been added to the issues? (area:, type:)
Have the relevant issues been added to the same project milestone as the pull request?

Changelog and release notes

Has the CHANGELOG.adoc + doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc been updated to reference the relevant issues?
Have the relevant API breaks been described in the CHANGELOG.adoc + doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc?
In case of a change with a visual impact, are there any screenshots in the doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc?
In case of a key change, has the change been added to Key highlights section in doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc?
Are the new / upgraded dependencies mentioned in the relevant section of the CHANGELOG.adoc + doc/content/modules/user-manual/pages/release-notes/YYYY.MM.0.adoc?

Documentation

Have you included an update of the documentation in your pull request? Please ask yourself if an update (installation manual, user manual, developer manual...) is needed and add one accordingly.

Tests

Is the code properly tested? Any pull request (fix, enhancement or new feature) should come with a test (or several). It could be unit tests, integration tests or cypress tests depending on the context. Only doc and releng pull request do not need for tests.

AxelRICHARD · 2025-03-04T12:56:37Z

Could you please create a bug describing the issue?
Then:

replace [bug] by [ISSUE_NUMBER] in the commit message title.
update the changelog (just look latest commits to see how it is done)
update the release note (just look latest commits to see how it is done)

Regards,

dvojtise · 2025-03-04T21:15:42Z

done 🙂

Regards,

AxelRICHARD

Could you please add an integration test or a cypress test?
An also add
Bug: https://github.com/eclipse-syson/syson/issues/1077
just above the signed-off-by line? (see other commits for examples)

Thank you!

AxelRICHARD · 2025-03-05T13:22:44Z

...rc/main/java/org/eclipse/syson/tree/explorer/view/services/SysONDefaultExplorerServices.java

    public SysONDefaultExplorerServices(IIdentityService identityService, IContentService contentService, IRepresentationMetadataSearchService representationMetadataSearchService, IExplorerServices explorerServices,
-            ISysONExplorerFilterService filterService) {
+            ISysONExplorerFilterService filterService, ExplorerServices siriuswebExplorerService) {


You don't need ExplorerServices from Sirius Web.
There is already a IExplorerServices explorerServices variable that gives you access to hasChildren method.
We don't have any implementation of IExplorerServices in SysON so the only implementation returned by IExplorerServices explorerServices is the one coming from Sirius Web.

AxelRICHARD · 2025-03-05T13:24:02Z

CHANGELOG.adoc

@@ -63,6 +65,7 @@ Export to textual SysMLv2 is not fully implemented yet so there are still unhand
 - https://github.com/eclipse-syson/syson/issues/1020[#1020] [general-view] The multiplicity should not be displayed on edges.
 - https://github.com/eclipse-syson/syson/issues/1009[#1009] [metamodel] Fix an issue where the diagram direct edit on graphical nodes could raise a backend error on unsettable enum attributes.
 - https://github.com/eclipse-syson/syson/issues/1052[#1052] [general-view] Fix an issue where the execution of "New Port In/Inout/Out" tools was failing.
+- https://github.com/eclipse-syson/syson/issues/1077[#1077] [explorer] Fix navigation in case of project containing both sysml and non-sysml model elements


You've added the entry twice in the changelog

dvojtise · 2025-03-05T22:25:02Z

I've applied your suggestions.
except for the test: I'm a bit lost about how to properly write integration test or cypress test:

the default Syson application doesn't propose any additional metamodel (not even Domain) so I don't know how to use the default UI to do that.
The proposed fix works for metamodel + edit added as spring jar and I don't see which metamodel would make sense to add to syson as default for every syson users.

note: creating model conformant to domain added using sirius web studio doesn't work, but for another reason I haven't investigated : the create object of the explorer show the elements it can create but does nothing without raising any error

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: eclipse-syson#1077 Signed-off-by: Didier Vojtisek <[email protected]>

dvojtise · 2025-03-06T14:44:22Z

I added a spring test

note: it uses mockito (that is already imported by spring-boot-starter-test) to create mock for some of the services
however, mockito seems to require a maven-surefire-plugin configuration to get rid of a warning (about self-attaching to enable the inline-mock-maker)

dvojtise force-pushed the fix-explorer-on-non-sysml-domains branch 2 times, most recently from ee6db2e to 0b4050f Compare March 1, 2025 22:56

AxelRICHARD added this to the 2025.4.0 milestone Mar 2, 2025

AxelRICHARD added pr: to review soon priority: high labels Mar 2, 2025

dvojtise changed the title ~~[bug] Fix explorer in case of non-sysml domain~~ [1077] Fix explorer in case of non-sysml domain Mar 4, 2025

dvojtise force-pushed the fix-explorer-on-non-sysml-domains branch 2 times, most recently from ca14ddf to 5210b43 Compare March 4, 2025 21:56

AxelRICHARD linked an issue Mar 5, 2025 that may be closed by this pull request

Explorer not correctly expanding content of project with both sysml and non-sysml content #1077

Open

AxelRICHARD reviewed Mar 5, 2025

View reviewed changes

dvojtise force-pushed the fix-explorer-on-non-sysml-domains branch 3 times, most recently from 2039a04 to 2b1bbab Compare March 5, 2025 21:41

dvojtise force-pushed the fix-explorer-on-non-sysml-domains branch from 2b1bbab to c71da9e Compare March 6, 2025 14:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[1077] Fix explorer in case of non-sysml domain #1071

[1077] Fix explorer in case of non-sysml domain #1071

dvojtise commented Mar 1, 2025 •

edited

Loading

AxelRICHARD commented Mar 4, 2025

dvojtise commented Mar 4, 2025

AxelRICHARD left a comment

AxelRICHARD Mar 5, 2025

AxelRICHARD Mar 5, 2025

dvojtise commented Mar 5, 2025 •

edited

Loading

dvojtise commented Mar 6, 2025

[1077] Fix explorer in case of non-sysml domain #1071

Are you sure you want to change the base?

[1077] Fix explorer in case of non-sysml domain #1071

Conversation

dvojtise commented Mar 1, 2025 • edited Loading

PLEASE READ ALL ITEMS AND CHECK ONLY RELEVANT CHECKBOXES BELOW

Project management

Changelog and release notes

Documentation

Tests

AxelRICHARD commented Mar 4, 2025

dvojtise commented Mar 4, 2025

AxelRICHARD left a comment

Choose a reason for hiding this comment

AxelRICHARD Mar 5, 2025

Choose a reason for hiding this comment

AxelRICHARD Mar 5, 2025

Choose a reason for hiding this comment

dvojtise commented Mar 5, 2025 • edited Loading

dvojtise commented Mar 6, 2025

dvojtise commented Mar 1, 2025 •

edited

Loading

dvojtise commented Mar 5, 2025 •

edited

Loading