Fix <FilterForm> applies but hides default value on clear
#9182
Conversation
| @@ -351,7 +351,7 @@ export const getQuery = ({ | |||
| ? queryFromLocation | |||
| : hasCustomParams(params) | |||
| ? { ...params } | |||
| : { filter: filterDefaultValues || {} }; | |||
There was a problem hiding this comment.
here, we applied filter default values only if there were no saved params. This prevented default values to be applied when a user resets all filters (because if they saved the filters once, they have some params in the store containing the sort and pagination)
| @@ -364,6 +364,10 @@ export const getQuery = ({ | |||
| query.page = 1; | |||
| } | |||
|
|
|||
| if (!query.filter || Object.keys(query.filter).length === 0) { | |||
| query.filter = filterDefaultValues || {}; | |||
There was a problem hiding this comment.
now we use filterdefaultValues even if there are some params - but only if the filter params is empty.
| @@ -161,6 +161,7 @@ const sanitizeRestProps = ({ | |||
| displayedFilters, | |||
| filterValues, | |||
| hasCreate, | |||
| showFilter, | |||
There was a problem hiding this comment.
This was causing warnings in tests
| @@ -250,7 +251,7 @@ const getInputValue = ( | |||
| filterValues: Record<string, any> | |||
| ) => { | |||
| if (formValues[key] === undefined || formValues[key] === null) { | |||
| return ''; | |||
| return (filterValues && filterValues[key]) || ''; | |||
There was a problem hiding this comment.
default to the filterValues from the URL when they change
|
So this conflicts with another feature, which allows user to remove filters with default values (see #2831). I suspect we can't have both features. Investigating. |
|
Confirmed, this would be a breaking change, so I'm closing this PR. |
No description provided.