[CPM-202] Remove courses from dropdown as they're added to a regulati…

…on (#145) * clean up api client code * fix crash when exporting plan with empty notes * make spacing consistend, update snapshots * remove courses from dropdown as they're added to a regulation * rename c to course * update timeout to 5000 Co-authored-by: dinith1 <[email protected]>
momentum-agile · Oct 14, 2020 · f9ae956 · f9ae956
1 parent c114420
commit f9ae956
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/api/src/uni-service.js b/api/src/uni-service.js
@@ -15,7 +15,7 @@ const fetchAllCourses = async (subject, year) => {
         () => {
             controller.abort();
         },
-        2000,
+        5000,
     );
 
     try {
@@ -39,7 +39,7 @@ const fetchParticularCourse = async (subject, catalogNbr, year) => {
         () => {
             controller.abort();
         },
-        2000,
+        5000,
     );
 
     try {

diff --git a/client/src/pages/Plan/usePlan.js b/client/src/pages/Plan/usePlan.js
@@ -13,7 +13,7 @@ const usePlan = () => {
     const [lastSaveDate, setLastSaveDate] = useState(new Date());
 
     const initPage = useCallback(async () => {
-        // Promise.all because we are going to have a lot of API calls once requirements/courses/notes come in !
+        // Promise.all because we are going to have a lot of API calls once requirements/courses/notes come in!
         Promise.all([CoursePlannerClient.getCourses(), CoursePlannerClient.getPlan(planId)])
             .then(([courses, plan]) => {
                 setCourses(courses);

diff --git a/client/src/pages/Programmes/InlineRegulations.js b/client/src/pages/Programmes/InlineRegulations.js
@@ -28,12 +28,6 @@ const InlineRegulations = ({ closeEdit, programme, notifyUpdate, regulation }) =
     const [points, setPoints] = useState(15);
     const [pointRequirement, setPointRequirement] = useState("EXACTLY");
 
-    const handleAddCourse = (course) => {
-        if (!courses.includes(course)) {
-            setCourses((oldCourses) => [course, ...oldCourses]);
-        }
-    };
-
     const handleRemoveCourse = (courseId) => {
         const filteredCourses = courses.filter((course) => course._id !== courseId);
         setCourses(filteredCourses);
@@ -126,8 +120,10 @@ const InlineRegulations = ({ closeEdit, programme, notifyUpdate, regulation }) =
                 {/* Course Dropdown */}
                 <Flex direction="row" width="55%" align="center">
                     <SingleSelect
-                        onChange={(course) => handleAddCourse(course)}
-                        data={data.map((course) => ({ value: course, label: course.courseCode }))}
+                        onChange={(course) => setCourses([...courses, course])}
+                        data={data
+                            .filter((course) => !courses.includes(course))
+                            .map((course) => ({ value: course, label: course.courseCode }))}
                         placeholder="Search"
                     />
                     <Flex
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ const fetchAllCourses = async (subject, year) => { @@
             () => {
                 controller.abort();
             },
-,
+,
         );
         try {
@@ Expand All @@
             () => {
                 controller.abort();
             },
-,
+,
         );
         try {
@@ Expand Down @@