Fix API pagination

GTBitsOfGood · Oct 5, 2023 · 44bfef9 · 44bfef9
1 parent 1bf3f3b
commit 44bfef9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/backend/server/mongodb/actions/User.ts b/backend/server/mongodb/actions/User.ts
@@ -154,7 +154,9 @@ export async function adminGetUsers(
     };
   }
 
-  const users = await UserModel.find(query).limit(pageSize);
+  const users = await UserModel.find(query, null, { sort: { _id: 1 } }).limit(
+    pageSize
+  );
   const totalCount = await UserModel.countDocuments(query);
 
   return { users, totalCount };

diff --git a/mobile/components/Overlays/PaginatedOverlay.tsx b/mobile/components/Overlays/PaginatedOverlay.tsx
@@ -1,4 +1,4 @@
-import React, { useState, ReactElement, useEffect } from "react";
+import React, { ReactElement } from "react";
 import { StyleSheet, View, Text } from "react-native";
 import { Ionicons } from "@expo/vector-icons";
 import IconButton from "../IconButton";

diff --git a/mobile/screens/Admin/AdminUserListScreen.tsx b/mobile/screens/Admin/AdminUserListScreen.tsx
@@ -16,7 +16,6 @@ export default function AdminUserList(props: any) {
   const [currentPage, setCurrentPage] = useState(0);
   const [error, setError] = useState("");
   const [searchText, setSearchText] = useState("");
-  const [totalUserCount, setTotalUserCount] = useState<number>(0);
   const [totalPages, setTotalPages] = useState<number>(0);
 
   const removeUserFromList = (errorMessage: string, userId: Types.ObjectId) => {
@@ -40,8 +39,7 @@ export default function AdminUserList(props: any) {
 
     if (result) {
       setAllUsers([[...result.users]]);
-      setTotalUserCount(result.totalCount);
-      setTotalPages(result.totalCount / PAGE_SIZE + 1);
+      setTotalPages(Math.ceil(result.totalCount / PAGE_SIZE));
     }
   }
 
@@ -126,7 +124,6 @@ export default function AdminUserList(props: any) {
               onEndEditing={loadUsers}
             />
           </View>
-          <Text>Total Users: {totalUserCount}</Text>
           {allUsers.length > 0 &&
             allUsers[currentPage].map((user, index) => {
               return (

diff --git a/mobile/screens/Analytics/AnalyticsUserList.tsx b/mobile/screens/Analytics/AnalyticsUserList.tsx
@@ -29,7 +29,7 @@ export default function AnalyticsUserList(props: any) {
       // setAllUsers([users]);
       if (result) {
         setAllUsers([[...result.users]]);
-        setTotalPages(result.totalCount / PAGE_SIZE + 1);
+        setTotalPages(Math.ceil(result.totalCount / PAGE_SIZE));
       }
     }
     BackHandler.addEventListener("hardwareBackPress", function () {

diff --git a/mobile/screens/Onboarding/LandingScreen.tsx b/mobile/screens/Onboarding/LandingScreen.tsx
@@ -62,7 +62,9 @@ export default function LandingScreen(props: any) {
             </View>
           ) : null}
           <View style={styles.quoteContainer}>
-            <Text style={styles.quoteText}>{`"Not all wounds are visible"`}</Text>
+            <Text
+              style={styles.quoteText}
+            >{`"Not all wounds are visible"`}</Text>
           </View>
         </View>
       }

diff --git a/mobile/screens/Training/AddTrainingLogScreen.tsx b/mobile/screens/Training/AddTrainingLogScreen.tsx
@@ -47,7 +47,7 @@ export default function AddTrainingLogScreen(props: any) {
     } else if (Number(totalHours) < 0) {
       setError("Total hours cannot be negative!");
       return;
-    } else if (Number(totalHours) > 24) { 
+    } else if (Number(totalHours) > 24) {
       setError("Total hours can't exceed 24.");
       return;
     } else if (skillKeysSelected.length === 0) {