X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/060353602bb2cb48639f040a3ff986b8dcbe84da..e84023ab9caa40e433dbd19ede8f7db6577f78fa:/src/views-components/create-project-dialog/create-project-dialog.tsx diff --git a/src/views-components/create-project-dialog/create-project-dialog.tsx b/src/views-components/create-project-dialog/create-project-dialog.tsx index 2cdd4790..eacb1eb5 100644 --- a/src/views-components/create-project-dialog/create-project-dialog.tsx +++ b/src/views-components/create-project-dialog/create-project-dialog.tsx @@ -3,23 +3,28 @@ // SPDX-License-Identifier: AGPL-3.0 import { connect } from "react-redux"; -import { Dispatch } from "../../../node_modules/redux"; +import { Dispatch } from "redux"; +import { SubmissionError } from "redux-form"; + import { RootState } from "../../store/store"; -import DialogProjectCreate from "../dialog-create/dialog-project-create"; -import actions, { createProject, getProjectList } from "../../store/project/project-action"; -import dataExplorerActions from "../../store/data-explorer/data-explorer-action"; +import { DialogProjectCreate } from "../dialog-create/dialog-project-create"; +import { projectActions, createProject, getProjectList } from "../../store/project/project-action"; +import { dataExplorerActions } from "../../store/data-explorer/data-explorer-action"; import { PROJECT_PANEL_ID } from "../../views/project-panel/project-panel"; +import { snackbarActions } from "../../store/snackbar/snackbar-actions"; const mapStateToProps = (state: RootState) => ({ - open: state.projects.creator.opened, - pending: state.projects.creator.pending, - error: state.projects.creator.error + open: state.projects.creator.opened }); -const submit = (data: { name: string, description: string }) => +const addProject = (data: { name: string, description: string }) => (dispatch: Dispatch, getState: () => RootState) => { const { ownerUuid } = getState().projects.creator; - dispatch(createProject(data)).then(() => { + return dispatch(createProject(data)).then(() => { + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: "Created a new project", + hideDuration: 2000 + })); dispatch(dataExplorerActions.REQUEST_ITEMS({ id: PROJECT_PANEL_ID })); dispatch(getProjectList(ownerUuid)); }); @@ -27,11 +32,14 @@ const submit = (data: { name: string, description: string }) => const mapDispatchToProps = (dispatch: Dispatch) => ({ handleClose: () => { - dispatch(actions.CLOSE_PROJECT_CREATOR()); + dispatch(projectActions.CLOSE_PROJECT_CREATOR()); }, onSubmit: (data: { name: string, description: string }) => { - dispatch(submit(data)); + return dispatch(addProject(data)) + .catch((e: any) => { + throw new SubmissionError({ name: e.errors.join("").includes("UniqueViolation") ? "Project with this name already exists." : "" }); + }); } }); -export default connect(mapStateToProps, mapDispatchToProps)(DialogProjectCreate); +export const CreateProjectDialog = connect(mapStateToProps, mapDispatchToProps)(DialogProjectCreate);