more cleaning

Author: spotta85

features/audit/audit-provider.tsx

@@ -29,8 +29,6 @@ import LoadingPage from "./components/loading-page";
 import {
   addPlannedCourse as addCourse,
   moveCourseToSemester,
-  removePlannedCourse as removeCourse,
-  wipePlannedCourses,
 } from "./audit-mutations";
 
 type SemesterInfo = Record<StringSemester, Course[]>;
@@ -161,95 +159,72 @@ export function AuditContextProvider({
     };
   }, [currentAuditId]);
 
-  async function persist(
-    auditId: string,
-    updated: CachedAuditData,
-  ): Promise<void> {
-    await saveAuditData(auditId, updated);
-    setAuditData(updated);
-  }
-
-  async function addPlannedCourse(
-    course: PlannedCourseOutline,
-    requirementTitle: string,
-    ruleTitle: string,
-  ): Promise<CourseId | null> {
-    if (!auditData || !currentAuditId) return null;
-    const result = addCourse(auditData, course, requirementTitle, ruleTitle);
-    if (!result) return null;
-    await persist(currentAuditId, result.audit);
-    return result.courseId;
-  }
-
-  async function removePlannedCourse(courseId: CourseId): Promise<boolean> {
-    if (!auditData || !currentAuditId) return false;
-    const updated = removeCourse(auditData, courseId);
-    if (!updated) return false;
-    await persist(currentAuditId, updated);
-    return true;
-  }
-
-  async function wipeAllPlannedCourses(): Promise<number> {
-    if (!auditData || !currentAuditId) return 0;
-    const result = wipePlannedCourses(auditData);
-    if (result.removed) await persist(currentAuditId, result.audit);
-    return result.removed;
-  }
-
-  async function moveCourseToNewSemester(
-    courseId: CourseId,
-    semester: StringSemester,
-  ): Promise<boolean> {
-    if (!auditData || !currentAuditId) return false;
-    const updated = moveCourseToSemester(auditData, courseId, semester);
-    if (!updated) return false;
-    await persist(currentAuditId, updated);
-    return true;
-  }
+  const value = useMemo<AuditContextValue>(() => {
+    const persist = async (auditId: string, updated: CachedAuditData) => {
+      await saveAuditData(auditId, updated);
+      setAuditData(updated);
+    };
 
-  async function renameAuditTitle(
-    auditId: string,
-    title: string,
-  ): Promise<boolean> {
-    const cleanTitle = title.trim();
-    if (!cleanTitle) return false;
-    const updatedHistory = await renameAudit(auditId, cleanTitle);
-    if (!updatedHistory) return false;
-    setHistory(updatedHistory);
-    return true;
-  }
+    // currentAuditId and history are guaranteed non-null past the loading
+    // guard below, which is the only path that renders this provider's value.
+    return {
+      sections,
+      history: history as AuditHistoryData,
+      semesters,
+      currentAuditId: currentAuditId as string,
+      currentAudit,
+      currentAuditName,
+      progresses,
+      courseMap,
+      getCourseById: (id) => {
+        const course = courseMap[id];
+        if (!course) throw new Error(`Course ${id} not found`);
+        return course;
+      },
+      setCurrentAuditId: (id) => {
+        window.history.pushState({}, "", `?auditId=${id}`);
+        setCurrentAuditIdState(id);
+        updateLastAuditId(id);
+      },
+      renameAuditTitle: async (auditId, title) => {
+        const cleanTitle = title.trim();
+        if (!cleanTitle) return false;
+        const updatedHistory = await renameAudit(auditId, cleanTitle);
+        if (!updatedHistory) return false;
+        setHistory(updatedHistory);
+        return true;
+      },
+      moveCourseToNewSemester: async (courseId, semester) => {
+        if (!auditData || !currentAuditId) return false;
+        const updated = moveCourseToSemester(auditData, courseId, semester);
+        if (!updated) return false;
+        await persist(currentAuditId, updated);
+        return true;
+      },
+      addPlannedCourse: async (course, requirementTitle, ruleTitle) => {
+        if (!auditData || !currentAuditId) return null;
+        const result = addCourse(auditData, course, requirementTitle, ruleTitle);
+        if (!result) return null;
+        await persist(currentAuditId, result.audit);
+        return result.courseId;
+      },
+    };
+  }, [
+    sections,
+    history,
+    semesters,
+    currentAuditId,
+    currentAudit,
+    currentAuditName,
+    progresses,
+    courseMap,
+    auditData,
+    updateLastAuditId,
+  ]);
 
   if (!loaded || !currentAuditId || !history) return <LoadingPage />;
 
