merge and fix data

codecov · Oct 31, 2023 · 3ece823 · 3ece823
1 parent aef0120
commit 3ece823
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.jsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.jsx
@@ -45,6 +45,7 @@ function FreePlanCard({ plan, scheduledPhase }) {
   let planValue = plan?.value
   let baseUnitPrice = plan?.baseUnitPrice
   let marketingName = plan?.marketingName
+
   if (trialOngoing) {
     benefits = planData?.pretrialPlan?.benefits
     planValue = planData?.pretrialPlan?.value

diff --git a/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.spec.jsx b/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.spec.jsx
@@ -142,6 +142,7 @@ const mockPlanData = {
   trialEndDate: '',
   trialTotalDays: 0,
   pretrialUsersCount: 0,
+  planUserCount: 1,
 }
 
 const mockPreTrialPlanInfo = {
@@ -189,8 +190,8 @@ describe('FreePlanCard', () => {
       plans,
       trialStatus = TrialStatuses.CANNOT_TRIAL,
       planValue = 'users-basic',
-      planUserCount = 1,
       flagValue = false,
+      planUserCount = 1,
     } = {
       owner: {
         username: 'codecov',
@@ -220,6 +221,7 @@ describe('FreePlanCard', () => {
                 ...mockPlanData,
                 trialStatus,
                 value: planValue,
+                planUserCount,
               },
               pretrialPlan: mockPreTrialPlanInfo,
             },
@@ -379,7 +381,6 @@ describe('FreePlanCard', () => {
           planValue: 'users-trial',
           trialStatus: TrialStatuses.ONGOING,
           plans: allPlans,
-          planUserCount: 4,
           flagValue: true,
         })
 
@@ -396,7 +397,6 @@ describe('FreePlanCard', () => {
           planValue: 'users-trial',
           trialStatus: TrialStatuses.ONGOING,
           plans: allPlans,
-          planUserCount: 4,
         })
 
         render(<FreePlanCard plan={freePlan} />, {

diff --git a/...subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.jsx b/...subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.jsx
@@ -51,7 +51,7 @@ function PlanUpgradeTeam() {
             </div>
             <div className="flex self-start">
               <Button to={{ pageName: 'upgradeOrgPlan' }} variant="primary">
-                {isFreePlan(currentPlan?.planName)
+                {isFreePlan(currentPlan?.value)
                   ? 'Upgrade to Team'
                   : 'Manage plan'}
               </Button>

diff --git a/...utes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.spec.jsx b/...utes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.spec.jsx
@@ -17,7 +17,7 @@ const mockPlanBasic = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',
@@ -32,7 +32,7 @@ const mockPlanPro = {
   billingRate: 'monthly',
   marketingName: 'Pro',
   monthlyUploadLimit: null,
-  planName: 'users-pr-inappm',
+  value: 'users-pr-inappm',
   trialStatus: TrialStatuses.CANNOT_TRIAL,
   trialStartDate: '',
   trialEndDate: '',
@@ -130,7 +130,7 @@ const mockPreTrialPlanInfo = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  planName: 'users-basic',
+  value: 'users-basic',
 }
 
 const server = setupServer()
@@ -199,7 +199,6 @@ describe('PlanUpgradeTeam', () => {
     })
 
     it('show the benefits list', async () => {
-      setup()
       render(<PlanUpgradeTeam />, {
         wrapper,
       })

diff --git a/src/services/account/usePlanData.ts b/src/services/account/usePlanData.ts
@@ -91,7 +91,6 @@ export const usePlanData = ({ provider, owner, opts }: UseTrialArgs) => {
         },
       }).then((res) => {
         const parsedRes = PlanDataSchema?.safeParse(res?.data?.owner)
-
         if (!parsedRes.success) {
           return {}
         }