Merge branch 'origin/master' into 13666-data-explorer-mapper

[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 a40d48d4bfd0424d2171f43d4cf580c94938c735..39d194ddbd96435dccea29116faa2739dd1653eb 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
 
+import * as _ from "lodash";
+
 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 = {
     items: Array<TreeItem<Project>>,
@@ -114,20 +115,38 @@ const projectsReducer = (state: ProjectState = { items: [], currentItemId: "" },
                 items: updateProjectTree(state.items, projects, parentItemId)
             };
         },
-        TOGGLE_PROJECT_TREE_ITEM: itemId => {
+        TOGGLE_PROJECT_TREE_ITEM_OPEN: itemId => {
             const items = _.cloneDeep(state.items);
-            resetTreeActivity(items);
             const item = findTreeItem(items, itemId);
             if (item) {
+                item.toggled = true;
                 item.open = !item.open;
+            }
+            return {
+                ...state,
+                items
+            };
+        },
+        TOGGLE_PROJECT_TREE_ITEM_ACTIVE: itemId => {
+            const items = _.cloneDeep(state.items);
+            resetTreeActivity(items);
+            const item = findTreeItem(items, itemId);
+            if (item) {
                 item.active = true;
-                item.toggled = true;
             }
             return {
                 items,
                 currentItemId: itemId
             };
         },
+        RESET_PROJECT_TREE_ACTIVITY: () => {
+            const items = _.cloneDeep(state.items);
+            resetTreeActivity(items);
+            return {
+                ...state,
+                items
+            };
+        },
         default: () => state
     });
 };