Fixed not clearing project panel items immediately on node click/open

[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 9b4c88eac845a7df4317a0b4403cef5288f6c5c6..0b4bcdf87ab033421319eaa472a3ea15449ea296 100644 (file)
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -36,18 +36,20 @@ export const setProjectItem = (projects: Array<TreeItem<Project>>, itemId: strin
         }
 
         if (itemMode === ItemMode.ACTIVE || itemMode === ItemMode.BOTH) {
-            dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(resource.uuid));
             dispatch(sidePanelActions.RESET_SIDE_PANEL_ACTIVITY(resource.uuid));
         }
 
         dispatch(push(getResourceUrl({...resource, kind: itemKind})));
     };
+
     let treeItem = findTreeItem(projects, itemId);
     if (treeItem && itemKind === ResourceKind.LEVEL_UP) {
         treeItem = findTreeItem(projects, treeItem.data.ownerUuid);
     }
 
     if (treeItem) {
+        dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(treeItem.data.uuid));
+
         if (treeItem.status === TreeItemStatus.Loaded) {
             openProjectItem(treeItem.data);
         } else {