chore: Gate expiration subs modal by license state as well as feature…

… toggle. (#1216)
openedx · Oct 30, 2024 · 72ff986 · 72ff986
1 parent 96970cf
commit 72ff986
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/src/components/expired-subscription-modal/index.jsx b/src/components/expired-subscription-modal/index.jsx
@@ -5,9 +5,11 @@ import DOMPurify from 'dompurify';
 import { useSubscriptions } from '../app/data';
 
 const ExpiredSubscriptionModal = () => {
-  const { data: { customerAgreement } } = useSubscriptions();
+  const { data: { customerAgreement, subscriptionLicense } } = useSubscriptions();
   const [isOpen] = useToggle(true);
-  if (!customerAgreement?.hasCustomLicenseExpirationMessaging) {
+  const displaySubscriptionExpirationModal = customerAgreement?.hasCustomLicenseExpirationMessaging
+      && !subscriptionLicense?.subscriptionPlan.isCurrent;
+  if (!displaySubscriptionExpirationModal) {
     return null;
   }
   return (

diff --git a/src/components/expired-subscription-modal/tests/ExpiredSubscriptionModal.test.jsx b/src/components/expired-subscription-modal/tests/ExpiredSubscriptionModal.test.jsx
@@ -21,6 +21,11 @@ describe('<ExpiredSubscriptionModal />', () => {
           expiredSubscriptionModalMessaging: null,
           urlForButtonInModal: null,
         },
+        subscriptionLicense: {
+          subscriptionPlan: {
+            isCurrent: true,
+          },
+        },
       },
     });
   });
@@ -30,7 +35,7 @@ describe('<ExpiredSubscriptionModal />', () => {
     expect(container).toBeEmptyDOMElement();
   });
 
-  test('renderwithrouters modal with messaging when `hasCustomLicenseExpirationMessaging` is true', () => {
+  test('does not renderwithrouter if learner has a current license', () => {
     useSubscriptions.mockReturnValue({
       data: {
         customerAgreement: {
@@ -40,6 +45,33 @@ describe('<ExpiredSubscriptionModal />', () => {
           expiredSubscriptionModalMessaging: '<p>Your subscription has expired.</p>',
           urlForButtonInModal: '/renew',
         },
+        subscriptionLicense: {
+          subscriptionPlan: {
+            isCurrent: true,
+          },
+        },
+      },
+    });
+
+    const { container } = renderWithRouter(<ExpiredSubscriptionModal />);
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  test('renderwithrouters modal with messaging when `hasCustomLicenseExpirationMessaging` is true and license is expired', () => {
+    useSubscriptions.mockReturnValue({
+      data: {
+        customerAgreement: {
+          hasCustomLicenseExpirationMessaging: true,
+          modalHeaderText: 'Expired Subscription',
+          buttonLabelInModal: 'Continue Learning',
+          expiredSubscriptionModalMessaging: '<p>Your subscription has expired.</p>',
+          urlForButtonInModal: '/renew',
+        },
+        subscriptionLicense: {
+          subscriptionPlan: {
+            isCurrent: false,
+          },
+        },
       },
     });