Navigation fixes

[arvados-workbench2.git] / src / store / navigation / navigation-action.ts

diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index 6e4b4bef38cd158c52f2ccd2001839cd2ef97e44..9b4c88eac845a7df4317a0b4403cef5288f6c5c6 100644 (file)
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -42,14 +42,17 @@ export const setProjectItem = (projects: Array<TreeItem<Project>>, itemId: strin
 
         dispatch(push(getResourceUrl({...resource, kind: itemKind})));
     };
-    const treeItem = findTreeItem(projects, itemId);
+    let treeItem = findTreeItem(projects, itemId);
+    if (treeItem && itemKind === ResourceKind.LEVEL_UP) {
+        treeItem = findTreeItem(projects, treeItem.data.ownerUuid);
+    }
 
     if (treeItem) {
         if (treeItem.status === TreeItemStatus.Loaded) {
             openProjectItem(treeItem.data);
         } else {
             dispatch<any>(getProjectList(itemId))
-                .then(() => openProjectItem(treeItem.data));
+                .then(() => openProjectItem(treeItem!.data));
         }
         if (itemMode === ItemMode.ACTIVE || itemMode === ItemMode.BOTH) {
             dispatch<any>(getCollectionList(itemId));