Merge branch '17308-property-editor-fixes'

[arvados-workbench2.git] / src / views-components / resource-properties-form / resource-properties-form.tsx

diff --git a/src/views-components/resource-properties-form/resource-properties-form.tsx b/src/views-components/resource-properties-form/resource-properties-form.tsx
index 2f3e0cd4d248bcb86dfc03aeac3f8b89f08d0a6a..e8d2fc58e565616e30349d331c1528aad498d53d 100644 (file)
--- a/src/views-components/resource-properties-form/resource-properties-form.tsx
+++ b/src/views-components/resource-properties-form/resource-properties-form.tsx
@@ -3,28 +3,45 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { InjectedFormProps, reduxForm } from 'redux-form';
-import { Grid, Button } from '@material-ui/core';
-import { PropertyKeyField, PROPERTY_KEY_FIELD_NAME } from './property-key-field';
-import { PropertyValueField, PROPERTY_VALUE_FIELD_NAME } from './property-value-field';
+import { InjectedFormProps } from 'redux-form';
+import { Grid, withStyles, WithStyles } from '@material-ui/core';
+import { PropertyKeyField, PROPERTY_KEY_FIELD_NAME, PROPERTY_KEY_FIELD_ID } from './property-key-field';
+import { PropertyValueField, PROPERTY_VALUE_FIELD_NAME, PROPERTY_VALUE_FIELD_ID } from './property-value-field';
+import { ProgressButton } from '~/components/progress-button/progress-button';
+import { GridClassKey } from '@material-ui/core/Grid';
 
 export interface ResourcePropertiesFormData {
     [PROPERTY_KEY_FIELD_NAME]: string;
+    [PROPERTY_KEY_FIELD_ID]: string;
     [PROPERTY_VALUE_FIELD_NAME]: string;
+    [PROPERTY_VALUE_FIELD_ID]: string;
 }
 
-export const ResourcePropertiesForm = reduxForm({ form: 'rpform' })(
-    ({ handleSubmit }: InjectedFormProps) =>
-        <form onSubmit={handleSubmit}>
-            <Grid container spacing={16}>
-                <Grid item xs>
-                    <PropertyKeyField />
-                </Grid>
-                <Grid item xs>
-                    <PropertyValueField />
-                </Grid>
-                <Grid item xs>
-                    <Button variant='contained'>Add</Button>
-                </Grid>
+export type ResourcePropertiesFormProps = InjectedFormProps<ResourcePropertiesFormData> & WithStyles<GridClassKey>;
+
+export const ResourcePropertiesForm = ({ handleSubmit, submitting, invalid, classes }: ResourcePropertiesFormProps ) =>
+    <form data-cy='resource-properties-form' onSubmit={handleSubmit}>
+        <Grid container spacing={16} classes={classes}>
+            <Grid item xs>
+                <PropertyKeyField />
+            </Grid>
+            <Grid item xs>
+                <PropertyValueField />
             </Grid>
-        </form>);
+            <Grid item xs>
+                <Button
+                    data-cy='property-add-btn'
+                    disabled={invalid}
+                    loading={submitting}
+                    color='primary'
+                    variant='contained'
+                    type='submit'>
+                    Add
+                </Button>
+            </Grid>
+        </Grid>
+    </form>;
+
+export const Button = withStyles(theme => ({
+    root: { marginTop: theme.spacing.unit }
+}))(ProgressButton);