merge master

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

diff --git a/src/store/tree-picker/tree-picker-reducer.ts b/src/store/tree-picker/tree-picker-reducer.ts
index 8d61714cc9f744929587dd7f96f613ba18120f67..cf67aa7600a011a7f365d1c35d4f17fdca963dd1 100644 (file)
--- a/src/store/tree-picker/tree-picker-reducer.ts
+++ b/src/store/tree-picker/tree-picker-reducer.ts
@@ -2,25 +2,35 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { createTree, setNodeValueWith, TreeNode, setNode, mapTreeValues } from "~/models/tree";
+import { createTree, setNodeValueWith, TreeNode, setNode, mapTreeValues, Tree } from "~/models/tree";
 import { TreePicker, TreePickerNode } from "./tree-picker";
 import { treePickerActions, TreePickerAction } from "./tree-picker-actions";
 import { TreeItemStatus } from "~/components/tree/tree";
 
-export const treePickerReducer = (state: TreePicker = createTree(), action: TreePickerAction) =>
+export const treePickerReducer = (state: TreePicker = {}, action: TreePickerAction) =>
     treePickerActions.match(action, {
-        LOAD_TREE_PICKER_NODE: ({ id }) =>
-            setNodeValueWith(setPending)(id)(state),
-        LOAD_TREE_PICKER_NODE_SUCCESS: ({ id, nodes }) => {
-            const [newState] = [state]
+        LOAD_TREE_PICKER_NODE: ({ id, pickerId }) => {
+            const picker = state[pickerId] || createTree();
+            const updatedPicker = setNodeValueWith(setPending)(id)(picker);
+            return { ...state, [pickerId]: updatedPicker };
+        },
+        LOAD_TREE_PICKER_NODE_SUCCESS: ({ id, nodes, pickerId }) => {
+            const picker = state[pickerId] || createTree();
+            const [updatedPicker] = [picker]
                 .map(receiveNodes(nodes)(id))
                 .map(setNodeValueWith(setLoaded)(id));
-            return newState;
+            return { ...state, [pickerId]: updatedPicker };
+        },
+        TOGGLE_TREE_PICKER_NODE_COLLAPSE: ({ id, pickerId }) => {
+            const picker = state[pickerId] || createTree();
+            const updatedPicker = setNodeValueWith(toggleCollapse)(id)(picker);
+            return { ...state, [pickerId]: updatedPicker };
+        },
+        TOGGLE_TREE_PICKER_NODE_SELECT: ({ id, pickerId }) => {
+            const picker = state[pickerId] || createTree();
+            const updatedPicker = mapTreeValues(toggleSelect(id))(picker);
+            return { ...state, [pickerId]: updatedPicker };
         },
-        TOGGLE_TREE_PICKER_NODE_COLLAPSE: ({ id }) =>
-            setNodeValueWith(toggleCollapse)(id)(state),
-        TOGGLE_TREE_PICKER_NODE_SELECT: ({ id }) =>
-            mapTreeValues(toggleSelect(id))(state),
         default: () => state
     });
 
@@ -38,8 +48,8 @@ const toggleSelect = (id: string) => (value: TreePickerNode): TreePickerNode =>
         ? ({ ...value, selected: !value.selected })
         : ({ ...value, selected: false });
 
-const receiveNodes = (nodes: Array<TreePickerNode>) => (parent: string) => (state: TreePicker) =>
-    nodes.reduce((tree, node) =>
+const receiveNodes = (nodes: Array<TreePickerNode>) => (parent: string) => (state: Tree<TreePickerNode>) =>
+    nodes.reduce((tree, node) => 
         setNode(
             createTreeNode(parent)(node)
         )(tree), state);