Merge pull request #7551 from marmelab/fix-date-parsed-in-filter

Fix parsed date/date-time filter resets component

Author: fzaninotto

packages/ra-ui-materialui/src/list/filter/FilterForm.spec.tsx

@@ -152,10 +152,13 @@ describe('<FilterForm />', () => {
                 nestedToClear: { nestedValue: 'def' },
                 classicUpdated: 'ghi',
                 nestedUpdated: { nestedValue: 'jkl' },
+                published_at: new Date('2022-01-01T03:00:00.000Z'),
+                clearedDateValue: null,
             };
             const newFilterValues = {
                 classicUpdated: 'ghi2',
                 nestedUpdated: { nestedValue: 'jkl2' },
+                published_at: '2022-01-01T03:00:00.000Z',
             };
 
             expect(
@@ -165,6 +168,8 @@ describe('<FilterForm />', () => {
                 nestedToClear: { nestedValue: '' },
                 classicUpdated: 'ghi2',
                 nestedUpdated: { nestedValue: 'jkl2' },
+                published_at: '2022-01-01T03:00:00.000Z',
+                clearedDateValue: '',
             });
         });
     });

packages/ra-ui-materialui/src/list/filter/FilterForm.tsx

@@ -237,9 +237,15 @@ const getInputValue = (
     key: string,
     filterValues: Record<string, any>
 ) => {
+    if (formValues[key] === undefined || formValues[key] === null) {
+        return '';
+    }
     if (Array.isArray(formValues[key])) {
         return lodashGet(filterValues, key, '');
     }
+    if (formValues[key] instanceof Date) {
+        return lodashGet(filterValues, key, '');
+    }
     if (typeof formValues[key] === 'object') {
         return Object.keys(formValues[key]).reduce((acc, innerKey) => {
             acc[innerKey] = getInputValue(