X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/d1af457494186adb375ce2c012cb58685e0556e3..31e84a9315728c2f58a26bf0e9e1d2b38326fb86:/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 ec593b9b..6152b99f 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -4,22 +4,29 @@ import { Dispatch } from 'redux'; import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; -import { RootState } from '../store'; +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 '../resources/resources-actions'; -import { getTreePicker, TreePicker } from '../tree-picker/tree-picker'; +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 { 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' } export const SIDE_PANEL_TREE = 'sidePanelTree'; @@ -39,32 +46,48 @@ 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.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(id => initTreeNode({ id, value: id })); - const projectsNode = initTreeNode({ id: 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({ id: '', pickerId: SIDE_PANEL_TREE, - nodes: [projectsNode, ...nodes] + nodes })); SIDE_PANEL_CATEGORIES.forEach(category => { - dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ - id: 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: [] + })); + } }); }; @@ -72,28 +95,61 @@ 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({ id: projectUuid, pickerId: SIDE_PANEL_TREE })); - const params = { - filters: new FilterBuilder() - .addEqual('ownerUuid', 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)); + 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('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, services: ServiceRepository) => { + 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 })); @@ -104,7 +160,7 @@ export const activateSidePanelTreeItem = (id: string) => }; export const activateSidePanelTreeProject = (id: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + async (dispatch: Dispatch, getState: () => RootState) => { const { treePicker } = getState(); const node = getSidePanelTreeNode(id)(treePicker); if (node && node.status !== TreeNodeStatus.LOADED) { @@ -121,12 +177,21 @@ export const activateSidePanelTreeProject = (id: string) => export const activateSidePanelTreeBranch = (id: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const ancestors = await services.ancestorsService.ancestors(id, 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({ - ids: ancestors.map(ancestor => ancestor.uuid), + 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 }));