Skip to content
This repository was archived by the owner on Apr 24, 2024. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export const PlantAndSeedSearch = () => {
disabled={isReadOnlyMode}
placeholder={t('plantSearch:placeholder')}
handleSearch={(value) => {
plantSearchActions.searchPlants(value);
plantSearchActions.searchPlants({ searchTerm: value, pageNumber: 0 });
seedSearchActions.searchSeeds(value);
}}
ref={searchInputRef}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const PLANT_KEYS = {
},

detail: (plantId: number) => [{ ...PLANT_KEYS._helpers.details()[0], plantId }] as const,
search: (searchTerm: string) => [{ ...PLANT_KEYS._helpers.searches()[0], searchTerm }] as const,
search: (searchTerm: string, pageNumber: number) =>
[{ ...PLANT_KEYS._helpers.searches()[0], searchTerm, pageNumber }] as const,
seasonalAvailable: (mapId: number, date: Date, page: number) =>
[
{
Expand Down Expand Up @@ -69,12 +70,12 @@ function findPlantByIdQueryFn({
* A hook that returns some functions to search for plants.
*/
export function usePlantSearch() {
const [searchTerm, setSearchTerm] = useState('');
const debouncedSearchTerm = useDebouncedValue(searchTerm, 500);
const [searchParams, setSearchParams] = useState({ searchTerm: '', pageNumber: 0 });
const debouncedSearchParams = useDebouncedValue(searchParams, 500);
const { t } = useTranslation(['plantSearch']);

const queryInfo = useQuery({
queryKey: PLANT_KEYS.search(debouncedSearchTerm),
queryKey: PLANT_KEYS.search(debouncedSearchParams.searchTerm, debouncedSearchParams.pageNumber),
queryFn: searchPlantsQueryFn,
select: mapPageToList,
meta: {
Expand All @@ -88,13 +89,13 @@ export function usePlantSearch() {
});

const clearSearchTerm = useCallback(() => {
setSearchTerm('');
setSearchParams({ searchTerm: '', pageNumber: 0 });
}, []);

return {
queryInfo,
actions: {
searchPlants: setSearchTerm,
searchPlants: setSearchParams,
clearSearchTerm,
},
};
Expand All @@ -108,8 +109,9 @@ function searchPlantsQueryFn({
queryKey,
}: QueryFunctionContext<ReturnType<(typeof PLANT_KEYS)['search']>>) {
const { searchTerm } = queryKey[0];
const { pageNumber } = queryKey[0];

return searchPlants(searchTerm, 0);
return searchPlants(searchTerm, pageNumber);
}

/**
Expand Down