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: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-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

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

rema-soptim · 2026-06-16T14:13:51Z

+                "Sending response to GET request: \"/api/datasets/{{}}/crossprofilediagram\" from \"{}\"",
+                datasetName,
+                originURL);
+        return databasePort.getCrossProfileDiagramUUID(datasetName).toString();


The method call should happen in between the 2 logs since this way the backend could log, that the result of the operation is sent to the frontend even if the program crashes inside databasePort.getCrossProfileDiagramUUID(datasetName).toString()

rema-soptim · 2026-06-16T14:20:26Z

+    private String graphUri;
+
+    private String color;
+


I think this is kind of questionable since the class is called CIMAssociation and cim resources do not have a color or graph attribute. I would suggest to create a deriving class specifically for rendering or something similar.
The same goes for the other CIMResource classes

rema-soptim · 2026-06-16T14:39:23Z


    @Getter private final DiagramLayout diagramLayout = new DiagramLayout();

+    @Getter private final UUID crossProfileDiagramUUID = UUID.randomUUID();


There is only one CrossProfileDiagram right? Isn't this then not just the same as an uuid for the dataset or is there any reason why it's specific to the diagram?

rema-soptim · 2026-06-16T14:42:49Z

+        var crossProfileDiagram =
+                getCustomDiagramsUseCase.getCrossProfileDiagram(datasetName, true, true);
+
+        var cimCollection = converter.convert(crossProfileDiagram);
+
+        var result =
+                renderer.renderGlobalUML(
+                        cimCollection,
+                        datasetName,
+                        databasePort.getCrossProfileDiagramUUID(datasetName));
+


These are 2 separate transactions. preferably they are all called in the same use case in one transaction

rema-soptim · 2026-06-18T09:20:33Z

+    /**
+     * Returns the fixed UUID of the CrossProfileDiagram for the given dataset.
+     *
+     * @param datasetName literal dataset name
+     * @return UUID of the CrossProfileDiagram for the dataset
+     */
+    UUID getCrossProfileDiagramUUID(String datasetName);
+
+    /**
+     * Returns the color of the given graph in the CrossProfileDiagram.
+     *
+     * @param graphIdentifier The identifier of the graph.
+     * @return The color as hex code of the graph.
+     */
+    String getCrossProfileDiagramColor(GraphIdentifier graphIdentifier);
+
+    /**
+     * Sets the color of the given graph in the CrossProfileDiagram.
+     *
+     * @param graphIdentifier The identifier of the graph.
+     * @param color The color as hex code.
+     */
+    void setCrossProfileDiagramColor(GraphIdentifier graphIdentifier, String color);
+


I feel like polluting the Dataset with feature specific methods is the wrong way. Instead, I think we should either store the colors in the graphWithContext, although I get that starting a transaction on all graphs, could be annoying.
Another way would be to handle this similar to the getDatasetDiagramLayout, which returns a new Object that hold the information about the crossProfileDiagram.

rema-soptim · 2026-06-18T09:41:29Z

+                                        new MergedClassDTO(
+                                                mergedUuid,
+                                                uri,
+                                                dto.getLabel(),
+                                                new ArrayList<>(),
+                                                new ArrayList<>(),
+                                                new ArrayList<>(),
+                                                new ArrayList<>(),
+                                                new ArrayList<>(),
+                                                new ArrayList<>()));


Explicitly initializing with a bunch of empty lists seems strange to me.
You could either make the lists final and add an @requiredargsconstructor,
create a builder or
annotate MergeClassDTO with @accessors(chain = true), set the lists to be an array list by default, and then create this object like this:

new MergedClassDTO(); .setUuid(mergedUuid) .setClassUri(uri) .setLabel(dto.getLabel());

rema-soptim · 2026-06-18T11:38:57Z

        associationList.forEach(
                cimAssociation -> {
+                    var finalCimAssociation = cimAssociation;
                    if (cimCollection.getClasses().stream()
                            .anyMatch(
                                    cimClass ->
                                            cimClass.getUri()
-                                                    .equals(cimAssociation.getRange().getUri()))) {
+                                                    .equals(
+                                                            finalCimAssociation
+                                                                    .getRange()
+                                                                    .getUri()))) {
+                        cimAssociation =
+                                cimAssociation.toBuilder()
+                                        .graphUri(graphIdentifier.graphUri())
+                                        .build();
                        cimCollection.getAssociations().add(cimAssociation);
                    }
                });


maybe rewrite this foreach, since its kind of unreadable, because of the formatting

rema-soptim · 2026-06-18T11:58:20Z

+    }
+
+    @Test
+    void getCrossProfileColors_returnsDTOFromUseCase() {


Rename tests to match the methodName_input_expectedResult convention, as used in other unit tests. this also goes for the other 3 new test classes

rema-soptim · 2026-06-18T11:59:07Z

+ *
+ */
+
+package org.rdfarchitect.api.dto.crossProfileDiagram;


Rename this package name to match the regular expression '^[a-z_]+(.[a-z_][a-z0-9_])$'.

rema-soptim · 2026-06-18T12:02:46Z

+
+@Data
+@AllArgsConstructor
+public class GraphSourcedDTO<T> {


Is this supposed to be named "GraphSourceDTO"?

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

kiph-soptim added 6 commits June 17, 2026 07:36

removed debug messages

33fc270

fixed single click expands merge view

e86aeca

fixed enum entry mapping

a2a9e9d

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

aab94ff

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

adjusted tests

f661899

selectedClassUUID and selectedClassType combined to selectedClass

2d93aea

rema-soptim requested changes Jun 18, 2026

View reviewed changes


		@Getter private final DiagramLayout diagramLayout = new DiagramLayout();

		@Getter private final UUID crossProfileDiagramUUID = UUID.randomUUID();


		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!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

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!

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!

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