feat: Merge View (RDFA-344) by kiph-soptim · Pull Request #176 · SOPTIM/RDFArchitect

kiph-soptim · 2026-06-11T09:16:59Z

Summary

Adds the Merge View. In the merge view all classes of an dataset are merged based on their URI and displayed in one diagram.

Related Issues

Checklist

Tests added or updated (or not applicable)
Documentation updated (or not applicable)
No breaking changes introduced (or described in the summary above)
Commits are signed off (git commit -s) for DCO

Testing Notes

…s-profile-diagrams # Conflicts: # frontend/src/routes/mainpage/packageNavigation/DatasetSection.svelte

…s-profile-diagrams # Conflicts: # backend/src/main/java/org/rdfarchitect/database/inmemory/GraphWithContext.java # backend/src/main/java/org/rdfarchitect/database/inmemory/GraphWithContextCollection.java # backend/src/main/java/org/rdfarchitect/database/inmemory/InMemoryDatabase.java # backend/src/main/java/org/rdfarchitect/database/inmemory/InMemoryDatabaseImpl.java # backend/src/main/java/org/rdfarchitect/database/inmemory/SessionDataStore.java # backend/src/main/java/org/rdfarchitect/services/diagrams/CustomDiagramService.java # backend/src/main/java/org/rdfarchitect/services/dl/select/QueryDiagramLayoutService.java # backend/src/main/java/org/rdfarchitect/services/dl/update/UpdateDiagramLayoutService.java # backend/src/main/java/org/rdfarchitect/services/dl/update/classlayout/UpdateClassLayoutService.java # frontend/src/lib/rendering/svelteflow/components/SvelteFlowClassContextMenu.svelte

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> Signed-off-by: Philipp Kirchner <philipp.kirchner@soptim.de>

This reverts commit fd48b2d.

This reverts commit 9b6babb.

Signed-off-by: Philipp Kirchner <philipp.kirchner@soptim.de>

+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)


+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@SuperBuilder(toBuilder = true)


+@Data
+@AllArgsConstructor
+public class CrossProfileDiagramColorDataDTO {
+    Map<String, String> graphColors;


+    private List<GraphSourcedDTO<AttributeDTO>> attributes;
+    private List<GraphSourcedDTO<EnumEntryDTO>> enumEntries;
+    private List<GraphSourcedDTO<AssociationPairDTO>> associationPairs;
+    private List<CIMSStereotype> stereotypes;


+    private List<GraphSourcedDTO<SuperClassDTO>> superClasses;
+    private List<GraphSourcedDTO<AttributeDTO>> attributes;
+    private List<GraphSourcedDTO<EnumEntryDTO>> enumEntries;
+    private List<GraphSourcedDTO<AssociationPairDTO>> associationPairs;


+    private List<ClassSourceDTO> sources;
+    private List<GraphSourcedDTO<SuperClassDTO>> superClasses;
+    private List<GraphSourcedDTO<AttributeDTO>> attributes;
+    private List<GraphSourcedDTO<EnumEntryDTO>> enumEntries;


+    private String label;
+    private List<ClassSourceDTO> sources;
+    private List<GraphSourcedDTO<SuperClassDTO>> superClasses;
+    private List<GraphSourcedDTO<AttributeDTO>> attributes;


+    private String classUri;
+    private String label;
+    private List<ClassSourceDTO> sources;
+    private List<GraphSourcedDTO<SuperClassDTO>> superClasses;


+    private UUID uuid;
+    private String classUri;
+    private String label;
+    private List<ClassSourceDTO> sources;


rema-soptim

A few things i noticed, while using the new feature. This is not a complete test

When opening a large merge view (full cgmes 2.4.15), the application is frozen for multiple seconds, before showing a loading animation for the diagram
the same goes for expanding an (especially) collapsing the merged diagram section in the navigation
clicked the merged view button once triggers a collapse or expand. instead this should happen on a double click.
Deleting a Graph unselects the merged view instead of just reloading it.
show Package Prefix setting only works in navigation not in the diagram

rema-soptim · 2026-06-16T08:01:46Z

+            <CheckBoxEditControl
+                label="Use colored properties in merged view"
+                value={localSettings["useColoredPropertiesInMergedView"]}
+                callOnInputTrue={() =>
+                    (localSettings["useColoredPropertiesInMergedView"] = true)}
+                callOnInputFalse={() =>
+                    (localSettings["useColoredPropertiesInMergedView"] = false)}
+                labelFirst={false}
+            />


Suggested change

<CheckBoxEditControl

label="Use colored properties in merged view"

value={localSettings["useColoredPropertiesInMergedView"]}

callOnInputTrue={() =>

(localSettings["useColoredPropertiesInMergedView"] = true)}

callOnInputFalse={() =>

(localSettings["useColoredPropertiesInMergedView"] = false)}

labelFirst={false}

/>

<CheckBoxEditControl

label="Use colored properties in merged view"

bind:value={localSettings["useColoredPropertiesInMergedView"]}

labelFirst={false}

/>

This can also be done for the other checkboxes

rema-soptim · 2026-06-16T08:59:36Z

+        editorState.selectedClassType.updateValue(classType);
        editorState.selectedDiagram.updateValue({
-            type: DiagramType.PACKAGE,
+            type: diagramType,
            id: classNavEntry.parent?.id ?? "default",
        });


Wouldn't it make more sense to also add the selectedClassType into the selectedClassUUID and create a new selectedClass:

{ type: ..., uuid: ..., }

Since they are pretty much always updates together. Also this would reduce the risk of forgetting to reset/update only one of them since they must be kept in sync anyway.

rema-soptim · 2026-06-16T09:06:29Z

 };

