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 4f7545fc979ea93b9fbe4fd6ee2f4e74559e6a87..48db05df77eb6051fcc5c84509fe317777ad7f26 100644 (file)
--- a/src/store/project/project-reducer.ts
+++ b/src/store/project/project-reducer.ts
@@ -2,10 +2,11 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
 //
 // SPDX-License-Identifier: AGPL-3.0
 

+import * as _ from "lodash";
+

 import { Project } from "../../models/project";
 import actions, { ProjectAction } from "./project-action";
 import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
 import { Project } from "../../models/project";
 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 = Array<TreeItem<Project>>;
 


@@ -83,17 +84,29 @@ const projectsReducer = (state: ProjectState = [], action: ProjectAction) => {
         PROJECTS_SUCCESS: ({ projects, parentItemId }) => {
             return updateProjectTree(state, projects, parentItemId);
         },
         PROJECTS_SUCCESS: ({ projects, parentItemId }) => {
             return updateProjectTree(state, projects, parentItemId);
         },

-        TOGGLE_PROJECT_TREE_ITEM: itemId => {
+        TOGGLE_PROJECT_TREE_ITEM_OPEN: itemId => {

             const tree = _.cloneDeep(state);
             const tree = _.cloneDeep(state);

-            resetTreeActivity(tree);

             const item = findTreeItem(tree, itemId);
             if (item) {
             const item = findTreeItem(tree, itemId);
             if (item) {

+                item.toggled = true;

                 item.open = !item.open;
                 item.open = !item.open;

+            }
+            return tree;
+        },
+        TOGGLE_PROJECT_TREE_ITEM_ACTIVE: itemId => {
+            const tree = _.cloneDeep(state);
+            resetTreeActivity(tree);
+            const item = findTreeItem(tree, itemId);
+            if (item) {

                 item.active = true;
                 item.active = true;

-                item.toggled = true;

             }
             return tree;
         },
             }
             return tree;
         },

+        RESET_PROJECT_TREE_ACTIVITY: () => {
+            const tree = _.cloneDeep(state);
+            resetTreeActivity(tree);
+            return tree;
+        },

         default: () => state
     });
 };
         default: () => state
     });
 };