ref: Update useAvailablePlans to have isSentry/TeamPlan AND remove is…

…SentryPlan helper for GQL field (#3610)
codecov · Jan 6, 2025 · 113a97f · 113a97f
1 parent f7044f2
commit 113a97f
Show file tree

Hide file tree

Showing 64 changed files with 485 additions and 213 deletions.
diff --git a/src/pages/AccountSettings/AccountSettings.test.jsx b/src/pages/AccountSettings/AccountSettings.test.jsx
@@ -168,6 +168,7 @@ describe('AccountSettings', () => {
                   planValue === Plans.USERS_TEAMM ||
                   planValue === Plans.USERS_TEAMY,
                 isTrialPlan: false,
+                isSentryPlan: false,
               },
             },
           },

diff --git a/src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx b/src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx
@@ -156,6 +156,7 @@ describe('AccountSettingsSideMenu', () => {
                   planValue === Plans.USERS_TEAMM ||
                   planValue === Plans.USERS_TEAMY,
                 isTrialPlan: false,
+                isSentryPlan: false,
               },
             },
           },

diff --git a/src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx b/src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx
@@ -220,6 +220,7 @@ describe('DefaultOrgSelector', () => {
                 isTeamPlan:
                   value === Plans.USERS_TEAMM || value === Plans.USERS_TEAMY,
                 isTrialPlan: value === Plans.USERS_TRIAL,
+                isSentryPlan: false,
                 trialStatus,
                 value,
               },

diff --git a/src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx b/src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx
@@ -29,6 +29,7 @@ const mockPlanData = {
   isEnterprisePlan: false,
   isFreePlan: true,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
   baseUnitPrice: 10,

diff --git a/src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx b/src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx
@@ -43,6 +43,7 @@ const mockPlanData = {
   isEnterprisePlan: false,
   isFreePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
 }

diff --git a/src/pages/MembersPage/MembersList/MembersList.test.jsx b/src/pages/MembersPage/MembersList/MembersList.test.jsx
@@ -53,6 +53,7 @@ const mockActiveUserRequest = {
 const mockPlanData = {
   isEnterprisePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTrialPlan: false,
   baseUnitPrice: 10,
   benefits: [],

diff --git a/src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.jsx b/src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.jsx
@@ -92,6 +92,7 @@ const queryClient = new QueryClient({
 const mockPlanData = {
   isEnterprisePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTrialPlan: false,
   baseUnitPrice: 10,
   benefits: [],

diff --git a/src/pages/OwnerPage/HeaderBanners/ExceededUploadsAlert/ExceededUploadsAlert.test.jsx b/src/pages/OwnerPage/HeaderBanners/ExceededUploadsAlert/ExceededUploadsAlert.test.jsx
@@ -40,6 +40,7 @@ const mockPlanDataResponse = {
   isEnterprisePlan: false,
   isFreePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
 }

diff --git a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.test.jsx b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.test.jsx
@@ -43,6 +43,7 @@ const mockPlanDataResponse = {
   isEnterprisePlan: false,
   isFreePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
 }

diff --git a/src/pages/OwnerPage/HeaderBanners/ReachingUploadLimitAlert/ReachingUploadLimitAlert.test.jsx b/src/pages/OwnerPage/HeaderBanners/ReachingUploadLimitAlert/ReachingUploadLimitAlert.test.jsx
@@ -33,6 +33,7 @@ const mockPlanDataResponse = {
   isEnterprisePlan: false,
   isFreePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
   trialStatus: TrialStatuses.NOT_STARTED,

diff --git a/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.test.tsx b/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.test.tsx
@@ -40,6 +40,7 @@ const mockResponse = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isEnterprisePlan: false,
+  isSentryPlan: false,
   isProPlan: false,
   isTrialPlan: false,
 }

diff --git a/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.test.tsx b/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.test.tsx
@@ -24,6 +24,8 @@ const teamPlans = [
     marketingName: 'Users Team',
     monthlyUploadLimit: 2500,
     value: Plans.USERS_TEAMM,
+    isTeamPlan: true,
+    isSentryPlan: false,
   },
   {
     baseUnitPrice: 5,
@@ -32,6 +34,8 @@ const teamPlans = [
     marketingName: 'Users Team',
     monthlyUploadLimit: 2500,
     value: Plans.USERS_TEAMY,
+    isTeamPlan: true,
+    isSentryPlan: false,
   },
 ]
 
@@ -47,6 +51,8 @@ const mockAvailablePlans = ({ hasTeamPlans }: { hasTeamPlans: boolean }) => [
       'Unlimited private repositories',
     ],
     monthlyUploadLimit: 250,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -60,6 +66,8 @@ const mockAvailablePlans = ({ hasTeamPlans }: { hasTeamPlans: boolean }) => [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   ...(hasTeamPlans ? teamPlans : []),
 ]
@@ -81,6 +89,7 @@ const mockPlanData = {
   isEnterprisePlan: false,
   isFreePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
 }

diff --git a/src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/DowngradePlan/DowngradePlan.test.jsx b/src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/DowngradePlan/DowngradePlan.test.jsx
@@ -32,6 +32,7 @@ const mockPlanData = {
       isEnterprisePlan: false,
       isFreePlan: true,
       isProPlan: false,
+      isSentryPlan: false,
       isTeamPlan: false,
       isTrialPlan: false,
       baseUnitPrice: 10,

diff --git a/...ubRoutes/CancelPlanPage/subRoutes/TeamPlanSpecialOffer/TeamPlanCard/TeamPlanCard.test.tsx b/...ubRoutes/CancelPlanPage/subRoutes/TeamPlanSpecialOffer/TeamPlanCard/TeamPlanCard.test.tsx
@@ -22,6 +22,8 @@ const mockAvailablePlans = [
       'Unlimited private repositories',
     ],
     monthlyUploadLimit: 250,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -35,6 +37,8 @@ const mockAvailablePlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -48,6 +52,8 @@ const mockAvailablePlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -61,6 +67,8 @@ const mockAvailablePlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -74,6 +82,8 @@ const mockAvailablePlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     baseUnitPrice: 6,
@@ -82,6 +92,8 @@ const mockAvailablePlans = [
     marketingName: 'Users Team',
     monthlyUploadLimit: 2500,
     value: Plans.USERS_TEAMM,
+    isTeamPlan: true,
+    isSentryPlan: false,
   },
   {
     baseUnitPrice: 5,
@@ -90,6 +102,8 @@ const mockAvailablePlans = [
     marketingName: 'Users Team',
     monthlyUploadLimit: 2500,
     value: Plans.USERS_TEAMY,
+    isTeamPlan: true,
+    isSentryPlan: false,
   },
 ]
 

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx
@@ -53,6 +53,7 @@ const mockPlanDataResponse = {
   isEnterprisePlan: false,
   isFreePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
 }

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/CurrentPlanCard.test.tsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/CurrentPlanCard.test.tsx
@@ -27,6 +27,7 @@ const proPlanDetails = {
     isEnterprisePlan: false,
     isFreePlan: false,
     isProPlan: true,
+    isSentryPlan: false,
     isTeamPlan: true,
     isTrialPlan: false,
   },
@@ -46,6 +47,7 @@ const freePlanDetails = {
     isEnterprisePlan: false,
     isFreePlan: true,
     isProPlan: false,
+    isSentryPlan: false,
     isTeamPlan: false,
     isTrialPlan: false,
   },
@@ -65,6 +67,7 @@ const enterprisePlan = {
     isEnterprisePlan: true,
     isFreePlan: false,
     isProPlan: false,
+    isSentryPlan: false,
     isTeamPlan: false,
     isTrialPlan: false,
   },
@@ -84,6 +87,7 @@ const usesInvoiceTeamPlan = {
     isEnterprisePlan: false,
     isFreePlan: false,
     isProPlan: false,
+    isSentryPlan: false,
     isTeamPlan: true,
     isTrialPlan: false,
   },
@@ -103,6 +107,7 @@ const trialPlanDetails = {
     isProPlan: false,
     isTeamPlan: true,
     isTrialPlan: true,
+    isSentryPlan: false,
   },
 }
 

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.jsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.jsx
@@ -40,13 +40,11 @@ function FreePlanCard({ plan, scheduledPhase }) {
     planData?.plan?.trialStatus === TrialStatuses.ONGOING
 
   let benefits = plan?.benefits
-  let planValue = plan?.value
   let baseUnitPrice = plan?.baseUnitPrice
   let marketingName = plan?.marketingName
 
   if (trialOngoing) {
     benefits = planData?.pretrialPlan?.benefits
-    planValue = planData?.pretrialPlan?.value
     baseUnitPrice = planData?.pretrialPlan?.baseUnitPrice
     marketingName = planData?.pretrialPlan?.marketingName
   }
@@ -77,7 +75,6 @@ function FreePlanCard({ plan, scheduledPhase }) {
             <div className="mb-4">
               <PlanPricing
                 plan={planData?.plan}
-                value={planValue}
                 baseUnitPrice={baseUnitPrice}
               />
             </div>

diff --git a/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.test.jsx b/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.test.jsx
@@ -28,6 +28,8 @@ const allPlans = [
       'Unlimited private repositories',
     ],
     monthlyUploadLimit: 250,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -41,6 +43,8 @@ const allPlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -54,6 +58,8 @@ const allPlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -67,6 +73,8 @@ const allPlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     marketingName: 'Pro Team',
@@ -80,6 +88,8 @@ const allPlans = [
       'Priority Support',
     ],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: false,
   },
   {
     baseUnitPrice: 6,
@@ -88,6 +98,8 @@ const allPlans = [
     marketingName: 'Users Team',
     monthlyUploadLimit: 2500,
     value: Plans.USERS_TEAMM,
+    isTeamPlan: true,
+    isSentryPlan: false,
   },
   {
     baseUnitPrice: 5,
@@ -96,6 +108,8 @@ const allPlans = [
     marketingName: 'Users Team',
     monthlyUploadLimit: 2500,
     value: Plans.USERS_TEAMY,
+    isTeamPlan: true,
+    isSentryPlan: false,
   },
 ]
 
@@ -107,6 +121,8 @@ const sentryPlans = [
     baseUnitPrice: 0,
     benefits: ['Includes 5 seats', 'Unlimited public repositories'],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: true,
   },
   {
     marketingName: 'Sentry',
@@ -115,6 +131,8 @@ const sentryPlans = [
     baseUnitPrice: 10,
     benefits: ['Includes 5 seats', 'Unlimited private repositories'],
     monthlyUploadLimit: null,
+    isTeamPlan: false,
+    isSentryPlan: true,
   },
 ]
 
@@ -128,6 +146,7 @@ const freePlan = {
   isFreePlan: true,
   isEnterprisePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTeamPlan: false,
   isTrialPlan: false,
 }
@@ -154,6 +173,7 @@ const mockPlanData = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isProPlan: false,
+  isSentryPlan: false,
   isTrialPlan: false,
 }