Merge branch '13797-refatoring-part2'

[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 475f83714d53db86307fde45656d0ed5f41c28dd..aefb8159871677ce2de8fb8ba13f4442d3d7133d 100644 (file)
--- a/src/views-components/dialog-create/dialog-project-create.tsx
+++ b/src/views-components/dialog-create/dialog-project-create.tsx
@@ -10,123 +10,133 @@ import DialogContent from '@material-ui/core/DialogContent';
 import DialogTitle from '@material-ui/core/DialogTitle';
 import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
 
-import Validator from '../../utils/dialog-validator';
+import { Validator } from '../../utils/dialog-validator';
+
+type CssRules = "button" | "lastButton" | "dialogContent" | "textField" | "dialog" | "dialogTitle";
+
+const styles: StyleRulesCallback<CssRules> = theme => ({
+    button: {
+        marginLeft: theme.spacing.unit
+    },
+    lastButton: {
+        marginLeft: theme.spacing.unit,
+        marginRight: "20px",
+    },
+    dialogContent: {
+        marginTop: "20px",
+    },
+    dialogTitle: {
+        paddingBottom: "0"
+    },
+    textField: {
+        marginTop: "32px",
+    },
+    dialog: {
+        minWidth: "600px",
+        minHeight: "320px"
+    }
+});
 
 interface ProjectCreateProps {
-  open: boolean;
-  handleClose: () => void;
+    open: boolean;
+    handleClose: () => void;
+    onSubmit: (data: { name: string, description: string }) => void;
 }
 
 interface DialogState {
-  name: string;
-  description: string;
-  isNameValid: boolean;
-  isDescriptionValid: boolean;
+    name: string;
+    description: string;
+    isNameValid: boolean;
+    isDescriptionValid: boolean;
 }
 
-class DialogProjectCreate extends React.Component<ProjectCreateProps & WithStyles<CssRules>> {
-  state: DialogState = {
-    name: '',
-    description: '',
-    isNameValid: false,
-    isDescriptionValid: true
-  };
+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;
+        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={handleClose} className={classes.lastButton} color="primary" disabled={!this.state.isNameValid || (!this.state.isDescriptionValid && description.length > 0)} variant="raised">CREATE A PROJECT</Button>
-          </DialogActions>
-        </div>
-      </Dialog>
-    );
-  }
+            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>
+            );
+        }
 
-  handleProjectName(e: any) {
-    this.setState({
-      name: e.target.value,
-    });
-  }
+        handleSubmit = () => {
+            this.props.onSubmit({
+                name: this.state.name,
+                description: this.state.description
+            });
+        }
 
-  handleDescriptionValue(e: any) {
-    this.setState({
-      description: e.target.value,
-    });
-  }
+        handleProjectName(e: React.ChangeEvent<HTMLInputElement>) {
+            this.setState({
+                name: e.target.value,
+            });
+        }
 
-  isNameValid(value: boolean | string) {
-    this.setState({
-      isNameValid: value,
-    });
-  }
+        handleDescriptionValue(e: React.ChangeEvent<HTMLInputElement>) {
+            this.setState({
+                description: e.target.value,
+            });
+        }
 
-  isDescriptionValid(value: boolean | string) {
-    this.setState({
-      isDescriptionValid: value,
-    });
-  }
-}
-
-type CssRules = "button" | "lastButton" | "dialogContent" | "textField" | "dialog" | "dialogTitle";
-
-const styles: StyleRulesCallback<CssRules> = theme => ({
-  button: {
-    marginLeft: theme.spacing.unit
-  },
-  lastButton: {
-    marginLeft: theme.spacing.unit,
-    marginRight: "20px",
-  },
-  dialogContent: {
-    marginTop: "20px",
-  },
-  dialogTitle: {
-    paddingBottom: "0"
-  },
-  textField: {
-    marginTop: "32px",
-  },
-  dialog: {
-    minWidth: "600px",
-    minHeight: "320px"
-  }
-});
+        isNameValid(value: boolean | string) {
+            this.setState({
+                isNameValid: value,
+            });
+        }
 
-export default withStyles(styles)(DialogProjectCreate);
\ No newline at end of file
+        isDescriptionValid(value: boolean | string) {
+            this.setState({
+                isDescriptionValid: value,
+            });
+        }
+    }
+);