Merge branch 'master'

[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 5caf012148f5bc9506ed281078dbd592d01acf9a..4f03ae1c7dbe174713b29fc3dbed21b5582d27e8 100644 (file)
--- a/src/store/project/project-action.ts
+++ b/src/store/project/project-action.ts
@@ -1,52 +1,38 @@
 // Copyright (C) The Arvados Authors. All rights reserved.
 //
 // SPDX-License-Identifier: AGPL-3.0
-import { default as unionize, ofType, UnionOf } from "unionize";
 
-import { ProjectResource } from "../../models/project";
+import { unionize, ofType, UnionOf } from '~/common/unionize';
+import { ProjectResource } from "~/models/project";
 import { Dispatch } from "redux";
-import { FilterBuilder } from "../../common/api/filter-builder";
+import { FilterBuilder } from "~/common/api/filter-builder";
 import { RootState } from "../store";
-import { checkPresenceInFavorites } from "../favorites/favorites-actions";
-import { ServiceRepository } from "../../services/services";
+import { updateFavorites } from "../favorites/favorites-actions";
+import { ServiceRepository } from "~/services/services";
+import { resourcesActions } from '~/store/resources/resources-actions';
 
 export const projectActions = unionize({
-    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: ProjectResource[], parentItemId?: 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'
 });
 
-export const getProjectList = (parentUuid: string = '') => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-    dispatch(projectActions.PROJECTS_REQUEST(parentUuid));
-    return services.projectService.list({
-        filters: FilterBuilder
-            .create()
-            .addEqual("ownerUuid", 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>) =>
+export const getProjectList = (parentUuid: string = '') => 
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const { ownerUuid } = getState().projects.creator;
-        const projectData = { ownerUuid, ...project };
-        dispatch(projectActions.CREATE_PROJECT(projectData));
-        return services.projectService
-            .create(projectData)
-            .then(project => dispatch(projectActions.CREATE_PROJECT_SUCCESS(project)));
+        dispatch(projectActions.PROJECTS_REQUEST(parentUuid));
+        return services.projectService.list({
+            filters: new FilterBuilder()
+                .addEqual("ownerUuid", parentUuid)
+                .getFilters()
+        }).then(({ items: projects }) => {
+            dispatch(projectActions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
+            dispatch<any>(updateFavorites(projects.map(project => project.uuid)));
+            dispatch<any>(resourcesActions.SET_RESOURCES(projects));
+            return projects;
+        });
     };
 
 export type ProjectAction = UnionOf<typeof projectActions>;