Final sort fix

OpenUpSA · Oct 15, 2024 · 030d5d8 · 030d5d8
1 parent 233b694
commit 030d5d8
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/components/attendance/index.js b/src/components/attendance/index.js
@@ -461,16 +461,18 @@ function Attendance() {
   }, [data, selectedParliament, grouping]);
 
   useEffect(() => {
-    filterAttendanceData(dataAttendance);
+    filterAndSortAttendanceData(dataAttendance);
   }, [
     dataAttendance,
     filteredByParties,
     filteredByCommittees,
     filteredByHouses,
     memberSearch,
+    sortedField,
+    sortedDirection,
   ]);
 
-  const filterAttendanceData = (data) => {
+  const filterAndSortAttendanceData = (data) => {
     data = data
       .filter((row) => {
         if (grouping === "members") {
@@ -498,10 +500,7 @@ function Attendance() {
           filteredByHouses.some((house) => row.houses.includes(house))
         );
       });
-    setFilteredAttendance(data);
-  };
 
-  const sortAttendanceData = (data) => {
     if (sortedDirection === "asc") {
       data = data.sort((a, b) => {
         if (sortedField === "label" || sortedField === "party") {
@@ -527,10 +526,6 @@ function Attendance() {
     setSortedDirection(sortedDirection === "desc" ? "asc" : "desc");
   };
 
-  useEffect(() => {
-    sortAttendanceData(dataAttendance);
-  }, [sortedField, sortedDirection]);
-
   return (
     <Fragment>
       <PMHeader />