X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/bb7f866a34548157fd5ba69475da4c8065f0227b..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 77f831fa..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 @@ -5,6 +5,7 @@ import * as React from "react"; import { Dispatch } from "redux"; import { connect } from "react-redux"; +import { isEqual } from 'lodash/fp'; import { TreeItem, TreeItemStatus } from '~/components/tree/tree'; import { ProjectResource } from "~/models/project"; import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; @@ -15,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 { @@ -29,7 +31,9 @@ export interface ProjectsTreePickerDataProps { includeFiles?: boolean; rootItemIcon: IconType; showSelection?: boolean; - loadRootItem: (item: TreeItem, pickerId: string, includeCollections?: boolean, inlcudeFiles?: boolean) => void; + relatedTreePickers?: string[]; + disableActivation?: string[]; + loadRootItem: (item: TreeItem, pickerId: string, includeCollections?: boolean, includeFiles?: boolean) => void; } export type ProjectsTreePickerProps = ProjectsTreePickerDataProps & Partial; @@ -39,10 +43,16 @@ const mapStateToProps = (_: any, { rootItemIcon, showSelection }: ProjectsTreePi showSelection: isSelectionVisible(showSelection), }); -const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollections, includeFiles, ...props }: ProjectsTreePickerProps): PickedTreePickerProps => ({ +const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollections, includeFiles, relatedTreePickers, ...props }: ProjectsTreePickerProps): PickedTreePickerProps => ({ onContextMenu: () => { return; }, toggleItemActive: (event, item, pickerId) => { - dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ id: item.id, pickerId })); + + const { disableActivation = [] } = props; + if (disableActivation.some(isEqual(item.id))) { + return; + } + + dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ id: item.id, pickerId, relatedTreePickers })); if (props.toggleItemActive) { props.toggleItemActive(event, item, pickerId); } @@ -65,7 +75,7 @@ const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollectio }, toggleItemSelection: (event, item, pickerId) => { dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECTION({ id: item.id, pickerId })); - if(props.toggleItemSelection){ + if (props.toggleItemSelection) { props.toggleItemSelection(event, item, pickerId); } }, @@ -74,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: