X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/77af50a44c54ef12a1d7abb59a0e4cba4284e77e..b0de143e088973715681f7eb6c41f2dccb648c2b:/src/store/project/project-action.ts diff --git a/src/store/project/project-action.ts b/src/store/project/project-action.ts index 35ff445e..3da60f65 100644 --- a/src/store/project/project-action.ts +++ b/src/store/project/project-action.ts @@ -3,15 +3,20 @@ // SPDX-License-Identifier: AGPL-3.0 import { default as unionize, ofType, UnionOf } from "unionize"; -import { Project } from "../../models/project"; +import { ProjectResource } from "../../models/project"; import { projectService } from "../../services/services"; import { Dispatch } from "redux"; +import FilterBuilder from "../../common/api/filter-builder"; +import { RootState } from "../store"; const actions = unionize({ - CREATE_PROJECT: ofType(), + OPEN_PROJECT_CREATOR: ofType<{ ownerUuid: string }>(), + CLOSE_PROJECT_CREATOR: ofType<{}>(), + CREATE_PROJECT: ofType>(), + CREATE_PROJECT_SUCCESS: ofType(), REMOVE_PROJECT: ofType(), PROJECTS_REQUEST: ofType(), - PROJECTS_SUCCESS: ofType<{ projects: Project[], parentItemId?: string }>(), + PROJECTS_SUCCESS: ofType<{ projects: ProjectResource[], parentItemId?: string }>(), TOGGLE_PROJECT_TREE_ITEM_OPEN: ofType(), TOGGLE_PROJECT_TREE_ITEM_ACTIVE: ofType(), RESET_PROJECT_TREE_ACTIVITY: ofType() @@ -20,15 +25,27 @@ const actions = unionize({ value: 'payload' }); -export const getProjectList = (parentUuid?: string) => (dispatch: Dispatch): Promise => { - 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 const getProjectList = (parentUuid: string = '') => (dispatch: Dispatch) => { + dispatch(actions.PROJECTS_REQUEST(parentUuid)); + return projectService.list({ + filters: FilterBuilder + .create() + .addEqual("ownerUuid", parentUuid) + }).then(({ items: projects }) => { + dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid })); + return projects; + }); }; +export const createProject = (project: Partial) => + (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; export default actions;