X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0d45466589474731ae6e0bce82000225b44573ac..b2caf3b43219f3ff88b3f84431536645776b53cc:/src/store/workbench/workbench-actions.ts diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index d56b6c36..94b4b4f5 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -5,17 +5,16 @@ import { Dispatch } from 'redux'; import { RootState } from "../store"; import { loadDetailsPanel } from '~/store/details-panel/details-panel-action'; -import { loadCollectionPanel } from '~/store/collection-panel/collection-panel-action'; import { snackbarActions } from '../snackbar/snackbar-actions'; import { loadFavoritePanel } from '../favorite-panel/favorite-panel-action'; import { openProjectPanel, projectPanelActions } from '~/store/project-panel/project-panel-action'; -import { activateSidePanelTreeItem, initSidePanelTree, SidePanelTreeCategory, loadSidePanelTreeProjects, getSidePanelTreeNodeAncestorsIds } from '../side-panel-tree/side-panel-tree-actions'; +import { activateSidePanelTreeItem, initSidePanelTree, SidePanelTreeCategory, loadSidePanelTreeProjects } from '../side-panel-tree/side-panel-tree-actions'; import { loadResource, updateResources } from '../resources/resources-actions'; import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-action'; import { projectPanelColumns } from '~/views/project-panel/project-panel'; import { favoritePanelColumns } from '~/views/favorite-panel/favorite-panel'; import { matchRootRoute } from '~/routes/routes'; -import { setCollectionBreadcrumbs, setSidePanelBreadcrumbs, setProcessBreadcrumbs, setSharedWithMeBreadcrumbs, setTrashBreadcrumbs } from '../breadcrumbs/breadcrumbs-actions'; +import { setSidePanelBreadcrumbs, setProcessBreadcrumbs, setSharedWithMeBreadcrumbs, setTrashBreadcrumbs } from '../breadcrumbs/breadcrumbs-actions'; import { navigateToProject } from '../navigation/navigation-action'; import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog'; import { ServiceRepository } from '~/services/services'; @@ -41,10 +40,10 @@ import { loadSharedWithMePanel } from '../shared-with-me-panel/shared-with-me-pa import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog'; import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; import { getProgressIndicator } from '../progress-indicator/progress-indicator-reducer'; -import { ResourceKind } from '~/models/resource'; +import { ResourceKind, extractUuidKind } from '~/models/resource'; import { FilterBuilder } from '~/services/api/filter-builder'; -import { ProjectResource } from '~/models/project'; - +import { GroupContentsResource } from '~/services/groups-service/groups-service'; +import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize'; export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen'; @@ -113,46 +112,29 @@ export const loadProject = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const userUuid = services.authService.getUuid(); if (userUuid) { - let project: ProjectResource | null = null; if (userUuid !== uuid) { - /** - * Use of /group/contents API is the only way to get trashed item - * A get method of a service will throw an exception with 404 status for resources that are trashed - */ - const resource = await loadGroupContentsResource(uuid, userUuid, services); - if (resource) { - if (resource.kind === ResourceKind.PROJECT) { - project = resource; - if (project.isTrashed) { - dispatch(setTrashBreadcrumbs(uuid)); - dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)); - } else { - await dispatch(activateSidePanelTreeItem(uuid)); - dispatch(setSidePanelBreadcrumbs(uuid)); - } - } - } else { - /** - * If item is not accesible using loadGroupContentsResource, - * but it can be obtained using the get method of the service - * then it is shared with the user - */ - project = await services.projectService.get(uuid); - if (project) { + const match = await loadGroupContentsResource({ uuid, userUuid, services }); + match({ + OWNED: async project => { + await dispatch(activateSidePanelTreeItem(uuid)); + dispatch(setSidePanelBreadcrumbs(uuid)); + dispatch(finishLoadingProject(project)); + }, + SHARED: project => { dispatch(setSharedWithMeBreadcrumbs(uuid)); dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME)); + dispatch(finishLoadingProject(project)); + }, + TRASHED: project => { + dispatch(setTrashBreadcrumbs(uuid)); + dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)); + dispatch(finishLoadingProject(project)); } - } - if (project) { - dispatch(updateResources([project])); - } + }); } else { await dispatch(activateSidePanelTreeItem(userUuid)); dispatch(setSidePanelBreadcrumbs(userUuid)); - } - if (project) { - dispatch(openProjectPanel(uuid)); - dispatch(loadDetailsPanel(uuid)); + dispatch(finishLoadingProject(userUuid)); } } }); @@ -189,7 +171,7 @@ export const moveProject = (data: MoveToFormDialogData) => }; export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialogData) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + async (dispatch: Dispatch) => { const updatedProject = await dispatch(projectUpdateActions.updateProject(data)); if (updatedProject) { dispatch(snackbarActions.OPEN_SNACKBAR({ @@ -203,11 +185,29 @@ export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialog export const loadCollection = (uuid: string) => handleFirstTimeLoad( - async (dispatch: Dispatch) => { - const collection = await dispatch(loadCollectionPanel(uuid)); - await dispatch(activateSidePanelTreeItem(collection.ownerUuid)); - dispatch(setCollectionBreadcrumbs(collection.uuid)); - dispatch(loadDetailsPanel(uuid)); + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const userUuid = services.authService.getUuid(); + if (userUuid) { + const match = await loadGroupContentsResource({ uuid, userUuid, services }); + match({ + OWNED: async collection => { + dispatch(updateResources([collection])); + await dispatch(activateSidePanelTreeItem(collection.ownerUuid)); + dispatch(setSidePanelBreadcrumbs(collection.ownerUuid)); + }, + SHARED: collection => { + dispatch(updateResources([collection])); + dispatch(setSharedWithMeBreadcrumbs(collection.ownerUuid)); + dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME)); + }, + TRASHED: collection => { + dispatch(updateResources([collection])); + dispatch(setTrashBreadcrumbs('')); + dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)); + }, + + }); + } }); export const createCollection = (data: collectionCreateActions.CollectionCreateFormDialogData) => @@ -347,18 +347,58 @@ export const loadSharedWithMe = handleFirstTimeLoad(async (dispatch: Dispatch) = await dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.SHARED_WITH_ME)); }); -const loadGroupContentsResource = async (uuid: string, ownerUuid: string, services: ServiceRepository) => { +const finishLoadingProject = (project: GroupContentsResource | string) => + async (dispatch: Dispatch) => { + const uuid = typeof project === 'string' ? project : project.uuid; + dispatch(openProjectPanel(uuid)); + dispatch(loadDetailsPanel(uuid)); + if (typeof project !== 'string') { + dispatch(updateResources([project])); + } + }; +const loadGroupContentsResource = async (params: { + uuid: string, + userUuid: string, + services: ServiceRepository +}) => { const filters = new FilterBuilder() - .addEqual('uuid', uuid) + .addEqual('uuid', params.uuid) .getFilters(); - - const { items } = await services.groupsService.contents(ownerUuid, { + const { items } = await params.services.groupsService.contents(params.userUuid, { filters, recursive: true, includeTrash: true, }); + const resource = items.shift(); + let handler: GroupContentsHandler; + if (resource) { + handler = (resource.kind === ResourceKind.COLLECTION || resource.kind === ResourceKind.PROJECT) && resource.isTrashed + ? groupContentsHandlers.TRASHED(resource) + : groupContentsHandlers.OWNED(resource); + } else { + const kind = extractUuidKind(params.uuid); + let resource: GroupContentsResource; + if (kind === ResourceKind.COLLECTION) { + resource = await params.services.collectionService.get(params.uuid); + } else if (kind === ResourceKind.PROJECT) { + resource = await params.services.projectService.get(params.uuid); + } else { + resource = await params.services.containerRequestService.get(params.uuid); + } + handler = groupContentsHandlers.SHARED(resource); + } + return (cases: MatchCases) => + groupContentsHandlers.match(handler, cases); - return items.shift(); +}; +const groupContentsHandlersRecord = { + TRASHED: ofType(), + SHARED: ofType(), + OWNED: ofType(), }; + +const groupContentsHandlers = unionize(groupContentsHandlersRecord); + +type GroupContentsHandler = UnionOf;