X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0c37a7e69b11fb23a4ffa2902a1343b3cd6769bc..21cec41c5bbdb37260f5be2e69cc247f5766e3d4:/src/store/breadcrumbs/breadcrumbs-actions.ts diff --git a/src/store/breadcrumbs/breadcrumbs-actions.ts b/src/store/breadcrumbs/breadcrumbs-actions.ts index 7d6f182d..9aebeb90 100644 --- a/src/store/breadcrumbs/breadcrumbs-actions.ts +++ b/src/store/breadcrumbs/breadcrumbs-actions.ts @@ -6,8 +6,6 @@ import { Dispatch } from 'redux'; import { RootState } from 'store/store'; import { getUserUuid } from "common/getuser"; import { getResource } from 'store/resources/resources'; -import { TreePicker } from '../tree-picker/tree-picker'; -import { getSidePanelTreeBranch, getSidePanelTreeNodeAncestorsIds } from '../side-panel-tree/side-panel-tree-actions'; import { propertiesActions } from '../properties/properties-actions'; import { getProcess } from 'store/processes/process'; import { ServiceRepository } from 'services/services'; @@ -26,6 +24,7 @@ import { CollectionIcon, IconType, ProcessIcon, ProjectIcon, WorkflowIcon } from import { CollectionResource } from 'models/collection'; import { getSidePanelIcon } from 'views-components/side-panel-tree/side-panel-tree'; import { WorkflowResource } from 'models/workflow'; +import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions"; export const BREADCRUMBS = 'breadcrumbs'; @@ -57,47 +56,67 @@ const resourceToBreadcrumb = (resource: CollectionResource | ContainerRequestRes icon: resourceToBreadcrumbIcon(resource), }) -const getSidePanelTreeBreadcrumbs = (uuid: string) => (treePicker: TreePicker): Breadcrumb[] => { - const nodes = getSidePanelTreeBranch(uuid)(treePicker); - return nodes.map(node => - typeof node.value === 'string' - ? { - label: node.value, - uuid: node.id, - icon: getSidePanelIcon(node.value) - } - : resourceToBreadcrumb(node.value)); -}; - export const setSidePanelBreadcrumbs = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const { treePicker, collectionPanel: { item } } = getState(); - const breadcrumbs = getSidePanelTreeBreadcrumbs(uuid)(treePicker); - const path = getState().router.location!.pathname; - const currentUuid = path.split('/')[2]; - const uuidKind = extractUuidKind(currentUuid); + try { + dispatch(progressIndicatorActions.START_WORKING(uuid + "-breadcrumbs")); + const ancestors = await services.ancestorsService.ancestors(uuid, ''); + dispatch(updateResources(ancestors)); - if (uuidKind === ResourceKind.COLLECTION) { - const collectionItem = item ? item : await services.collectionService.get(currentUuid); - const parentProcessItem = await getCollectionParent(collectionItem)(services); - if (parentProcessItem) { - const mainProcessItem = await getProcessParent(parentProcessItem)(services); - mainProcessItem && breadcrumbs.push(resourceToBreadcrumb(mainProcessItem)); - breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); + let breadcrumbs: Breadcrumb[] = []; + const { collectionPanel: { item } } = getState(); + + const path = getState().router.location!.pathname; + const currentUuid = path.split('/')[2]; + const uuidKind = extractUuidKind(currentUuid); + const rootUuid = getUserUuid(getState()); + + if (ancestors.find(ancestor => ancestor.uuid === rootUuid)) { + // Handle home project uuid root + breadcrumbs.push({ + label: SidePanelTreeCategory.PROJECTS, + uuid: SidePanelTreeCategory.PROJECTS, + icon: getSidePanelIcon(SidePanelTreeCategory.PROJECTS) + }); + } else if (Object.values(SidePanelTreeCategory).includes(uuid as SidePanelTreeCategory)) { + // Handle SidePanelTreeCategory root + breadcrumbs.push({ + label: uuid, + uuid: uuid, + icon: getSidePanelIcon(uuid) + }); } - dispatch(setBreadcrumbs(breadcrumbs, collectionItem)); - } else if (uuidKind === ResourceKind.PROCESS) { - const processItem = await services.containerRequestService.get(currentUuid); - const parentProcessItem = await getProcessParent(processItem)(services); - if (parentProcessItem) { - breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); + + breadcrumbs = ancestors.reduce((breadcrumbs, ancestor) => + ancestor.kind === ResourceKind.GROUP + ? [...breadcrumbs, resourceToBreadcrumb(ancestor)] + : breadcrumbs, + breadcrumbs); + + if (uuidKind === ResourceKind.COLLECTION) { + const collectionItem = item ? item : await services.collectionService.get(currentUuid); + const parentProcessItem = await getCollectionParent(collectionItem)(services); + if (parentProcessItem) { + const mainProcessItem = await getProcessParent(parentProcessItem)(services); + mainProcessItem && breadcrumbs.push(resourceToBreadcrumb(mainProcessItem)); + breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); + } + dispatch(setBreadcrumbs(breadcrumbs, collectionItem)); + } else if (uuidKind === ResourceKind.PROCESS) { + const processItem = await services.containerRequestService.get(currentUuid); + const parentProcessItem = await getProcessParent(processItem)(services); + if (parentProcessItem) { + breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); + } + dispatch(setBreadcrumbs(breadcrumbs, processItem)); + } else if (uuidKind === ResourceKind.WORKFLOW) { + const workflowItem = await services.workflowService.get(currentUuid); + dispatch(setBreadcrumbs(breadcrumbs, workflowItem)); } - dispatch(setBreadcrumbs(breadcrumbs, processItem)); - } else if (uuidKind === ResourceKind.WORKFLOW) { - const workflowItem = await services.workflowService.get(currentUuid); - dispatch(setBreadcrumbs(breadcrumbs, workflowItem)); + dispatch(setBreadcrumbs(breadcrumbs)); + } finally { + dispatch(progressIndicatorActions.STOP_WORKING(uuid + "-breadcrumbs")); } - dispatch(setBreadcrumbs(breadcrumbs)); }; export const setSharedWithMeBreadcrumbs = (uuid: string) => @@ -108,42 +127,50 @@ export const setTrashBreadcrumbs = (uuid: string) => export const setCategoryBreadcrumbs = (uuid: string, category: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const ancestors = await services.ancestorsService.ancestors(uuid, ''); - dispatch(updateResources(ancestors)); - const initialBreadcrumbs: Breadcrumb[] = [ - { - label: category, - uuid: category, - icon: getSidePanelIcon(category) - } - ]; - const { collectionPanel: { item } } = getState(); - const path = getState().router.location!.pathname; - const currentUuid = path.split('/')[2]; - const uuidKind = extractUuidKind(currentUuid); - let breadcrumbs = ancestors.reduce((breadcrumbs, ancestor) => - ancestor.kind === ResourceKind.GROUP - ? [...breadcrumbs, resourceToBreadcrumb(ancestor)] - : breadcrumbs, - initialBreadcrumbs); - if (uuidKind === ResourceKind.COLLECTION) { - const collectionItem = item ? item : await services.collectionService.get(currentUuid); - const parentProcessItem = await getCollectionParent(collectionItem)(services); - if (parentProcessItem) { - const mainProcessItem = await getProcessParent(parentProcessItem)(services); - mainProcessItem && breadcrumbs.push(resourceToBreadcrumb(mainProcessItem)); - breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); - } - dispatch(setBreadcrumbs(breadcrumbs, collectionItem)); - } else if (uuidKind === ResourceKind.PROCESS) { - const processItem = await services.containerRequestService.get(currentUuid); - const parentProcessItem = await getProcessParent(processItem)(services); - if (parentProcessItem) { - breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); + try { + dispatch(progressIndicatorActions.START_WORKING(uuid + "-breadcrumbs")); + const ancestors = await services.ancestorsService.ancestors(uuid, ''); + dispatch(updateResources(ancestors)); + const initialBreadcrumbs: Breadcrumb[] = [ + { + label: category, + uuid: category, + icon: getSidePanelIcon(category) + } + ]; + const { collectionPanel: { item } } = getState(); + const path = getState().router.location!.pathname; + const currentUuid = path.split('/')[2]; + const uuidKind = extractUuidKind(currentUuid); + let breadcrumbs = ancestors.reduce((breadcrumbs, ancestor) => + ancestor.kind === ResourceKind.GROUP + ? [...breadcrumbs, resourceToBreadcrumb(ancestor)] + : breadcrumbs, + initialBreadcrumbs); + if (uuidKind === ResourceKind.COLLECTION) { + const collectionItem = item ? item : await services.collectionService.get(currentUuid); + const parentProcessItem = await getCollectionParent(collectionItem)(services); + if (parentProcessItem) { + const mainProcessItem = await getProcessParent(parentProcessItem)(services); + mainProcessItem && breadcrumbs.push(resourceToBreadcrumb(mainProcessItem)); + breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); + } + dispatch(setBreadcrumbs(breadcrumbs, collectionItem)); + } else if (uuidKind === ResourceKind.PROCESS) { + const processItem = await services.containerRequestService.get(currentUuid); + const parentProcessItem = await getProcessParent(processItem)(services); + if (parentProcessItem) { + breadcrumbs.push(resourceToBreadcrumb(parentProcessItem)); + } + dispatch(setBreadcrumbs(breadcrumbs, processItem)); + } else if (uuidKind === ResourceKind.WORKFLOW) { + const workflowItem = await services.workflowService.get(currentUuid); + dispatch(setBreadcrumbs(breadcrumbs, workflowItem)); } - dispatch(setBreadcrumbs(breadcrumbs, processItem)); + dispatch(setBreadcrumbs(breadcrumbs)); + } finally { + dispatch(progressIndicatorActions.STOP_WORKING(uuid + "-breadcrumbs")); } - dispatch(setBreadcrumbs(breadcrumbs)); }; const getProcessParent = (childProcess: ContainerRequestResource) => @@ -186,10 +213,10 @@ const getCollectionParent = (collection: CollectionResource) => export const setProjectBreadcrumbs = (uuid: string) => - (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const ancestors = getSidePanelTreeNodeAncestorsIds(uuid)(getState().treePicker); + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const ancestors = await services.ancestorsService.ancestors(uuid, ''); const rootUuid = getUserUuid(getState()); - if (uuid === rootUuid || ancestors.find(uuid => uuid === rootUuid)) { + if (uuid === rootUuid || ancestors.find(ancestor => ancestor.uuid === rootUuid)) { dispatch(setSidePanelBreadcrumbs(uuid)); } else { dispatch(setSharedWithMeBreadcrumbs(uuid)); @@ -206,15 +233,6 @@ export const setProcessBreadcrumbs = (processUuid: string) => } }; -export const setWorkflowBreadcrumbs = (workflowUuid: string) => - (dispatch: Dispatch, getState: () => RootState) => { - const { resources } = getState(); - const workflow = getResource(workflowUuid)(resources); - if (workflow) { - dispatch(setProjectBreadcrumbs(workflow.ownerUuid)); - } - }; - export const setGroupsBreadcrumbs = () => setBreadcrumbs([{ label: SidePanelTreeCategory.GROUPS,