fix: Instructors and Students pages are now filtering by institution …

…correctly.
Pearson-Advance · Dec 11, 2024 · d8ba650 · d8ba650
1 parent 9da56e9
commit d8ba650
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/features/Instructors/InstructorsPage/index.jsx b/src/features/Instructors/InstructorsPage/index.jsx
@@ -21,17 +21,13 @@ const InstructorsPage = () => {
 
   useEffect(() => {
     if (Object.keys(selectedInstitution).length > 0) {
-      dispatch(fetchInstructorsData(selectedInstitution.id, initialPage));
+      dispatch(fetchInstructorsData(selectedInstitution.id, currentPage, stateInstructors.filters));
     }
 
     return () => {
       dispatch(resetInstructorsRequest());
     };
-  }, [selectedInstitution, dispatch]); // eslint-disable-line react-hooks/exhaustive-deps
-
-  useEffect(() => {
-    dispatch(fetchInstructorsData(selectedInstitution.id, currentPage, stateInstructors.filters));
-  }, [currentPage]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [selectedInstitution, dispatch, currentPage]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const handlePagination = (targetPage) => {
     setCurrentPage(targetPage);

diff --git a/src/features/Students/StudentsPage/index.jsx b/src/features/Students/StudentsPage/index.jsx
@@ -17,18 +17,14 @@ const StudentsPage = () => {
 
   useEffect(() => {
     if (Object.keys(selectedInstitution).length > 0) {
-      dispatch(fetchStudentsData(selectedInstitution.id, initialPage));
+      dispatch(fetchStudentsData(selectedInstitution.id, currentPage, stateStudents.filters));
     }
 
     return () => {
       dispatch(resetStudentsTable());
     };
   }, [selectedInstitution, dispatch]); // eslint-disable-line react-hooks/exhaustive-deps
 
-  useEffect(() => {
-    dispatch(fetchStudentsData(selectedInstitution.id, currentPage, stateStudents.filters));
-  }, [currentPage]); // eslint-disable-line react-hooks/exhaustive-deps
-
   const resetPagination = () => {
     setCurrentPage(initialPage);
   };