X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/d6d85de50096eb0053d58c5022fd4e949c830929..9cdcf53b97efc80d6c7de7e0d4da7edf91f15c31:/src/store/side-panel-tree/side-panel-tree-actions.ts diff --git a/src/store/side-panel-tree/side-panel-tree-actions.ts b/src/store/side-panel-tree/side-panel-tree-actions.ts index 268f1e6c..1f18b85c 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -4,30 +4,50 @@ import { Dispatch } from 'redux'; import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; -import { createTreePickerNode } from '~/store/tree-picker/tree-picker'; -import { RootState } from '../store'; +import { RootState } from '~/store/store'; +import { getUserUuid } from "~/common/getuser"; import { ServiceRepository } from '~/services/services'; -import { FilterBuilder } from '~/common/api/filter-builder'; -import { resourcesActions } from '../resources/resources-actions'; -import { getNodeValue } from '../../models/tree'; -import { getTreePicker } from '../tree-picker/tree-picker'; -import { TreeItemStatus } from "~/components/tree/tree"; +import { FilterBuilder } from '~/services/api/filter-builder'; +import { resourcesActions } from '~/store/resources/resources-actions'; +import { getTreePicker, TreePicker } from '~/store/tree-picker/tree-picker'; +import { getNodeAncestors, getNodeAncestorsIds, getNode, TreeNode, initTreeNode, TreeNodeStatus } from '~/models/tree'; +import { ProjectResource } from '~/models/project'; +import { OrderBuilder } from '~/services/api/order-builder'; +import { ResourceKind } from '~/models/resource'; +import { GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; +import { GroupClass } from '~/models/group'; export enum SidePanelTreeCategory { PROJECTS = 'Projects', SHARED_WITH_ME = 'Shared with me', + PUBLIC_FAVORITES = 'Public Favorites', WORKFLOWS = 'Workflows', - RECENT_OPEN = 'Recent open', FAVORITES = 'Favorites', - TRASH = 'Trash' + TRASH = 'Trash', + ALL_PROCESSES = 'All Processes' } export const SIDE_PANEL_TREE = 'sidePanelTree'; +export const getSidePanelTree = (treePicker: TreePicker) => + getTreePicker(SIDE_PANEL_TREE)(treePicker); + +export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker): Array> => { + const tree = getSidePanelTree(treePicker); + if (tree) { + const ancestors = getNodeAncestors(uuid)(tree); + const node = getNode(uuid)(tree); + if (node) { + return [...ancestors, node]; + } + } + return []; +}; + const SIDE_PANEL_CATEGORIES = [ - SidePanelTreeCategory.SHARED_WITH_ME, + SidePanelTreeCategory.ALL_PROCESSES, + SidePanelTreeCategory.PUBLIC_FAVORITES, SidePanelTreeCategory.WORKFLOWS, - SidePanelTreeCategory.RECENT_OPEN, SidePanelTreeCategory.FAVORITES, SidePanelTreeCategory.TRASH, ]; @@ -36,17 +56,19 @@ export const isSidePanelTreeCategory = (id: string) => SIDE_PANEL_CATEGORIES.som export const initSidePanelTree = () => (dispatch: Dispatch, getState: () => RootState, { authService }: ServiceRepository) => { - const rootProjectUuid = authService.getUuid() || ''; - const nodes = SIDE_PANEL_CATEGORIES.map(nodeId => createTreePickerNode({ nodeId, value: nodeId })); - const projectsNode = createTreePickerNode({ nodeId: rootProjectUuid, value: SidePanelTreeCategory.PROJECTS }); + const rootProjectUuid = getUserUuid(getState()); + if (!rootProjectUuid) { return; } + const nodes = SIDE_PANEL_CATEGORIES.map(id => initTreeNode({ id, value: id })); + const projectsNode = initTreeNode({ id: rootProjectUuid, value: SidePanelTreeCategory.PROJECTS }); + const sharedNode = initTreeNode({ id: SidePanelTreeCategory.SHARED_WITH_ME, value: SidePanelTreeCategory.SHARED_WITH_ME }); dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - nodeId: '', + id: '', pickerId: SIDE_PANEL_TREE, - nodes: [projectsNode, ...nodes] + nodes: [projectsNode, sharedNode, ...nodes] })); SIDE_PANEL_CATEGORIES.forEach(category => { dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - nodeId: category, + id: category, pickerId: SIDE_PANEL_TREE, nodes: [] })); @@ -55,65 +77,136 @@ export const initSidePanelTree = () => export const loadSidePanelTreeProjects = (projectUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: projectUuid, pickerId: SIDE_PANEL_TREE })); + const treePicker = getTreePicker(SIDE_PANEL_TREE)(getState().treePicker); + const node = treePicker ? getNode(projectUuid)(treePicker) : undefined; + if (projectUuid === SidePanelTreeCategory.SHARED_WITH_ME) { + await dispatch(loadSharedRoot); + } else if (node || projectUuid === '') { + await dispatch(loadProject(projectUuid)); + } + }; + +const loadProject = (projectUuid: string) => + async (dispatch: Dispatch, _: () => RootState, services: ServiceRepository) => { + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: projectUuid, pickerId: SIDE_PANEL_TREE })); const params = { filters: new FilterBuilder() - .addEqual('ownerUuid', projectUuid) - .getFilters() + .addEqual('owner_uuid', projectUuid) + .getFilters(), + order: new OrderBuilder() + .addAsc('name') + .getOrder() }; const { items } = await services.projectService.list(params); dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - nodeId: projectUuid, + id: projectUuid, pickerId: SIDE_PANEL_TREE, - nodes: items.map(item => createTreePickerNode({ nodeId: item.uuid, value: item })), + nodes: items.map(item => initTreeNode({ id: item.uuid, value: item })), })); dispatch(resourcesActions.SET_RESOURCES(items)); }; -export const activateSidePanelTreeItem = (nodeId: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const node = getSidePanelTreeNode(nodeId)(getState()); - if (node && !node.selected) { - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId: SIDE_PANEL_TREE })); +const loadSharedRoot = async (dispatch: Dispatch, _: () => RootState, services: ServiceRepository) => { + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: SidePanelTreeCategory.SHARED_WITH_ME, pickerId: SIDE_PANEL_TREE })); + + const params = { + filters: `[${new FilterBuilder() + .addIsA('uuid', ResourceKind.PROJECT) + .addEqual('group_class', GroupClass.PROJECT) + .getFilters()}]`, + order: new OrderBuilder() + .addAsc('name', GroupContentsResourcePrefix.PROJECT) + .getOrder(), + limit: 1000 + }; + + const { items } = await services.groupsService.shared(params); + + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ + id: SidePanelTreeCategory.SHARED_WITH_ME, + pickerId: SIDE_PANEL_TREE, + nodes: items.map(item => initTreeNode({ id: item.uuid, value: item })), + })); + + dispatch(resourcesActions.SET_RESOURCES(items)); +}; + +export const activateSidePanelTreeItem = (id: string) => + async (dispatch: Dispatch, getState: () => RootState) => { + const node = getSidePanelTreeNode(id)(getState().treePicker); + if (node && !node.active) { + dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ id, pickerId: SIDE_PANEL_TREE })); } - if (!isSidePanelTreeCategory(nodeId)) { - dispatch(activateSidePanelTreeProject(nodeId)); + if (!isSidePanelTreeCategory(id)) { + await dispatch(activateSidePanelTreeProject(id)); } }; -export const activateSidePanelTreeProject = (nodeId: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const node = getSidePanelTreeNode(nodeId)(getState()); - if (node && node.status !== TreeItemStatus.LOADED) { - await dispatch(loadSidePanelTreeProjects(nodeId)); - if (node.collapsed) { - dispatch(toggleSidePanelTreeItemCollapse(nodeId)); - } +export const activateSidePanelTreeProject = (id: string) => + async (dispatch: Dispatch, getState: () => RootState) => { + const { treePicker } = getState(); + const node = getSidePanelTreeNode(id)(treePicker); + if (node && node.status !== TreeNodeStatus.LOADED) { + await dispatch(loadSidePanelTreeProjects(id)); } else if (node === undefined) { - dispatch(activateSidePanelTreeBranch(nodeId)); + await dispatch(activateSidePanelTreeBranch(id)); } + dispatch(treePickerActions.EXPAND_TREE_PICKER_NODES({ + ids: getSidePanelTreeNodeAncestorsIds(id)(treePicker), + pickerId: SIDE_PANEL_TREE + })); + dispatch(expandSidePanelTreeItem(id)); }; -export const activateSidePanelTreeBranch = (nodeId: string) => +export const activateSidePanelTreeBranch = (id: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const ancestors = await services.ancestorsService.ancestors(nodeId, services.authService.getUuid() || ''); + const userUuid = getUserUuid(getState()); + if (!userUuid) { return; } + const ancestors = await services.ancestorsService.ancestors(id, userUuid); + const isShared = ancestors.every(({ uuid }) => uuid !== userUuid); + if (isShared) { + await dispatch(loadSidePanelTreeProjects(SidePanelTreeCategory.SHARED_WITH_ME)); + } for (const ancestor of ancestors) { await dispatch(loadSidePanelTreeProjects(ancestor.uuid)); } - for (const ancestor of ancestors) { - dispatch(toggleSidePanelTreeItemCollapse(ancestor.uuid)); + dispatch(treePickerActions.EXPAND_TREE_PICKER_NODES({ + ids: [ + ...(isShared ? [SidePanelTreeCategory.SHARED_WITH_ME] : []), + ...ancestors.map(ancestor => ancestor.uuid) + ], + pickerId: SIDE_PANEL_TREE + })); + dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ id, pickerId: SIDE_PANEL_TREE })); + }; + +export const toggleSidePanelTreeItemCollapse = (id: string) => + async (dispatch: Dispatch, getState: () => RootState) => { + const node = getSidePanelTreeNode(id)(getState().treePicker); + if (node && node.status === TreeNodeStatus.INITIAL) { + await dispatch(loadSidePanelTreeProjects(node.id)); } - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId: SIDE_PANEL_TREE })); + dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id, pickerId: SIDE_PANEL_TREE })); }; -const getSidePanelTreeNode = (nodeId: string) => (state: RootState) => { - const sidePanelTree = getTreePicker(SIDE_PANEL_TREE)(state.treePicker); +export const expandSidePanelTreeItem = (id: string) => + async (dispatch: Dispatch, getState: () => RootState) => { + const node = getSidePanelTreeNode(id)(getState().treePicker); + if (node && !node.expanded) { + dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id, pickerId: SIDE_PANEL_TREE })); + } + }; + +export const getSidePanelTreeNode = (id: string) => (treePicker: TreePicker) => { + const sidePanelTree = getTreePicker(SIDE_PANEL_TREE)(treePicker); return sidePanelTree - ? getNodeValue(nodeId)(sidePanelTree) + ? getNode(id)(sidePanelTree) : undefined; }; -export const toggleSidePanelTreeItemCollapse = (nodeId: string) => - async (dispatch: Dispatch, getState: () => RootState) => { - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId: SIDE_PANEL_TREE })); - }; +export const getSidePanelTreeNodeAncestorsIds = (id: string) => (treePicker: TreePicker) => { + const sidePanelTree = getTreePicker(SIDE_PANEL_TREE)(treePicker); + return sidePanelTree + ? getNodeAncestorsIds(id)(sidePanelTree) + : []; +};