merge conficts

[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..184922e3ecde97900cb0e694a4b193639c02e1bb 100644 (file)
--- a/src/store/project/project-action.ts
+++ b/src/store/project/project-action.ts
@@ -1,30 +1,56 @@
 // Copyright (C) The Arvados Authors. All rights reserved.
 //
 // SPDX-License-Identifier: AGPL-3.0
-
-import { Project } from "../../models/project";
 import { default as unionize, ofType, UnionOf } from "unionize";
+
+import { Project, ProjectResource } from "../../models/project";
 import { projectService } from "../../services/services";
 import { Dispatch } from "redux";
+import { getResourceKind } from "../../models/resource";
+import FilterBuilder from "../../common/api/filter-builder";
+import { ThunkAction } from "../../../node_modules/redux-thunk";
 
 const actions = unionize({
-    CREATE_PROJECT: ofType<Project>(),
+    OPEN_PROJECT_CREATOR: ofType<{ownerUuid: string}>(),
+    CLOSE_PROJECT_CREATOR: ofType<{}>(),
+    CREATE_PROJECT: ofType<Partial<ProjectResource>>(),
+    CREATE_PROJECT_SUCCESS: ofType<ProjectResource>(),
+    CREATE_PROJECT_ERROR: ofType<string>(),
     REMOVE_PROJECT: ofType<string>(),
-    PROJECTS_REQUEST: ofType<any>(),
+    PROJECTS_REQUEST: ofType<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[]> => {
-    dispatch(actions.PROJECTS_REQUEST());
-    return projectService.getProjectList(parentUuid).then(projects => {
-        dispatch(actions.PROJECTS_SUCCESS({projects, parentItemId: parentUuid}));
+export const getProjectList = (parentUuid: string = '') => (dispatch: Dispatch) => {
+    dispatch(actions.PROJECTS_REQUEST(parentUuid));
+    return projectService.list({
+        filters: FilterBuilder
+            .create<ProjectResource>()
+            .addEqual("ownerUuid", parentUuid)
+    }).then(listResults => {
+        const projects = listResults.items.map(item => ({
+            ...item,
+            kind: getResourceKind(item.kind)
+        }));
+        dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
         return projects;
     });
 };
 
+export const createProject = (project: Partial<ProjectResource>) =>
+    (dispatch: Dispatch) => {
+        dispatch(actions.CREATE_PROJECT(project));
+        return projectService
+            .create(project)
+            .then(project => dispatch(actions.CREATE_PROJECT_SUCCESS(project)))
+            .catch(() => dispatch(actions.CREATE_PROJECT_ERROR("Could not create a project")));
+    };
+
 export type ProjectAction = UnionOf<typeof actions>;
 export default actions;