X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/185f57cf4371e7811077bee56976028dd640688d..66fbf108bc45021a3187bb63f4c0672e4e6ad3c9:/src/views-components/projects-tree-picker/generic-projects-tree-picker.tsx diff --git a/src/views-components/projects-tree-picker/generic-projects-tree-picker.tsx b/src/views-components/projects-tree-picker/generic-projects-tree-picker.tsx index fafb0505..07b1ad81 100644 --- a/src/views-components/projects-tree-picker/generic-projects-tree-picker.tsx +++ b/src/views-components/projects-tree-picker/generic-projects-tree-picker.tsx @@ -16,13 +16,14 @@ import { GroupContentsResource } from '~/services/groups-service/groups-service' import { CollectionDirectory, CollectionFile, CollectionFileType } from '~/models/collection-file'; import { ResourceKind } from '~/models/resource'; import { TreePickerProps, TreePicker } from "~/views-components/tree-picker/tree-picker"; +import { LinkResource } from "~/models/link"; export interface ProjectsTreePickerRootItem { id: string; name: string; } -export type ProjectsTreePickerItem = ProjectsTreePickerRootItem | GroupContentsResource | CollectionDirectory | CollectionFile; +export type ProjectsTreePickerItem = ProjectsTreePickerRootItem | GroupContentsResource | CollectionDirectory | CollectionFile | LinkResource; type PickedTreePickerProps = Pick, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen' | 'toggleItemSelection'>; export interface ProjectsTreePickerDataProps { @@ -32,7 +33,7 @@ export interface ProjectsTreePickerDataProps { showSelection?: boolean; relatedTreePickers?: string[]; disableActivation?: string[]; - loadRootItem: (item: TreeItem, pickerId: string, includeCollections?: boolean, inlcudeFiles?: boolean) => void; + loadRootItem: (item: TreeItem, pickerId: string, includeCollections?: boolean, includeFiles?: boolean) => void; } export type ProjectsTreePickerProps = ProjectsTreePickerDataProps & Partial; @@ -45,9 +46,9 @@ const mapStateToProps = (_: any, { rootItemIcon, showSelection }: ProjectsTreePi const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollections, includeFiles, relatedTreePickers, ...props }: ProjectsTreePickerProps): PickedTreePickerProps => ({ onContextMenu: () => { return; }, toggleItemActive: (event, item, pickerId) => { - + const { disableActivation = [] } = props; - if(disableActivation.some(isEqual(item.id))){ + if (disableActivation.some(isEqual(item.id))) { return; } @@ -83,6 +84,14 @@ const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollectio export const ProjectsTreePicker = connect(mapStateToProps, mapDispatchToProps)(TreePicker); const getProjectPickerIcon = ({ data }: TreeItem, rootIcon: IconType): IconType => { + if ('headKind' in data) { + switch (data.headKind) { + case ResourceKind.COLLECTION: + return CollectionIcon; + default: + return ProjectIcon; + } + } if ('kind' in data) { switch (data.kind) { case ResourceKind.COLLECTION: