From 5c5fb3899b3dad07219aef2f5ebdea3f778546f8 Mon Sep 17 00:00:00 2001 From: Bhargav Kodali Date: Fri, 20 Dec 2024 16:14:40 -0700 Subject: [PATCH 1/2] add option for pageSizes --- .../framework/esm-react-utils/src/useOpenmrsInfinite.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts b/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts index e603d56d2..f994fa10d 100644 --- a/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts +++ b/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts @@ -26,6 +26,8 @@ export interface UseServerInfiniteOptions { immutable?: boolean; swrInfiniteConfig?: SWRInfiniteConfiguration; + + resultsPerPage?:number; } export interface UseServerInfiniteReturnObject { @@ -112,15 +114,15 @@ export function useServerInfinite( serverPaginationHandlers: ServerPaginationHandlers, options: UseServerInfiniteOptions = {}, ): UseServerInfiniteReturnObject { - const { swrInfiniteConfig, immutable } = options; + const { swrInfiniteConfig, immutable,resultsPerPage=50 } = options; const { getNextUrl, getTotalCount, getData } = serverPaginationHandlers; const fetcher: (key: string) => Promise> = options.fetcher ?? openmrsFetch; const getKey = useCallback( (pageIndex: number, previousPageData: FetchResponse): string | null => { if (pageIndex == 0) { - return url?.toString() ?? null; + return url?.toString().concat(`&limit=${resultsPerPage}`) ?? null; } else { - return serverPaginationHandlers.getNextUrl(previousPageData.data); + return serverPaginationHandlers.getNextUrl(previousPageData.data)+`&limit=${resultsPerPage}`; } }, [url], From 6f5c54066daeba6d23e24434945c5c25265529dc Mon Sep 17 00:00:00 2001 From: Bhargav Kodali Date: Fri, 20 Dec 2024 16:16:41 -0700 Subject: [PATCH 2/2] add option for pageSizes --- packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts b/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts index f994fa10d..af0268297 100644 --- a/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts +++ b/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts @@ -125,7 +125,7 @@ export function useServerInfinite( return serverPaginationHandlers.getNextUrl(previousPageData.data)+`&limit=${resultsPerPage}`; } }, - [url], + [url,resultsPerPage], ); const { data, size, setSize, ...rest } = useSWRInfinite>(getKey, fetcher, {