From fab343a2e9856946809f6d51918e88bffaec0ab1 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 5 Dec 2023 09:41:06 -0500 Subject: [PATCH] fix: increase default staleTime for paginated data (#11041) * fix: update default staleTime for paginated data * fix: swap cacheTime for staleTime in app-wide query client * fix: revert cacheTime change * fix: update debug limit * fix: apply staleTime to prefetches * refactor: cleanup code --- site/src/hooks/usePaginatedQuery.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/site/src/hooks/usePaginatedQuery.ts b/site/src/hooks/usePaginatedQuery.ts index 182b1c3796..5be2b5e3b6 100644 --- a/site/src/hooks/usePaginatedQuery.ts +++ b/site/src/hooks/usePaginatedQuery.ts @@ -105,6 +105,7 @@ export function usePaginatedQuery< searchParams: outerSearchParams, queryFn: outerQueryFn, prefetch = true, + staleTime = 60 * 1000, // One minute ...extraOptions } = options; @@ -115,7 +116,8 @@ export function usePaginatedQuery< const currentPage = parsePage(searchParams); const currentPageOffset = (currentPage - 1) * limit; - const getQueryOptionsFromPage = (pageNumber: number) => { + type Options = UseQueryOptions; + const getQueryOptionsFromPage = (pageNumber: number): Options => { const pageParams: QueryPageParams = { pageNumber, limit, @@ -124,13 +126,13 @@ export function usePaginatedQuery< }; const payload = queryPayload?.(pageParams) as RuntimePayload; - return { + staleTime, queryKey: queryKey({ ...pageParams, payload }), queryFn: (context: QueryFunctionContext) => { return outerQueryFn({ ...context, ...pageParams, payload }); }, - } as const; + }; }; // Not using infinite query right now because that requires a fair bit of list @@ -160,7 +162,6 @@ export function usePaginatedQuery< } const options = getQueryOptionsFromPage(newPage); - return queryClient.prefetchQuery(options); });