Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 13827-structured...

[arvados-workbench2.git] / src / views / collection-panel / collection-tag-form.tsx

diff --git a/src/views/collection-panel/collection-tag-form.tsx b/src/views/collection-panel/collection-tag-form.tsx
index 83ad0ca42860a1e70c8e85900411af15eea3baf0..9aa881286580eefd0302c0c12f3f926fdabef6d3 100644 (file)
--- a/src/views/collection-panel/collection-tag-form.tsx
+++ b/src/views/collection-panel/collection-tag-form.tsx
@@ -6,25 +6,37 @@ import * as React from 'react';
 import { reduxForm, Field, reset } from 'redux-form';
 import { compose, Dispatch } from 'redux';
 import { ArvadosTheme } from '~/common/custom-theme';
-import { StyleRulesCallback, withStyles, WithStyles, Button, CircularProgress, Grid } from '@material-ui/core';
+import { StyleRulesCallback, withStyles, WithStyles, Button, CircularProgress, Grid, Typography } from '@material-ui/core';
 import { TagProperty } from '~/models/tag';
 import { TextField } from '~/components/text-field/text-field';
 import { createCollectionTag, COLLECTION_TAG_FORM_NAME } from '~/store/collection-panel/collection-panel-action';
 import { TAG_VALUE_VALIDATION, TAG_KEY_VALIDATION } from '~/validators/validators';
 
-type CssRules = 'buttonWrapper' | 'saveButton' | 'circularProgress';
+type CssRules = 'root' | 'keyField' | 'valueField' | 'buttonWrapper' | 'saveButton' | 'circularProgress';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+    root: {
+        width: '100%',
+        display: 'flex'
+    },
+    keyField: {
+        width: '25%',
+        marginRight: theme.spacing.unit * 3
+    },
+    valueField: {
+        width: '40%',
+        marginRight: theme.spacing.unit * 3
+    },
     buttonWrapper: {
+        paddingTop: '14px',
         position: 'relative',
-        display: 'inline-block'
     },
     saveButton: {
         boxShadow: 'none'
     },
     circularProgress: {
         position: 'absolute',
-        top: 0,
+        top: -9,
         bottom: 0,
         left: 0,
         right: 0,
@@ -59,33 +71,31 @@ export const CollectionTagForm = compose(
             render() {
                 const { classes, submitting, pristine, invalid, handleSubmit } = this.props;
                 return (
-                    <form onSubmit={handleSubmit}>
-                        <Grid container justify="flex-start" alignItems="baseline" spacing={24}>
-                            <Grid item xs={3} component={"span"}>
-                                <Field name="key"
-                                    disabled={submitting}
-                                    component={TextField}
-                                    validate={TAG_KEY_VALIDATION}
-                                    label="Key" />
-                            </Grid>
-                            <Grid item xs={5} component={"span"}>
-                                <Field name="value"
-                                    disabled={submitting}
-                                    component={TextField}
-                                    validate={TAG_VALUE_VALIDATION}
-                                    label="Value" />
-                            </Grid>
-                            <Grid item component={"span"} className={classes.buttonWrapper}>
-                                <Button type="submit" className={classes.saveButton}
-                                    color="primary"
-                                    size='small'
-                                    disabled={invalid || submitting || pristine}
-                                    variant="contained">
-                                    ADD
-                                </Button>
-                                {submitting && <CircularProgress size={20} className={classes.circularProgress} />}
-                            </Grid>
-                        </Grid>
+                    <form onSubmit={handleSubmit} className={classes.root}>
+                        <div className={classes.keyField}>
+                            <Field name="key"
+                                disabled={submitting}
+                                component={TextField}
+                                validate={TAG_KEY_VALIDATION}
+                                label="Key" />
+                        </div>
+                        <div className={classes.valueField}>
+                            <Field name="value"
+                                disabled={submitting}
+                                component={TextField}
+                                validate={TAG_VALUE_VALIDATION}
+                                label="Value" />
+                        </div>
+                        <div className={classes.buttonWrapper}>
+                            <Button type="submit" className={classes.saveButton}
+                                color="primary"
+                                size='small'
+                                disabled={invalid || submitting || pristine}
+                                variant="contained">
+                                ADD
+                            </Button>
+                            {submitting && <CircularProgress size={20} className={classes.circularProgress} />}
+                        </div>
                     </form>
                 );
             }