Skip to content

fix: issue#223 / reload button #234

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
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix: issue#223 / reload button #234

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97a929c
fix: issue#223 / reload button
May 17, 2024
1b79c57
fix: fixing review request
May 17, 2024
fe99bc3
fix: issue#223 remove unnecessary callback funtion
May 17, 2024
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
47 changes: 25 additions & 22 deletions src/pages/Home/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCallback, useMemo, useState } from 'react';
import { useMemo, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
import { RotateCw } from 'lucide-react';
import qs from 'qs';
Expand Down Expand Up @@ -26,6 +26,7 @@ const Home = () => {
...initialFilterData,
...qs.parse(new URLSearchParams(window.location.search).toString()),
});
const [forceRefresh, setForceRefresh] = useState(false);

const [, setSearch] = useThrottle<string>(
{
Expand All @@ -42,36 +43,33 @@ const Home = () => {
[]
);

const clearSearch = useCallback(() => {
const clearSearch = () => {
setSearch('');
setFilterData(initialFilterData);
setSearchParams('');
refresh();
}, [refresh, setSearch, setSearchParams]);
};

const hasMore = useMemo(
() => shelters.page * shelters.perPage < shelters.count,
[shelters.page, shelters.perPage, shelters.count]
);

const onSubmitFilterForm = useCallback(
(values: IFilterFormProps) => {
setOpenModal(false);
setFilterData(values);
const searchQuery = qs.stringify(values, {
skipNulls: true,
});
setSearchParams(searchQuery);
refresh({
params: {
search: searchQuery,
},
});
},
[refresh, setSearchParams]
);
const onSubmitFilterForm = (values: IFilterFormProps) => {
setOpenModal(false);
setFilterData(values);
const searchQuery = qs.stringify(values, {
skipNulls: true,
});
setSearchParams(searchQuery);
refresh({
params: {
search: searchQuery,
},
});
};

const handleFetchMore = useCallback(() => {
const handleFetchMore = () => {
const params = {
...shelters.filters,
page: shelters.page + 1,
Expand All @@ -85,7 +83,11 @@ const Home = () => {
},
true
);
}, [refresh, filterData, shelters.filters, shelters.page, shelters.perPage]);
};

const handleRefreshClick = () => {
setForceRefresh((prev) => !prev);
};

return (
<div className="flex flex-col h-screen items-center">
Expand All @@ -106,7 +108,7 @@ const Home = () => {
loading={loading}
variant="ghost"
size="sm"
onClick={() => refresh()}
onClick={handleRefreshClick}
className="disabled:bg-red-500 hover:bg-red-400"
>
<RotateCw size={20} className="stroke-white" />
Expand All @@ -115,6 +117,7 @@ const Home = () => {
}
/>
<ShelterListView
key={forceRefresh}
loading={loading}
count={shelters.count}
data={shelters.results}
Expand Down