From 0487e48dd2531ee854570131be51d13095c453f8 Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Sun, 15 Oct 2023 15:52:34 -0700 Subject: [PATCH] Fix pager. --- src/components/common/DataTable.tsx | 4 ++-- src/components/hooks/useFilterQuery.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx index ad76f18b..a3c63c0a 100644 --- a/src/components/common/DataTable.tsx +++ b/src/components/common/DataTable.tsx @@ -45,11 +45,11 @@ export function DataTable({ const noResults = Boolean(!isLoading && query && !hasData); const handleSearch = query => { - setParams({ ...params, query, page: params.query ? page : 1 }); + setParams({ ...params, query, page: params.page ? page : 1 }); }; const handlePageChange = page => { - setParams({ ...params, page }); + setParams({ ...params, query, page }); }; if (error) { diff --git a/src/components/hooks/useFilterQuery.ts b/src/components/hooks/useFilterQuery.ts index 1879180d..37c28b7e 100644 --- a/src/components/hooks/useFilterQuery.ts +++ b/src/components/hooks/useFilterQuery.ts @@ -1,7 +1,8 @@ import { useState } from 'react'; import { useApi } from 'components/hooks/useApi'; +import { UseQueryOptions } from '@tanstack/react-query'; -export function useFilterQuery(key: any[], fn, options?: any) { +export function useFilterQuery(key: any[], fn, options?: UseQueryOptions) { const [params, setParams] = useState({ query: '', page: 1,