map working

sandboxnu · Feb 9, 2025 · 117a927 · 117a927
1 parent 2c00859
commit 117a927
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 24 deletions.
diff --git a/packages/frontend/components/AddCourseModal/AddCourseModal.tsx b/packages/frontend/components/AddCourseModal/AddCourseModal.tsx
@@ -14,7 +14,7 @@ import {
   VStack,
 } from "@chakra-ui/react";
 import { NUPathEnum, ScheduleCourse2, SeasonEnum } from "@graduate/common";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { useSearchCourses } from "../../hooks";
 import {
   getCourseDisplayString,
@@ -79,15 +79,7 @@ export const AddCourseModal: React.FC<AddCourseModalProps> = ({
     setIsLoadingSelectCourse(true);
 
     // grab any coreqs of the course that haven't already been selected/added to the term
-    const coreqs = isAutoSelectCoreqs
-      ? (await getRequiredCourseCoreqs(course, catalogYear)).filter((coreq) => {
-          const isAlreadySelected = selectedCourses.find((selectedCourse) =>
-            isEqualCourses(selectedCourse, coreq)
-          );
-          const isAlreadyAdded = isCourseAlreadyAdded(coreq);
-          return !(isAlreadyAdded || isAlreadySelected);
-        })
-      : [];
+    const coreqs = courseCoreqsMap.get(course.id) || [];
 
     const updatedSelectedCourses = [...selectedCourses, course, ...coreqs];
 
@@ -124,6 +116,43 @@ export const AddCourseModal: React.FC<AddCourseModalProps> = ({
     closeModalDisplay();
   };
 
+  const [courseCoreqsMap, setCourseCoreqsMap] = useState(
+    new Map<any, ScheduleCourse2<null>[]>()
+  );
+  useEffect(() => {
+    if (!courses || courses.length === 0 || isCourseSearchLoading) {
+      console.log("Courses are not ready yet...");
+      return;
+    }
+    const fetchCoreqsForAllCourses = async () => {
+      if (!courses || courses.length === 0) return;
+      if (courses) {
+        const newCourseCoreqsMap = new Map<any, ScheduleCourse2<null>[]>();
+
+        for (const course of courses) {
+          const coreqs = (
+            await getRequiredCourseCoreqs(course, catalogYear)
+          ).filter((coreq) => !isCourseAlreadyAdded(coreq));
+
+          if (coreqs.length === 1) {
+            newCourseCoreqsMap.set(getCourseDisplayString(course), coreqs);
+            console.log(
+              `Fetching coreqs for course ${getCourseDisplayString(course)}`
+            );
+            console.log(`Coreqs fetched:`, coreqs);
+          }
+        }
+        setCourseCoreqsMap(newCourseCoreqsMap);
+      }
+    };
+
+    fetchCoreqsForAllCourses();
+  }, [courses, catalogYear]);
+
+  useEffect(() => {
+    console.log("Updated courseCoreqsMap:", courseCoreqsMap);
+  }, [courseCoreqsMap]);
+
   return (
     <Modal isOpen={isOpen} onClose={onClose} size="4xl" isCentered>
       <ModalOverlay />
@@ -227,19 +256,24 @@ export const AddCourseModal: React.FC<AddCourseModalProps> = ({
                   {courses &&
                     sortCoursesByNUPath(courses, selectedNUPaths).map(
                       (course) => (
-                        <SearchResult
-                          key={getCourseDisplayString(course)}
-                          year={catalogYear}
-                          season={season}
-                          course={course}
-                          addSelectedCourse={addSelectedCourse}
-                          isResultAlreadyAdded={isCourseAlreadyAdded(course)}
-                          isResultAlreadySelected={isCourseAlreadySelected(
-                            course
+                        <>
+                          <SearchResult
+                            key={getCourseDisplayString(course)}
+                            year={catalogYear}
+                            season={season}
+                            course={course}
+                            addSelectedCourse={addSelectedCourse}
+                            isResultAlreadyAdded={isCourseAlreadyAdded(course)}
+                            isResultAlreadySelected={isCourseAlreadySelected(
+                              course
+                            )}
+                            isSelectingAnotherCourse={isLoadingSelectCourse}
+                            selectedNUPaths={selectedNUPaths}
+                          />
+                          {courseCoreqsMap.get(course.id) !== undefined && (
+                            <Text>hi</Text>
                           )}
-                          isSelectingAnotherCourse={isLoadingSelectCourse}
-                          selectedNUPaths={selectedNUPaths}
-                        />
+                        </>
                       )
                     )}
                 </Flex>

diff --git a/packages/frontend/components/AddCourseModal/SearchResult.tsx b/packages/frontend/components/AddCourseModal/SearchResult.tsx
@@ -125,13 +125,13 @@ export const SearchResult: React.FC<SearchResultProps> = ({
           />
         </GraduateToolTip>
       </Flex>
-      {course.coreqs && (
+      {/* {course.coreqs && (
         <Collapse in={opened} animateOpacity>
           <Box px="sm" py="xs" borderRadius="lg" backgroundColor="transparent">
             <Text fontSize="sm">boo</Text>
           </Box>
         </Collapse>
-      )}
+      )} */}
     </Box>
   );
 };