X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7df4149100f41cc8d4a5438630ba95a1d72409a1..10ce16c28de952f6533ca3cc9df909269e3d2a53:/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 aefb8159..34c655e2 100644
--- a/src/views-components/dialog-create/dialog-project-create.tsx
+++ b/src/views-components/dialog-create/dialog-project-create.tsx
@@ -3,16 +3,91 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
+import { reduxForm, Field } from 'redux-form';
+import { compose } from 'redux';
 import TextField from '@material-ui/core/TextField';
 import Dialog from '@material-ui/core/Dialog';
 import DialogActions from '@material-ui/core/DialogActions';
 import DialogContent from '@material-ui/core/DialogContent';
 import DialogTitle from '@material-ui/core/DialogTitle';
-import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { Button, StyleRulesCallback, WithStyles, withStyles, CircularProgress } from '@material-ui/core';
 
-import { Validator } from '../../utils/dialog-validator';
+import { NAME, DESCRIPTION } from '../../validators/create-project/create-project-validator';
 
-type CssRules = "button" | "lastButton" | "dialogContent" | "textField" | "dialog" | "dialogTitle";
+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;
+}
+
+class DialogProjectCreate extends React.Component<DialogProjectProps & WithStyles<CssRules>> {
+    render() {
+        const { classes, open, handleClose, handleSubmit, onSubmit, submitting } = this.props;
+
+        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={NAME}
+                                className={classes.textField}
+                                label="Project Name" />
+                            <Field name="description"
+                                component={this.renderTextField}
+                                floatinglabeltext="Description - optional"
+                                validate={DESCRIPTION}
+                                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}
+        />
+    )
+}
+
+type CssRules = "button" | "lastButton" | "formContainer" | "textField" | "dialog" | "dialogTitle" | "createProgress" | "dialogActions";
 
 const styles: StyleRulesCallback<CssRules> = theme => ({
     button: {
@@ -22,7 +97,9 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
         marginLeft: theme.spacing.unit,
         marginRight: "20px",
     },
-    dialogContent: {
+    formContainer: {
+        display: "flex",
+        flexDirection: "column",
         marginTop: "20px",
     },
     dialogTitle: {
@@ -34,109 +111,18 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
     dialog: {
         minWidth: "600px",
         minHeight: "320px"
+    },
+    createProgress: {
+        position: "absolute",
+        minWidth: "20px",
+        right: "95px"
+    },
+    dialogActions: {
+        marginBottom: "24px"
     }
 });
 
-interface ProjectCreateProps {
-    open: boolean;
-    handleClose: () => void;
-    onSubmit: (data: { name: string, description: string }) => void;
-}
-
-interface DialogState {
-    name: string;
-    description: string;
-    isNameValid: boolean;
-    isDescriptionValid: boolean;
-}
-
-export const DialogProjectCreate = withStyles(styles)(
-    class extends React.Component<ProjectCreateProps & WithStyles<CssRules>> {
-        state: DialogState = {
-            name: '',
-            description: '',
-            isNameValid: false,
-            isDescriptionValid: true
-        };
-
-        render() {
-            const { name, description } = this.state;
-            const { classes, open, handleClose } = this.props;
-
-            return (
-                <Dialog
-                    open={open}
-                    onClose={handleClose}>
-                    <div className={classes.dialog}>
-                        <DialogTitle id="form-dialog-title" className={classes.dialogTitle}>Create a project</DialogTitle>
-                        <DialogContent className={classes.dialogContent}>
-                            <Validator
-                                value={name}
-                                onChange={e => this.isNameValid(e)}
-                                isRequired={true}
-                                render={hasError =>
-                                    <TextField
-                                        margin="dense"
-                                        className={classes.textField}
-                                        id="name"
-                                        onChange={e => this.handleProjectName(e)}
-                                        label="Project name"
-                                        error={hasError}
-                                        fullWidth/>}/>
-                            <Validator
-                                value={description}
-                                onChange={e => this.isDescriptionValid(e)}
-                                isRequired={false}
-                                render={hasError =>
-                                    <TextField
-                                        margin="dense"
-                                        className={classes.textField}
-                                        id="description"
-                                        onChange={e => this.handleDescriptionValue(e)}
-                                        label="Description - optional"
-                                        error={hasError}
-                                        fullWidth/>}/>
-                        </DialogContent>
-                        <DialogActions>
-                            <Button onClick={handleClose} className={classes.button} color="primary">CANCEL</Button>
-                            <Button onClick={this.handleSubmit} className={classes.lastButton} color="primary"
-                                    disabled={!this.state.isNameValid || (!this.state.isDescriptionValid && description.length > 0)}
-                                    variant="raised">CREATE A PROJECT</Button>
-                        </DialogActions>
-                    </div>
-                </Dialog>
-            );
-        }
-
-        handleSubmit = () => {
-            this.props.onSubmit({
-                name: this.state.name,
-                description: this.state.description
-            });
-        }
-
-        handleProjectName(e: React.ChangeEvent<HTMLInputElement>) {
-            this.setState({
-                name: e.target.value,
-            });
-        }
-
-        handleDescriptionValue(e: React.ChangeEvent<HTMLInputElement>) {
-            this.setState({
-                description: e.target.value,
-            });
-        }
-
-        isNameValid(value: boolean | string) {
-            this.setState({
-                isNameValid: value,
-            });
-        }
-
-        isDescriptionValid(value: boolean | string) {
-            this.setState({
-                isDescriptionValid: value,
-            });
-        }
-    }
-);
+export default compose(
+    reduxForm({ form: 'projectCreateDialog' }),
+    withStyles(styles)
+)(DialogProjectCreate);