dce-reactkit 3.9.3 → 3.9.4-beta-logreviewer.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "3.9.3",
+  "version": "3.9.4-beta-logreviewer.1",
   "description": "Shared components for Harvard DCE apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/components/LogReviewer.tsx

@@ -959,10 +959,23 @@ const LogReviewer: React.FC<Props> = (props) => {
         const { year, month } = toLoad[i];
 
         // Load
-        const logs = await visitServerEndpoint({
-          path: `${LOG_REVIEW_ROUTE_PATH_PREFIX}/years/${year}/months/${month}`,
-          method: 'GET',
-        });
+        let logs: Log[] = [];
+        let pageNumber = 1;
+        let hasAnotherPage = true;
+
+        while (hasAnotherPage) {
+          const response = await visitServerEndpoint({
+            path: `${LOG_REVIEW_ROUTE_PATH_PREFIX}/years/${year}/months/${month}`,
+            method: 'GET',
+            params: {
+              pageNumber,
+            },
+          });
+
+          logs = logs.concat(response.items);
+          hasAnotherPage = response.hasAnotherPage;
+          pageNumber += 1;
+        }
 
         // Add to map
         if (!logMap[year]) {

package/src/server/initServer.ts

@@ -246,12 +246,14 @@ const initServer = (
       paramTypes: {
         year: ParamType.Int,
         month: ParamType.Int,
+        pageNumber: ParamType.Int,
       },
       handler: async ({ params }) => {
         // Get user info
         const {
           year,
           month,
+          pageNumber,
           userId,
           isAdmin,
         } = params;
@@ -266,13 +268,17 @@ const initServer = (
         }
 
         // Query for logs
-        const logs: Log[] = await _logCollection.find({
-          year,
-          month,
+        const response = await _logCollection.findPaged({
+          query: {
+            year,
+            month,
+          },
+          perPage: 1000,
+          pageNumber,
         });
 
-        // Return logs
-        return logs;
+        // Return response
+        return response;
       },
     }),
   );