Merge branch '21128-toolbar-context-menu'

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

diff --git a/src/models/collection-file.ts b/src/models/collection-file.ts
index 97afcac6ca70d4f5d7fc0f8f005e980b3597d7eb..3688557a6154c8e8a3fc9dca87d486d004a6b754 100644 (file)
--- a/src/models/collection-file.ts
+++ b/src/models/collection-file.ts
@@ -52,7 +52,7 @@ export const createCollectionFile = (data: Partial<CollectionFile>): CollectionF
     ...data
 });
 
-export const createCollectionFilesTree = (data: Array<CollectionDirectory | CollectionFile>) => {
+export const createCollectionFilesTree = (data: Array<CollectionDirectory | CollectionFile>, joinParents: Boolean = true) => {
     const directories = data.filter(item => item.type === CollectionFileType.DIRECTORY);
     directories.sort((a, b) => a.path.localeCompare(b.path));
     const files = data.filter(item => item.type === CollectionFileType.FILE);
@@ -60,22 +60,21 @@ export const createCollectionFilesTree = (data: Array<CollectionDirectory | Coll
         .reduce((tree, item) => setNode({
             children: [],
             id: item.id,
-            parent: getParentId(item),
+            parent: joinParents ? getParentId(item) : '',
             value: item,
             active: false,
             selected: false,
             expanded: false,
             status: TreeNodeStatus.INITIAL
-
         })(tree), createTree<CollectionDirectory | CollectionFile>());
 };
 
 const getParentId = (item: CollectionDirectory | CollectionFile) =>
     item.path
-        ? join('', [getCollectionId(item.id), item.path])
+        ? join('', [getCollectionResourceCollectionUuid(item.id), item.path])
         : item.path;
 
-const getCollectionId = pipe(
+export const getCollectionResourceCollectionUuid = pipe(
     split('/'),
     head,
-);
\ No newline at end of file
+);