X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ea54fb82c3a59ca8a959643f8bec4776635433e0..d416c9aa7b70da4f8998792a42616b991d882f26:/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 23c5ea22..58f7d82d 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -3,25 +3,31 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from 'redux'; -import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; -import { createTreePickerNode, TreePickerNode } from '~/store/tree-picker/tree-picker'; -import { RootState } from '../store'; -import { ServiceRepository } from '~/services/services'; -import { FilterBuilder } from '~/services/api/filter-builder'; -import { resourcesActions } from '../resources/resources-actions'; -import { getTreePicker, TreePicker } from '../tree-picker/tree-picker'; -import { TreeItemStatus } from "~/components/tree/tree"; -import { getNodeAncestors, getNodeValue, getNodeAncestorsIds, getNode } from '~/models/tree'; -import { ProjectResource } from '~/models/project'; -import { progressIndicatorActions } from '../progress-indicator/progress-indicator-actions'; +import { treePickerActions } from "store/tree-picker/tree-picker-actions"; +import { RootState } from 'store/store'; +import { getUserUuid } from "common/getuser"; +import { ServiceRepository } from 'services/services'; +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'; +import { CategoriesListReducer } from 'common/plugintypes'; +import { pluginConfig } from 'plugins'; export enum SidePanelTreeCategory { PROJECTS = 'Projects', SHARED_WITH_ME = 'Shared with me', + PUBLIC_FAVORITES = 'Public Favorites', WORKFLOWS = 'Workflows', - RECENT_OPEN = 'Recently open', - FAVORITES = 'Favorites', - TRASH = 'Trash' + FAVORITES = 'My Favorites', + TRASH = 'Trash', + ALL_PROCESSES = 'All Processes', + GROUPS = 'Groups', } export const SIDE_PANEL_TREE = 'sidePanelTree'; @@ -29,11 +35,11 @@ export const SIDE_PANEL_TREE = 'sidePanelTree'; export const getSidePanelTree = (treePicker: TreePicker) => getTreePicker(SIDE_PANEL_TREE)(treePicker); -export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker): Array> => { +export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker): Array> => { const tree = getSidePanelTree(treePicker); if (tree) { - const ancestors = getNodeAncestors(uuid)(tree).map(node => node.value); - const node = getNodeValue(uuid)(tree); + const ancestors = getNodeAncestors(uuid)(tree); + const node = getNode(uuid)(tree); if (node) { return [...ancestors, node]; } @@ -41,32 +47,49 @@ export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker) return []; }; -const SIDE_PANEL_CATEGORIES = [ +let SIDE_PANEL_CATEGORIES: string[] = [ + SidePanelTreeCategory.PROJECTS, SidePanelTreeCategory.SHARED_WITH_ME, - SidePanelTreeCategory.WORKFLOWS, - SidePanelTreeCategory.RECENT_OPEN, + SidePanelTreeCategory.PUBLIC_FAVORITES, SidePanelTreeCategory.FAVORITES, - SidePanelTreeCategory.TRASH, + // SidePanelTreeCategory.WORKFLOWS, + SidePanelTreeCategory.GROUPS, + SidePanelTreeCategory.ALL_PROCESSES, + SidePanelTreeCategory.TRASH ]; +const reduceCatsFn: (a: string[], + b: CategoriesListReducer) => string[] = (a, b) => b(a); + +SIDE_PANEL_CATEGORIES = pluginConfig.sidePanelCategories.reduce(reduceCatsFn, SIDE_PANEL_CATEGORIES); + export const isSidePanelTreeCategory = (id: string) => SIDE_PANEL_CATEGORIES.some(category => category === id); + 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 => { + if (id === SidePanelTreeCategory.PROJECTS) { + return initTreeNode({ id: rootProjectUuid, value: SidePanelTreeCategory.PROJECTS }); + } else { + return initTreeNode({ id, value: id }); + } + }); dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - nodeId: '', + id: '', pickerId: SIDE_PANEL_TREE, - nodes: [projectsNode, ...nodes] + nodes })); SIDE_PANEL_CATEGORIES.forEach(category => { - dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - nodeId: category, - pickerId: SIDE_PANEL_TREE, - nodes: [] - })); + if (category !== SidePanelTreeCategory.PROJECTS && category !== SidePanelTreeCategory.SHARED_WITH_ME) { + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ + id: category, + pickerId: SIDE_PANEL_TREE, + nodes: [] + })); + } }); }; @@ -74,90 +97,135 @@ export const loadSidePanelTreeProjects = (projectUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const treePicker = getTreePicker(SIDE_PANEL_TREE)(getState().treePicker); const node = treePicker ? getNode(projectUuid)(treePicker) : undefined; - if (node || projectUuid === '') { - dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: projectUuid, pickerId: SIDE_PANEL_TREE })); - const params = { - filters: new FilterBuilder() - .addEqual('ownerUuid', projectUuid) - .getFilters() - }; - const { items } = await services.projectService.list(params); - dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - nodeId: projectUuid, - pickerId: SIDE_PANEL_TREE, - nodes: items.map(item => createTreePickerNode({ nodeId: item.uuid, value: item })), - })); - dispatch(resourcesActions.SET_RESOURCES(items)); + if (projectUuid === SidePanelTreeCategory.SHARED_WITH_ME) { + await dispatch(loadSharedRoot); + } else if (node || projectUuid !== '') { + await dispatch(loadProject(projectUuid)); } }; -export const activateSidePanelTreeItem = (nodeId: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const node = getSidePanelTreeNode(nodeId)(getState().treePicker); - if (node && !node.selected) { - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId: SIDE_PANEL_TREE })); +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('owner_uuid', projectUuid) + .getFilters(), + order: new OrderBuilder() + .addAsc('name') + .getOrder() + }; + const { items } = await services.projectService.list(params); + dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ + id: projectUuid, + pickerId: SIDE_PANEL_TREE, + nodes: items.map(item => initTreeNode({ id: item.uuid, value: item })), + })); + dispatch(resourcesActions.SET_RESOURCES(items)); + }; + +const loadSharedRoot = async (dispatch: Dispatch, getState: () => 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) + .addIn('group_class', [GroupClass.PROJECT, GroupClass.FILTER]) + .addDistinct('uuid', getState().auth.config.uuidPrefix + '-j7d0g-publicfavorites') + .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)) { - await dispatch(activateSidePanelTreeProject(nodeId)); + if (!isSidePanelTreeCategory(id)) { + await dispatch(activateSidePanelTreeProject(id)); } }; -export const activateSidePanelTreeProject = (nodeId: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +export const activateSidePanelTreeProject = (id: string) => + async (dispatch: Dispatch, getState: () => RootState) => { const { treePicker } = getState(); - const node = getSidePanelTreeNode(nodeId)(treePicker); - if (node && node.status !== TreeItemStatus.LOADED) { - await dispatch(loadSidePanelTreeProjects(nodeId)); + const node = getSidePanelTreeNode(id)(treePicker); + if (node && node.status !== TreeNodeStatus.LOADED) { + await dispatch(loadSidePanelTreeProjects(id)); } else if (node === undefined) { - await dispatch(activateSidePanelTreeBranch(nodeId)); + await dispatch(activateSidePanelTreeBranch(id)); } dispatch(treePickerActions.EXPAND_TREE_PICKER_NODES({ - nodeIds: getSidePanelTreeNodeAncestorsIds(nodeId)(treePicker), + ids: getSidePanelTreeNodeAncestorsIds(id)(treePicker), pickerId: SIDE_PANEL_TREE })); - dispatch(expandSidePanelTreeItem(nodeId)); + 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)); } dispatch(treePickerActions.EXPAND_TREE_PICKER_NODES({ - nodeIds: ancestors.map(ancestor => ancestor.uuid), + ids: [ + ...(isShared ? [SidePanelTreeCategory.SHARED_WITH_ME] : []), + ...ancestors.map(ancestor => ancestor.uuid) + ], pickerId: SIDE_PANEL_TREE })); - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId: SIDE_PANEL_TREE })); + dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ id, pickerId: SIDE_PANEL_TREE })); }; -export const toggleSidePanelTreeItemCollapse = (nodeId: string) => +export const toggleSidePanelTreeItemCollapse = (id: string) => async (dispatch: Dispatch, getState: () => RootState) => { - const node = getSidePanelTreeNode(nodeId)(getState().treePicker); - if (node && node.status === TreeItemStatus.INITIAL) { - await dispatch(loadSidePanelTreeProjects(node.nodeId)); + const node = getSidePanelTreeNode(id)(getState().treePicker); + if (node && node.status === TreeNodeStatus.INITIAL) { + await dispatch(loadSidePanelTreeProjects(node.id)); } - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId: SIDE_PANEL_TREE })); + dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id, pickerId: SIDE_PANEL_TREE })); }; -export const expandSidePanelTreeItem = (nodeId: string) => +export const expandSidePanelTreeItem = (id: string) => async (dispatch: Dispatch, getState: () => RootState) => { - const node = getSidePanelTreeNode(nodeId)(getState().treePicker); - if (node && node.collapsed) { - dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId: SIDE_PANEL_TREE })); + 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 = (nodeId: string) => (treePicker: TreePicker) => { +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 getSidePanelTreeNodeAncestorsIds = (nodeId: string) => (treePicker: TreePicker) => { +export const getSidePanelTreeNodeAncestorsIds = (id: string) => (treePicker: TreePicker) => { const sidePanelTree = getTreePicker(SIDE_PANEL_TREE)(treePicker); return sidePanelTree - ? getNodeAncestorsIds(nodeId)(sidePanelTree) + ? getNodeAncestorsIds(id)(sidePanelTree) : []; };