Merge branch 'master'

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

diff --git a/src/views-components/dialog-create/dialog-collection-create.tsx b/src/views-components/dialog-create/dialog-collection-create.tsx
index 804aae11f72f3e85f69eab01660b121d8a789b5f..0686904ab3403aba2a60ae1f5599a129acbeb77d 100644 (file)
--- a/src/views-components/dialog-create/dialog-collection-create.tsx
+++ b/src/views-components/dialog-create/dialog-collection-create.tsx
@@ -5,11 +5,8 @@
 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 { TextField } from '../../components/text-field/text-field';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '@material-ui/core/';
 import { Button, StyleRulesCallback, WithStyles, withStyles, CircularProgress } from '@material-ui/core';
 
 import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-collection/create-collection-validator';
@@ -56,83 +53,61 @@ interface DialogCollectionCreateProps {
     files: UploadFile[];
 }
 
-interface TextFieldProps {
-    label: string;
-    floatinglabeltext: string;
-    className?: string;
-    input?: string;
-    meta?: any;
-}
-
 export const DialogCollectionCreate = compose(
     connect((state: RootState) => ({
         files: state.collections.uploader
     })),
     reduxForm({ form: 'collectionCreateDialog' }),
     withStyles(styles))(
-    class DialogCollectionCreate extends React.Component<DialogCollectionCreateProps & DispatchProp & WithStyles<CssRules>> {
-        render() {
-            const { classes, open, handleClose, handleSubmit, onSubmit, submitting, invalid, pristine, files } = this.props;
-            const busy = submitting || files.reduce(
-                (prev, curr) => prev + (curr.loaded > 0 && curr.loaded < curr.total ? 1 : 0), 0
-            ) > 0;
-            return (
-                <Dialog
-                    open={open}
-                    onClose={handleClose}
-                    fullWidth={true}
-                    maxWidth='sm'
-                    disableBackdropClick={true}
-                    disableEscapeKeyDown={true}>
-                    <form onSubmit={handleSubmit((data: any) => onSubmit(data, files))}>
-                        <DialogTitle id="form-dialog-title">Create a collection</DialogTitle>
-                        <DialogContent className={classes.formContainer}>
-                            <Field name="name"
+        class DialogCollectionCreate extends React.Component<DialogCollectionCreateProps & DispatchProp & WithStyles<CssRules>> {
+            render() {
+                const { classes, open, handleClose, handleSubmit, onSubmit, submitting, invalid, pristine, files } = this.props;
+                const busy = submitting || files.reduce(
+                    (prev, curr) => prev + (curr.loaded > 0 && curr.loaded < curr.total ? 1 : 0), 0
+                ) > 0;
+                return (
+                    <Dialog
+                        open={open}
+                        onClose={handleClose}
+                        fullWidth={true}
+                        maxWidth='sm'
+                        disableBackdropClick={true}
+                        disableEscapeKeyDown={true}>
+                        <form onSubmit={handleSubmit((data: any) => onSubmit(data, files))}>
+                            <DialogTitle id="form-dialog-title">Create a collection</DialogTitle>
+                            <DialogContent className={classes.formContainer}>
+                                <Field name="name"
                                     disabled={submitting}
-                                    component={this.renderTextField}
-                                    floatinglabeltext="Collection Name"
+                                    component={TextField}
                                     validate={COLLECTION_NAME_VALIDATION}
                                     className={classes.textField}
-                                    label="Collection Name"/>
-                            <Field name="description"
+                                    label="Collection Name" />
+                                <Field name="description"
                                     disabled={submitting}
-                                    component={this.renderTextField}
-                                    floatinglabeltext="Description - optional"
+                                    component={TextField}
                                     validate={COLLECTION_DESCRIPTION_VALIDATION}
                                     className={classes.textField}
-                                    label="Description - optional"/>
-                            <FileUpload
-                                files={files}
-                                disabled={busy}
-                                onDrop={files => this.props.dispatch(collectionUploaderActions.SET_UPLOAD_FILES(files))}/>
-                        </DialogContent>
-                        <DialogActions className={classes.dialogActions}>
-                            <Button onClick={handleClose} className={classes.button} color="primary"
+                                    label="Description - optional" />
+                                <FileUpload
+                                    files={files}
+                                    disabled={busy}
+                                    onDrop={files => this.props.dispatch(collectionUploaderActions.SET_UPLOAD_FILES(files))} />
+                            </DialogContent>
+                            <DialogActions className={classes.dialogActions}>
+                                <Button onClick={handleClose} className={classes.button} color="primary"
                                     disabled={busy}>CANCEL</Button>
-                            <Button type="submit"
+                                <Button type="submit"
                                     className={classes.lastButton}
                                     color="primary"
                                     disabled={invalid || busy || pristine}
                                     variant="contained">
-                                CREATE A COLLECTION
+                                    CREATE A COLLECTION
                             </Button>
-                            {busy && <CircularProgress size={20} className={classes.createProgress}/>}
-                        </DialogActions>
-                    </form>
-                </Dialog>
-            );
+                                {busy && <CircularProgress size={20} className={classes.createProgress} />}
+                            </DialogActions>
+                        </form>
+                    </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}
-            />
-        )
-    }
-);
+    );