Added central action for navigation

[arvados-workbench2.git] / src / store / project / project-reducer.ts

diff --git a/src/store/project/project-reducer.ts b/src/store/project/project-reducer.ts
index 2c74eb239d1774d20937c6b44745cf526a74f6c6..a40d48d4bfd0424d2171f43d4cf580c94938c735 100644 (file)
--- a/src/store/project/project-reducer.ts
+++ b/src/store/project/project-reducer.ts
@@ -7,7 +7,10 @@ import actions, { ProjectAction } from "./project-action";
 import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
 import * as _ from "lodash";
 
-export type ProjectState = Array<TreeItem<Project>>;
+export type ProjectState = {
+    items: Array<TreeItem<Project>>,
+    currentItemId: string
+};
 
 export function findTreeItem<T>(tree: Array<TreeItem<T>>, itemId: string): TreeItem<T> | undefined {
     let item;
@@ -64,7 +67,7 @@ function updateProjectTree(tree: Array<TreeItem<Project>>, projects: Project[],
             treeItem.status = TreeItemStatus.Loaded;
         }
     }
-    const items = projects.map((p, idx) => ({
+    const items = projects.map(p => ({
         id: p.uuid,
         open: false,
         active: false,
@@ -81,31 +84,49 @@ function updateProjectTree(tree: Array<TreeItem<Project>>, projects: Project[],
     return items;
 }
 
-const projectsReducer = (state: ProjectState = [], action: ProjectAction) => {
+const projectsReducer = (state: ProjectState = { items: [], currentItemId: "" }, action: ProjectAction) => {
     return actions.match(action, {
-        CREATE_PROJECT: project => [...state, project],
+        CREATE_PROJECT: project => ({
+            ...state,
+            items: state.items.concat({
+                id: project.uuid,
+                open: false,
+                active: false,
+                status: TreeItemStatus.Loaded,
+                toggled: false,
+                items: [],
+                data: project
+            })
+        }),
         REMOVE_PROJECT: () => state,
         PROJECTS_REQUEST: itemId => {
-            const tree = _.cloneDeep(state);
-            const item = findTreeItem(tree, itemId);
+            const items = _.cloneDeep(state.items);
+            const item = findTreeItem(items, itemId);
             if (item) {
                 item.status = TreeItemStatus.Pending;
+                state.items = items;
             }
-            return tree;
+            return state;
         },
         PROJECTS_SUCCESS: ({ projects, parentItemId }) => {
-            return updateProjectTree(state, projects, parentItemId);
+            return {
+                ...state,
+                items: updateProjectTree(state.items, projects, parentItemId)
+            };
         },
         TOGGLE_PROJECT_TREE_ITEM: itemId => {
-            const tree = _.cloneDeep(state);
-            resetTreeActivity(tree);
-            const item = findTreeItem(tree, itemId);
+            const items = _.cloneDeep(state.items);
+            resetTreeActivity(items);
+            const item = findTreeItem(items, itemId);
             if (item) {
                 item.open = !item.open;
                 item.active = true;
                 item.toggled = true;
             }
-            return tree;
+            return {
+                items,
+                currentItemId: itemId
+            };
         },
         default: () => state
     });