Merge pull request #241 from CSCfi/develop

rahti Deployment from current develop
CSCfi · Jan 8, 2025 · 62cd6fc · 62cd6fc
2 parents d78724b + df14a39
commit 62cd6fc
Show file tree

Hide file tree

Showing 16 changed files with 248 additions and 411 deletions.
diff --git a/mscr-ui/public/locales/en/common.json b/mscr-ui/public/locales/en/common.json
@@ -29,7 +29,7 @@
     "finish-editing": "Finish editing",
     "invalidate-crosswalk": "Invalidate crosswalk",
     "invalidate-schema": "Invalidate schema",
-    "mscr-copy": "Covert to MSCR Format",
+    "mscr-copy": "Make a MSCR Copy",
     "publish-crosswalk": "Publish crosswalk",
     "publish-schema": "Publish schema",
     "revision": "Add new revision",
@@ -91,7 +91,7 @@
       "crosswalk-create": "Create Crosswalk",
       "crosswalk-register": "Register Crosswalk",
       "crosswalk-revision": "Register revision",
-      "mscr-copy": "Convert to MSCR Format",
+      "mscr-copy": "MSCR Copy",
       "schema-register": "Register Schema",
       "schema-revision": "Register revision"
     },
@@ -109,7 +109,7 @@
       "crosswalk-mscr-copy": "Register MSCR copy of crosswalk",
       "crosswalk-register": "Register existing crosswalk",
       "crosswalk-revision": "Register revision of crosswalk",
-      "schema-mscr-copy": "Convert Schema to MSCR Format",
+      "schema-mscr-copy": "Make a MSCR copy",
       "schema-register": "Register schema",
       "schema-revision": "Register revision of schema"
     },
@@ -278,7 +278,7 @@
     "add-schema": "New schema added",
     "add-schema-revision": "New schema version added",
     "copy-crosswalk": "MSCR copy of crosswalk added",
-    "copy-schema": "Schema is converted to MSCR format",
+    "copy-schema": "MSCR copy of schema added",
     "crosswalk-deleted": "Crosswalk was removed",
     "crosswalk-deprecated": "Crosswalk deprecated",
     "crosswalk-invalidated": "Crosswalk invalidated",

diff --git a/mscr-ui/src/common/components/schema-info/index.tsx b/mscr-ui/src/common/components/schema-info/index.tsx
@@ -71,8 +71,6 @@ export default function SchemaInfo(props: {
       generatedTree.then((res) => {
         if (res) {
           setTreeDataOriginal(res);
-          // Expand tree when data is loaded
-          setPartlyExpanded();
           setTreeData(res);
           setTreeDataFetched(true);
           setNodeIdToNodeDictionary(nodeIdToShallowNode);
@@ -82,11 +80,6 @@ export default function SchemaInfo(props: {
     }
   }, [getSchemaDataIsSuccess, getSchemaData]);
 
-  // Expand tree when data is loaded
-  useEffect(() => {
-    setPartlyExpanded();
-  }, [isTreeDataFetched]);
-
   // Expand and select nodes when input changed (from mappings accordion)
   useEffect(() => {
     if (props.treeSelection) {
@@ -108,47 +101,40 @@ export default function SchemaInfo(props: {
     setSelectedTreeNodes(selectedNodes);
   }, [treeSelectedArray, nodeIdToNodeDictionary]);
 
-  const setPartlyExpanded = () => {
+  const setFullyExpanded = () => {
     const nodeIdsToExpand: string[] = [];
-    treeData.forEach(({ children, id }) => {
-      if (children && children.length > 0) {
-        nodeIdsToExpand.push(id);
-        if (children.length === 1) {
-          nodeIdsToExpand.push(children[0].id);
-        }
-      }
+    Object.entries(nodeIdToNodeDictionary).map(([nodeId, node]) => {
+      if (node.some((n) => n.children.length > 0)) nodeIdsToExpand.push(nodeId);
     });
     setTreeExpandedArray(nodeIdsToExpand);
   };
 
   function clearTreeSearch() {
     setTreeSelectedArray([]);
-    setPartlyExpanded();
     setSelectedTreeNodes([]);
   }
 
   // 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.rootPathIds);
+      });
     });
 
     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);
   }
 
   const handleExpandClick = () => {
     if (treeExpandedArray.length === 0) {
-      setPartlyExpanded();
+      setFullyExpanded();
     } else {
       setTreeExpandedArray([]);
     }
@@ -321,7 +307,7 @@ export default function SchemaInfo(props: {
             >
               {isTreeDataFetched && (
                 <SchemaTree
-                  nodes={treeData[0]}
+                  nodes={treeData}
                   treeSelectedArray={treeSelectedArray}
                   treeExpanded={treeExpandedArray}
                   performTreeAction={performCallbackFromTreeAction}

diff --git a/mscr-ui/src/common/components/schema-info/schema-tree/index.tsx b/mscr-ui/src/common/components/schema-info/schema-tree/index.tsx
@@ -48,7 +48,7 @@ export default function SchemaTree({
   showQname,
   isSourceTree,
 }: {
-  nodes: RenderTree;
+  nodes: RenderTree[];
   treeSelectedArray: string[];
   treeExpanded: string[];
   performTreeAction: (action: string, nodeIds: string[]) => void;
@@ -78,16 +78,7 @@ export default function SchemaTree({
       defaultExpandIcon={<ChevronRightIcon />}
       multiSelect
     >
-      <TreeItem
-        key={nodes.visualTreeId}
-        nodeId={nodes.id}
-        label={nodes.name}
-        className="linked-tree-item"
-      >
-        {Array.isArray(nodes.children)
-          ? nodes.children.map((node: RenderTree) => toTree(node, showQname))
-          : null}
-      </TreeItem>
+      {nodes.map((node: RenderTree) => toTree(node, showQname))}
     </TreeView>
   );
 }
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
@@ -132,7 +132,6 @@ export default function NodeInfo(props: {
           )}
           {props.isNodeEditable &&
             selectedNode &&
-            selectedNode?.elementPath !== 'ROOT' &&
             !isLeafNode &&
             !props.hasCustomRoot && (
               <Button