started edit plan model

TODO MAKE CURRENT MINOR SHOW UP IN EDIT DROPDOWN
sandboxnu · Dec 3, 2024 · 902beb3 · 902beb3
1 parent 6393f2c
commit 902beb3
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 15 deletions.
diff --git a/packages/frontend/components/Plan/AddPlanModal.tsx b/packages/frontend/components/Plan/AddPlanModal.tsx
@@ -151,13 +151,14 @@ export const AddPlanModal: React.FC<AddPlanModalProps> = ({
   const onCloseAddPlanModal = () => {
     reset();
     setIsNoMajorSelected(false);
+    setIsNoMinorSelected(false);
     onCloseDisplay();
   };
 
   const title = watch("name");
   const catalogYear = watch("catalogYear");
   const majorName = watch("major");
-  const minorName = watch("minor");
+  //const minorName = watch("minor");
   const concentration = watch("concentration");
   const agreeToBetaMajor = watch("agreeToBetaMajor");
 
@@ -324,20 +325,6 @@ export const AddPlanModal: React.FC<AddPlanModalProps> = ({
                       isSearchable
                       useFuzzySearch
                     />
-                    <PlanSelect
-                      label="Minor"
-                      placeholder="Select a Minor"
-                      name="minor"
-                      control={control}
-                      options={extractSupportedMinorOptions(
-                        catalogYear,
-                        supportedMinorsData
-                      )}
-                      //rules={{ required: "Minor is required." }}
-                      isDisabled={!catalogYear}
-                      isSearchable
-                      useFuzzySearch
-                    />
                     <Flex align="center">
                       <Text size="xs" mr="xs">
                         Can&apos;t find your major / minor?
@@ -362,6 +349,20 @@ export const AddPlanModal: React.FC<AddPlanModalProps> = ({
                         useFuzzySearch
                       />
                     )}
+                    <PlanSelect
+                      label="Minor"
+                      placeholder="Select a Minor"
+                      name="minor"
+                      control={control}
+                      options={extractSupportedMinorOptions(
+                        catalogYear,
+                        supportedMinorsData
+                      )}
+                      //rules={{ required: "Minor is required." }}
+                      isDisabled={!catalogYear}
+                      isSearchable
+                      useFuzzySearch
+                    />
                     {majorName && !isValidatedMajor && (
                       <Flex alignItems="center">
                         <Checkbox

diff --git a/packages/frontend/components/Plan/EditPlanModal.tsx b/packages/frontend/components/Plan/EditPlanModal.tsx
@@ -29,9 +29,11 @@ import {
   USE_STUDENT_WITH_PLANS_SWR_KEY,
   useStudentWithPlans,
   useSupportedMajors,
+  useSupportedMinors,
 } from "../../hooks";
 import {
   extractSupportedMajorOptions,
+  extractSupportedMinorOptions,
   extractSupportedMajorYears,
   handleApiClientError,
   noLeadOrTrailWhitespacePattern,
@@ -49,6 +51,7 @@ type EditPlanModalProps = {
 type EditPlanInput = {
   name: string;
   major: string;
+  minor?: string;
   catalogYear: number;
   concentration: string;
   agreeToBetaMajor: boolean;
@@ -57,6 +60,8 @@ type EditPlanInput = {
 export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
   const { supportedMajorsData, error: supportedMajorsError } =
     useSupportedMajors();
+  const { supportedMinorsData, error: supportedMinorsError } =
+    useSupportedMinors();
   const { mutate } = useSWRConfig();
   const router = useRouter();
   const { onOpen, onClose: onCloseDisplay, isOpen } = useDisclosure();
@@ -86,6 +91,7 @@ export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
       name: plan.name,
       catalogYear: plan.catalogYear,
       major: plan.major,
+      minor: plan.minor,
       concentration: plan.concentration,
     });
 
@@ -103,6 +109,9 @@ export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
   if (supportedMajorsError) {
     handleApiClientError(supportedMajorsError, router);
   }
+  if (supportedMinorsError) {
+    handleApiClientError(supportedMinorsError, router);
+  }
 
   if (!student) {
     return <></>;
@@ -323,6 +332,21 @@ export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
                         useFuzzySearch
                       />
                     )}
+                    <PlanSelect
+                      label="Minor"
+                      placeholder="Select a Minor"
+                      name="minor"
+                      control={control}
+                      options={extractSupportedMinorOptions(
+                        catalogYear,
+                        supportedMinorsData
+                      )}
+                      //TODO:::: HOW TO HAVE DFAULT VALUEEEEEEEEEEE :DDDDD
+                      //rules={{ required: "Minor is required." }}
+                      isDisabled={!catalogYear}
+                      isSearchable
+                      useFuzzySearch
+                    />
                     {majorName && !isValidatedMajor && (
                       <Flex alignItems="center">
                         <Checkbox