Sort the courseruns by enrollment date so we grab the closest one

mitodl · Jan 4, 2024 · 335193c · 335193c
1 parent 59db8bb
commit 335193c
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/frontend/public/src/components/CourseProductDetailEnroll.js b/frontend/public/src/components/CourseProductDetailEnroll.js
@@ -86,14 +86,26 @@ export class CourseProductDetailEnroll extends React.Component<
   resolveFirstEnrollableRun() {
     const { courseRuns } = this.props
 
-    const enrollableRun = courseRuns.find((run: EnrollmentFlaggedCourseRun) => {
-      return (
-        (run.enrollment_start === null ||
-          moment(run.enrollment_start).isBefore(moment.now())) &&
-        (run.enrollment_end === null ||
-          moment(run.enrollment_end).isAfter(moment.now()))
-      )
-    })
+    const enrollableRun = courseRuns
+      .sort((a: EnrollmentFlaggedCourseRun, b: EnrollmentFlaggedCourseRun) => {
+        if (moment(a.enrollment_start).isBefore(moment(b.enrollment_start))) {
+          return -1
+        } else if (
+          moment(a.enrollment_start).isAfter(moment(b.enrollment_start))
+        ) {
+          return 1
+        } else {
+          return 0
+        }
+      })
+      .find((run: EnrollmentFlaggedCourseRun) => {
+        return (
+          (run.enrollment_start === null ||
+            moment(run.enrollment_start).isBefore(moment.now())) &&
+          (run.enrollment_end === null ||
+            moment(run.enrollment_end).isAfter(moment.now()))
+        )
+      })
 
     return enrollableRun
   }