change condition for disabling button

sandboxnu · Apr 10, 2024 · a444292 · a444292
1 parent 1e31164
commit a444292
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/packages/frontend/components/Plan/AddPlanModal.tsx b/packages/frontend/components/Plan/AddPlanModal.tsx
@@ -161,11 +161,13 @@ export const AddPlanModal: React.FC<AddPlanModalProps> = ({
     yearSupportedMajors?.[majorName ?? ""]?.verified ?? false;
 
   const isValidForm =
-    title &&
-    catalogYear &&
-    majorName &&
-    (!isConcentrationRequired || concentration) &&
-    (!isValidatedMajor ? agreeToBetaMajor : true);
+    (title &&
+      catalogYear &&
+      majorName &&
+      (!isConcentrationRequired || concentration) &&
+      (!isValidatedMajor ? agreeToBetaMajor : true)) ||
+    // Valid plan for no major selected
+    (title && isNoMajorSelected);
 
   const noMajorHelperLabel = (
     <Stack>

diff --git a/packages/frontend/components/Plan/EditPlanModal.tsx b/packages/frontend/components/Plan/EditPlanModal.tsx
@@ -131,11 +131,13 @@ export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
     yearSupportedMajors?.[majorName ?? ""]?.verified ?? false;
 
   const isValidForm =
-    title &&
-    catalogYear &&
-    majorName &&
-    (!isConcentrationRequired || concentration) &&
-    (!isValidatedMajor ? agreeToBetaMajor : true);
+    (title &&
+      catalogYear &&
+      majorName &&
+      (!isConcentrationRequired || concentration) &&
+      (!isValidatedMajor ? agreeToBetaMajor : true)) ||
+    // Valid plan for no major selected
+    (title && isNoMajorSelected);
 
   const onSubmitHandler = async (payload: UpdatePlanDto) => {
     // no submitting till the curr plan has been fetched