X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0ce21e3487078a53f1b653446b5e615cd6dda709..1c6bd6afe7d0faf19f24a37a283e1d0e39de6b79:/src/store/project/project-action.ts diff --git a/src/store/project/project-action.ts b/src/store/project/project-action.ts index 3acf091b..77223e9e 100644 --- a/src/store/project/project-action.ts +++ b/src/store/project/project-action.ts @@ -6,12 +6,11 @@ import { default as unionize, ofType, UnionOf } from "unionize"; 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({ +export const projectActions = unionize({ OPEN_PROJECT_CREATOR: ofType<{ ownerUuid: string }>(), CLOSE_PROJECT_CREATOR: ofType<{}>(), CREATE_PROJECT: ofType>(), @@ -28,14 +27,15 @@ 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() .addEqual("ownerUuid", parentUuid) }).then(({ items: projects }) => { - dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid })); + dispatch(projectActions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid })); + dispatch(checkPresenceInFavorites(projects.map(project => project.uuid))); return projects; }); }; @@ -44,12 +44,11 @@ export const createProject = (project: Partial) => (dispatch: Dispatch, getState: () => RootState) => { const { ownerUuid } = getState().projects.creator; const projectData = { ownerUuid, ...project }; - dispatch(actions.CREATE_PROJECT(projectData)); + dispatch(projectActions.CREATE_PROJECT(projectData)); return projectService .create(projectData) - .then(project => dispatch(actions.CREATE_PROJECT_SUCCESS(project))) - .catch(() => dispatch(actions.CREATE_PROJECT_ERROR("Could not create a project"))); + .then(project => dispatch(projectActions.CREATE_PROJECT_SUCCESS(project))) + .catch(() => dispatch(projectActions.CREATE_PROJECT_ERROR("Could not create a project"))); }; -export type ProjectAction = UnionOf; -export default actions; +export type ProjectAction = UnionOf;