Merge pull request #6338 from marmelab/fix-default-filter-value-false

Fix filter with default value false is not working
marmelab · Jun 8, 2021 · a68a2af · a68a2af
2 parents 14de16c + ddc2674
commit a68a2af
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/packages/ra-core/src/reducer/admin/resource/list/queryReducer.spec.ts b/packages/ra-core/src/reducer/admin/resource/list/queryReducer.spec.ts
@@ -100,6 +100,20 @@ describe('Query Reducer', () => {
             });
         });
 
+        it('should work with false default value', () => {
+            const updatedState = queryReducer(
+                { filter: {}, displayedFilters: {} },
+                {
+                    type: 'SHOW_FILTER',
+                    payload: { filterName: 'foo', defaultValue: false },
+                }
+            );
+            expect(updatedState.filter).toEqual({ foo: false });
+            expect(updatedState.displayedFilters).toEqual({
+                foo: true,
+            });
+        });
+
         it('should work without default value', () => {
             const updatedState = queryReducer(
                 {

diff --git a/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts b/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
@@ -99,13 +99,14 @@ const queryReducer: Reducer<ListParams> = (
             }
             return {
                 ...previousState,
-                filter: action.payload.defaultValue
-                    ? set(
-                          previousState.filter,
-                          action.payload.filterName,
-                          action.payload.defaultValue
-                      )
-                    : previousState.filter,
+                filter:
+                    typeof action.payload.defaultValue !== 'undefined'
+                        ? set(
+                              previousState.filter,
+                              action.payload.filterName,
+                              action.payload.defaultValue
+                          )
+                        : previousState.filter,
                 // we don't use lodash.set() for displayed filters
                 // to avoid problems with compound filter names (e.g. 'author.name')
                 displayedFilters: {