X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/714e665e783490e3710a772bc54c2c062965e812..901a27dcbc5e09497f237d47555d8f713bb21cb9:/src/models/collection-file.ts

diff --git a/src/models/collection-file.ts b/src/models/collection-file.ts
index d74ada6008..3951d272ee 100644
--- a/src/models/collection-file.ts
+++ b/src/models/collection-file.ts
@@ -2,7 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Tree, createTree, setNode } from './tree';
+import { Tree, createTree, setNode, TreeNodeStatus } from './tree';
+import { head, split, pipe, join } from 'lodash/fp';
 
 export type CollectionFilesTree = Tree<CollectionDirectory | CollectionFile>;
 
@@ -59,7 +60,21 @@ export const createCollectionFilesTree = (data: Array<CollectionDirectory | Coll
         .reduce((tree, item) => setNode({
             children: [],
             id: item.id,
-            parent: item.path,
-            value: item
+            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