X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e1605f7c93aeb41ae31e0dd88a9afd8709136b62..0cc06c813afc8373f3c6675c3519960382a7067f:/src/store/breadcrumbs/breadcrumbs-actions.ts

diff --git a/src/store/breadcrumbs/breadcrumbs-actions.ts b/src/store/breadcrumbs/breadcrumbs-actions.ts
index 71de5ce4..90af2c2f 100644
--- a/src/store/breadcrumbs/breadcrumbs-actions.ts
+++ b/src/store/breadcrumbs/breadcrumbs-actions.ts
@@ -4,6 +4,7 @@
 
 import { Dispatch } from 'redux';
 import { RootState } from '~/store/store';
+import { getUserUuid } from "~/common/getuser";
 import { Breadcrumb } from '~/components/breadcrumbs/breadcrumbs';
 import { getResource } from '~/store/resources/resources';
 import { TreePicker } from '../tree-picker/tree-picker';
@@ -15,6 +16,7 @@ import { SidePanelTreeCategory, activateSidePanelTreeItem } from '~/store/side-p
 import { updateResources } from '../resources/resources-actions';
 import { ResourceKind } from '~/models/resource';
 import { GroupResource } from '~/models/group';
+import { extractUuidKind } from '~/models/resource';
 
 export const BREADCRUMBS = 'breadcrumbs';
 
@@ -22,8 +24,14 @@ export interface ResourceBreadcrumb extends Breadcrumb {
     uuid: string;
 }
 
-export const setBreadcrumbs = (breadcrumbs: Breadcrumb[]) =>
-    propertiesActions.SET_PROPERTY({ key: BREADCRUMBS, value: breadcrumbs });
+export const setBreadcrumbs = (breadcrumbs: any, currentItem?: any) => {
+    if (currentItem) {
+        const addLastItem = { label: currentItem.name, uuid: currentItem.uuid };
+        breadcrumbs.push(addLastItem);
+    }
+    return propertiesActions.SET_PROPERTY({ key: BREADCRUMBS, value: breadcrumbs });
+};
+
 
 const getSidePanelTreeBreadcrumbs = (uuid: string) => (treePicker: TreePicker): ResourceBreadcrumb[] => {
     const nodes = getSidePanelTreeBranch(uuid)(treePicker);
@@ -34,9 +42,20 @@ const getSidePanelTreeBreadcrumbs = (uuid: string) => (treePicker: TreePicker):
 };
 
 export const setSidePanelBreadcrumbs = (uuid: string) =>
-    (dispatch: Dispatch, getState: () => RootState) => {
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const { treePicker } = getState();
         const breadcrumbs = getSidePanelTreeBreadcrumbs(uuid)(treePicker);
+        const path = getState().router.location!.pathname;
+        const currentUuid = path.split('/')[2];
+        const uuidKind = extractUuidKind(currentUuid);
+
+        if (uuidKind === ResourceKind.COLLECTION) {
+            const collectionItem = await services.collectionService.get(currentUuid);
+            dispatch(setBreadcrumbs(breadcrumbs, collectionItem));
+        } else if (uuidKind === ResourceKind.PROCESS) {
+            const processItem = await services.containerRequestService.get(currentUuid);
+            dispatch(setBreadcrumbs(breadcrumbs, processItem));
+        }
         dispatch(setBreadcrumbs(breadcrumbs));
     };
 
@@ -53,19 +72,28 @@ export const setCategoryBreadcrumbs = (uuid: string, category: SidePanelTreeCate
         const initialBreadcrumbs: ResourceBreadcrumb[] = [
             { label: category, uuid: category }
         ];
-        const breadrumbs = ancestors.reduce((breadcrumbs, ancestor) =>
+        const path = getState().router.location!.pathname;
+        const currentUuid = path.split('/')[2];
+        const uuidKind = extractUuidKind(currentUuid);
+        const breadcrumbs = ancestors.reduce((breadcrumbs, ancestor) =>
             ancestor.kind === ResourceKind.GROUP
                 ? [...breadcrumbs, { label: ancestor.name, uuid: ancestor.uuid }]
                 : breadcrumbs,
             initialBreadcrumbs);
-
-        dispatch(setBreadcrumbs(breadrumbs));
+        if (uuidKind === ResourceKind.COLLECTION) {
+            const collectionItem = await services.collectionService.get(currentUuid);
+            dispatch(setBreadcrumbs(breadcrumbs, collectionItem));
+        } else if (uuidKind === ResourceKind.PROCESS) {
+            const processItem = await services.containerRequestService.get(currentUuid);
+            dispatch(setBreadcrumbs(breadcrumbs, processItem));
+        }
+        dispatch(setBreadcrumbs(breadcrumbs));
     };
 
 export const setProjectBreadcrumbs = (uuid: string) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         const ancestors = getSidePanelTreeNodeAncestorsIds(uuid)(getState().treePicker);
-        const rootUuid = services.authService.getUuid();
+        const rootUuid = getUserUuid(getState());
         if (uuid === rootUuid || ancestors.find(uuid => uuid === rootUuid)) {
             dispatch(setSidePanelBreadcrumbs(uuid));
         } else {
@@ -74,14 +102,6 @@ export const setProjectBreadcrumbs = (uuid: string) =>
         }
     };
 
-export const setCollectionBreadcrumbs = (collectionUuid: string) =>
-    (dispatch: Dispatch, getState: () => RootState) => {
-        const { resources } = getState();
-        const collection = getResource(collectionUuid)(resources);
-        if (collection) {
-            dispatch<any>(setProjectBreadcrumbs(collection.ownerUuid));
-        }
-    };
 export const setProcessBreadcrumbs = (processUuid: string) =>
     (dispatch: Dispatch, getState: () => RootState) => {
         const { resources } = getState();