790 allow plans with no concentration

packages/api/package.json

@@ -36,7 +36,7 @@
     "@nestjs/passport": "^8.1.0",
     "@nestjs/platform-express": "^9.0.5",
     "@nestjs/typeorm": "^8.0.2",
-    "bcrypt": "5.0.0",
+    "bcrypt": "5.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
     "cookie-parser": "^1.4.6",

packages/api/src/constants.ts

@@ -7,3 +7,5 @@
  */
 export const COOKIE_DOMAIN =
   process.env.NODE_ENV === "production" ? "graduatenu.com" : "localhost";
+
+export const UNDECIDED = "Undecided";

packages/api/src/major/major.service.ts

@@ -3,6 +3,7 @@ import {
   SupportedMajorsForYear,
   SupportedMajors,
   SupportedConcentrations,
+  UNDECIDED_STRING,
 } from "@graduate/common";
 import { Injectable, Logger } from "@nestjs/common";
 import { formatServiceCtx } from "../utils";
@@ -120,9 +121,9 @@ export class MajorService {
       return false;
     }
 
-    const isValidConcentrationName = concentrations.some(
-      (c) => c === concentrationName
-    );
+    const isValidConcentrationName =
+      concentrations.includes(concentrationName) ||
+      concentrationName === UNDECIDED_STRING;
 
     if (!isValidConcentrationName) {
       this.logger.debug(
@@ -134,10 +135,8 @@ export class MajorService {
         },
         MajorService.formatMajorServiceCtx("isValidConcentrationForMajor")
       );
-
       return false;
     }
-
     return true;
   }
 

packages/api/src/major/majors/2021/computer-information-science/computer_science_bacs/parsed.commit.json

