disable major select when year is unselected

sandboxnu · Feb 4, 2024 · a7353b9 · a7353b9
1 parent 6c81c22
commit a7353b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/packages/frontend/components/Form/Select.tsx b/packages/frontend/components/Form/Select.tsx
@@ -25,6 +25,7 @@ type PlanSelectProps = {
   /** Are the field values numbers. */
   isNumeric?: boolean;
   isSearchable?: boolean;
+  isDisabled?: boolean;
   /** An option in the select dropdown that indicates "no selection". */
   noValueOptionLabel?: string;
   /** Fuzzy options to use */
@@ -41,6 +42,7 @@ export const PlanSelect: React.FC<PlanSelectProps> = ({
   rules,
   isNumeric,
   isSearchable,
+  isDisabled,
   noValueOptionLabel,
   useFuzzySearch,
 }) => {
@@ -113,6 +115,7 @@ export const PlanSelect: React.FC<PlanSelectProps> = ({
         onChange={onChange}
         value={selectedOption}
         isSearchable={isSearchable}
+        isDisabled={isDisabled}
         defaultValue={noValueOption}
         filterOption={filterOptions}
         {...fieldRest}

diff --git a/packages/frontend/components/Plan/AddPlanModal.tsx b/packages/frontend/components/Plan/AddPlanModal.tsx
@@ -243,7 +243,7 @@ export const AddPlanModal: React.FC<AddPlanModalProps> = ({
                         setValue("concentration", "");
                       }}
                       rules={{ required: "Major is required." }}
-                      helperText='First select your catalog year. If you still cannot find your major, select "No Major" above.'
+                      isDisabled={!!!catalogYear}
                       isSearchable
                       useFuzzySearch
                     />

diff --git a/packages/frontend/components/Plan/EditPlanModal.tsx b/packages/frontend/components/Plan/EditPlanModal.tsx
@@ -268,6 +268,7 @@ export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
                       }}
                       rules={{ required: "Major is required." }}
                       isSearchable
+                      isDisabled={!!!catalogYear}
                     />
                     <PlanConcentrationsSelect
                       catalogYear={catalogYear}