X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/37e43f4e19ad2bd27b15fe7f0d857218dad39055..5627bf1a83323d2b0364cb069564998eb8c6ca7a:/src/views-components/project-tree-picker/project-tree-picker.tsx diff --git a/src/views-components/project-tree-picker/project-tree-picker.tsx b/src/views-components/project-tree-picker/project-tree-picker.tsx index e09d78ab..3859180f 100644 --- a/src/views-components/project-tree-picker/project-tree-picker.tsx +++ b/src/views-components/project-tree-picker/project-tree-picker.tsx @@ -6,70 +6,154 @@ import * as React from "react"; import { Dispatch } from "redux"; import { connect } from "react-redux"; import { Typography } from "@material-ui/core"; -import { TreePicker } from "../tree-picker/tree-picker"; -import { TreeProps, TreeItem, TreeItemStatus } from "~/components/tree/tree"; +import { TreePicker, TreePickerProps } from "../tree-picker/tree-picker"; +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 } from "~/components/icon/icon"; +import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon } from "~/components/icon/icon"; import { createTreePickerNode } from "~/store/tree-picker/tree-picker"; import { RootState } from "~/store/store"; import { ServiceRepository } from "~/services/services"; import { FilterBuilder } from "~/common/api/filter-builder"; +import { WrappedFieldProps } from 'redux-form'; -type ProjectTreePickerProps = Pick, 'toggleItemActive' | 'toggleItemOpen'>; +type ProjectTreePickerProps = Pick; -const mapDispatchToProps = (dispatch: Dispatch, props: {onChange: (projectUuid: string) => void}): ProjectTreePickerProps => ({ - toggleItemActive: id => { - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ id })); - props.onChange(id); +const mapDispatchToProps = (dispatch: Dispatch, props: { onChange: (projectUuid: string) => void }): ProjectTreePickerProps => ({ + onContextMenu: () => { return; }, + toggleItemActive: (nodeId, status, pickerId) => { + getNotSelectedTreePickerKind(pickerId) + .forEach(pickerId => dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId: '', pickerId }))); + dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId })); + + props.onChange(nodeId); }, - toggleItemOpen: (id, status) => { - status === TreeItemStatus.INITIAL - ? dispatch(loadProjectTreePickerProjects(id)) - : dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id })); + toggleItemOpen: (nodeId, status, pickerId) => { + dispatch(toggleItemOpen(nodeId, status, pickerId)); } }); +const toggleItemOpen = (nodeId: string, status: TreeItemStatus, pickerId: string) => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + if (status === TreeItemStatus.INITIAL) { + if (pickerId === TreePickerId.PROJECTS) { + dispatch(loadProjectTreePickerProjects(nodeId)); + } else if (pickerId === TreePickerId.FAVORITES) { + dispatch(loadFavoriteTreePickerProjects(nodeId === services.authService.getUuid() ? '' : nodeId)); + } else { + // TODO: load sharedWithMe + } + } else { + dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId })); + } + }; + +const getNotSelectedTreePickerKind = (pickerId: string) => { + return [TreePickerId.PROJECTS, TreePickerId.FAVORITES, TreePickerId.SHARED_WITH_ME].filter(nodeId => nodeId !== pickerId); +}; + +export enum TreePickerId { + PROJECTS = 'Projects', + SHARED_WITH_ME = 'Shared with me', + FAVORITES = 'Favorites' +} + export const ProjectTreePicker = connect(undefined, mapDispatchToProps)((props: ProjectTreePickerProps) => -
- +
+ Select a project -
- +
+ + +
); + // TODO: move action creator to store directory -export const loadProjectTreePickerProjects = (id: string) => +export const loadProjectTreePickerProjects = (nodeId: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id })); + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.PROJECTS })); - const ownerUuid = id.length === 0 ? services.authService.getUuid() || '' : id; + const ownerUuid = nodeId.length === 0 ? services.authService.getUuid() || '' : nodeId; - const filters = FilterBuilder - .create() - .addEqual('ownerUuid', ownerUuid); + const filters = new FilterBuilder() + .addEqual('ownerUuid', ownerUuid) + .getFilters(); const { items } = await services.projectService.list({ filters }); - dispatch(receiveProjectTreePickerData(id, items)); + dispatch(receiveTreePickerData(nodeId, items, TreePickerId.PROJECTS)); }; +export const loadFavoriteTreePickerProjects = (nodeId: string) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const parentId = services.authService.getUuid() || ''; + + if (nodeId === '') { + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: parentId, pickerId: TreePickerId.FAVORITES })); + const { items } = await services.favoriteService.list(parentId); + + dispatch(receiveTreePickerData(parentId, items as ProjectResource[], TreePickerId.FAVORITES)); + } else { + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.FAVORITES })); + const filters = new FilterBuilder() + .addEqual('ownerUuid', nodeId) + .getFilters(); + + const { items } = await services.projectService.list({ filters }); + + dispatch(receiveTreePickerData(nodeId, items, TreePickerId.FAVORITES)); + } + + }; + +const getProjectPickerIcon = (item: TreeItem) => { + switch (item.data.name) { + case TreePickerId.FAVORITES: + return FavoriteIcon; + case TreePickerId.PROJECTS: + return ProjectsIcon; + case TreePickerId.SHARED_WITH_ME: + return ShareMeIcon; + default: + return ProjectIcon; + } +}; + const renderTreeItem = (item: TreeItem) => ; + // TODO: move action creator to store directory -const receiveProjectTreePickerData = (id: string, projects: ProjectResource[]) => +export const receiveTreePickerData = (nodeId: string, projects: ProjectResource[], pickerId: string) => (dispatch: Dispatch) => { dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - id, - nodes: projects.map(project => createTreePickerNode({ id: project.uuid, value: project })) + nodeId, + nodes: projects.map(project => createTreePickerNode({ nodeId: project.uuid, value: project })), + pickerId, })); - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id })); + + dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId })); }; + +export const ProjectTreePickerField = (props: WrappedFieldProps) => +
+ + {props.meta.dirty && props.meta.error && + + {props.meta.error} + } +
; + +const handleChange = (props: WrappedFieldProps) => (value: string) => + props.input.value === value + ? props.input.onChange('') + : props.input.onChange(value); +