X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/32dcbe112366f6ce4037e87527aac5ea7865bee0..159c84a15b7739c02dc4bc0d9626b515e8426b92:/src/models/collection-file.ts diff --git a/src/models/collection-file.ts b/src/models/collection-file.ts index 37e18cfc..3951d272 100644 --- 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; @@ -59,12 +60,21 @@ export const createCollectionFilesTree = (data: Array setNode({ children: [], id: item.id, - parent: item.path, + parent: getParentId(item), value: item, active: false, selected: false, expanded: false, status: TreeNodeStatus.INITIAL - })(tree), createTree()); -}; \ 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