X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a918d09702ac7b1ac111ea12ded1cdb2bd801e88..b0de143e088973715681f7eb6c41f2dccb648c2b:/src/store/project/project-action.ts

diff --git a/src/store/project/project-action.ts b/src/store/project/project-action.ts
index 4cc21979..3da60f65 100644
--- a/src/store/project/project-action.ts
+++ b/src/store/project/project-action.ts
@@ -3,16 +3,20 @@
 // SPDX-License-Identifier: AGPL-3.0
 import { default as unionize, ofType, UnionOf } from "unionize";
 
-import { Project } from "../../models/project";
-import { groupsService } from "../../services/services";
+import { 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 { RootState } from "../store";
 
 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>(),
     REMOVE_PROJECT: ofType<string>(),
     PROJECTS_REQUEST: ofType<string>(),
-    PROJECTS_SUCCESS: ofType<{ projects: Project[], parentItemId?: string }>(),
+    PROJECTS_SUCCESS: ofType<{ projects: ProjectResource[], parentItemId?: string }>(),
     TOGGLE_PROJECT_TREE_ITEM_OPEN: ofType<string>(),
     TOGGLE_PROJECT_TREE_ITEM_ACTIVE: ofType<string>(),
     RESET_PROJECT_TREE_ACTIVITY: ofType<string>()
@@ -20,18 +24,28 @@ const actions = unionize({
         tag: 'type',
         value: 'payload'
     });
- 
+
 export const getProjectList = (parentUuid: string = '') => (dispatch: Dispatch) => {
-        dispatch(actions.PROJECTS_REQUEST(parentUuid));
-        return groupsService.list().then(listResults => {
-            const projects = listResults.items.map(item => ({
-                ...item,
-                kind: getResourceKind(item.kind)
-            }));
-            dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
-            return projects;
-        });
+    dispatch(actions.PROJECTS_REQUEST(parentUuid));
+    return projectService.list({
+        filters: FilterBuilder
+            .create<ProjectResource>()
+            .addEqual("ownerUuid", parentUuid)
+    }).then(({ items: projects }) => {
+        dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
+        return projects;
+    });
 };
 
+export const createProject = (project: Partial<ProjectResource>) =>
+    (dispatch: Dispatch, getState: () => RootState) => {
+        const { ownerUuid } = getState().projects.creator;
+        const projectData = { ownerUuid, ...project };
+        dispatch(actions.CREATE_PROJECT(projectData));
+        return projectService
+            .create(projectData)
+            .then(project => dispatch(actions.CREATE_PROJECT_SUCCESS(project)));
+    };
+
 export type ProjectAction = UnionOf<typeof actions>;
 export default actions;