codecov · adrian-codecov · Oct 31, 2023 · Oct 30, 2023
diff --git a/src/pages/DefaultOrgSelector/DefaultOrgSelector.jsx b/src/pages/DefaultOrgSelector/DefaultOrgSelector.jsx
@@ -102,7 +102,7 @@ function DefaultOrgSelector() {
     updateDefaultOrg({ username: selectedOrg })
 
     if (
-      isBasicPlan(planData?.plan?.planName) &&
+      isBasicPlan(planData?.plan?.value) &&
       selectedOrg !== currentUser?.user?.username &&
       isNewTrial
     ) {

diff --git a/src/pages/DefaultOrgSelector/DefaultOrgSelector.spec.jsx b/src/pages/DefaultOrgSelector/DefaultOrgSelector.spec.jsx
@@ -23,7 +23,7 @@ const mockTrialData = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: 'ONGOING',
   trialStartDate: '2023-01-01T08:55:25',
   trialEndDate: '2023-01-10T08:55:25',
@@ -73,7 +73,7 @@ describe('DefaultOrgSelector', () => {
     useUserData,
     isValidUser = true,
     trialStatus = 'NOT_STARTED',
-    planName = 'users-basic',
+    value = 'users-basic',
   } = {}) {
     const mockMutationVariables = jest.fn()
     const mockTrialMutationVariables = jest.fn()
@@ -103,15 +103,15 @@ describe('DefaultOrgSelector', () => {
               plan: {
                 ...mockTrialData,
                 trialStatus,
-                planName,
+                value,
               },
               pretrialPlan: {
                 baseUnitPrice: 10,
                 benefits: [],
                 billingRate: 'monthly',
                 marketingName: 'Users Basic',
                 monthlyUploadLimit: 250,
-                planName: 'users-basic',
+                value: 'users-basic',
               },
             },
           })
@@ -677,7 +677,7 @@ describe('DefaultOrgSelector', () => {
             },
           },
         },
-        planName: 'users-free',
+        value: 'users-free',
         myOrganizationsData: {
           me: {
             myOrganizations: {
@@ -956,7 +956,7 @@ describe('DefaultOrgSelector', () => {
             },
           },
         },
-        planName: 'users-basic',
+        value: 'users-basic',
       })
 
       render(<DefaultOrgSelector />, { wrapper: wrapper() })

diff --git a/src/pages/MembersPage/MembersActivation/Activation/Activation.jsx b/src/pages/MembersPage/MembersActivation/Activation/Activation.jsx
@@ -19,7 +19,7 @@ function Activation() {
   const planQuantity = accountDetails?.plan?.quantity || 0
 
   if (
-    isTrialPlan(planData?.plan?.planName) &&
+    isTrialPlan(planData?.plan?.value) &&
     planData?.plan?.trialStatus === TrialStatuses.ONGOING
   ) {
     return (
@@ -42,7 +42,7 @@ function Activation() {
   }
 
   if (
-    isFreePlan(planData?.plan?.planName) &&
+    isFreePlan(planData?.plan?.value) &&
     planData?.plan?.trialStatus === TrialStatuses.EXPIRED
   ) {
     return (

diff --git a/src/pages/MembersPage/MembersActivation/Activation/Activation.spec.jsx b/src/pages/MembersPage/MembersActivation/Activation/Activation.spec.jsx
@@ -29,7 +29,7 @@ const mockPlanData = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',
@@ -85,7 +85,7 @@ describe('Activation', () => {
               plan: {
                 ...mockPlanData,
                 trialStatus,
-                planName: planValue,
+                value: planValue,
               },
             },
           })

diff --git a/src/pages/MembersPage/MembersActivation/MembersActivation.jsx b/src/pages/MembersPage/MembersActivation/MembersActivation.jsx
@@ -21,7 +21,7 @@
 
   const showAutoActivate =
     !isUndefined(planAutoActivate) &&
-    !isTrialPlan(planData?.plan?.planName) &&
+    !isTrialPlan(planData?.plan?.value) &&
     planData?.plan?.trialStatus !== TrialStatuses.ONGOING
 
   return (

diff --git a/src/pages/MembersPage/MembersActivation/MembersActivation.spec.jsx b/src/pages/MembersPage/MembersActivation/MembersActivation.spec.jsx
@@ -30,7 +30,7 @@ const mockPlanData = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',
@@ -82,7 +82,7 @@ describe('Members Activation', () => {
               plan: {
                 ...mockPlanData,
                 trialStatus,
-                planName: planValue,
+                value: planValue,
               },
             },
           })

diff --git a/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.spec.tsx b/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.spec.tsx
@@ -32,7 +32,7 @@ const mockResponse = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',
@@ -97,7 +97,7 @@ describe('TrialReminder', () => {
                 trialStatus,
                 trialStartDate,
                 trialEndDate,
-                planName: planValue,
+                value: planValue,
               },
             },
           })

diff --git a/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.tsx b/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.tsx
@@ -50,7 +50,7 @@
     },
   })
 
