Fix incorrect commit

Author: minhhaitran08

course-matrix/backend/jest.config.ts

@@ -2,12 +2,8 @@ import type { Config } from "jest";
 
 const config: Config = {
   preset: "ts-jest",
-  moduleNameMapper: {
-    "\\.(css|scss)$": "identity-obj-proxy",
-    "^.+\\.svg": "<rootDir>/tests/mocks/svgMock.tsx",
-  },
+  moduleNameMapper: { "\\.(css|scss)$": "identity-obj-proxy" },
   // to obtain access to the matchers.
-  setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   modulePaths: ["<rootDir>"],
   testEnvironment: "jsdom",

course-matrix/backend/src/utils/convert-breadth-requirement.ts

@@ -27,5 +27,5 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src", "tests/setupTests.ts"]
+  "include": ["src"]
 }

course-matrix/backend/src/utils/convert-year-level.ts

@@ -2,12 +2,8 @@ import type { Config } from "jest";
 
 const config: Config = {
   preset: "ts-jest",
-  moduleNameMapper: {
-    "\\.(css|scss)$": "identity-obj-proxy",
-    "^.+\\.svg": "<rootDir>/tests/mocks/svgMock.tsx",
-  },
+  moduleNameMapper: { "\\.(css|scss)$": "identity-obj-proxy" },
   // to obtain access to the matchers.
-  setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   modulePaths: ["<rootDir>"],
   testEnvironment: "jsdom",

course-matrix/backend/tests/mocks/svgMock.tsx

@@ -41,11 +41,9 @@ import SearchFilters from "./SearchFilters";
 import Calendar from "./Calendar";
 import { Timetable } from "@/utils/type-utils";
 import { useSearchParams } from "react-router-dom";
-
 type FormContextType = UseFormReturn<z.infer<typeof TimetableFormSchema>>;
 export const FormContext = createContext<FormContextType | null>(null);
 const SEARCH_LIMIT = 1000;
-
 /**
  * TimetableBuilder Component
  *
@@ -81,35 +79,31 @@ const SEARCH_LIMIT = 1000;
  *
  * @returns {JSX.Element} The rendered timetable builder.
  */
-
 const TimetableBuilder = () => {
   const form = useForm<z.infer<typeof TimetableFormSchema>>({
     resolver: zodResolver(TimetableFormSchema),
     defaultValues: baseTimetableForm,
   });
-
   const filterForm = useForm<z.infer<typeof FilterFormSchema>>({
     resolver: zodResolver(FilterFormSchema),
   });
-
   const [queryParams, setQueryParams] = useSearchParams();
   const isEditingTimetable = queryParams.has("edit");
   const editingTimetableId = queryParams.get("edit");
-
   const selectedCourses = form.watch("courses") || [];
   const enabledRestrictions = form.watch("restrictions") || [];
   const searchQuery = form.watch("search");
   const debouncedSearchQuery = useDebounceValue(searchQuery, 250);
-
   const [isCustomSettingsOpen, setIsCustomSettingsOpen] = useState(false);
   const [filters, setFilters] = useState<FilterForm | null>(null);
   const [showFilters, setShowFilters] = useState(false);
-  const [timetableId, setTimetableId] = useState(-1);
+  const [timetableId, setTimetableId] = useState(
+    editingTimetableId ? parseInt(editingTimetableId) : 0
+  );
 
   const noSearchAndFilter = () => {
     return !searchQuery && !filters;
   };
-
   // limit search number if no search query or filters for performance purposes.
   // Otherwise, limit is 10k, which effectively gets all results.
   const { data, isLoading, error, refetch } = useGetCoursesQuery({
@@ -118,38 +112,32 @@ const TimetableBuilder = () => {
     semester: form.getValues("semester"),
     ...filters,
   });
-
   const { data: eventsData, isLoading: eventsLoading } = useGetEventsQuery(
-    timetableId,
+    timetableId
   ) as {
     data: { courseEvents: unknown[]; userEvents: unknown[] };
     isLoading: boolean;
   };
   const courseEvents = eventsData?.courseEvents || [];
   const userEvents = eventsData?.userEvents || [];
-
   const { data: timetablesData } = useGetTimetablesQuery() as {
     data: Timetable[];
   };
   const timetables = timetablesData || [];
-
   useEffect(() => {
     if (searchQuery) {
       refetch();
     }
   }, [debouncedSearchQuery]);
-
   const createTimetable = (values: z.infer<typeof TimetableFormSchema>) => {
     console.log(values);
     // TODO Send request to /api/timetable/create
   };
-
   const handleReset = () => {
     form.reset();
     filterForm.reset();
     setFilters(null);
   };
-
   const handleRemoveCourse = (course: {
     id: number;
     code: string;
@@ -159,24 +147,20 @@ const TimetableBuilder = () => {
     const newList = currentList.filter((item) => item.id !== course.id);
     form.setValue("courses", newList);
   };
-
   const handleAddRestriction = (values: z.infer<typeof RestrictionSchema>) => {
     const currentList = form.getValues("restrictions");
     const newList = [...currentList, values];
     form.setValue("restrictions", newList);
   };
-
   const handleRemoveRestriction = (index: number) => {
     const currentList = form.getValues("restrictions");
     const newList = currentList.filter((_, i) => i !== index);
     form.setValue("restrictions", newList);
   };
-
   const applyFilters = (values: z.infer<typeof FilterFormSchema>) => {
     setFilters(values);
     console.log("Apply filters", values);
   };
-
   return (
     <>
       <div className="w-full">
@@ -223,7 +207,6 @@ const TimetableBuilder = () => {
           </div>
           <hr />
         </div>
-
         <div className="m-8 flex gap-12">
           <div className="w-2/5">
             <Form {...form}>
@@ -254,7 +237,7 @@ const TimetableBuilder = () => {
                                     <SelectItem key={value} value={value}>
                                       {value}
                                     </SelectItem>
-                                  ),
+                                  )
                                 )}
                               </SelectContent>
                             </Select>
@@ -263,7 +246,6 @@ const TimetableBuilder = () => {
                         </FormItem>
                       )}
                     />
-
                     <FormField
                       control={form.control}
                       name="search"
@@ -310,7 +292,6 @@ const TimetableBuilder = () => {
                       ))}
                     </div>
                   </div>
-
                   <div className="flex gap-12 items-end">
                     <div className="flex flex-col gap-2">
                       <h2 className="text-lg">Custom Settings</h2>
@@ -328,7 +309,6 @@ const TimetableBuilder = () => {
                       + Add new
                     </Button>
                   </div>
-
                   <div className="flex flex-col">
                     <p className="text-sm pb-2">
                       Enabled Restrictions: {enabledRestrictions.length}
@@ -357,7 +337,6 @@ const TimetableBuilder = () => {
                               {restric.numDays} days off
                             </p>
                           )}
-
                           <X
                             size={16}
                             className="hover:text-red-500 cursor-pointer"
@@ -367,7 +346,6 @@ const TimetableBuilder = () => {
                       ))}
                     </div>
                   </div>
-
                   <Button type="submit">Generate</Button>
                 </form>
               </FormContext.Provider>
@@ -382,7 +360,6 @@ const TimetableBuilder = () => {
               closeHandler={() => setIsCustomSettingsOpen(false)}
             />
           )}
-
           {showFilters && (
             <SearchFilters
               submitHandler={applyFilters}
@@ -400,5 +377,4 @@ const TimetableBuilder = () => {
     </>
   );
 };
-
 export default TimetableBuilder;