Merge pull request #433 from NIAEFEUP/fix/admin-pagination-show-corre…

…ct-total-pages fix: admin pagination show correct total pages
NIAEFEUP · Feb 5, 2025 · aa95835 · aa95835
2 parents 8f9b858 + 12ca47c
commit aa95835
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 29 deletions.
diff --git a/src/components/admin/AdminMainContent.tsx b/src/components/admin/AdminMainContent.tsx
@@ -15,11 +15,14 @@ export const AdminMainContent = () => {
     const [activeStates, setActiveStates] = useState<Array<AdminRequestState>>([]);
 
     const [currPage, setCurrPage] = useState<number>(1);
+    const [totalPages, setTotalPages] = useState<number>(1);
 
     return (
         <AdminPaginationContext.Provider value={{
             currPage,
-            setCurrPage
+            setCurrPage,
+            totalPages,
+            setTotalPages
         }}>
             <RequestFiltersContext.Provider value={{
                 activeCourse: activeCourse,

diff --git a/src/components/admin/AdminPagination.tsx b/src/components/admin/AdminPagination.tsx
@@ -3,14 +3,14 @@ import { Pagination, PaginationContent, PaginationItem, PaginationLink } from ".
 import AdminPaginationContext from "../../contexts/admin/AdminPaginationContext";
 
 export const AdminPagination = () => {
-    const { currPage, setCurrPage } = useContext(AdminPaginationContext);
+    const { currPage, setCurrPage, totalPages } = useContext(AdminPaginationContext);
 
     return <Pagination>
         <PaginationContent>
             {currPage > 1 && (
                 <PaginationItem>
-                    <PaginationLink 
-                        href="#" 
+                    <PaginationLink
+                        href="#"
                         onClick={() => setCurrPage(prev => prev - 1)}
                         className="hover:bg-black hover:text-white"
                     >
@@ -19,22 +19,23 @@ export const AdminPagination = () => {
                 </PaginationItem>
             )}
             <PaginationItem>
-                <PaginationLink 
-                    className="bg-black text-white hover:bg-white hover:text-black" 
+                <PaginationLink
+                    className="bg-black text-white hover:bg-white hover:text-black"
                     href="#"
                 >
                     {currPage}
                 </PaginationLink>
             </PaginationItem>
-            <PaginationItem>
-                <PaginationLink 
-                    href="#" 
-                    onClick={() => setCurrPage(prev => prev + 1)}
-                    className="hover:bg-black hover:text-white"
-                >
-                    {currPage + 1}
-                </PaginationLink>
-            </PaginationItem>
+            {currPage < totalPages && (
+                <PaginationItem>
+                    <PaginationLink
+                        href="#"
+                        onClick={() => setCurrPage(prev => prev + 1)}
+                        className="hover:bg-black hover:text-white"
+                    >
+                        {currPage + 1}
+                    </PaginationLink>
+                </PaginationItem>)}
         </PaginationContent>
     </Pagination>
 }
diff --git a/src/components/admin/requests/MultipleStudentExchanges.tsx b/src/components/admin/requests/MultipleStudentExchanges.tsx
@@ -2,14 +2,18 @@ import { BarLoader } from "react-spinners";
 import useMultipleStudentExchanges from "../../../hooks/admin/useMultipleStudentExchanges";
 import { MultipleStudentExchangeCard } from "./cards/MultipleStudentExchangeCard";
 import RequestFiltersContext from "../../../contexts/admin/RequestFiltersContext";
-import { useContext } from "react";
+import { useContext, useEffect } from "react";
 import AdminPaginationContext from "../../../contexts/admin/AdminPaginationContext";
 
 export const MultipleStudentExchanges = () => {
     const filterContext = useContext(RequestFiltersContext);
 
-    const { currPage } = useContext(AdminPaginationContext);
-    const { exchanges, loading } = useMultipleStudentExchanges(filterContext, currPage);
+    const { currPage, setTotalPages } = useContext(AdminPaginationContext);
+    const { exchanges, totalPages, loading } = useMultipleStudentExchanges(filterContext, currPage);
+
+    useEffect(() => {
+        setTotalPages(totalPages)
+    }, [exchanges]);
 
     return (
         <>

diff --git a/src/components/admin/requests/SingleStudentExchanges.tsx b/src/components/admin/requests/SingleStudentExchanges.tsx
@@ -2,13 +2,17 @@ import { BarLoader } from "react-spinners";
 import useSingleStudentExchanges from "../../../hooks/admin/useSingleStudentExchanges";
 import { SingleStudentExchangeCard } from "./cards/SingleStudentExchangeCard";
 import RequestFiltersContext from "../../../contexts/admin/RequestFiltersContext";
-import { useContext } from "react";
+import { useContext, useEffect } from "react";
 import AdminPaginationContext from "../../../contexts/admin/AdminPaginationContext";
 
 export const SingleStudentExchanges = () => {
     const filterContext = useContext(RequestFiltersContext);
-    const {currPage} = useContext(AdminPaginationContext);
-    const { exchanges, loading } = useSingleStudentExchanges(filterContext, currPage);
+    const { currPage, setTotalPages } = useContext(AdminPaginationContext);
+    const { exchanges, loading, totalPages } = useSingleStudentExchanges(filterContext, currPage);
+
+    useEffect(() => {
+        setTotalPages(totalPages)
+    }, [exchanges]);
 
     return (
         <>

diff --git a/src/components/admin/requests/StudentEnrollments.tsx b/src/components/admin/requests/StudentEnrollments.tsx
@@ -2,14 +2,18 @@ import { BarLoader } from "react-spinners";
 import useStudentEnrollments from "../../../hooks/admin/useStudentEnrollments";
 import { StudentEnrollmentCard } from "./cards/StudentEnrollmentCard";
 import RequestFiltersContext from "../../../contexts/admin/RequestFiltersContext";
-import { useContext } from "react";
+import { useContext, useEffect } from "react";
 import AdminPaginationContext from "../../../contexts/admin/AdminPaginationContext";
 
 export const StudentEnrollments = () => {
     const filterContext = useContext(RequestFiltersContext);
 
-    const { currPage } = useContext(AdminPaginationContext);
-    const { enrollments, loading } = useStudentEnrollments(filterContext, currPage);
+    const { currPage, setTotalPages } = useContext(AdminPaginationContext);
+    const { enrollments, loading, totalPages } = useStudentEnrollments(filterContext, currPage);
+
+    useEffect(() => {
+        setTotalPages(totalPages)
+    }, [enrollments]);
 
     return (
         <>

diff --git a/src/contexts/admin/AdminPaginationContext.tsx b/src/contexts/admin/AdminPaginationContext.tsx
@@ -2,12 +2,16 @@ import { Context, Dispatch, createContext, SetStateAction } from "react";
 
 export interface AdminPaginationContextContent {
     currPage: number,
-    setCurrPage: Dispatch<SetStateAction<number>>
+    setCurrPage: Dispatch<SetStateAction<number>>,
+    totalPages: number,
+    setTotalPages: Dispatch<SetStateAction<number>>
 }
 
 const AdminPaginationContext: Context<AdminPaginationContextContent> = createContext({
     currPage: 1,
-    setCurrPage: () => { }
+    setCurrPage: () => { },
+    totalPages: 0,
+    setTotalPages: () => { }
 });
 
 export default AdminPaginationContext;
diff --git a/src/hooks/admin/useMultipleStudentExchanges.tsx b/src/hooks/admin/useMultipleStudentExchanges.tsx
@@ -25,10 +25,12 @@ export default (filterContext: RequestFiltersContextContent, pageIndex: number)
   const { data, error, mutate } = useSWR(
     buildUrlWithFilterParams(`${api.BACKEND_URL}/exchange/direct/?page=${pageIndex}`, filterContext), getExchanges
   );
-  const exchanges = useMemo(() => data ? [].concat(...data) : null, [data]);
+  const exchanges = useMemo(() => data ? [].concat(...data["exchanges"]) : null, [data]);
+  const totalPages = useMemo(() => data ? data["total_pages"] : null, [data]);
 
   return {
     exchanges,
+    totalPages,
     error,
     loading: !data,
     mutate,

diff --git a/src/hooks/admin/useSingleStudentExchanges.tsx b/src/hooks/admin/useSingleStudentExchanges.tsx
@@ -27,10 +27,12 @@ export default (filterContext: RequestFiltersContextContent, pageIndex: number)
     getExchanges
   );
 
-  const exchanges = useMemo(() => data ? [].concat(...data) : null, [data]);
+  const exchanges = useMemo(() => data ? [].concat(...data["exchanges"]) : null, [data]);
+  const totalPages = useMemo(() => data ? data["total_pages"] : null, [data]);
 
   return {
     exchanges,
+    totalPages,
     error,
     loading: !data,
     mutate,

diff --git a/src/hooks/admin/useStudentEnrollments.tsx b/src/hooks/admin/useStudentEnrollments.tsx
@@ -27,10 +27,12 @@ export default (filtersContext: RequestFiltersContextContent, pageIndex: number)
     getEnrollments
   );
 
-  const enrollments = useMemo(() => data ? [].concat(...data) : null, [data]);
+  const enrollments = useMemo(() => data ? [].concat(...data["enrollments"]) : null, [data]);
+  const totalPages = useMemo(() => data ? data["total_pages"] : null, [data]);
 
   return {
     enrollments,
+    totalPages,
     error,
     loading: !data,
     mutate,