ref: Convert isBasicPlan to isFreePlan GQL property (#3600)

Author: ajay-sentry

src/pages/DefaultOrgSelector/DefaultOrgSelector.jsx

@@ -17,7 +17,6 @@ import { useUpdateDefaultOrganization } from 'services/defaultOrganization'
 import { useStaticNavLinks } from 'services/navigation'
 import { useStartTrial } from 'services/trial'
 import { CustomerIntent, useUser } from 'services/user'
-import { isBasicPlan } from 'shared/utils/billing'
 import { mapEdges } from 'shared/utils/graphql'
 import { providerToName } from 'shared/utils/provider'
 import A from 'ui/A/A'
@@ -133,7 +132,7 @@ function DefaultOrgSelector() {
       jsonPayload: { action: 'Selected Default Org' },
     })
     if (
-      isBasicPlan(planData?.plan?.value) &&
+      planData?.plan?.isFreePlan &&
       selectedOrg !== currentUser?.user?.username &&
       isNewTrial &&
       planData?.hasPrivateRepos

src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx

@@ -215,7 +215,7 @@ describe('DefaultOrgSelector', () => {
               plan: {
                 ...mockTrialData,
                 isEnterprisePlan: false,
-                isFreePlan: false,
+                isFreePlan: value === Plans.USERS_BASIC,
                 isTeamPlan:
                   value === Plans.USERS_TEAMM || value === Plans.USERS_TEAMY,
                 trialStatus,

src/pages/RepoPage/CoverageOnboarding/ActivationBanner/ActivationBanner.tsx

@@ -3,7 +3,6 @@ import { useParams } from 'react-router-dom'
 import config from 'config'
 
 import { TrialStatuses, usePlanData } from 'services/account'
-import { isBasicPlan } from 'shared/utils/billing'
 
 import ActivationRequiredBanner from './ActivationRequiredBanner'
 import ActivationRequiredSelfHosted from './ActivationRequiredSelfHosted'
@@ -24,9 +23,7 @@ function ActivationBanner() {
   })
   const isNewTrial = planData?.plan?.trialStatus === TrialStatuses.NOT_STARTED
   const isTrialEligible =
-    isBasicPlan(planData?.plan?.value) &&
-    planData?.hasPrivateRepos &&
-    isNewTrial
+    planData?.plan?.isFreePlan && planData?.hasPrivateRepos && isNewTrial
   const seatsLimitReached = !planData?.plan?.hasSeatsLeft
   const isFreePlanValue = planData?.plan?.isFreePlan
 

src/shared/utils/billing.test.ts

@@ -11,7 +11,6 @@ import {
   formatNumberToUSD,
   formatTimestampToCalendarDate,
   getNextBillingDate,
-  isBasicPlan,
   isCodecovProPlan,
   isProPlan,
   isSentryPlan,
@@ -493,19 +492,6 @@ describe('canApplySentryUpgrade', () => {
   })
 })
 
-describe('isBasicPlan', () => {
-  it('returns true when plan is basic', () => {
-    expect(isBasicPlan(Plans.USERS_BASIC)).toBeTruthy()
-  })
-
-  it('returns false when plan is not basic', () => {
-    expect(isBasicPlan(Plans.USERS_FREE)).toBeFalsy()
-    expect(isBasicPlan(Plans.USERS_INAPP)).toBeFalsy()
-    expect(isBasicPlan(Plans.USERS_ENTERPRISEM)).toBeFalsy()
-    expect(isBasicPlan(Plans.USERS_SENTRYM)).toBeFalsy()
-  })
-})
-
 describe('isTrialPlan', () => {
   it('returns true when plan is trial', () => {
     expect(isTrialPlan(Plans.USERS_TRIAL)).toBeTruthy()

src/shared/utils/billing.ts

@@ -53,13 +53,6 @@ export interface Plan {
   isTeamPlan: boolean
 }
 
-export function isBasicPlan(plan?: PlanName) {
-  if (isString(plan)) {
-    return plan === Plans.USERS_BASIC
-  }
-  return false
-}
-
 export function isSentryPlan(plan?: PlanName | null) {
   if (isString(plan)) {
     return plan === Plans.USERS_SENTRYM || plan === Plans.USERS_SENTRYY