X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/82908c571a492f19f2ea402e033fa84b6df15b61..6578e959652ed10a51424d1b66f80280164824dd:/src/views-components/project-properties-dialog/project-properties-form.tsx

diff --git a/src/views-components/project-properties-dialog/project-properties-form.tsx b/src/views-components/project-properties-dialog/project-properties-form.tsx
index 82ae040695..bd72bcff2a 100644
--- a/src/views-components/project-properties-dialog/project-properties-form.tsx
+++ b/src/views-components/project-properties-dialog/project-properties-form.tsx
@@ -2,94 +2,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-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 } from '@material-ui/core';
-import { TagProperty } from '~/models/tag';
-import { TextField } from '~/components/text-field/text-field';
-import { TAG_VALUE_VALIDATION, TAG_KEY_VALIDATION } from '~/validators/validators';
+import { reduxForm, reset } from 'redux-form';
 import { PROJECT_PROPERTIES_FORM_NAME, createProjectProperty } from '~/store/details-panel/details-panel-action';
+import { ResourcePropertiesForm, ResourcePropertiesFormData } from '~/views-components/resource-properties-form/resource-properties-form';
 
-type CssRules = 'root' | 'keyField' | 'valueField' | 'buttonWrapper' | 'saveButton' | 'circularProgress';
-
-const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
-    root: {
-        width: '100%',
-        display: 'flex'
-    },
-    keyField: {
-        width: '40%',
-        marginRight: theme.spacing.unit * 3
-    },
-    valueField: {
-        width: '40%',
-        marginRight: theme.spacing.unit * 3
-    },
-    buttonWrapper: {
-        paddingTop: '14px',
-        position: 'relative',
-    },
-    saveButton: {
-        boxShadow: 'none'
-    },
-    circularProgress: {
-        position: 'absolute',
-        top: -9,
-        bottom: 0,
-        left: 0,
-        right: 0,
-        margin: 'auto'
+export const ProjectPropertiesForm = reduxForm<ResourcePropertiesFormData>({
+    form: PROJECT_PROPERTIES_FORM_NAME,
+    onSubmit: (data, dispatch) => {
+        dispatch<any>(createProjectProperty(data));
+        dispatch(reset(PROJECT_PROPERTIES_FORM_NAME));
     }
-});
-
-interface ProjectPropertiesFormDataProps {
-    submitting: boolean;
-    invalid: boolean;
-    pristine: boolean;
-}
-
-interface ProjectPropertiesFormActionProps {
-    handleSubmit: any;
-}
-
-type ProjectPropertiesFormProps = ProjectPropertiesFormDataProps & ProjectPropertiesFormActionProps & WithStyles<CssRules>;
-
-export const ProjectPropertiesForm = compose(
-    reduxForm({
-        form: PROJECT_PROPERTIES_FORM_NAME,
-        onSubmit: (data: TagProperty, dispatch: Dispatch) => {
-            dispatch<any>(createProjectProperty(data));
-            dispatch(reset(PROJECT_PROPERTIES_FORM_NAME));
-        }
-    }),
-    withStyles(styles))(
-        ({ classes, submitting, pristine, invalid, handleSubmit }: ProjectPropertiesFormProps) => 
-            <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>
-        );
+})(ResourcePropertiesForm);