X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/312f0cb3a36f9bce0b16b53765701578191daab8..6129d1321586333fc7da1193c2b2e1c1e701c352:/src/store/project/project-action.ts

diff --git a/src/store/project/project-action.ts b/src/store/project/project-action.ts
index a02c9e75..77223e9e 100644
--- a/src/store/project/project-action.ts
+++ b/src/store/project/project-action.ts
@@ -3,21 +3,22 @@
 // SPDX-License-Identifier: AGPL-3.0
 import { default as unionize, ofType, UnionOf } from "unionize";
 
-import { Project, ProjectResource } from "../../models/project";
+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 { ThunkAction } from "../../../node_modules/redux-thunk";
+import { FilterBuilder } from "../../common/api/filter-builder";
+import { RootState } from "../store";
+import { checkPresenceInFavorites } from "../favorites/favorites-actions";
 
-const actions = unionize({
-    OPEN_PROJECT_CREATOR: ofType<{}>(),
+export const projectActions = unionize({
+    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<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>()
@@ -26,30 +27,28 @@ const actions = unionize({
         value: 'payload'
     });
 
-export const getProjectList = (parentUuid: string = '') => (dispatch: Dispatch) => {
-    dispatch(actions.PROJECTS_REQUEST(parentUuid));
+export const getProjectList = (parentUuid: string = '') => (dispatch: Dispatch, getState: () => RootState) => {
+    dispatch(projectActions.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 }));
+    }).then(({ items: projects }) => {
+        dispatch(projectActions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
+        dispatch<any>(checkPresenceInFavorites(projects.map(project => project.uuid)));
         return projects;
     });
 };
 
 export const createProject = (project: Partial<ProjectResource>) =>
-    (dispatch: Dispatch) => {
-        dispatch(actions.CREATE_PROJECT(project));
+    (dispatch: Dispatch, getState: () => RootState) => {
+        const { ownerUuid } = getState().projects.creator;
+        const projectData = { ownerUuid, ...project };
+        dispatch(projectActions.CREATE_PROJECT(projectData));
         return projectService
-            .create(project)
-            .then(project => dispatch(actions.CREATE_PROJECT_SUCCESS(project)))
-            .catch(() => dispatch(actions.CREATE_PROJECT_ERROR("Could not create a project")));
+            .create(projectData)
+            .then(project => dispatch(projectActions.CREATE_PROJECT_SUCCESS(project)))
+            .catch(() => dispatch(projectActions.CREATE_PROJECT_ERROR("Could not create a project")));
     };
 
-export type ProjectAction = UnionOf<typeof actions>;
-export default actions;
+export type ProjectAction = UnionOf<typeof projectActions>;