From 995160d6faccd3ba876d503f56a4215909901ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maaria=20Wahlstr=C3=B6m?= <maaria.wahlstrom@csc.fi>
Date: Tue, 10 Dec 2024 10:31:49 +0200
Subject: [PATCH 1/2] CSCFC4EMSCR-585 Change node elementpath to array

---
 mscr-ui/src/common/components/schema-info/index.tsx | 13 ++++++-------
 .../schema-info/schema-tree/node-info/index.tsx     |  1 -
 .../schema-tree/schema-tree-renderer/index.tsx      |  7 +++----
 .../interfaces/crosswalk-connection.interface.ts    |  3 +--
 mscr-ui/src/modules/crosswalk-editor/index.tsx      |  3 +--
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/mscr-ui/src/common/components/schema-info/index.tsx b/mscr-ui/src/common/components/schema-info/index.tsx
index ef574a6f7..c27044a4f 100644
--- a/mscr-ui/src/common/components/schema-info/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/index.tsx
@@ -116,18 +116,17 @@ export default function SchemaInfo(props: {
 
   // Used by tree select and filtering
   function getAllNodeIdsOnPathToLeaf(nodeIds: string[]) {
-    const elementPaths: string[] = [];
+    let idsOnPath: string[] = [];
     nodeIds.forEach((nodeId) => {
       const nodes = nodeIdToNodeDictionary[nodeId];
-      nodes.map((node) => elementPaths.push(node.elementPath));
+      nodes.map((node) => {
+        idsOnPath = idsOnPath.concat(node.elementPath);
+      });
     });
 
     const nodesToSelect: Set<string> = new Set();
-    elementPaths.forEach((path) => {
-      const nodeIdsOnPath = path.split('.');
-      nodeIdsOnPath.forEach((nodeId) => {
-        nodesToSelect.add(nodeId);
-      });
+    idsOnPath.forEach((pathNodeId) => {
+      nodesToSelect.add(pathNodeId);
     });
 
     return Array.from(nodesToSelect);
diff --git a/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx b/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx
index fd99692e7..a7400c67c 100644
--- a/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx
@@ -132,7 +132,6 @@ export default function NodeInfo(props: {
           )}
           {props.isNodeEditable &&
             selectedNode &&
-            selectedNode?.elementPath !== 'ROOT' &&
             !isLeafNode &&
             !props.hasCustomRoot && (
               <Button
diff --git a/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx b/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
index f346c78eb..cabd86290 100644
--- a/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
@@ -4,7 +4,7 @@ let treeIndex = 0;
 
 function createRenderTree(
   input: any,
-  elementPath: string,
+  elementPath: string[],
   definitions: any,
   idToNodeDictionary: { [key: string]: RenderTree[] },
 ) {
@@ -16,8 +16,7 @@ function createRenderTree(
       visualTreeId: treeIndex.toString(),
       id: obj.toString(),
       properties: definitions[obj],
-      elementPath: elementPath == '' ? obj.toString() : elementPath + '.' + obj.toString(),
-      parentElementPath: elementPath,
+      elementPath: [...elementPath, obj.toString()],
       children: [],
       uri: definitions[obj]['@id'],
     };
@@ -47,7 +46,7 @@ export function generateTreeFromJson(jsonInput: any) {
   const generatedTree = new Promise<RenderTree[]>((resolve) => {
     const renderedTree = createRenderTree(
       jsonInput.content.tree,
-      '',
+      [],
       jsonInput.content.definitions,
       nodeIdToShallowNode
     );
diff --git a/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts b/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
index a1fc9cf80..d41dea47f 100644
--- a/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
+++ b/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
@@ -36,8 +36,7 @@ export interface RenderTree {
     visualTreeId: string;
     id: string;
     properties: any;
-    elementPath: string;
-    parentElementPath: string | undefined;
+    elementPath: string[];
     children: RenderTree[];
     uri: string;
 }
diff --git a/mscr-ui/src/modules/crosswalk-editor/index.tsx b/mscr-ui/src/modules/crosswalk-editor/index.tsx
index ed67e1e4a..4080ac6a7 100644
--- a/mscr-ui/src/modules/crosswalk-editor/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/index.tsx
@@ -41,8 +41,7 @@ export default function CrosswalkEditor({
   const isEditModeActive = useSelector(selectIsEditContentActive());
 
   const emptyTreeSelection: RenderTree = {
-    elementPath: '',
-    parentElementPath: undefined,
+    elementPath: [],
     name: '',
     id: '',
     visualTreeId: '',

From 86d6bac5e78882c5c781bff2f1617b06fef8b436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maaria=20Wahlstr=C3=B6m?= <maaria.wahlstrom@csc.fi>
Date: Wed, 11 Dec 2024 12:21:26 +0200
Subject: [PATCH 2/2] CSCFC4EMSCR-585 Rename node property elementPath to
 rootPathIds

---
 mscr-ui/src/common/components/schema-info/index.tsx         | 2 +-
 .../schema-info/schema-tree/schema-tree-renderer/index.tsx  | 6 +++---
 .../src/common/interfaces/crosswalk-connection.interface.ts | 2 +-
 mscr-ui/src/modules/crosswalk-editor/index.tsx              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mscr-ui/src/common/components/schema-info/index.tsx b/mscr-ui/src/common/components/schema-info/index.tsx
index c27044a4f..637ea0bea 100644
--- a/mscr-ui/src/common/components/schema-info/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/index.tsx
@@ -120,7 +120,7 @@ export default function SchemaInfo(props: {
     nodeIds.forEach((nodeId) => {
       const nodes = nodeIdToNodeDictionary[nodeId];
       nodes.map((node) => {
-        idsOnPath = idsOnPath.concat(node.elementPath);
+        idsOnPath = idsOnPath.concat(node.rootPathIds);
       });
     });
 
diff --git a/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx b/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
index cabd86290..5e13baa22 100644
--- a/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
@@ -4,7 +4,7 @@ let treeIndex = 0;
 
 function createRenderTree(
   input: any,
-  elementPath: string[],
+  rootPathIds: string[],
   definitions: any,
   idToNodeDictionary: { [key: string]: RenderTree[] },
 ) {
@@ -16,7 +16,7 @@ function createRenderTree(
       visualTreeId: treeIndex.toString(),
       id: obj.toString(),
       properties: definitions[obj],
-      elementPath: [...elementPath, obj.toString()],
+      rootPathIds: [...rootPathIds, obj.toString()],
       children: [],
       uri: definitions[obj]['@id'],
     };
@@ -28,7 +28,7 @@ function createRenderTree(
       // HAS CHILDREN, OTHERWISE IS LEAF
       newNode.children = createRenderTree(
         input[obj],
-        newNode.elementPath,
+        newNode.rootPathIds,
         definitions,
         idToNodeDictionary,
       );
diff --git a/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts b/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
index d41dea47f..fe970b788 100644
--- a/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
+++ b/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
@@ -36,7 +36,7 @@ export interface RenderTree {
     visualTreeId: string;
     id: string;
     properties: any;
-    elementPath: string[];
+    rootPathIds: string[];
     children: RenderTree[];
     uri: string;
 }
diff --git a/mscr-ui/src/modules/crosswalk-editor/index.tsx b/mscr-ui/src/modules/crosswalk-editor/index.tsx
index 4080ac6a7..c8d8c3000 100644
--- a/mscr-ui/src/modules/crosswalk-editor/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/index.tsx
@@ -41,7 +41,7 @@ export default function CrosswalkEditor({
   const isEditModeActive = useSelector(selectIsEditContentActive());
 
   const emptyTreeSelection: RenderTree = {
-    elementPath: [],
+    rootPathIds: [],
     name: '',
     id: '',
     visualTreeId: '',