diff --git a/packages/web/components/templates/library/LibraryContainer.tsx b/packages/web/components/templates/library/LibraryContainer.tsx index 5b5733dcd..58b20ab57 100644 --- a/packages/web/components/templates/library/LibraryContainer.tsx +++ b/packages/web/components/templates/library/LibraryContainer.tsx @@ -118,6 +118,7 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element { const { data: itemsPages, isLoading, + isFetchingNextPage, isFetching, fetchNextPage, hasNextPage, @@ -677,6 +678,13 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element { } }) + console.log( + 'isFetching && !isLoading, isFetchingNextPage', + isFetching, + isLoading, + isFetchingNextPage + ) + const setIsChecked = useCallback( (itemId: string, set: boolean) => { if (set && checkedItems.indexOf(itemId) === -1) { @@ -824,7 +832,7 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element { loadMore={fetchNextPage} hasMore={hasNextPage ?? false} hasData={!!itemsPages} - isValidating={isLoading} + isValidating={isLoading || isFetchingNextPage} fetchItemsError={!!fetchItemsError} labelsTarget={labelsTarget} setLabelsTarget={setLabelsTarget} diff --git a/packages/web/lib/networking/library_items/useLibraryItems.tsx b/packages/web/lib/networking/library_items/useLibraryItems.tsx index f1a408f19..096c30040 100644 --- a/packages/web/lib/networking/library_items/useLibraryItems.tsx +++ b/packages/web/lib/networking/library_items/useLibraryItems.tsx @@ -224,7 +224,7 @@ export function useGetLibraryItems( // If no folder is specified cache this as `home` queryKey: ['libraryItems', section, fullQuery], queryFn: async ({ queryKey, pageParam }) => { - console.log('querying: ', pageParam, fullQuery, queryKey) + console.log('queryKey, pageParam', queryKey, pageParam) const response = (await gqlFetcher(gqlSearchQuery(includeCount), { after: pageParam, first: limit, @@ -234,20 +234,19 @@ export function useGetLibraryItems( return response.search }, enabled, - maxPages: 5, initialPageParam: '0', getNextPageParam: (lastPage: LibraryItems, pages) => { - console.log('getting next page: ', pages) + console.log('getting next page: ', lastPage?.pageInfo?.endCursor, pages) return lastPage.pageInfo.hasNextPage ? lastPage?.pageInfo?.endCursor : undefined }, - getPreviousPageParam: (firstPage, pages) => { - console.log('firstPage.pageInfo', firstPage?.pageInfo?.startCursor) - return firstPage.pageInfo.hasPreviousPage - ? firstPage?.pageInfo?.startCursor - : undefined - }, + // getPreviousPageParam: (firstPage, pages) => { + // console.log('firstPage.pageInfo', firstPage?.pageInfo?.startCursor) + // return firstPage.pageInfo.hasPreviousPage + // ? firstPage?.pageInfo?.startCursor + // : undefined + // }, }) } diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx index 234192d3b..2a0b38aa9 100644 --- a/packages/web/pages/_app.tsx +++ b/packages/web/pages/_app.tsx @@ -33,7 +33,7 @@ import React from 'react' const queryClient = new QueryClient({ defaultOptions: { queries: { - gcTime: 1000 * 60 * 60 * 48, // 48 hours + gcTime: 1000 * 60 * 60 * 4, // 4hrs }, }, })