missing concentration message appears conditionally and abstracted co…

…nvertToOptionObjects method
sandboxnu · Feb 2, 2025 · febd2cd · febd2cd
1 parent e9f3394
commit febd2cd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 30 deletions.
diff --git a/packages/api/src/major/major.service.ts b/packages/api/src/major/major.service.ts
@@ -122,7 +122,7 @@ export class MajorService {
 
     const isValidConcentrationName =
       concentrations.includes(concentrationName) ||
-      concentrationName.toLowerCase() === "undecided";
+      concentrationName === "Undecided";
 
     if (!isValidConcentrationName) {
       this.logger.debug(

diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
@@ -1,5 +1,10 @@
 import type { OptionObject } from "./types";
 
+const UNDECIDED_OPTION: OptionObject = {
+  label: "Undecided",
+  value: "Undecided",
+};
+
 /** Does the given password satisfy our minimum criteria for strength? */
 export const isStrongPassword = (password: string): boolean => {
   const containsLettersAndNumbersRegex = /^(?=.*[a-zA-Z])(?=.*[0-9])/;
@@ -33,32 +38,23 @@ export const majorOptionObjectComparator = (
   return majorNameComparator(a.value.toString(), b.value.toString());
 };
 
-/**
- * Converts a list of strings or numbers into a list of option objects for the
- * Select component, including an "Undecided" option.
- */
-export const convertToOptionObjectsIncludingUndecided = (
-  options: (string | number)[]
-): OptionObject[] => {
-  const optionObjects = convertToOptionObjects(options);
-  optionObjects.unshift({
-    label: "Undecided",
-    value: "Undecided",
-  });
-  return optionObjects;
-};
-
 /**
  * Converts a list of strings or numbers into a list of option objects for the
  * Select component.
+ *
+ * IncludeUndecided: optional parameter specifying whether to include\
+ * "Undecided" as an option
  */
 export const convertToOptionObjects = (
-  options: (string | number)[]
+  options: (string | number)[],
+  includeUndecided = false
 ): OptionObject[] => {
-  return options.map((option) => {
-    return {
-      label: option,
-      value: option,
-    };
-  });
+  const optionObjects = options.map((option) => ({
+    label: option,
+    value: option,
+  }));
+  if (includeUndecided) {
+    optionObjects.unshift(UNDECIDED_OPTION);
+  }
+  return optionObjects;
 };
diff --git a/packages/frontend/components/Plan/AddPlanModal.tsx b/packages/frontend/components/Plan/AddPlanModal.tsx
@@ -22,7 +22,6 @@ import {
   CreatePlanDtoWithoutSchedule,
   PlanModel,
   convertToOptionObjects,
-  convertToOptionObjectsIncludingUndecided,
 } from "@graduate/common";
 import { useRouter } from "next/router";
 import { Dispatch, SetStateAction, useContext, useState } from "react";
@@ -319,8 +318,9 @@ export const AddPlanModal: React.FC<AddPlanModalProps> = ({
                         label="Concentrations"
                         name="concentration"
                         placeholder="Select a Concentration"
-                        options={convertToOptionObjectsIncludingUndecided(
-                          majorConcentrations.concentrations
+                        options={convertToOptionObjects(
+                          majorConcentrations.concentrations,
+                          true
                         )}
                         control={control}
                         rules={{

diff --git a/packages/frontend/components/Plan/EditPlanModal.tsx b/packages/frontend/components/Plan/EditPlanModal.tsx
@@ -20,7 +20,6 @@ import {
   PlanModel,
   UpdatePlanDto,
   convertToOptionObjects,
-  convertToOptionObjectsIncludingUndecided,
 } from "@graduate/common";
 import { useRouter } from "next/router";
 import { useCallback, useContext, useEffect, useState } from "react";
@@ -311,8 +310,9 @@ export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
                         label="Concentrations"
                         name="concentration"
                         placeholder="Select a Concentration"
-                        options={convertToOptionObjectsIncludingUndecided(
-                          majorConcentrations.concentrations
+                        options={convertToOptionObjects(
+                          majorConcentrations.concentrations,
+                          true
                         )}
                         control={control}
                         rules={{

diff --git a/packages/frontend/components/Sidebar/SidebarContainer.tsx b/packages/frontend/components/Sidebar/SidebarContainer.tsx
@@ -77,7 +77,9 @@ const SidebarContainer: React.FC<PropsWithChildren<SidebarContainerProps>> = ({
             </Text>
           )}
         </Box>
-        <ConcentrationDropdownWarning />
+        {subtitle === "Concentration Undecided" && (
+          <ConcentrationDropdownWarning />
+        )}
         {renderDropdownWarning && <DropdownWarning />}
         {creditsTaken !== undefined && (
           <Flex mb="sm" alignItems="baseline" columnGap="xs">