From d2031fdd329801a21b0b35a540465cb3411f8a43 Mon Sep 17 00:00:00 2001
From: Tiago-Salles <tiagosalles20@gmail.com>
Date: Tue, 9 Sep 2025 16:40:41 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F(course-runs):=20refactor=20s?=
 =?UTF-8?q?elf=20paced=20course=20availability=20presentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Changed self paced course availability presentation
- Remove the entire run component if other runs list is empty
---
 .../components/SyllabusAsideList/index.tsx    | 24 ++++-------
 .../SyllabusCourseRunCompacted/index.tsx      | 43 +++++++++++++------
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusAsideList/index.tsx b/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusAsideList/index.tsx
index 95ed09e1b2..1d9dcce55a 100644
--- a/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusAsideList/index.tsx
+++ b/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusAsideList/index.tsx
@@ -108,28 +108,20 @@ export const SyllabusAsideList = ({
 
   const showLanguages = CourseRunHelper.IsAllCourseRunsWithSameLanguages(courseRuns);
 
+  // If there are no runs to display at all, don't render anything
+  if (openedRuns.length <= 1 && otherRuns.length === 0) {
+    return null;
+  }
+
   return (
     <>
       <h2 className="course-detail__title">
-        {openedRuns.length === 1 ? (
-          <FormattedMessage {...messages.otherCourseRuns} />
-        ) : (
+        {openedRuns.length > 1 ? (
           <FormattedMessage {...messages.courseRunsTitle} />
+        ) : (
+          <FormattedMessage {...messages.otherCourseRuns} />
         )}
       </h2>
-      {openedRuns.length <= 1 && otherRuns.length === 0 && (
-        <div className="course-detail__row course-detail__no-runs">
-          {openedRuns.length === 0 ? (
-            <p>
-              <FormattedMessage {...messages.noCourseRuns} />
-            </p>
-          ) : (
-            <p>
-              <FormattedMessage {...messages.noOtherCourseRuns} />
-            </p>
-          )}
-        </div>
-      )}
       {openedRuns.length > 1 && (
         <div
           id="courseDetailsRunsOpen"
diff --git a/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusCourseRunCompacted/index.tsx b/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusCourseRunCompacted/index.tsx
index efb6e5605e..16dea31115 100644
--- a/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusCourseRunCompacted/index.tsx
+++ b/src/frontend/js/widgets/SyllabusCourseRunsList/components/SyllabusCourseRunCompacted/index.tsx
@@ -34,13 +34,18 @@ const messages = defineMessages({
   selfPaceRunPeriod: {
     id: 'components.SyllabusCourseRunCompacted.selfPaceCoursePeriod',
     description: 'Course date of an opened and self paced course run block',
-    defaultMessage: 'Available until {endDate}',
+    defaultMessage: 'Until {endDate, select, undefined {} other {{endDate}}}',
   },
   selfPaceNoEndDate: {
     id: 'components.SyllabusCourseRunCompacted.selfPaceNoEndDate',
     description: 'Self paced course run block with no end date',
     defaultMessage: 'Available',
   },
+  enrollment: {
+    id: 'components.SyllabusCourseRun.enrollment',
+    description: 'Title of the enrollment dates section of an opened course run block',
+    defaultMessage: 'Enrollment',
+  },
   coursePrice: {
     id: 'components.SyllabusCourseRunCompacted.coursePrice',
     description: 'Title of the course enrollment price section of an opened course run block',
@@ -105,6 +110,7 @@ const OpenedSelfPacedCourseRun = ({
   let enrollmentDiscountedPrice = '';
   let certificatePrice = '';
   let certificateDiscountedPrice = '';
+  const enrollmentEnd = courseRun.enrollment_end ? formatDate(courseRun.enrollment_end) : '...';
 
   if (courseRun.offer) {
     const offer = courseRun.offer.toUpperCase().replaceAll(' ', '_');
@@ -157,19 +163,32 @@ const OpenedSelfPacedCourseRun = ({
     <>
       {courseRun.title && <h3>{StringHelper.capitalizeFirst(courseRun.title)}</h3>}
       <dl>
-        {!showLanguages && (
-          <dt>
-            <FormattedMessage {...messages.course} />
-          </dt>
-        )}
         <dd>
           {hasEndDate ? (
-            <FormattedMessage
-              {...messages.selfPaceRunPeriod}
-              values={{
-                endDate: end,
-              }}
-            />
+            <>
+              <dt>
+                <FormattedMessage {...messages.enrollment} />
+              </dt>
+              <dd>
+                <FormattedMessage
+                  {...messages.selfPaceRunPeriod}
+                  values={{
+                    endDate: enrollmentEnd,
+                  }}
+                />
+              </dd>
+              <dt>
+                <FormattedMessage {...messages.course} />
+              </dt>
+              <dd>
+                <FormattedMessage
+                  {...messages.selfPaceRunPeriod}
+                  values={{
+                    endDate: end,
+                  }}
+                />
+              </dd>
+            </>
           ) : (
             <FormattedMessage {...messages.selfPaceNoEndDate} />
           )}