Merge pull request #764 from Health-Informatics-UoN/fix/763/paginatio…

…n-limits

Fix update table list of columns limit

app/next-client-app/api/scanreports.ts

@@ -2,6 +2,7 @@
 import { revalidatePath } from "next/cache";
 import request from "@/lib/api/request";
 import { redirect } from "next/navigation";
+import { fetchAllPages } from "@/lib/api/utils";
 
 const fetchKeys = {
   list: (filter?: string) =>
@@ -72,6 +73,17 @@ export async function getScanReportFields(
   }
 }
 
+export async function getAllScanReportFields(
+  filter: string | undefined,
+): Promise<ScanReportField[]> {
+  try {
+    return await fetchAllPages<ScanReportField>(fetchKeys.fields(filter));
+  } catch (error) {
+    console.warn("Failed to fetch data.");
+    return [];
+  }
+}
+
 export async function getScanReportValues(
   filter: string | undefined,
 ): Promise<PaginatedResponse<ScanReportValue>> {

app/next-client-app/app/scanreports/[id]/tables/[tableId]/update/page.tsx

@@ -6,8 +6,8 @@ import {
   BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb";
 import {
+  getAllScanReportFields,
   getScanReport,
-  getScanReportFields,
   getScanReportPermissions,
   getScanReportTable,
 } from "@/api/scanreports";
@@ -26,21 +26,21 @@ interface UpdateTableProps {
 export default async function UpdateTable({
   params: { id, tableId },
 }: UpdateTableProps) {
+  const defaultPageSize = 50;
   const defaultParams = {
     scan_report_table: tableId,
     fields: "name,id",
+    page_size: defaultPageSize,
   };
   const combinedParams = { ...defaultParams };
 
   const query = objToQuery(combinedParams);
 
-  const scanReportsFields = await getScanReportFields(query);
-  const shortenFields = scanReportsFields.results.map(
-    (item: ScanReportField) => ({
-      id: item.id,
-      name: item.name,
-    })
-  );
+  const scanReportsFields = await getAllScanReportFields(query);
+  const shortenFields = scanReportsFields.map((item: ScanReportField) => ({
+    id: item.id,
+    name: item.name,
+  }));
   const scanReportsName = await getScanReport(id);
   const table = await getScanReportTable(tableId);
   const permissions = await getScanReportPermissions(id);

app/next-client-app/lib/api/utils.ts

@@ -0,0 +1,26 @@
+import request from "./request";
+
+/**
+ * Fetches all pages of paginated data from the specified url.
+ *
+ * Iterates through paginated data until all pages are fetched and concatenated.
+ *
+ * @template T - The type of data to be fetched
+ * @param {string} url - The url to fetch from
+ * @returns {Promise<T[]>} - A promise that resolves to an array of all fetched data
+ */
+export async function fetchAllPages<T>(url: string): Promise<T[]> {
+  let allResults: T[] = [];
+  let pageNumber = 1;
+
+  while (true) {
+    const urlWithPage = `${url}&p=${pageNumber}`;
+    const data: PaginatedResponse<T> = await request(urlWithPage);
+
+    allResults = allResults.concat(data.results);
+    pageNumber++;
+    if (!data.next) break;
+  }
+
+  return allResults;
+}