fix: ensure multiple subs work properly when 1 has previously expired (…

…#790)
openedx · Jul 20, 2023 · df27b82 · df27b82
1 parent e1a4753
commit df27b82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/components/course/data/tests/utils.test.jsx b/src/components/course/data/tests/utils.test.jsx
@@ -692,7 +692,6 @@ describe('getSubscriptionDisabledEnrollmentReasonType', () => {
         },
       ],
     };
-
     const reasonType = getSubscriptionDisabledEnrollmentReasonType({
       customerAgreementConfig,
       catalogsWithCourse,

diff --git a/src/components/course/data/utils.jsx b/src/components/course/data/utils.jsx
@@ -679,12 +679,14 @@ export const getSubscriptionDisabledEnrollmentReasonType = ({
   const subscriptionsApplicableToCourse = customerAgreementConfig?.subscriptions?.filter(
     subscription => catalogsWithCourse.includes(subscription?.enterpriseCatalogUuid),
   );
-  const hasExpiredSubscriptions = subscriptionsApplicableToCourse?.filter(
+  const hasApplicableSubscriptions = subscriptionsApplicableToCourse.length > 0;
+
+  const hasExpiredSubscriptions = hasApplicableSubscriptions && subscriptionsApplicableToCourse.every(
     subscription => subscription.daysUntilExpirationIncludingRenewals < 0,
-  )?.length > 0;
-  const hasExhaustedSubscriptions = subscriptionsApplicableToCourse?.filter(
+  );
+  const hasExhaustedSubscriptions = hasApplicableSubscriptions && subscriptionsApplicableToCourse.every(
     subscription => subscription?.licenses?.unassigned === 0,
-  )?.length > 0;
+  );
   const applicableSubscriptionNonExpiredNonExhausted = subscriptionsApplicableToCourse?.find(
     subscription => subscription.daysUntilExpirationIncludingRenewals >= 0 && subscription?.licenses?.unassigned > 0,
   );