Merge pull request #625 from pennlabs/aag/frontend-fixes

Frontend fixes
pennlabs · Apr 8, 2024 · 9816982 · 9816982
2 parents d668040 + 62acb4b
commit 9816982
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/backend/degree/static/pdp/degree-editor.js b/backend/degree/static/pdp/degree-editor.js
@@ -78,12 +78,10 @@ const LayoutFlow = () => {
   const [edges, setEdges, onEdgesChange] = useEdgesState([]);
 
   const onConnect = useCallback((params) => {
-    console.log("onConnect", params);
     if (params.source === params.target) return;
     const [sourceIsDegree, sourceId] = pkOfNodeId(params.source);
     const [targetIsDegree, targetId] = pkOfNodeId(params.target);
     if (sourceIsDegree || targetIsDegree) return;
-    console.log("HERE");
     const redirect = `/admin/degree/doublecountrestriction/add/?rule=${sourceId}&other_rule=${targetId}`;
     window.location.href = redirect;
   }, []);

diff --git a/frontend/degree-plan/components/FourYearPlan/Semesters.tsx b/frontend/degree-plan/components/FourYearPlan/Semesters.tsx
@@ -8,7 +8,6 @@ import Select from "react-select";
 import { ModalKey } from "./DegreeModal";
 
 const getNextSemester = (semester: string) => {
-  console.log("GET NEXT SEMESTER");
   const year = parseInt(semester.slice(0, 4));
   const season = semester.slice(4);
   if (season === "A") {
@@ -238,10 +237,10 @@ const Semesters = ({
     let parsed;
     try {
       parsed = JSON.parse(stickyValue)
+      setSemesters(parsed)
     } catch {
       setSemesters(getDefaultSemesters());
     }
-    setSemesters(parsed);
   }, [activeDegreeplan, currentSemester]);
 
   /** Update semesters to local storage */
@@ -250,7 +249,7 @@ const Semesters = ({
     // if finish loading and no semesters, we go to edit mode for the user to add new semesters
     else setEditMode(false);
     if (!activeDegreeplan) return;
-    if (typeof window !== undefined) {
+    if (typeof window !== "undefined" && Object.keys(semesters).length) {
       localStorage.setItem(
         getLocalSemestersKey(activeDegreeplan.id),
         JSON.stringify(semesters)

diff --git a/frontend/degree-plan/components/FourYearPlanPage.tsx b/frontend/degree-plan/components/FourYearPlanPage.tsx
@@ -74,7 +74,6 @@ const FourYearPlanPage = ({
     if (!isLoadingDegreeplans && !degreeplans?.length) {
       setShowOnboardingModal(true);
     }
-    console.log(activeDegreeplan)
     if (!degreeplans?.length) {
       setActiveDegreeplan(null);
     } else if (

diff --git a/frontend/degree-plan/components/Requirements/CourseInReq.tsx b/frontend/degree-plan/components/Requirements/CourseInReq.tsx
@@ -35,7 +35,6 @@ const CourseInReq = (props : CourseInReqProps) => {
         /** If the current rule about to be removed is the only rule 
         * the course satisfied, then we delete the fulfillment */
         if (updated_rules && updated_rules.length == 0) {
-          console.log('hwere')
           removeFulfillment(full_code);
         } else {
           updateFulfillment({rules: updated_rules}, full_code);

diff --git a/frontend/degree-plan/components/Requirements/QObject.tsx b/frontend/degree-plan/components/Requirements/QObject.tsx
@@ -314,7 +314,6 @@ const QObject = ({ q, fulfillments, rule, satisfied, activeDegreePlanId }: QObje
         case "COURSE":
             const [fulfillment] = fulfillments.filter(fulfillment => fulfillment.full_code == q.full_code && (!q.semester || q.semester === fulfillment.semester))
             return <CourseInReq course={{...q, rules: fulfillment ? fulfillment.rules : []}} fulfillment={fulfillment} isDisabled={satisfied && !fulfillment} isUsed={!!fulfillment} rule_id={rule.id} activeDegreePlanId={activeDegreePlanId}/>;
-            // onClick={() => { console.log("fired"); createOrUpdate({ rules: [rule.id] }, q.full_code)}}
     }
 }
 
@@ -351,8 +350,6 @@ const RuleLeaf = ({ q_json, fulfillmentsForRule, rule, satisfied, activeDegreePl
     const t3 = transformSearchConditions(t2)
     q_json = t3 as TransformedQObject;
 
-    // console.log(q_json)
-
     return (
         <RuleLeafWrapper $wrap>
             <QObject q={q_json} fulfillments={fulfillmentsForRule} rule={rule} satisfied={satisfied} activeDegreePlanId={activeDegreePlanId} />

diff --git a/frontend/degree-plan/pages/OnboardingPage.tsx b/frontend/degree-plan/pages/OnboardingPage.tsx
@@ -250,7 +250,8 @@ const OnboardingPage = ({
     /** Filter major options based on selected schools/degrees */
     const majorOptions =
       degrees
-        ?.filter((d) => d.year == startingYear?.value && schools.map((s) => s.value).includes(d.degree))
+        ?.filter((d) => schools.map((s) => s.value).includes(d.degree))
+        .sort((d) => Math.abs((startingYear ? startingYear.value : d.year) - d.year))
         .map((degree) => ({
           value: degree,
           label: createMajorLabel(degree),
@@ -268,6 +269,11 @@ const OnboardingPage = ({
               getLocalSemestersKey(res.id),
               JSON.stringify(interpolateSemesters(startingYear.value, graduationYear.value))
             );
+            console.log(
+              "****",
+              getLocalSemestersKey(res.id),
+              JSON.stringify(interpolateSemesters(startingYear.value, graduationYear.value))
+            );
           }
           setActiveDegreeplan(res);
           const updated = postFetcher(