merge conflicts

[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 bb7d3d07e3720cfba20aa939122582d54be5860f..94a451a86574e70de24f6d143ede7217ce25cf9c 100644 (file)
--- a/src/store/project/project-reducer.ts
+++ b/src/store/project/project-reducer.ts
@@ -4,19 +4,23 @@
 
 import * as _ from "lodash";
 
-import { Project } from "../../models/project";
-import actions, { ProjectAction } from "./project-action";
+import { projectActions, ProjectAction } from "./project-action";
 import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
+import { ProjectResource } from "../../models/project";
 
 export type ProjectState = {
-    items: Array<TreeItem<Project>>,
+    items: Array<TreeItem<ProjectResource>>,
     currentItemId: string,
-    creator: {
-        opened: boolean,
-        pending: boolean
-    }
+    creator: ProjectCreator
 };
 
+interface ProjectCreator {
+    opened: boolean;
+    pending: boolean;
+    ownerUuid: string;
+    error?: string;
+}
+
 export function findTreeItem<T>(tree: Array<TreeItem<T>>, itemId: string): TreeItem<T> | undefined {
     let item;
     for (const t of tree) {
@@ -64,7 +68,7 @@ function resetTreeActivity<T>(tree: Array<TreeItem<T>>) {
     }
 }
 
-function updateProjectTree(tree: Array<TreeItem<Project>>, projects: Project[], parentItemId?: string): Array<TreeItem<Project>> {
+function updateProjectTree(tree: Array<TreeItem<ProjectResource>>, projects: ProjectResource[], parentItemId?: string): Array<TreeItem<ProjectResource>> {
     let treeItem;
     if (parentItemId) {
         treeItem = findTreeItem(tree, parentItemId);
@@ -79,7 +83,7 @@ function updateProjectTree(tree: Array<TreeItem<Project>>, projects: Project[],
         status: TreeItemStatus.Initial,
         data: p,
         items: []
-    } as TreeItem<Project>));
+    } as TreeItem<ProjectResource>));
 
     if (treeItem) {
         treeItem.items = items;
@@ -89,22 +93,31 @@ function updateProjectTree(tree: Array<TreeItem<Project>>, projects: Project[],
     return items;
 }
 
+const updateCreator = (state: ProjectState, creator: Partial<ProjectCreator>) => ({
+    ...state,
+    creator: {
+        ...state.creator,
+        ...creator
+    }
+});
+
 const initialState: ProjectState = {
     items: [],
     currentItemId: "",
     creator: {
         opened: false,
-        pending: false
+        pending: false,
+        ownerUuid: ""
     }
 };
 
 
-const projectsReducer = (state: ProjectState = initialState, action: ProjectAction) => {
-    return actions.match(action, {
-        OPEN_PROJECT_CREATOR: () => ({ ...state, creator: { opened: true, pending: false } }),
-        CREATE_PROJECT: () => ({ ...state, creator: { opened: false, pending: true } }),
-        CREATE_PROJECT_SUCCESS: () => ({ ...state, creator: { opened: false, pending: false } }),
-        CREATE_PROJECT_ERROR: () => ({ ...state, creator: { opened: false, pending: false } }),
+export const projectsReducer = (state: ProjectState = initialState, action: ProjectAction) => {
+    return projectActions.match(action, {
+        OPEN_PROJECT_CREATOR: ({ ownerUuid }) => updateCreator(state, { ownerUuid, opened: true, pending: false }),
+        CLOSE_PROJECT_CREATOR: () => updateCreator(state, { opened: false }),
+        CREATE_PROJECT: () => updateCreator(state, { error: undefined }),
+        CREATE_PROJECT_SUCCESS: () => updateCreator(state, { opened: false, ownerUuid: "" }),
         REMOVE_PROJECT: () => state,
         PROJECTS_REQUEST: itemId => {
             const items = _.cloneDeep(state.items);
@@ -113,12 +126,13 @@ const projectsReducer = (state: ProjectState = initialState, action: ProjectActi
                 item.status = TreeItemStatus.Pending;
                 state.items = items;
             }
-            return state;
+            return { ...state, items };
         },
         PROJECTS_SUCCESS: ({ projects, parentItemId }) => {
+            const items = _.cloneDeep(state.items);
             return {
                 ...state,
-                items: updateProjectTree(state.items, projects, parentItemId)
+                items: updateProjectTree(items, projects, parentItemId)
             };
         },
         TOGGLE_PROJECT_TREE_ITEM_OPEN: itemId => {
@@ -129,6 +143,7 @@ const projectsReducer = (state: ProjectState = initialState, action: ProjectActi
                 item.open = !item.open;
             }
             return {
+                ...state,
                 items,
                 currentItemId: itemId
             };
@@ -142,6 +157,7 @@ const projectsReducer = (state: ProjectState = initialState, action: ProjectActi
                 item.active = true;
             }
             return {
+                ...state,
                 items,
                 currentItemId: itemId
             };
@@ -150,6 +166,7 @@ const projectsReducer = (state: ProjectState = initialState, action: ProjectActi
             const items = _.cloneDeep(state.items);
             resetTreeActivity(items);
             return {
+                ...state,
                 items,
                 currentItemId: ""
             };
@@ -157,5 +174,3 @@ const projectsReducer = (state: ProjectState = initialState, action: ProjectActi
         default: () => state
     });
 };
-
-export default projectsReducer;