Merge branch '13781-Data-operations-Creating-a-project-validation'

[arvados-workbench2.git] / src / views-components / dialog-create / dialog-project-create.tsx

diff --git a/src/views-components/dialog-create/dialog-project-create.tsx b/src/views-components/dialog-create/dialog-project-create.tsx
index c448df3b0c0075ec34664624188537206be9b929..592efc1a388a65f63a3471a2edfaa8a8eb674929 100644 (file)
--- a/src/views-components/dialog-create/dialog-project-create.tsx
+++ b/src/views-components/dialog-create/dialog-project-create.tsx
@@ -12,91 +12,9 @@ import DialogContent from '@material-ui/core/DialogContent';
 import DialogTitle from '@material-ui/core/DialogTitle';
 import { Button, StyleRulesCallback, WithStyles, withStyles, CircularProgress } from '@material-ui/core';
 
-import { NAME, DESCRIPTION } from '../../validators/create-project/create-project-validator';
-import { isUniqName } from '../../validators/is-uniq-name';
+import { PROJECT_NAME_VALIDATION, PROJECT_DESCRIPTION_VALIDATION } from '../../validators/create-project/create-project-validator';
 
-interface ProjectCreateProps {
-    open: boolean;
-    pending: boolean;
-    handleClose: () => void;
-    onSubmit: (data: { name: string, description: string }) => void;
-    handleSubmit: any;
-}
-
-interface TextFieldProps {
-    label: string;
-    floatinglabeltext: string;
-    className?: string;
-    input?: string;
-    meta?: any;
-}
-
-class DialogProjectCreate extends React.Component<ProjectCreateProps & WithStyles<CssRules>> {
-    /*componentWillReceiveProps(nextProps: ProjectCreateProps) {
-        const { error } = nextProps;
-
-        TODO: Validation for other errors
-        if (this.props.error !== error && error && error.includes("UniqueViolation")) {
-            this.setState({ isUniqName: error });
-        }
-}*/
-
-    render() {
-        const { classes, open, handleClose, pending, handleSubmit, onSubmit } = this.props;
-
-        return (
-            <Dialog
-                open={open}
-                onClose={handleClose}>
-                <div className={classes.dialog}>
-                    <form onSubmit={handleSubmit((data: any) => onSubmit(data))}>
-                        <DialogTitle id="form-dialog-title" className={classes.dialogTitle}>Create a project</DialogTitle>
-                        <DialogContent className={classes.formContainer}>
-                            <Field name="name"
-                                component={this.renderTextField}
-                                floatinglabeltext="Project Name"
-                                validate={NAME}
-                                className={classes.textField}
-                                label="Project Name" />
-                            <Field name="description"
-                                component={this.renderTextField}
-                                floatinglabeltext="Description"
-                                validate={DESCRIPTION}
-                                className={classes.textField}
-                                label="Description" />
-                        </DialogContent>
-                        <DialogActions>
-                            <Button onClick={handleClose} className={classes.button} color="primary" disabled={pending}>CANCEL</Button>
-                            <Button type="submit"
-                                className={classes.lastButton}
-                                color="primary"
-                                disabled={pending}
-                                variant="contained">
-                                CREATE A PROJECT
-                            </Button>
-                            {pending && <CircularProgress size={20} className={classes.createProgress} />}
-                        </DialogActions>
-                    </form>
-                </div>
-            </Dialog>
-        );
-    }
-
-    // TODO Make it separate file
-    renderTextField = ({ input, label, meta: { touched, error }, ...custom }: TextFieldProps) => (
-        <TextField
-            helperText={touched && error ? error : void 0}
-            label={label}
-            className={this.props.classes.textField}
-            error={touched && !!error} 
-            autoComplete='off'
-            {...input}
-            {...custom}
-        />
-    )
-}
-
-type CssRules = "button" | "lastButton" | "formContainer" | "textField" | "dialog" | "dialogTitle" | "createProgress";
+type CssRules = "button" | "lastButton" | "formContainer" | "textField" | "dialog" | "dialogTitle" | "createProgress" | "dialogActions";
 
 const styles: StyleRulesCallback<CssRules> = theme => ({
     button: {
@@ -126,9 +44,85 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
         minWidth: "20px",
         right: "95px"
     },
+    dialogActions: {
+        marginBottom: "24px"
+    }
 });
+interface DialogProjectProps {
+    open: boolean;
+    handleClose: () => void;
+    onSubmit: (data: { name: string, description: string }) => void;
+    handleSubmit: any;
+    submitting: boolean;
+}
+
+interface TextFieldProps {
+    label: string;
+    floatinglabeltext: string;
+    className?: string;
+    input?: string;
+    meta?: any;
+}
+
+export const DialogProjectCreate = compose(
+    reduxForm({ form: 'projectCreateDialog' }),
+    withStyles(styles))(
+    class DialogProjectCreate extends React.Component<DialogProjectProps & WithStyles<CssRules>> {
+        render() {
+            const { classes, open, handleClose, handleSubmit, onSubmit, submitting } = this.props;
 
-export default compose(
-    reduxForm({ form: 'projectCreateDialog',/* asyncValidate: isUniqName, asyncBlurFields: ["name"] */}),
-    withStyles(styles)
-)(DialogProjectCreate);
\ No newline at end of file
+            return (
+                <Dialog
+                    open={open}
+                    onClose={handleClose}
+                    disableBackdropClick={true}
+                    disableEscapeKeyDown={true}>
+                    <div className={classes.dialog}>
+                        <form onSubmit={handleSubmit((data: any) => onSubmit(data))}>
+                            <DialogTitle id="form-dialog-title" className={classes.dialogTitle}>Create a
+                                project</DialogTitle>
+                            <DialogContent className={classes.formContainer}>
+                                <Field name="name"
+                                       component={this.renderTextField}
+                                       floatinglabeltext="Project Name"
+                                       validate={PROJECT_NAME_VALIDATION}
+                                       className={classes.textField}
+                                       label="Project Name"/>
+                                <Field name="description"
+                                       component={this.renderTextField}
+                                       floatinglabeltext="Description - optional"
+                                       validate={PROJECT_DESCRIPTION_VALIDATION}
+                                       className={classes.textField}
+                                       label="Description - optional"/>
+                            </DialogContent>
+                            <DialogActions className={classes.dialogActions}>
+                                <Button onClick={handleClose} className={classes.button} color="primary"
+                                        disabled={submitting}>CANCEL</Button>
+                                <Button type="submit"
+                                        className={classes.lastButton}
+                                        color="primary"
+                                        disabled={submitting}
+                                        variant="contained">
+                                    CREATE A PROJECT
+                                </Button>
+                                {submitting && <CircularProgress size={20} className={classes.createProgress}/>}
+                            </DialogActions>
+                        </form>
+                    </div>
+                </Dialog>
+            );
+        }
+
+        renderTextField = ({ input, label, meta: { touched, error }, ...custom }: TextFieldProps) => (
+            <TextField
+                helperText={touched && error}
+                label={label}
+                className={this.props.classes.textField}
+                error={touched && !!error}
+                autoComplete='off'
+                {...input}
+                {...custom}
+            />
+        )
+    }
+);