Skip to content

fix: respect initial filters when array #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PeterYurkovich wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: respect initial filters when array #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/module/src/Hooks/filters.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,19 @@ describe('useDataViewFilters', () => {
setSearchParams,
};
const { result } = renderHook(() => useDataViewFilters(props));
expect(result.current.filters).toEqual({ test: [ 'foo', 'bar' ] });
})
expect(result.current.filters).toEqual({ test: ['foo', 'bar'] });
});
it('should respect initial filters', () => {
const searchParams = new URLSearchParams();
const setSearchParams = jest.fn();
const props: UseDataViewFiltersProps<{ test: string[] }> = {
initialFilters: { test: ['foo'] },
searchParams,
setSearchParams
};
const { result } = renderHook(() => useDataViewFilters(props));
expect(result.current.filters).toEqual({ test: ['foo'] });
});

it('should reset filters to default values when clearAllFilters is called', () => {
const { result } = renderHook(() => useDataViewFilters({ initialFilters }));
Expand Down
13 changes: 7 additions & 6 deletions packages/module/src/Hooks/filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ export const useDataViewFilters = <T extends object>({
const getInitialFilters = useCallback((): T => isUrlSyncEnabled
? Object.keys(initialFilters).reduce((loadedFilters, key) => {
const isArrayFilter = Array.isArray(initialFilters[key]);
const urlValue = isArrayFilter ? searchParams?.getAll(key) : searchParams?.get(key);

// eslint-disable-next-line no-nested-ternary
loadedFilters[key] = urlValue
? (isArrayFilter && !Array.isArray(urlValue) ? [ urlValue ] : urlValue)
: initialFilters[key];
if (isArrayFilter) {
const urlValue = searchParams?.getAll(key) ?? [];
loadedFilters[key] = urlValue.length > 0 ? urlValue : initialFilters[key];
} else {
const urlValue = searchParams?.get(key);
loadedFilters[key] = urlValue ? urlValue : initialFilters[key];
}

return loadedFilters;
}, { ...initialFilters })
Expand Down