@@ -541,6 +541,7 @@
   ],
   "concentrations": {
     "minOptions": 1,
+
     "concentrationOptions": [
       {
         "type": "SECTION",

packages/common/src/constants.ts

@@ -7,3 +7,5 @@ export const wrongPasswordError = "Incorrect Password";
 export const forgotPasswordTokenExpiredError = "Token expired";
 export const unableToSendEmail = "Unable to send email";
 export const emailAlreadyConfirmed = "Email already confirmed";
+export const UNDECIDED_STRING = "Undecided";
+export const UNDECIDED_CONCENTRATION = "Concentration Undecided";

packages/common/src/major2-validation.ts

@@ -15,6 +15,7 @@ import {
   Err,
   Ok,
 } from "./types";
+import { UNDECIDED_STRING } from "./constants";
 import { assertUnreachable, courseToString } from "./course-utils";
 
 /**
@@ -193,13 +194,20 @@ interface CourseValidationTracker {
 
   // do we have enough courses to take all classes in both solutions?
   hasEnoughCoursesForBoth(s1: Solution, s2: Solution): boolean;
+
+  setNecessaryCourses(courses: Set<string>): void;
+
+  getNecessaryCourses(): Set<string>;
 }
 
 // exported for testing
 export class Major2ValidationTracker implements CourseValidationTracker {
   // maps courseString => [course instance, # of times taken]
   private currentCourses: Map<string, [ScheduleCourse2<unknown>, number]>;
 
+  //list of degree-required courses that we should not consider in the range validator
+  private necessaryCourses: Set<string> = new Set();
+
   constructor(courses: ScheduleCourse2<unknown>[]) {
     this.currentCourses = new Map();
     for (const c of courses) {
@@ -260,6 +268,14 @@ export class Major2ValidationTracker implements CourseValidationTracker {
     return true;
   }
 
+  setNecessaryCourses(courses: Set<string>) {
+    this.necessaryCourses = courses;
+  }
+
+  getNecessaryCourses() {
+    return this.necessaryCourses;
+  }
+
   // Maps the # of each course required in the given solution
   private static createTakenMap(s: Solution): Map<string, number> {
     const map = new Map();
@@ -295,6 +311,10 @@ export function validateMajor2(
   }
 
   const majorReqs = [...major.requirementSections, ...concentrationReq];
+
+  const requiredCourses: Set<string> = new Set();
+  tracker.setNecessaryCourses(getNecessaryCourses(majorReqs, requiredCourses));
+
   // create a big AND requirement of all the sections and selected concentrations
   const requirementsResult = validateRequirement(
     {
@@ -323,6 +343,51 @@ export function validateMajor2(
   });
 }
 
+/**
+ * Crawls through the requirements, producing a list of necessary courses. This
+ * is used to filter out courses that cannot be used for the range.
+ */
+export function getNecessaryCourses(
+  requirements: Requirement2[],
+  requiredCourses: Set<string>
+): Set<string> {
+  const tracker = new Major2ValidationTracker([]);
+
+  for (const req of requirements) {
+    crawlRequirement(req, tracker, requiredCourses);
+  }
+  return requiredCourses;
+}
+
+/** Crawls through the requirements, producing a list of necessary courses. */
+function crawlRequirement(
+  req: Requirement2,
+  tracker: CourseValidationTracker,
+  requiredCourses: Set<string>
+): void {
+  switch (req.type) {
+    // base cases, a course is added to the list of necessary courses
+    case "COURSE":
+      requiredCourses.add(courseToString(req));
+      break;
+    // inductive case, we crawl through the children of an AND requirement
+    case "AND":
+      req.courses.forEach((r) => crawlRequirement(r, tracker, requiredCourses));
+      break;
+    // inductive case, we crawl through the children of a whole section
+    case "SECTION":
+      req.requirements.forEach((r) =>
+        crawlRequirement(r, tracker, requiredCourses)
+      );
+    case "XOM":
+    case "OR":
+    case "RANGE":
+      break;
+    default:
+      return assertUnreachable(req);
+  }
+}
+
 /**
  * Produces the selected input concentrations to be included in major validation.
  *
@@ -338,6 +403,10 @@ export function getConcentrationsRequirement(
   if (concentrationsRequirement.concentrationOptions.length === 0) {
     return [];
   }
+  // Allow undecided concentrations
+  if (inputConcentrations === UNDECIDED_STRING) {
+    return [];
+  }
   const concentrationRequirements = [];
   for (const c of selectedConcentrations) {
     const found = concentrationsRequirement.concentrationOptions.find(
@@ -443,6 +512,8 @@ function validateRangeRequirement(
 ): Result<Array<Solution>, MajorValidationError> {
   // get the eligible courses (Filter out exceptions)
   const exceptions = new Set(r.exceptions.map(courseToString));
+  tracker.getNecessaryCourses().forEach((course) => exceptions.add(course));
+
   const courses = tracker
     .getAll(r.subject, r.idRangeStart, r.idRangeEnd)
     .filter((c) => !exceptions.has(courseToString(c)));

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])/;
@@ -36,14 +41,20 @@ export const majorOptionObjectComparator = (
 /**
  * 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;
 };

packages/common/test/major2-validation.test.ts

@@ -20,7 +20,7 @@ import {
   IOrCourse2,
   IRequiredCourse,
   IXofManyCourse,
-  Major2,
+  type Major2,
   Requirement2,
   ScheduleCourse2,
   Section,

packages/frontend/components/Plan/AddPlanModal.tsx

@@ -319,7 +319,8 @@ export const AddPlanModal: React.FC<AddPlanModalProps> = ({
                         name="concentration"
                         placeholder="Select a Concentration"
                         options={convertToOptionObjects(
-                          majorConcentrations.concentrations
+                          majorConcentrations.concentrations,
+                          true
                         )}
                         control={control}
                         rules={{

packages/frontend/components/Plan/EditPlanModal.tsx

@@ -311,7 +311,8 @@ export const EditPlanModal: React.FC<EditPlanModalProps> = ({ plan }) => {
                         name="concentration"
                         placeholder="Select a Concentration"
                         options={convertToOptionObjects(
-                          majorConcentrations.concentrations
+                          majorConcentrations.concentrations,
+                          true
                         )}
                         control={control}
                         rules={{

packages/frontend/components/Plan/ErrorModalError.tsx

@@ -0,0 +1,70 @@
+import { ChevronDownIcon, ChevronUpIcon, WarningIcon } from "@chakra-ui/icons";
+import { Box, Flex, Text, Collapse } from "@chakra-ui/react";
+import { useState } from "react";
+
+interface ErrorModalErrorProps {
+  title: string;
+  message: string;
+}
+
+export const ErrorModalError: React.FC<ErrorModalErrorProps> = ({
+  title,
+  message,
+}) => {
+  const [opened, setOpened] = useState(false);
+
+  return (
+    <Box
+      border="1px solid"
+      borderColor="primary.red.main"
+      borderRadius="lg"
+      backgroundColor="#FAE8E7"
+      transition="background-color 0.25s ease"
+      _hover={{ backgroundColor: "#F9DAD8" }}
+    >
+      <Flex
+        onClick={() => setOpened(!opened)}
+        direction="row"
+        justifyContent="space-between"
+        alignItems="flex-start"
+        height="45px"
+        color="black"
+        fontWeight="bold"
+        p="sm"
+        position="sticky"
+        top="0px"
+        zIndex={1}
+      >
+        <Flex direction="row" height="100%" columnGap="sm">
+          <Flex direction="row" height="100%" alignItems="center" gap="1">
+            <WarningIcon
+              color="primary.red.main"
+              width="2rem"
+              alignSelf="center"
+              alignItems="center"
+              justifySelf="center"
+              transition="background 0.15s ease"
+            />
+            <Text color="black" mt="0" fontSize="sm">
+              {title}
+            </Text>
+          </Flex>
+        </Flex>
+
+        <Flex ml="xs" alignItems="center" justifyItems="center">
+          {opened ? (
+            <ChevronUpIcon boxSize="25px" color="primary.red.main" />
+          ) : (
+            <ChevronDownIcon boxSize="25px" color="primary.red.main" />
+          )}
+        </Flex>
+      </Flex>
+
+      <Collapse in={opened} animateOpacity>
+        <Box px="sm" py="xs" borderRadius="lg" backgroundColor="transparent">
+          <Text fontSize="sm">{message}</Text>
+        </Box>
+      </Collapse>
+    </Box>
+  );
+};