+export const ClassType = {
+    NORMAL_CLASS: "normalClass",


"normalClass" sounds ambiguous, consider renaming to "singleClass"

rema-soptim · 2026-06-16T12:59:08Z

+    function shortName(uri) {
+        const match = uri.match(/[#/]([^#/]+)\/?$/);
+        return match ? match[1] : uri;
+    }
+</script>


Preferably use the existing uri class to separate the uri prefix from suffix to ensure consistent behavior across components.

rema-soptim · 2026-06-16T13:16:03Z

+    function snapshotOriginal() {
+        originalJson = JSON.stringify(
+            colorEntries.map(e => ({ graphURI: e.graphURI, color: e.color })),
+        );
+    }
+


Why create a new map? Can't you just stringify the object directly? Same for the hasChanges derived

rema-soptim · 2026-06-16T13:22:53Z

+    );
+
+    $effect(() => {
+        if (!datasetNavEntry.label) return;


Is this case even possible? This would be a dataset without a label right?

rema-soptim · 2026-06-16T13:52:40Z

+    function getGraphLabel(graphURI) {
+        if (!graphURI) return graphURI;
+        const hashIndex = graphURI.lastIndexOf("#");
+        const slashIndex = graphURI.lastIndexOf("/");
+        const splitIndex = Math.max(hashIndex, slashIndex);
+        return splitIndex >= 0 ? graphURI.slice(splitIndex + 1) : graphURI;
+    }
 </script>


Here again, preferably use the existing uri class if possible to split prefix and suffix

rema-soptim · 2026-06-16T14:02:40Z

+    function extractGraphLabel(graphUri) {
+        const hash = graphUri.lastIndexOf("#");
+        const slash = graphUri.lastIndexOf("/");
+        const idx = Math.max(hash, slash);
+        return idx >= 0 ? graphUri.substring(idx + 1) : graphUri;
+    }
+


Use uri class

kiph-soptim added 12 commits May 21, 2026 14:14

temp

13194ac

temp

19b638d

Merge remote-tracking branch 'origin/main' into feature/RDFA-344-Cros…

278bba1

…s-profile-diagrams # Conflicts: # frontend/src/routes/mainpage/packageNavigation/DatasetSection.svelte

temp

aeed5ad

solved after merge problems

096adfa

fixed license header

1a6ec24

deleted class

c4a1d5f

added option to disable colored properties

05ae9e9

added color to association edges and fixed tests

c157b2c

fixes

2d59a0c

fixes

53a21f7

github-code-quality Bot found potential problems Jun 11, 2026

View reviewed changes

kiph-soptim added 2 commits June 11, 2026 11:34

ignore not needed fields

b93d0a2

fix

29068ac

github-code-quality Bot found potential problems Jun 11, 2026

View reviewed changes

Comment thread backend/src/main/java/org/rdfarchitect/models/cim/data/dto/CIMMergedClass.java Fixed

Comment thread backend/src/main/java/org/rdfarchitect/models/cim/data/dto/CIMMergedClass.java Fixed

kiph-soptim added 3 commits June 11, 2026 12:00

fix

498f6bc

Merge branch 'main' into feature/RDFA-344-Cross-profile-diagrams

0db756b

fix

7660c9b

github-code-quality Bot found potential problems Jun 11, 2026

View reviewed changes

Comment thread backend/src/main/java/org/rdfarchitect/models/cim/data/dto/CIMMergedClass.java Fixed

Comment thread backend/src/main/java/org/rdfarchitect/models/cim/data/dto/CIMMergedClass.java Fixed

kiph-soptim and others added 6 commits June 11, 2026 12:47

fix

0a8d95d

fixed Missing Override annotation

9b6babb

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> Signed-off-by: Philipp Kirchner <philipp.kirchner@soptim.de>

format

fd48b2d

Revert "format"

7b30326

This reverts commit fd48b2d.

Revert "fixed Missing Override annotation"

f892cab

This reverts commit 9b6babb.

Merge branch 'main' into feature/RDFA-344-Cross-profile-diagrams

cbbd73f

github-code-quality Bot found potential problems Jun 11, 2026

View reviewed changes

Comment thread backend/src/main/java/org/rdfarchitect/models/cim/data/dto/CIMMergedClass.java Fixed

Comment thread backend/src/main/java/org/rdfarchitect/models/cim/data/dto/CIMMergedClass.java Fixed

kiph-soptim added 2 commits June 11, 2026 13:50

improved loading time of the merged class editor

82ba9a0

added show in diagram to merged classes

38f6664

github-code-quality Bot found potential problems Jun 12, 2026

View reviewed changes

kiph-soptim added 5 commits June 12, 2026 10:39

refactoring

fcec506

added tests

110ee82

updated README.md

cab90dc

Merge branch 'main' into feature/RDFA-344-Cross-profile-diagrams

55a872b

Signed-off-by: Philipp Kirchner <philipp.kirchner@soptim.de>

format

162dd47

kiph-soptim marked this pull request as ready for review June 12, 2026 09:25

kiph-soptim added 2 commits June 16, 2026 08:13

Merge branch 'main' into feature/RDFA-344-Cross-profile-diagrams

5352a11

Merge branch 'main' into feature/RDFA-344-Cross-profile-diagrams

f8e6d3b

github-code-quality Bot found potential problems Jun 16, 2026

View reviewed changes

rema-soptim requested changes Jun 16, 2026

View reviewed changes

removed debug messages

33fc270


		import java.util.List;

		@EqualsAndHashCode(callSuper = true)

Conversation

kiph-soptim commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Related Issues

Checklist

Testing Notes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rema-soptim left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kiph-soptim commented Jun 11, 2026 •

edited

Loading