-  return (
-    <AuditContext.Provider
-      value={{
-        sections,
-        history,
-        semesters,
-        currentAuditId,
-        currentAudit,
-        currentAuditName,
-        setCurrentAuditId: (id) => {
-          window.history.pushState({}, "", `?auditId=${id}`);
-          setCurrentAuditIdState(id);
-          updateLastAuditId(id);
-        },
-        renameAuditTitle,
-        moveCourseToNewSemester,
-        progresses,
-        getCourseById: (id) => {
-          const course = courseMap[id];
-          if (!course) throw new Error(`Course ${id} not found`);
-          return course;
-        },
-        courseMap,
-        addPlannedCourse,
-      }}
-    >
-      {children}
-    </AuditContext.Provider>
-  );
+  return <AuditContext.Provider value={value}>{children}</AuditContext.Provider>;
 }
 
 export function useAuditContext(): AuditContextValue {

features/catalog/components/course-add-modal.tsx

@@ -23,19 +23,6 @@ import { useAuditContext } from "@/features/audit/audit-provider";
 import { useCourseModalContext } from "../course-modal-provider";
 import CourseCard from "@/features/planner/components/course-card";
 
-type RecommendationScope = {
-  requirementTitle?: string;
-  ruleTitle?: string;
-};
-
-interface CourseAddModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  recommendedCourses?: CatalogCourse[];
-  recommendationScope?: RecommendationScope | null;
-  isLoading?: boolean;
-}
-
 interface CourseSearchData {
   searchQuery: string;
   department: string;
@@ -261,20 +248,14 @@ function CourseSearchContent({
   );
 }
 
-interface FulfillingCoursesContentProps {
-  courses: CatalogCourse[];
-  recommendationScope?: RecommendationScope | null;
-  isLoading?: boolean;
-  onClose: () => void;
-}
-
-function FulfillingCoursesContent({
-  courses,
-  recommendationScope,
-  isLoading = false,
-  onClose,
-}: FulfillingCoursesContentProps) {
+function FulfillingCoursesContent() {
   const { addPlannedCourse } = useAuditContext();
+  const {
+    recommendedCourses: courses,
+    recommendationScope,
+    isLoadingRecommendedCourses: isLoading,
+    closeModal: onClose,
+  } = useCourseModalContext();
   const displayedCourses = dedupeCatalogCoursesByCode(courses);
   const [query, setQuery] = useState("");
   const [pickedId, setPickedId] = useState<number | null>(null);
@@ -467,19 +448,14 @@ export function CourseSearchPanel() {
   );
 }
 
-export default function CourseAddModal({
-  isOpen,
-  onClose,
-  recommendedCourses = [],
-  recommendationScope,
-  isLoading = false,
-}: CourseAddModalProps) {
+export default function CourseAddModal() {
+  const { isOpen, closeModal } = useCourseModalContext();
   if (!isOpen) return null;
 
   return (
     <div
       className="fixed inset-0 z-50 flex items-center justify-center transition-all duration-200 bg-black/50 opacity-100"
-      onClick={onClose}
+      onClick={closeModal}
     >
       <div
         className="bg-background rounded-md border border-dap-border shadow-2xl w-full max-w-[550px] max-h-[90vh] mx-4 transform transition-all duration-200 overflow-hidden scale-100 opacity-100"
@@ -489,12 +465,7 @@ export default function CourseAddModal({
           <h2 className="text-3xl leading-none font-bold text-text mb-8">
             Fulfilling courses
           </h2>
-          <FulfillingCoursesContent
-            courses={recommendedCourses}
-            recommendationScope={recommendationScope}
-            isLoading={isLoading}
-            onClose={onClose}
-          />
+          <FulfillingCoursesContent />
         </div>
       </div>
     </div>

features/catalog/course-modal-provider.tsx

@@ -4,11 +4,18 @@ import {
   getSuggestedCoursesForRequirement,
 } from "./catalog-db";
 import type { CatalogCourse } from "@/domain/catalog";
-import { createContext, useContext, useEffect, useState } from "react";
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
 import { useAuditContext } from "@/features/audit/audit-provider";
 
 // Context for sharing audit data betw sidebar and main
-type RecommendationScope = {
+export type RecommendationScope = {
   requirementTitle?: string;
   ruleTitle?: string;
 };
@@ -80,35 +87,39 @@ export const CourseModalContextProvider = ({
     recommendationScope?.ruleTitle,
   ]);
 
-  const closeModal = () => {
+  const openModal = useCallback((scope?: RecommendationScope) => {
+    setRecommendedCourses([]);
+    setRecommendationScope(scope ?? null);
+    setIsOpen(true);
+  }, []);
+  const closeModal = useCallback(() => {
     setIsOpen(false);
     setRecommendationScope(null);
-  };
+  }, []);
+
+  const value = useMemo<CourseModalContextType>(
+    () => ({
+      isOpen,
+      recommendedCourses,
+      recommendationScope,
+      isLoadingRecommendedCourses,
+      openModal,
+      closeModal,
+    }),
+    [
+      isOpen,
+      recommendedCourses,
+      recommendationScope,
+      isLoadingRecommendedCourses,
+      openModal,
+      closeModal,
+    ],
+  );
 
   return (
-    <CourseModalContext.Provider
-      value={{
-        isOpen,
-        recommendedCourses,
-        recommendationScope,
-        isLoadingRecommendedCourses,
-        openModal: (scope) => {
-          setRecommendedCourses([]);
-          setRecommendationScope(scope ?? null);
-          setIsOpen(true);
-        },
-        closeModal,
-      }}
-    >
+    <CourseModalContext.Provider value={value}>
       {children}
-
-      <CourseAddModal
-        isOpen={isOpen}
-        recommendedCourses={recommendedCourses}
-        recommendationScope={recommendationScope}
-        isLoading={isLoadingRecommendedCourses}
-        onClose={closeModal}
-      />
+      <CourseAddModal />
     </CourseModalContext.Provider>
   );
 };