Merge branch 'master'

[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 0b4bcdf87ab033421319eaa472a3ea15449ea296..b811f9a292b8b42bf9cfb6ba8fcdf93db017351d 100644 (file)
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -5,12 +5,15 @@
 import { Dispatch } from "redux";
 import projectActions, { getProjectList } from "../project/project-action";
 import { push } from "react-router-redux";
-import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
+import { TreeItemStatus } from "../../components/tree/tree";
 import { getCollectionList } from "../collection/collection-action";
 import { findTreeItem } from "../project/project-reducer";
-import { Project } from "../../models/project";
 import { Resource, ResourceKind } from "../../models/resource";
 import sidePanelActions from "../side-panel/side-panel-action";
+import dataExplorerActions from "../data-explorer/data-explorer-action";
+import { PROJECT_PANEL_ID } from "../../views/project-panel/project-panel";
+import { projectPanelItems } from "../../views/project-panel/project-panel-selectors";
+import { RootState } from "../store";
 
 export const getResourceUrl = (resource: Resource): string => {
     switch (resource.kind) {
@@ -28,36 +31,50 @@ export enum ItemMode {
     ACTIVE
 }
 
-export const setProjectItem = (projects: Array<TreeItem<Project>>, itemId: string, itemKind: ResourceKind, itemMode: ItemMode) => (dispatch: Dispatch) => {
+export const setProjectItem = (itemId: string, itemKind = ResourceKind.PROJECT, itemMode = ItemMode.OPEN) =>
+    (dispatch: Dispatch, getState: () => RootState) => {
+        const { projects } = getState();
 
-    const openProjectItem = (resource: Resource) => {
-        if (itemMode === ItemMode.OPEN || itemMode === ItemMode.BOTH) {
-            dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_OPEN(resource.uuid));
+        let treeItem = findTreeItem(projects.items, itemId);
+        if (treeItem && itemKind === ResourceKind.LEVEL_UP) {
+            treeItem = findTreeItem(projects.items, treeItem.data.ownerUuid);
         }
 
-        if (itemMode === ItemMode.ACTIVE || itemMode === ItemMode.BOTH) {
-            dispatch(sidePanelActions.RESET_SIDE_PANEL_ACTIVITY(resource.uuid));
-        }
+        if (treeItem) {
+            dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(treeItem.data.uuid));
 
-        dispatch(push(getResourceUrl({...resource, kind: itemKind})));
+            if (treeItem.status === TreeItemStatus.Loaded) {
+                dispatch<any>(openProjectItem(treeItem.data, itemKind, itemMode));
+            } else {
+                dispatch<any>(getProjectList(itemId))
+                    .then(() => dispatch<any>(openProjectItem(treeItem!.data, itemKind, itemMode)));
+            }
+            if (itemMode === ItemMode.ACTIVE || itemMode === ItemMode.BOTH) {
+                dispatch<any>(getCollectionList(itemId));
+            }
+        }
     };
 
-    let treeItem = findTreeItem(projects, itemId);
-    if (treeItem && itemKind === ResourceKind.LEVEL_UP) {
-        treeItem = findTreeItem(projects, treeItem.data.ownerUuid);
-    }
+const openProjectItem = (resource: Resource, itemKind: ResourceKind, itemMode: ItemMode) =>
+    (dispatch: Dispatch, getState: () => RootState) => {
 
-    if (treeItem) {
-        dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(treeItem.data.uuid));
+        const { collections, projects } = getState();
 
-        if (treeItem.status === TreeItemStatus.Loaded) {
-            openProjectItem(treeItem.data);
-        } else {
-            dispatch<any>(getProjectList(itemId))
-                .then(() => openProjectItem(treeItem!.data));
+        if (itemMode === ItemMode.OPEN || itemMode === ItemMode.BOTH) {
+            dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_OPEN(resource.uuid));
         }
+
         if (itemMode === ItemMode.ACTIVE || itemMode === ItemMode.BOTH) {
-            dispatch<any>(getCollectionList(itemId));
+            dispatch(sidePanelActions.RESET_SIDE_PANEL_ACTIVITY(resource.uuid));
         }
-    }
-};
+
+        dispatch(push(getResourceUrl({ ...resource, kind: itemKind })));
+        dispatch(dataExplorerActions.SET_ITEMS({
+            id: PROJECT_PANEL_ID,
+            items: projectPanelItems(
+                projects.items,
+                resource.uuid,
+                collections
+            )
+        }));
+    };