Correct some react hook

coderdojobraga · Nov 23, 2023 · 208d594 · 208d594
1 parent 1ceaa82
commit 208d594
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 41 deletions.
diff --git a/apps/app/components/LectureForm/index.js b/apps/app/components/LectureForm/index.js
@@ -34,6 +34,7 @@ export default function LectureForm({ id }) {
       setEvents(response.data);
     });
   }, []);
+
   useEffect(() => {
     if (id !== "new") {
       listEvents().then((response) => {
@@ -59,7 +60,7 @@ export default function LectureForm({ id }) {
       promise = Promise.all(events.map((event) => getNinjaEvents(event.id)));
     }
     return promise;
-  });
+  }, [events]);
 
   useEffect(() => {
     fetchData().then((responses) => {
@@ -71,7 +72,7 @@ export default function LectureForm({ id }) {
         )
       );
     });
-  }, [events, fetchData]);
+  }, [fetchData]);
 
   const [filteredNinjas, setFilteredNinjas] = useState([]);
   const handleEventChange = useCallback(
@@ -94,7 +95,8 @@ export default function LectureForm({ id }) {
     const filtered = mentors.filter((mentor) => {
       const lecture = lectures.find(
         (lecture) =>
-          lecture.mentor.id === mentor.id && lecture.event.id === selectedEvent
+          lecture.mentor.id === mentor.id &&
+          lecture.event.id === selectedEvent.id
       );
       return !lecture;
     });
@@ -107,25 +109,14 @@ export default function LectureForm({ id }) {
     );
   }, [filteredNinjas]);
 
-  useEffect(() => {
-    const filtered = ninjas.filter((ninja) => {
-      const lecture = lectures.find(
-        (lecture) =>
-          lecture.ninja.id === ninja.id && lecture.event.id === selectedEvent
-      );
-      return !lecture;
-    });
-    setFilteredNinjas(filtered);
-  }, [ninjas, selectedEvent, lectures, handleEventChange]);
-
   useEffect(() => {
     setFilteredMentors(
       filteredMentors.sort((a, b) => a.first_name.localeCompare(b.first_name))
     );
   }, [filteredMentors]);
 
   const onFinish = (values) => {
-    if (Object.keys(selectedEvent).length != 0) {
+    if (Object.keys(selectedEvent).length !== 0) {
       api
         .createLecture(values)
         .then(() => {

diff --git a/apps/app/components/Signup/index.tsx b/apps/app/components/Signup/index.tsx
@@ -113,8 +113,8 @@ function Signup() {
               value
                 ? Promise.resolve()
                 : Promise.reject(
-                  "É necessário concordar com os termos e condições"
-                ),
+                    "É necessário concordar com os termos e condições"
+                  ),
           },
         ]}
       >

diff --git a/apps/app/pages/admin/lectures/presences/index.tsx b/apps/app/pages/admin/lectures/presences/index.tsx
@@ -112,34 +112,29 @@ export default function Presences() {
         );
       });
   }, []);
-  const generateData = () => {
-    const data: any[] = [];
+  useEffect(() => {
+    const generateData = () => {
+      const data: any[] = [];
 
-    selectedLectures.map((lecture: any) => {
-      if (lecture.attendance == null) {
-        lecture.attendance = "both_absent";
-      }
-      data.push({
-        ninja: `${lecture.ninja.first_name} ${lecture.ninja.last_name}`,
-        mentor: `${lecture.mentor.first_name} ${lecture.mentor.last_name}`,
-        presences: `${lecture.attendance}`,
-        key: lecture.id,
+      selectedLectures.forEach((lecture: any) => {
+        if (lecture.attendance == null) {
+          lecture.attendance = "both_absent";
+        }
+        data.push({
+          ninja: `${lecture.ninja.first_name} ${lecture.ninja.last_name}`,
+          mentor: `${lecture.mentor.first_name} ${lecture.mentor.last_name}`,
+          presences: `${lecture.attendance}`,
+          key: lecture.id,
+        });
       });
-    });
 
-    setData(data);
-  };
-  useEffect(() => {
-    if (selectedEvent !== "") {
-      setSelectedLectures(
-        lectures.filter((lecture) => lecture.event.id === selectedEvent)
-      );
-    }
-  }, [selectedEvent, lectures]);
+      setData(data);
+    };
 
-  useEffect(() => {
-    generateData();
-  }, [selectedLectures, generateData]);
+    if (selectedLectures.length > 0) {
+      generateData();
+    }
+  }, [selectedLectures]);
 
   const handleEditButtonClick = () => {
     setEditButtonVisible(false);