Fix incorrect commit

Author: minhhaitran08

course-matrix/backend/src/utils/convert-breadth-requirement.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-year-level.ts

@@ -292,7 +292,7 @@ const TimetableBuilder = () => {
                   </div>
                   <div className="flex flex-col">
                     <p className="text-sm pb-2">
-                      Selected courses: {selectedCourses.length} (Max 8)
+                      Selected courses: {selectedCourses.length}
                     </p>
                     <div className="flex gap-2 flex-col">
                       {selectedCourses.map((course, index) => (
@@ -332,18 +332,9 @@ const TimetableBuilder = () => {
                   </div>
 
                   <div className="flex flex-col">
-                    <FormField
-                      control={form.control}
-                      name="restrictions"
-                      render={({ field }) => (
-                        <FormItem className="pb-2">
-                          <p className="text-sm">
-                            Enabled Restrictions: {enabledRestrictions.length}
-                          </p>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
+                    <p className="text-sm pb-2">
+                      Enabled Restrictions: {enabledRestrictions.length}
+                    </p>
                     <div className="flex gap-2 flex-col">
                       {enabledRestrictions.map((restric, index) => (
                         <div
@@ -381,19 +372,18 @@ const TimetableBuilder = () => {
 
                   <Button type="submit">Generate</Button>
                 </form>
-
-                {isCustomSettingsOpen && (
-                  <CreateCustomSetting
-                    submitHandler={handleAddRestriction}
-                    closeHandler={() => setIsCustomSettingsOpen(false)}
-                  />
-                )}
               </FormContext.Provider>
             </Form>
           </div>
           <div className="w-3/5">
             <Calendar courseEvents={courseEvents} userEvents={userEvents} />
           </div>
+          {isCustomSettingsOpen && (
+            <CreateCustomSetting
+              submitHandler={handleAddRestriction}
+              closeHandler={() => setIsCustomSettingsOpen(false)}
+            />
+          )}
 
           {showFilters && (
             <SearchFilters