fix: changing TRIAL variable to self-service-trial (#1727)

* fix: changing TRIAL variable to self-service-trial

* fix: PR request

Co-authored-by: Troy Sankey <[email protected]>

---------

Co-authored-by: Troy Sankey <[email protected]>

Author: kiram15

src/components/subscriptions/MultipleSubscriptionPicker.jsx

@@ -10,15 +10,15 @@ import {
 import { Error, Launch, SpinnerSimple } from '@openedx/paragon/icons';
 
 import SubscriptionCard from './SubscriptionCard';
-import { DEFAULT_LEAD_TEXT } from './data/constants';
+import { DEFAULT_LEAD_TEXT, SELF_SERVICE_PAID, SELF_SERVICE_TRIAL } from './data/constants';
 import EnterpriseAccessApiService from '../../data/services/EnterpriseAccessApiService';
 
 const MultipleSubscriptionsPicker = ({
   enterpriseUuid, leadText, subscriptions, createActions,
 }) => {
   const intl = useIntl();
   const [stripeSessionStatus, setStripeSessionStatus] = useState('default');
-  const hasSelfServiceSubs = subscriptions.some(sub => ['self-service-paid', 'self-service-trial'].includes(sub.planType));
+  const hasSelfServiceSubs = subscriptions.some(sub => [SELF_SERVICE_PAID, SELF_SERVICE_TRIAL].includes(sub.planType));
 
   const handleManageSubscriptionClick = async () => {
     setStripeSessionStatus('pending');

src/components/subscriptions/SubscriptionCard.jsx

@@ -10,7 +10,7 @@ import { FormattedMessage, getLocale } from '@edx/frontend-platform/i18n';
 
 import classNames from 'classnames';
 import {
-  ACTIVE, FREE_TRIAL_BADGE, TRIAL, SCHEDULED, SUBSCRIPTION_STATUS_BADGE_MAP, ENDED,
+  ACTIVE, ENDED, FREE_TRIAL_BADGE, SCHEDULED, SELF_SERVICE_TRIAL, SUBSCRIPTION_STATUS_BADGE_MAP,
 } from './data/constants';
 import { useUpcomingInvoiceAmount } from './data/hooks';
 import { SubscriptionContext } from './SubscriptionData';
@@ -91,7 +91,7 @@ const SubscriptionCard = ({
         <Badge className="mr-2" variant={SUBSCRIPTION_STATUS_BADGE_MAP[subscriptionStatus].variant}>
           {subscriptionStatus}
         </Badge>
-        {planType === TRIAL && (
+        {planType === SELF_SERVICE_TRIAL && (
           <>
             <Badge className="mr-2" variant="info">
               {FREE_TRIAL_BADGE}
@@ -118,7 +118,7 @@ const SubscriptionCard = ({
             )}
           </>
         )}
-        {planType !== TRIAL && (
+        {planType !== SELF_SERVICE_TRIAL && (
           <span>
             {formattedStartDate} - {formattedExpirationDate}
           </span>

src/components/subscriptions/data/constants.js

@@ -58,6 +58,10 @@ export const SUBSCRIPTION_STATUS_BADGE_MAP = {
   [TRIAL]: { variant: 'info' },
 };
 
+// Self-service plan types
+export const SELF_SERVICE_TRIAL = 'Self-service Trial';
+export const SELF_SERVICE_PAID = 'Self-service Paid';
+
 export const FREE_TRIAL_BADGE = 'Free Trial';
 
 // Browse and request constants `BrowseAndRequestAlert`

src/components/subscriptions/data/hooks.js

@@ -5,11 +5,11 @@ import { camelCaseObject } from '@edx/frontend-platform/utils';
 import LicenseManagerApiService from '../../../data/services/LicenseManagerAPIService';
 import {
   NETWORK_ERROR_MESSAGE,
+  SELF_SERVICE_TRIAL,
   STRIPE_EVENT_SUMMARY,
   SUBSCRIPTION_USERS,
   SUBSCRIPTION_USERS_OVERVIEW,
   SUBSCRIPTIONS,
-  TRIAL,
 } from './constants';
 import EnterpriseAccessApiService from '../../../data/services/EnterpriseAccessApiService';
 
@@ -265,7 +265,7 @@ export const useUpcomingInvoiceAmount = ({ subPlanUuid, planType, setErrors }) =
       }
     };
     // only trial plans will have associated StripeEventSummaries
-    if (planType === TRIAL) {
+    if (planType === SELF_SERVICE_TRIAL) {
       fetchStripeEvent();
     } else {
       // return early prevent unnecessary calls to enterprise-access for non-trial plans

src/components/subscriptions/tests/MultipleSubscriptionsPicker.test.jsx

@@ -7,7 +7,7 @@ import '@testing-library/jest-dom/extend-expect';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 
 import { renderWithRouter } from '../../test/testUtils';
-import { DEFAULT_LEAD_TEXT } from '../data/constants';
+import { DEFAULT_LEAD_TEXT, SELF_SERVICE_PAID } from '../data/constants';
 import MultipleSubscriptionsPicker from '../MultipleSubscriptionPicker';
 import EnterpriseAccessApiService from '../../../data/services/EnterpriseAccessApiService';
 
@@ -50,7 +50,7 @@ const subsProps = {
       startDate: '2021-04-13',
       expirationDate: '2024-04-13',
       enterpriseCatalogUuid: firstCatalogUuid,
-      planType: 'self-service-paid',
+      planType: SELF_SERVICE_PAID,
       licenses: {
         allocated: 10,
         total: 20,

src/components/subscriptions/tests/SubscriptionCard.test.jsx

@@ -13,7 +13,7 @@ import {
 } from '@openedx/paragon';
 import { renderWithRouter } from '../../test/testUtils';
 import SubscriptionCard from '../SubscriptionCard';
-import { ENDED, FREE_TRIAL_BADGE, TRIAL } from '../data/constants';
+import { ENDED, FREE_TRIAL_BADGE, SELF_SERVICE_TRIAL } from '../data/constants';
 import EnterpriseAccessApiService from '../../../data/services/EnterpriseAccessApiService';
 
 const defaultSubscription = {
@@ -39,7 +39,7 @@ const trialSubscription = {
   title: 'Trial Plan',
   startDate: '2020-03-13',
   expirationDate: '2025-04-13',
-  planType: TRIAL,
+  planType: SELF_SERVICE_TRIAL,
 };
 const trialProps = {
   subscription: trialSubscription,
@@ -57,7 +57,7 @@ const endedTrialSubscription = {
   title: 'Trial Plan',
   startDate: '1999-03-13',
   expirationDate: '1999-04-13',
-  planType: TRIAL,
+  planType: SELF_SERVICE_TRIAL,
 };
 const endedTrialProps = {
   subscription: endedTrialSubscription,

src/components/subscriptions/tests/data/hooks.test.jsx

@@ -5,7 +5,7 @@ import LicenseManagerApiService from '../../../../data/services/LicenseManagerAP
 import EnterpriseAccessApiService from '../../../../data/services/EnterpriseAccessApiService';
 import { useSubscriptionUsersOverview, useUpcomingInvoiceAmount } from '../../data/hooks';
 
-import { TRIAL } from '../../data/constants';
+import { SELF_SERVICE_TRIAL } from '../../data/constants';
 
 const TEST_SUBSCRIPTION_PLAN_UUID = 'test-plan-uuid-1';
 
@@ -130,7 +130,7 @@ describe('useUpcomingInvoiceAmount', () => {
 
     const { result } = renderHook(() => useUpcomingInvoiceAmount({
       uuid: TEST_PLAN_UUID,
-      planType: TRIAL,
+      planType: SELF_SERVICE_TRIAL,
       setErrors,
     }));