merge-conflicts

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

diff --git a/src/store/project/project-action.ts b/src/store/project/project-action.ts
index 728b1cc95e587112104d032f6cbc56698fe45426..3c264d3ef9fcbba5089a9294a65b3aec0d863c5b 100644 (file)
--- a/src/store/project/project-action.ts
+++ b/src/store/project/project-action.ts
@@ -1,29 +1,33 @@
 // Copyright (C) The Arvados Authors. All rights reserved.
 //
 // SPDX-License-Identifier: AGPL-3.0
 // Copyright (C) The Arvados Authors. All rights reserved.
 //
 // SPDX-License-Identifier: AGPL-3.0

+import { default as unionize, ofType, UnionOf } from "unionize";

 
 import { Project } from "../../models/project";
 
 import { Project } from "../../models/project";

-import { default as unionize, ofType, UnionOf } from "unionize";

 import { projectService } from "../../services/services";
 import { Dispatch } from "redux";
 
 const actions = unionize({
     CREATE_PROJECT: ofType<Project>(),
     REMOVE_PROJECT: ofType<string>(),
 import { projectService } from "../../services/services";
 import { Dispatch } from "redux";
 
 const actions = unionize({
     CREATE_PROJECT: ofType<Project>(),
     REMOVE_PROJECT: ofType<string>(),

-    PROJECTS_REQUEST: ofType<any>(),
+    PROJECTS_REQUEST: ofType<string>(),

     PROJECTS_SUCCESS: ofType<{ projects: Project[], parentItemId?: string }>(),
     PROJECTS_SUCCESS: ofType<{ projects: Project[], parentItemId?: string }>(),

-    TOGGLE_PROJECT_TREE_ITEM: ofType<string>()
+    TOGGLE_PROJECT_TREE_ITEM_OPEN: ofType<string>(),
+    TOGGLE_PROJECT_TREE_ITEM_ACTIVE: ofType<string>(),
+    RESET_PROJECT_TREE_ACTIVITY: ofType<string>(),

 }, {
 }, {

-    tag: 'type',
-    value: 'payload'
-});
+        tag: 'type',
+        value: 'payload'
+    });

 
 export const getProjectList = (parentUuid?: string) => (dispatch: Dispatch): Promise<Project[]> => {
 
 export const getProjectList = (parentUuid?: string) => (dispatch: Dispatch): Promise<Project[]> => {

-    dispatch(actions.PROJECTS_REQUEST());
-    return projectService.getProjectList(parentUuid).then(projects => {
-        dispatch(actions.PROJECTS_SUCCESS({projects, parentItemId: parentUuid}));
-        return projects;
-    });
+    if (parentUuid) {
+        dispatch(actions.PROJECTS_REQUEST(parentUuid));
+        return projectService.getProjectList(parentUuid).then(projects => {
+            dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
+            return projects;
+        });
+    } return Promise.resolve([]);

 };
 
 export type ProjectAction = UnionOf<typeof actions>;
 };
 
 export type ProjectAction = UnionOf<typeof actions>;