X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f8fb6725beec5b2bf0eec7f375d49f9189ff1bc3..62cb779efb0b098c05053e957c765a807467b28b:/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 07b1ad81..11b51caa 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 @@ -2,28 +2,22 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from "react"; +import 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"; -import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon"; -import { ProjectIcon, InputIcon, IconType, CollectionIcon } from '~/components/icon/icon'; -import { loadProject, loadCollection } from '~/store/tree-picker/tree-picker-actions'; -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"; +import { TreeItem, TreeItemStatus } from 'components/tree/tree'; +import { ProjectResource } from "models/project"; +import { treePickerActions } from "store/tree-picker/tree-picker-actions"; +import { ListItemTextIcon } from "components/list-item-text-icon/list-item-text-icon"; +import { ProjectIcon, FileInputIcon, IconType, CollectionIcon } from 'components/icon/icon'; +import { loadProject, loadCollection } from 'store/tree-picker/tree-picker-actions'; +import { ProjectsTreePickerItem, ProjectsTreePickerRootItem } from 'store/tree-picker/tree-picker-middleware'; +import { ResourceKind } from 'models/resource'; +import { TreePickerProps, TreePicker } from "views-components/tree-picker/tree-picker"; +import { CollectionFileType } from 'models/collection-file'; -export interface ProjectsTreePickerRootItem { - id: string; - name: string; -} -export type ProjectsTreePickerItem = ProjectsTreePickerRootItem | GroupContentsResource | CollectionDirectory | CollectionFile | LinkResource; type PickedTreePickerProps = Pick, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen' | 'toggleItemSelection'>; export interface ProjectsTreePickerDataProps { @@ -33,7 +27,9 @@ export interface ProjectsTreePickerDataProps { showSelection?: boolean; relatedTreePickers?: string[]; disableActivation?: string[]; - loadRootItem: (item: TreeItem, pickerId: string, includeCollections?: boolean, includeFiles?: boolean) => void; + options?: { showOnlyOwned: boolean, showOnlyWritable: boolean }; + loadRootItem: (item: TreeItem, pickerId: string, + includeCollections?: boolean, includeFiles?: boolean, options?: { showOnlyOwned: boolean, showOnlyWritable: boolean }) => void; } export type ProjectsTreePickerProps = ProjectsTreePickerDataProps & Partial; @@ -43,7 +39,7 @@ const mapStateToProps = (_: any, { rootItemIcon, showSelection }: ProjectsTreePi showSelection: isSelectionVisible(showSelection), }); -const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollections, includeFiles, relatedTreePickers, ...props }: ProjectsTreePickerProps): PickedTreePickerProps => ({ +const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollections, includeFiles, relatedTreePickers, options, ...props }: ProjectsTreePickerProps): PickedTreePickerProps => ({ onContextMenu: () => { return; }, toggleItemActive: (event, item, pickerId) => { @@ -64,10 +60,10 @@ const mapDispatchToProps = (dispatch: Dispatch, { loadRootItem, includeCollectio dispatch( data.kind === ResourceKind.COLLECTION ? loadCollection(id, pickerId) - : loadProject({ id, pickerId, includeCollections, includeFiles }) + : loadProject({ id, pickerId, includeCollections, includeFiles, options }) ); } else if (!('type' in data) && loadRootItem) { - loadRootItem(item as TreeItem, pickerId, includeCollections, includeFiles); + loadRootItem(item as TreeItem, pickerId, includeCollections, includeFiles, options); } } else if (status === TreeItemStatus.LOADED) { dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id, pickerId })); @@ -102,7 +98,7 @@ const getProjectPickerIcon = ({ data }: TreeItem, rootIc } else if ('type' in data) { switch (data.type) { case CollectionFileType.FILE: - return InputIcon; + return FileInputIcon; default: return ProjectIcon; }