Skip to content

Commit 6d64ede

Browse files
committed
fix: filter parameters
1 parent 063850f commit 6d64ede

File tree

4 files changed

+195
-56
lines changed

4 files changed

+195
-56
lines changed

package-lock.json

Lines changed: 171 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"date-fns": "^3.6.0",
2828
"formik": "^2.4.6",
2929
"lucide-react": "^0.378.0",
30-
"query-string": "^9.0.0",
30+
"qs": "^6.12.1",
3131
"react": "^18.2.0",
3232
"react-dom": "^18.2.0",
3333
"react-hook-form": "^7.51.4",
@@ -41,6 +41,7 @@
4141
},
4242
"devDependencies": {
4343
"@types/node": "^20.12.8",
44+
"@types/qs": "^6.9.15",
4445
"@types/react": "^18.2.66",
4546
"@types/react-dom": "^18.2.22",
4647
"@types/react-input-mask": "^3.0.5",

src/pages/Home/Home.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
22
import { useNavigate, useSearchParams } from 'react-router-dom';
33
import { RotateCw, LogOutIcon } from 'lucide-react';
4-
import qs from 'query-string';
4+
import qs from 'qs';
55

66
import { Footer, Header } from '@/components';
77
import { useShelters, useThrottle } from '@/hooks';
@@ -36,7 +36,7 @@ const Home = () => {
3636
throttle: 400,
3737
callback: (v) => {
3838
const params = {
39-
search: v ? qs.stringify(filterData, { arrayFormat: 'bracket' }) : '',
39+
search: v ? qs.stringify(filterData) : '',
4040
};
4141
refresh({
4242
params: params,
@@ -51,7 +51,8 @@ const Home = () => {
5151
setSearchValue('');
5252
setSearch('');
5353
setFilterData(initialFilterData);
54-
}, [setSearch]);
54+
setSearchParams('');
55+
}, [setSearch, setSearchParams]);
5556

5657
const hasMore = useMemo(
5758
() => shelters.page * shelters.perPage < shelters.count,
@@ -63,11 +64,13 @@ const Home = () => {
6364
setOpenModal(false);
6465
setFilterData(values);
6566
console.log(values);
66-
const search = qs.stringify(values, { arrayFormat: 'bracket' });
67-
setSearchParams(search);
67+
const searchQuery = qs.stringify(values, {
68+
skipNulls: true,
69+
});
70+
setSearchParams(searchQuery);
6871
refresh({
6972
params: {
70-
search,
73+
search: searchQuery,
7174
},
7275
});
7376
},

0 commit comments

Comments
 (0)