-  const planValue = planData?.plan?.planName
+  const planValue = planData?.plan?.value
 
   const { trialNotStarted, trialOngoing, trialExpired, cannotTrial } =
     determineTrialStates({

diff --git a/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.jsx b/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.jsx
@@ -27,7 +27,7 @@ function CancelPlanPage() {
   const { data: planData } = usePlanData({ provider, owner })
 
   const isOnTrial =
-    isTrialPlan(planData?.plan?.planName) &&
+    isTrialPlan(planData?.plan?.value) &&
     planData?.plan?.trialStatus === TrialStatuses.ONGOING
 
   // redirect right away if the user is on an enterprise plan

diff --git a/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.spec.jsx b/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.spec.jsx
@@ -19,7 +19,7 @@ const mockPlanData = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',
@@ -105,7 +105,7 @@ describe('CancelPlanPage', () => {
               plan: {
                 ...mockPlanData,
                 trialStatus,
-                planName: planValue,
+                value: planValue,
               },
             },
           })

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.jsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.jsx
@@ -124,16 +124,16 @@
 
   const uploadsNumber = ownerData?.numberOfUploads
   const trialOngoing =
-    isTrialPlan(planData?.plan?.planName) &&
+    isTrialPlan(planData?.plan?.value) &&
     planData?.plan.trialStatus === TrialStatuses.ONGOING
 
   let benefits = plan?.benefits
-  let planName = plan?.value
+  let planValue = plan?.value
   let baseUnitPrice = plan?.baseUnitPrice
   let marketingName = plan?.marketingName
   if (trialOngoing) {
     benefits = planData?.pretrialPlan?.benefits
-    planName = planData?.pretrialPlan?.planName
+    planValue = planData?.pretrialPlan?.value
     baseUnitPrice = planData?.pretrialPlan?.baseUnitPrice
     marketingName = planData?.pretrialPlan?.marketingName
   }
@@ -161,7 +161,7 @@
           </div>
           <div className="flex flex-col gap-3 border-t pt-2 sm:border-0 sm:p-0">
             <p className="text-xs font-semibold">Pricing</p>
-            <PlanPricing value={planName} baseUnitPrice={baseUnitPrice} />
+            <PlanPricing value={planValue} baseUnitPrice={baseUnitPrice} />
             <div>
               {isNumber(uploadsNumber) && (
                 <p className="mt-4 text-xs text-ds-gray-senary">

diff --git a/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.spec.jsx b/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.spec.jsx
@@ -116,7 +116,7 @@ const mockPlanData = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',
@@ -130,7 +130,7 @@ const mockPreTrialPlanInfo = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
 }
 
 const server = setupServer()
@@ -192,7 +192,7 @@ describe('FreePlanCard', () => {
               plan: {
                 ...mockPlanData,
                 trialStatus,
-                planName: planValue,
+                value: planValue,
               },
               pretrialPlan: mockPreTrialPlanInfo,
             },

diff --git a/.../CurrentOrgPlan/CurrentPlanCard/FreePlanCard/ProPlanSubheading/ProPlanSubheading.spec.tsx b/.../CurrentOrgPlan/CurrentPlanCard/FreePlanCard/ProPlanSubheading/ProPlanSubheading.spec.tsx
@@ -14,7 +14,7 @@ const mockResponse = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',
@@ -67,7 +67,7 @@ describe('ProPlanSubheading', () => {
               plan: {
                 ...mockResponse,
                 trialStatus,
-                planName: planValue,
+                value: planValue,
               },
             },
           })

diff --git a/...outes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/ProPlanSubheading/ProPlanSubheading.tsx b/...outes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/ProPlanSubheading/ProPlanSubheading.tsx
@@ -21,7 +21,7 @@ function ProPlanSubheading() {
   // - user on a free plan
   // - trial status is not started
   if (
-    isFreePlan(planData?.plan?.planName) &&
+    isFreePlan(planData?.plan?.value) &&
     planData?.plan?.trialStatus === TrialStatuses.NOT_STARTED
   ) {
     return (
@@ -36,7 +36,7 @@ function ProPlanSubheading() {
   // - user is on a trial plan
   // - trial status is currently ongoing
   if (
-    isTrialPlan(planData?.plan?.planName) &&
+    isTrialPlan(planData?.plan?.value) &&
     planData?.plan?.trialStatus === TrialStatuses.ONGOING
   ) {
     return (
@@ -51,7 +51,7 @@ function ProPlanSubheading() {
   // - user is currently on a free plan
   // - trial status is expired
   if (
-    isFreePlan(planData?.plan?.planName) &&
+    isFreePlan(planData?.plan?.value) &&
     planData?.plan?.trialStatus === TrialStatuses.EXPIRED
   ) {
     return <p className="text-ds-gray-quinary">Your org trialed this plan</p>

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/ProPlanCard/ProPlanCard.spec.jsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/ProPlanCard/ProPlanCard.spec.jsx
@@ -38,8 +38,8 @@ describe('ProPlanCard', () => {
         wrapper,
       })
 
-      const planName = screen.getByText(/Pro Team plan/)
-      expect(planName).toBeInTheDocument()
+      const planValue = screen.getByText(/Pro Team plan/)
+      expect(planValue).toBeInTheDocument()
     })
 
     it('renders the benefits', () => {

diff --git a/...lanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/shared/ActionsBilling/ActionsBilling.jsx b/...lanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/shared/ActionsBilling/ActionsBilling.jsx
@@ -31,7 +31,7 @@
 
   const canStartTrial =
     planData?.plan?.trialStatus === TrialStatuses.NOT_STARTED &&
-    isFreePlan(planData?.plan?.planName)
+    isFreePlan(planData?.plan?.value)
 
   if (canStartTrial) {
     return (

diff --git a/...ge/subRoutes/CurrentOrgPlan/CurrentPlanCard/shared/ActionsBilling/ActionsBilling.spec.jsx b/...ge/subRoutes/CurrentOrgPlan/CurrentPlanCard/shared/ActionsBilling/ActionsBilling.spec.jsx
@@ -142,7 +142,7 @@ const mockTrialData = {
     billingRate: 'monthly',
     marketingName: 'Users Basic',
     monthlyUploadLimit: 250,
-    planName: 'users-basic',
+    value: 'users-basic',
     trialStatus: 'ONGOING',
     trialStartDate: '2023-01-01T08:55:25',
     trialEndDate: '2023-01-10T08:55:25',

diff --git a/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/InvoiceDetail.spec.jsx b/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/InvoiceDetail.spec.jsx
@@ -30,23 +30,23 @@ const invoice = {
       amount: -9449,
       currency: 'usd',
       period: { end: 1610473200, start: 1609298708 },
-      planName: 'users-pr-inappm',
+      value: 'users-pr-inappm',
       quantity: 19,
     },
     {
       description: null,
       amount: 72000,
       currency: 'usd',
       period: { end: 1640834708, start: 1609298708 },
-      planName: 'users-pr-inappy',
+      value: 'users-pr-inappy',
       quantity: 6,
     },
     {
       description: null,
       amount: 72000,
       currency: 'usd',
       period: { end: null, start: null },
-      planName: 'same period doesnt render date',
+      value: 'same period doesnt render date',
       quantity: 1,
     },
   ],

diff --git a/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/sections/InvoiceFooter.spec.jsx b/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/sections/InvoiceFooter.spec.jsx
@@ -26,23 +26,23 @@ const invoice = {
       amount: -9449,
       currency: 'usd',
       period: { end: 1610473200, start: 1609298708 },
-      planName: 'users-pr-inappm',
+      value: 'users-pr-inappm',
       quantity: 19,
     },
     {
       description: null,
       amount: 72000,
       currency: 'usd',
       period: { end: 1640834708, start: 1609298708 },
-      planName: 'users-pr-inappy',
+      value: 'users-pr-inappy',
       quantity: 6,
     },
     {
       description: null,
       amount: 72000,
       currency: 'usd',
       period: { end: null, start: null },
-      planName: 'same period doesnt render date',
+      value: 'same period doesnt render date',
       quantity: 1,
     },
   ],

diff --git a/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/sections/InvoiceHeader.spec.jsx b/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/sections/InvoiceHeader.spec.jsx
@@ -27,23 +27,23 @@ const mockInvoice = ({ status = 'paid' } = {}) => {
         amount: -9449,
         currency: 'usd',
         period: { end: 1610473200, start: 1609298708 },
-        planName: 'users-pr-inappm',
+        value: 'users-pr-inappm',
         quantity: 19,
       },
       {
         description: null,
         amount: 72000,
         currency: 'usd',
         period: { end: 1640834708, start: 1609298708 },
-        planName: 'users-pr-inappy',
+        value: 'users-pr-inappy',
         quantity: 6,
       },
       {
         description: null,
         amount: 72000,
         currency: 'usd',
         period: { end: null, start: null },
-        planName: 'same period doesnt render date',
+        value: 'same period doesnt render date',
         quantity: 1,
       },
     ],

diff --git a/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/sections/InvoiceItems.jsx b/src/pages/PlanPage/subRoutes/InvoiceDetailsPage/sections/InvoiceItems.jsx
@@ -28,7 +28,7 @@ InvoiceItems.propTypes = {
         quantity: PropTypes.number.isRequired,
         amount: PropTypes.number.isRequired,
         description: PropTypes.string,
-        planName: PropTypes.string,
+        value: PropTypes.string,
         period: PropTypes.shape({
           start: PropTypes.number,
           end: PropTypes.number,