Merge branch '17691-relax-add-ssh-validation' into main. Closes #17691

[arvados-workbench2.git] / src / models / collection-file.ts

diff --git a/src/models/collection-file.ts b/src/models/collection-file.ts
index 37e18cfc0d247905900d3fec4ac6160a8d3afe01..3951d272ee8f3d046c96036be440fef8187f9e91 100644 (file)
--- a/src/models/collection-file.ts
+++ b/src/models/collection-file.ts
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Tree, createTree, setNode, TreeNodeStatus } from './tree';
+import { head, split, pipe, join } from 'lodash/fp';
 
 export type CollectionFilesTree = Tree<CollectionDirectory | CollectionFile>;
 
@@ -59,12 +60,21 @@ export const createCollectionFilesTree = (data: Array<CollectionDirectory | Coll
         .reduce((tree, item) => setNode({
             children: [],
             id: item.id,
-            parent: item.path,
+            parent: getParentId(item),
             value: item,
             active: false,
             selected: false,
             expanded: false,
             status: TreeNodeStatus.INITIAL
-
         })(tree), createTree<CollectionDirectory | CollectionFile>());
-};
\ No newline at end of file
+};
+
+const getParentId = (item: CollectionDirectory | CollectionFile) =>
+    item.path
+        ? join('', [getCollectionId(item.id), item.path])
+        : item.path;
+
+const getCollectionId = pipe(
+    split('/'),
+    head,
+);
\ No newline at end of file