Fix FilterForm Submit

Fixes #3731
marmelab · Sep 25, 2019 · 0126076 · 0126076
1 parent 171e0d3
commit 0126076
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/ra-ui-materialui/src/list/FilterForm.js b/packages/ra-ui-materialui/src/list/FilterForm.js
@@ -37,6 +37,7 @@ const sanitizeRestProps = ({
     dirtySinceLastSubmit,
     dispatch,
     displayedFilters,
+    filters,
     filterValues,
     handleSubmit,
     hasSubmitErrors,
@@ -110,6 +111,7 @@ export class FilterForm extends Component {
             <form
                 className={classnames(className, classes.form)}
                 {...sanitizeRestProps(rest)}
+                onSubmit={handleSubmit}
             >
                 {this.getShownFilters().map(filterElement => (
                     <FilterFormInput
@@ -127,6 +129,11 @@ export class FilterForm extends Component {
     }
 }
 
+const handleSubmit = event => {
+    event.preventDefault();
+    return false;
+};
+
 FilterForm.propTypes = {
     resource: PropTypes.string.isRequired,
     filters: PropTypes.arrayOf(PropTypes.node).isRequired,
@@ -169,9 +176,9 @@ const EnhancedFilterForm = props => {
 
     return (
         <Form
-            onSubmit={() => {}}
+            onSubmit={handleFinalFormSubmit}
             initialValues={mergedInitialValuesWithDefaultValues}
-            render={formProps => (
+            render={() => (
                 <>
                     <FormSpy
                         subscription={FormSpySubscription}
@@ -182,13 +189,15 @@ const EnhancedFilterForm = props => {
                             props && props.setFilters(values);
                         }}
                     />
-                    <FilterForm classes={classes} {...formProps} {...rest} />
+                    <FilterForm classes={classes} {...rest} />
                 </>
             )}
         />
     );
 };
 
+const handleFinalFormSubmit = () => {};
+
 // Options to instruct the FormSpy that it should only listen to the values and pristine changes
 const FormSpySubscription = { values: true, pristine: true };
 

diff --git a/packages/ra-ui-materialui/src/list/FilterForm.spec.js b/packages/ra-ui-materialui/src/list/FilterForm.spec.js
@@ -20,7 +20,7 @@ describe('<FilterForm />', () => {
         const filters = [
             <TextInput source="title" label="Title" />,
             <TextInput source="customer.name" label="Name" />,
-        ]; // eslint-disable-line react/jsx-key
+        ];
         const displayedFilters = {
             title: true,
             'customer.name': true,