ref: Migrate to isTeamPlan GQ field (#3592)

codecov · Dec 20, 2024 · fdd77d4 · fdd77d4
1 parent 9034486
commit fdd77d4
Show file tree

Hide file tree

Showing 58 changed files with 153 additions and 52 deletions.
diff --git a/src/pages/AccountSettings/AccountSettings.test.jsx b/src/pages/AccountSettings/AccountSettings.test.jsx
@@ -163,6 +163,9 @@ describe('AccountSettings', () => {
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planValue === Plans.USERS_TEAMM ||
+                  planValue === Plans.USERS_TEAMY,
               },
             },
           },

diff --git a/src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx b/src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx
@@ -151,6 +151,9 @@ describe('AccountSettingsSideMenu', () => {
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planValue === Plans.USERS_TEAMM ||
+                  planValue === Plans.USERS_TEAMY,
               },
             },
           },

diff --git a/src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx b/src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx
@@ -214,6 +214,8 @@ describe('DefaultOrgSelector', () => {
                 ...mockTrialData,
                 isEnterprisePlan: false,
                 isFreePlan: false,
+                isTeamPlan:
+                  value === Plans.USERS_TEAMM || value === Plans.USERS_TEAMY,
                 trialStatus,
                 value,
               },

diff --git a/src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx b/src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx
@@ -28,6 +28,7 @@ const mockedAccountDetails = {
 const mockPlanData = {
   isEnterprisePlan: false,
   isFreePlan: true,
+  isTeamPlan: false,
   baseUnitPrice: 10,
   benefits: [],
   billingRate: BillingRate.MONTHLY,

diff --git a/src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx b/src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx
@@ -42,6 +42,7 @@ const mockPlanData = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const server = setupServer()

diff --git a/src/pages/MembersPage/MembersList/MembersList.test.jsx b/src/pages/MembersPage/MembersList/MembersList.test.jsx
@@ -130,6 +130,9 @@ describe('MembersList', () => {
                 ...mockPlanData,
                 value: planName,
                 isFreePlan: planName === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planName === Plans.USERS_TEAMM ||
+                  planName === Plans.USERS_TEAMY,
                 planUserCount,
                 hasSeatsLeft,
               },

diff --git a/src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.jsx b/src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.jsx
@@ -158,6 +158,9 @@ describe('MembersTable', () => {
                 ...mockPlanData,
                 value: planName,
                 isFreePlan: planName === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planName === Plans.USERS_TEAMM ||
+                  planName === Plans.USERS_TEAMY,
                 planUserCount,
                 hasSeatsLeft,
               },

diff --git a/src/pages/OwnerPage/HeaderBanners/ExceededUploadsAlert/ExceededUploadsAlert.test.jsx b/src/pages/OwnerPage/HeaderBanners/ExceededUploadsAlert/ExceededUploadsAlert.test.jsx
@@ -39,6 +39,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 beforeAll(() => {

diff --git a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.test.jsx b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.test.jsx
@@ -42,6 +42,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const mockPlanDataResponseNoUploadLimit = {

diff --git a/src/pages/OwnerPage/HeaderBanners/ReachingUploadLimitAlert/ReachingUploadLimitAlert.test.jsx b/src/pages/OwnerPage/HeaderBanners/ReachingUploadLimitAlert/ReachingUploadLimitAlert.test.jsx
@@ -32,6 +32,7 @@ const mockPlanDataResponse = {
   value: Plans.USERS_PR_INAPPM,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
   trialStatus: TrialStatuses.NOT_STARTED,
   trialStartDate: '',
   trialEndDate: '',

diff --git a/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.test.tsx b/src/pages/OwnerPage/Tabs/TrialReminder/TrialReminder.test.tsx
@@ -103,6 +103,9 @@ describe('TrialReminder', () => {
                 trialEndDate,
                 value: planValue,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planValue === Plans.USERS_TEAMM ||
+                  planValue === Plans.USERS_TEAMY,
               },
             },
           },

diff --git a/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.test.tsx b/src/pages/PlanPage/subRoutes/CancelPlanPage/CancelPlanPage.test.tsx
@@ -80,6 +80,7 @@ const mockPlanData = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const queryClient = new QueryClient({
@@ -158,6 +159,9 @@ describe('CancelPlanPage', () => {
                 value: planValue,
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planValue === Plans.USERS_TEAMM ||
+                  planValue === Plans.USERS_TEAMY,
               },
             },
           },

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx
@@ -52,6 +52,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const mockEnterpriseAccountDetailsNinetyPercent = {

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/CurrentPlanCard.test.tsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/CurrentPlanCard.test.tsx
@@ -26,6 +26,7 @@ const proPlanDetails = {
     billingRate: null,
     isEnterprisePlan: false,
     isFreePlan: false,
+    isTeamPlan: true,
   },
 }
 
@@ -42,6 +43,7 @@ const freePlanDetails = {
     ],
     isEnterprisePlan: false,
     isFreePlan: true,
+    isTeamPlan: false,
   },
 }
 
@@ -58,6 +60,7 @@ const enterprisePlan = {
     ],
     isEnterprisePlan: true,
     isFreePlan: false,
+    isTeamPlan: false,
   },
 }
 
@@ -74,6 +77,7 @@ const usesInvoiceTeamPlan = {
     ],
     isEnterprisePlan: false,
     isFreePlan: false,
+    isTeamPlan: true,
   },
   usesInvoice: true,
 }
@@ -88,6 +92,7 @@ const trialPlanDetails = {
     value: Plans.USERS_TRIAL,
     isEnterprisePlan: false,
     isFreePlan: false,
+    isTeamPlan: true,
   },
 }
 

diff --git a/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.test.jsx b/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.test.jsx
@@ -127,6 +127,7 @@ const freePlan = {
   monthlyUploadLimit: null,
   isFreePlan: true,
   isEnterprisePlan: false,
+  isTeamPlan: false,
 }
 
 const scheduledPhase = {
@@ -224,6 +225,9 @@ describe('FreePlanCard', () => {
                 value: planValue,
                 planUserCount,
                 isFreePlan: planValue === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planValue === Plans.USERS_TEAMM ||
+                  planValue === Plans.USERS_TEAMY,
               },
               pretrialPlan: mockPreTrialPlanInfo,
             },

diff --git a/...utes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.test.jsx b/...utes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.test.jsx
@@ -15,6 +15,7 @@ vi.mock('shared/plan/BenefitList', () => ({ default: () => 'BenefitsList' }))
 const mockPlanBasic = {
   isEnterprisePlan: false,
   isFreePlan: true,
+  isTeamPlan: false,
   baseUnitPrice: 0,
   benefits: ['Up to # user', 'Unlimited public repositories'],
   billingRate: BillingRate.MONTHLY,
@@ -33,6 +34,7 @@ const mockPlanBasic = {
 const mockPlanPro = {
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
   baseUnitPrice: 10,
   benefits: ['Up to # user', 'Unlimited public repositories'],
   billingRate: BillingRate.MONTHLY,
@@ -51,6 +53,7 @@ const mockPlanPro = {
 const mockPlanTrialing = {
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
   baseUnitPrice: 10,
   benefits: ['Up to # user', 'Unlimited public repositories'],
   billingRate: BillingRate.MONTHLY,

diff --git a/.../CurrentOrgPlan/CurrentPlanCard/FreePlanCard/ProPlanSubheading/ProPlanSubheading.test.tsx b/.../CurrentOrgPlan/CurrentPlanCard/FreePlanCard/ProPlanSubheading/ProPlanSubheading.test.tsx
@@ -25,6 +25,7 @@ const mockResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: true,
+  isTeamPlan: false,
 }
 
 const server = setupServer()

diff --git a/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/PaidPlanCard/PaidPlanCard.test.tsx b/...ages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/PaidPlanCard/PaidPlanCard.test.tsx
@@ -30,6 +30,7 @@ vi.mock('shared/plan/ScheduledPlanDetails', () => ({
 const mockProPlan = {
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
   marketingName: 'Pro',
   value: Plans.USERS_PR_INAPPM,
   billingRate: BillingRate.MONTHLY,
@@ -48,6 +49,7 @@ const mockProPlan = {
 const mockTeamPlan = {
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: true,
   marketingName: 'Team',
   value: Plans.USERS_TEAMM,
   billingRate: BillingRate.MONTHLY,

diff --git a/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/PaidPlanCard/PaidPlanCard.tsx b/src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/PaidPlanCard/PaidPlanCard.tsx
@@ -6,7 +6,6 @@ import { PlanPageDataQueryOpts } from 'pages/PlanPage/queries/PlanPageDataQueryO
 import { useAccountDetails, usePlanData } from 'services/account'
 import BenefitList from 'shared/plan/BenefitList'
 import ScheduledPlanDetails from 'shared/plan/ScheduledPlanDetails'
-import { isTeamPlan } from 'shared/utils/billing'
 
 import ActionsBilling from '../shared/ActionsBilling/ActionsBilling'
 import PlanPricing from '../shared/PlanPricing'
@@ -75,7 +74,7 @@ function PaidPlanCard() {
             <ScheduledPlanDetails scheduledPhase={scheduledPhase} />
           ) : null}
         </div>
-        {isNumber(numberOfUploads) && isTeamPlan(plan?.value) ? (
+        {isNumber(numberOfUploads) && plan?.isTeamPlan ? (
           <div>
             <p className="mb-2 text-xs font-semibold">Private repo uploads</p>
             <p className="text-xs text-ds-gray-senary">

diff --git a/...ge/subRoutes/CurrentOrgPlan/CurrentPlanCard/shared/ActionsBilling/ActionsBilling.test.jsx b/...ge/subRoutes/CurrentOrgPlan/CurrentPlanCard/shared/ActionsBilling/ActionsBilling.test.jsx
@@ -229,6 +229,9 @@ describe('Actions Billing', () => {
                 ...trialPlanData.plan,
                 value: accountDetails.plan.value,
                 isFreePlan: accountDetails.plan.value === Plans.USERS_BASIC,
+                isTeamPlan:
+                  accountDetails.plan.value === Plans.USERS_TEAMM ||
+                  accountDetails.plan.value === Plans.USERS_TEAMY,
               },
               hasPrivateRepos,
             },

diff --git a/.../PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/ProPlanDetails/ProPlanDetails.test.jsx b/.../PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/ProPlanDetails/ProPlanDetails.test.jsx
@@ -187,6 +187,7 @@ describe('ProPlanDetails', () => {
               plan: {
                 ...mockPlanData,
                 isFreePlan: !isProPlan && !isSentryPlan,
+                isTeamPlan: false,
                 trialStatus: isOngoingTrial
                   ? TrialStatuses.ONGOING
                   : TrialStatuses.CANNOT_TRIAL,

diff --git a/...age/subRoutes/UpgradePlanPage/UpgradeDetails/SentryPlanDetails/SentryPlanDetails.test.jsx b/...age/subRoutes/UpgradePlanPage/UpgradeDetails/SentryPlanDetails/SentryPlanDetails.test.jsx
@@ -180,6 +180,7 @@ describe('SentryPlanDetails', () => {
               plan: {
                 ...mockPlanData,
                 isFreePlan: !isProPlan,
+                isTeamPlan: false,
                 trialStatus: isOngoingTrial
                   ? TrialStatuses.ONGOING
                   : TrialStatuses.CANNOT_TRIAL,

diff --git a/...lanPage/subRoutes/UpgradePlanPage/UpgradeDetails/TeamPlanDetails/TeamPlanDetails.test.jsx b/...lanPage/subRoutes/UpgradePlanPage/UpgradeDetails/TeamPlanDetails/TeamPlanDetails.test.jsx
@@ -93,6 +93,7 @@ const mockPlanData = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const server = setupServer()

diff --git a/src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/UpgradeDetails.tsx b/src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/UpgradeDetails.tsx
@@ -1,5 +1,5 @@
 import { IndividualPlan } from 'services/account'
-import { isSentryPlan, isTeamPlan } from 'shared/utils/billing'
+import { isSentryPlan, Plans } from 'shared/utils/billing'
 
 import ProPlanDetails from './ProPlanDetails'
 import SentryPlanDetails from './SentryPlanDetails'
@@ -8,7 +8,10 @@ import TeamPlanDetails from './TeamPlanDetails'
 function UpgradeDetails({ selectedPlan }: { selectedPlan: IndividualPlan }) {
   if (isSentryPlan(selectedPlan.value)) {
     return <SentryPlanDetails />
-  } else if (isTeamPlan(selectedPlan.value)) {
+  } else if (
+    selectedPlan?.value === Plans.USERS_TEAMM ||
+    selectedPlan?.value === Plans.USERS_TEAMY
+  ) {
     return <TeamPlanDetails />
   } else {
     return <ProPlanDetails />

diff --git a/src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/Controller.tsx b/src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeForm/Controllers/Controller.tsx
@@ -1,7 +1,7 @@
 import { UseFormRegister, UseFormSetValue } from 'react-hook-form'
 
 import { IndividualPlan } from 'services/account'
-import { isSentryPlan, isTeamPlan } from 'shared/utils/billing'
+import { isSentryPlan, Plans } from 'shared/utils/billing'
 
 import ProPlanController from './ProPlanController'
 import SentryPlanController from './SentryPlanController'
@@ -30,7 +30,10 @@ const Controller: React.FC<BillingControlsProps> = ({
   setFormValue,
   setSelectedPlan,
 }) => {
-  if (isTeamPlan(newPlan?.value)) {
+  if (
+    newPlan?.value === Plans.USERS_TEAMM ||
+    newPlan?.value === Plans.USERS_TEAMY
+  ) {
     return (
       <TeamPlanController
         newPlan={newPlan}

diff --git a/...PlanPage/UpgradeForm/Controllers/ProPlanController/BillingOptions/BillingOptions.test.tsx b/...PlanPage/UpgradeForm/Controllers/ProPlanController/BillingOptions/BillingOptions.test.tsx
@@ -70,6 +70,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: true,
 }
 
 const server = setupServer()

diff --git a/...utes/UpgradePlanPage/UpgradeForm/Controllers/ProPlanController/ProPlanController.test.tsx b/...utes/UpgradePlanPage/UpgradeForm/Controllers/ProPlanController/ProPlanController.test.tsx
@@ -130,6 +130,7 @@ const mockPlanDataResponseMonthly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const mockPlanDataResponseYearly = {
@@ -148,6 +149,7 @@ const mockPlanDataResponseYearly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const queryClient = new QueryClient({

diff --git a/...nPage/UpgradeForm/Controllers/SentryPlanController/BillingOptions/BillingOptions.test.tsx b/...nPage/UpgradeForm/Controllers/SentryPlanController/BillingOptions/BillingOptions.test.tsx
@@ -70,6 +70,7 @@ const mockPlanDataResponse = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const server = setupServer()

diff --git a/...pgradePlanPage/UpgradeForm/Controllers/SentryPlanController/SentryPlanController.test.tsx b/...pgradePlanPage/UpgradeForm/Controllers/SentryPlanController/SentryPlanController.test.tsx
@@ -116,6 +116,7 @@ const mockPlanDataResponseMonthly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const mockPlanDataResponseYearly = {
@@ -134,6 +135,7 @@ const mockPlanDataResponseYearly = {
   hasSeatsLeft: true,
   isEnterprisePlan: false,
   isFreePlan: false,
+  isTeamPlan: false,
 }
 
 const queryClient = new QueryClient({

diff --git a/...lanPage/UpgradeForm/Controllers/TeamPlanController/BillingOptions/BillingOptions.test.tsx b/...lanPage/UpgradeForm/Controllers/TeamPlanController/BillingOptions/BillingOptions.test.tsx
@@ -60,6 +60,7 @@ const mockPlanDataResponse = {
   planUserCount: 1,
   hasSeatsLeft: true,
   isFreePlan: false,
+  isTeamPlan: true,
 }
 
 const server = setupServer()

diff --git a/...gradePlanPage/UpgradeForm/Controllers/TeamPlanController/ErrorBanner/ErrorBanner.test.tsx b/...gradePlanPage/UpgradeForm/Controllers/TeamPlanController/ErrorBanner/ErrorBanner.test.tsx
@@ -134,6 +134,7 @@ describe('ErrorBanner', () => {
           planUserCount: 1,
           isEnterprisePlan: false,
           isFreePlan: false,
+          isTeamPlan: false,
         }
         if (planValue === Plans.USERS_BASIC) {
           return HttpResponse.json({