Merge pull request #455 from NIAEFEUP/fix/enrollment-text

fix: enrollment page text
NIAEFEUP · Feb 9, 2025 · 03aa395 · 03aa395
2 parents 78e0bcd + 7289caf
commit 03aa395
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/components/exchange/enrollments/AlreadyEnrolledCourseUnitCard.tsx b/src/components/exchange/enrollments/AlreadyEnrolledCourseUnitCard.tsx
@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction, useState } from "react"
+import { Dispatch, SetStateAction, useEffect, useState } from "react"
 import { CourseInfo } from "../../../@types"
 import { Button } from "../../ui/button"
 import { Card, CardHeader, CardTitle } from "../../ui/card"
@@ -22,6 +22,12 @@ export const AlreadyEnrolledCourseUnitCard = ({
 }: Props) => {
     const [removeSelected, setRemoveSelected] = useState<boolean>(false);
 
+    useEffect(() => {
+        if(enrollmentChoices.size === 0) {
+            setRemoveSelected(false);
+        }
+    }, [enrollmentChoices])
+
     return (
         <Card>
             <CardHeader className="flex flex-row justify-between items-center py-2 px-4">
@@ -47,7 +53,7 @@ export const AlreadyEnrolledCourseUnitCard = ({
                 >
                     {removeSelected 
                         ? "Cancelar pedido"
-                        : "Anular inscrição"
+                        : "Anular inscrição em turma"
                     }
                 </Button>
             </CardHeader>

diff --git a/src/components/exchange/enrollments/Enrollments.tsx b/src/components/exchange/enrollments/Enrollments.tsx
@@ -9,7 +9,6 @@ import { Button } from "../../ui/button";
 import courseUnitEnrollmentService from "../../../api/services/courseUnitEnrollmentService";
 import { ExchangeSidebarStatus } from "../../../pages/Exchange"
 import { useToast } from "../../ui/use-toast";
-import useLocalStorage from "../../../hooks/useLocalStorage";
 import useStudentCourseUnits from "../../../hooks/useStudentCourseUnits";
 import { AlreadyEnrolledCourseUnitCard } from "./AlreadyEnrolledCourseUnitCard";
 import { EnrollingCourseUnitCard } from "./EnrollingCourseUnitCard";
@@ -32,7 +31,7 @@ export const Enrollments = ({
 }: Props) => {
   const parentCourseContext = useContext(CourseContext);
 
-  const [enrollCourses, setEnrollCourses] = useLocalStorage<CourseInfo[]>("enrollCourses", []);
+  const [enrollCourses, setEnrollCourses] = useState<CourseInfo[]>([]);
   const [enrollmentChoices, setEnrollmentChoices] = useState<Map<number, EnrollmentOption>>(new Map());
   const [disenrollmentChoices, setDisenrollmentChoices] = useState<Map<number, EnrollmentOption>>(new Map());
   const [coursesInfo, setCoursesInfo] = useState<CourseInfo[]>([]);
@@ -125,6 +124,8 @@ export const Enrollments = ({
                   description: 'Pedido de inscrição submetida com sucesso',
                 });
                 setEnrollCourses([]);
+                setEnrollmentChoices(new Map());
+                setDisenrollmentChoices(new Map());
               } else {
                 const json = await res.json();
                 toast({

diff --git a/src/components/planner/sidebar/sessionController/ExchangeCoursePicker.tsx b/src/components/planner/sidebar/sessionController/ExchangeCoursePicker.tsx
@@ -15,7 +15,7 @@ export const ExchangeCoursePicker = ({
   enrollCourses,
   setEnrollCourses
 }: Props) => {
-  const [checkboxedCourses, setCheckboxedCourses] = useLocalStorage("enrollCoursesCheckboxedCourses", []);
+  const [checkboxedCourses, setCheckboxedCourses] = useState([]);
   const [coursesInfo, setCoursesInfo] = useState<CourseInfo[]>([]);
   const [modalOpen, setModalOpen] = useState<boolean>(false)
   const [selectedMajor, setSelectedMajor] = useLocalStorage<Major>("enrollMajor",null);