Merge remote-tracking branch 'origin/main' into sshin/stripe-5

Author: suejung-sentry

src/config.js

@@ -13,6 +13,7 @@ const defaultConfig = {
   GH_APP: DEFAULT_GH_APP,
   GH_APP_AI: 'codecov-ai',
   SUNBURST_ENABLED: true,
+  DISPLAY_SELF_HOSTED_EXPIRATION_BANNER: true,
 }
 
 export function removeReactAppPrefix(obj) {
@@ -38,6 +39,11 @@ export function removeReactAppPrefix(obj) {
     keys['SUNBURST_ENABLED'] = keys['SUNBURST_ENABLED'].toLowerCase() === 'true'
   }
 
+  if ('DISPLAY_SELF_HOSTED_EXPIRATION_BANNER' in keys) {
+    keys['DISPLAY_SELF_HOSTED_EXPIRATION_BANNER'] =
+      keys['DISPLAY_SELF_HOSTED_EXPIRATION_BANNER'].toLowerCase() === 'true'
+  }
+
   if ('SENTRY_TRACING_SAMPLE_RATE' in keys) {
     keys['SENTRY_TRACING_SAMPLE_RATE'] = parseFloat(
       keys['SENTRY_TRACING_SAMPLE_RATE']

src/config.test.js

@@ -70,6 +70,16 @@ describe('config', () => {
       })
     })
 
+    describe('sets DISPLAY_SELF_HOSTED_EXPIRATION_BANNER to boolean', () => {
+      it('sets to true', () => {
+        const obj = { DISPLAY_SELF_HOSTED_EXPIRATION_BANNER: 'true' }
+
+        expect(removeReactAppPrefix(obj)).toEqual({
+          DISPLAY_SELF_HOSTED_EXPIRATION_BANNER: true,
+        })
+      })
+    })
+
     describe('sets IS_DEDICATED_NAMESPACE to boolean', () => {
       it('sets to true', () => {
         const obj = {

src/shared/GlobalBanners/SelfHostedLicenseExpiration/SelfHostedLicenseExpiration.test.tsx

@@ -165,6 +165,21 @@ describe('SelfHostedLicenseExpiration', () => {
       expect(resolveIssueButton).not.toBeInTheDocument()
     })
 
+    it('does not render the banner when disabled', async () => {
+      config.IS_SELF_HOSTED = true
+      config.IS_DEDICATED_NAMESPACE = true
+      config.DISPLAY_SELF_HOSTED_EXPIRATION_BANNER = false
+      setup({
+        seatsUsed: 5,
+        seatsLimit: 10,
+        expirationDate: null,
+      })
+      render(<SelfHostedLicenseExpiration />, { wrapper: wrapper(['']) })
+
+      const resolveIssueButton = screen.queryByText(/Resolve issue/)
+      expect(resolveIssueButton).not.toBeInTheDocument()
+    })
+
     it('does not render the banner when there are no seats used', async () => {
       config.IS_SELF_HOSTED = true
       config.IS_DEDICATED_NAMESPACE = true
@@ -200,6 +215,7 @@ describe('SelfHostedLicenseExpiration', () => {
       vi.setSystemTime(new Date('2023-08-01'))
       config.IS_SELF_HOSTED = true
       config.IS_DEDICATED_NAMESPACE = true
+      config.DISPLAY_SELF_HOSTED_EXPIRATION_BANNER = true
     })
 
     afterEach(() => {

src/shared/GlobalBanners/SelfHostedLicenseExpiration/SelfHostedLicenseExpiration.tsx

@@ -81,7 +81,10 @@ const SelfHostedLicenseExpiration = () => {
   const isLicenseExpiringWithin30Days = dateDiff < 31 && dateDiff >= 0
 
   const shouldDisplayBanner =
-    isSeatsLimitReached || isLicenseExpired || isLicenseExpiringWithin30Days
+    (isSeatsLimitReached ||
+      isLicenseExpired ||
+      isLicenseExpiringWithin30Days) &&
+    config.DISPLAY_SELF_HOSTED_EXPIRATION_BANNER
 
   if (!shouldDisplayBanner) {
     return null

src/shared/GlobalTopBanners/TokenlessBanner/TokenlessBanner.test.tsx

@@ -5,6 +5,8 @@ import { setupServer } from 'msw/node'
 import { Suspense } from 'react'
 import { MemoryRouter, Route } from 'react-router-dom'
 
+import { Plans } from 'shared/utils/billing'
+
 import TokenlessBanner from './TokenlessBanner'
 
 const mocks = vi.hoisted(() => ({
@@ -15,6 +17,8 @@ vi.mock('shared/featureFlags', () => ({
   useFlags: mocks.useFlags,
 }))
 
+vi.mock('services/users')
+
 vi.mock('./TokenRequiredBanner', () => ({
   default: () => 'TokenRequiredBanner',
 }))
@@ -41,6 +45,50 @@ afterAll(() => {
   server.close()
 })
 
+const mockSignedInUser = {
+  me: {
+    owner: {
+      defaultOrgUsername: 'codecov',
+    },
+    email: '[email protected]',
+    privateAccess: true,
+    onboardingCompleted: true,
+    businessEmail: '[email protected]',
+    termsAgreement: true,
+    user: {
+      name: 'Jane Doe',
+      username: 'janedoe',
+      avatarUrl: 'http://127.0.0.1/avatar-url',
+      avatar: 'http://127.0.0.1/avatar-url',
+      student: false,
+      studentCreatedAt: null,
+      studentUpdatedAt: null,
+      customerIntent: 'PERSONAL',
+    },
+    trackingMetadata: {
+      service: 'github',
+      ownerid: 123,
+      serviceId: '123',
+      plan: Plans.USERS_BASIC,
+      staff: false,
+      hasYaml: false,
+      bot: null,
+      delinquent: null,
+      didTrial: null,
+      planProvider: null,
+      planUserCount: 1,
+      createdAt: 'timestamp',
+      updatedAt: 'timestamp',
+      profile: {
+        createdAt: 'timestamp',
+        otherGoal: null,
+        typeProjects: [],
+        goals: [],
+      },
+    },
+  },
+}
+
 const wrapper =
   (initialEntries = ['/gh/codecov']): React.FC<React.PropsWithChildren> =>
   ({ children }) => (
@@ -57,9 +105,11 @@ describe('TokenlessBanner', () => {
   function setup({
     tokenlessSection = true,
     uploadTokenRequired = false,
+    currentUser,
   }: {
     tokenlessSection?: boolean
     uploadTokenRequired?: boolean
+    currentUser?: any
   } = {}) {
     mocks.useFlags.mockReturnValue({ tokenlessSection })
 
@@ -74,12 +124,15 @@ describe('TokenlessBanner', () => {
             },
           },
         })
+      }),
+      graphql.query('CurrentUser', () => {
+        return HttpResponse.json({ data: currentUser })
       })
     )
   }
 
   it('renders nothing when tokenlessSection flag is false', () => {
-    setup({ tokenlessSection: false })
+    setup({ tokenlessSection: false, currentUser: mockSignedInUser })
     const { container } = render(<TokenlessBanner />, {
       wrapper: wrapper(['/gh/codecov']),
     })
@@ -95,7 +148,7 @@ describe('TokenlessBanner', () => {
   })
 
   it('renders TokenRequiredBanner when uploadTokenRequired is true', async () => {
-    setup({ uploadTokenRequired: true })
+    setup({ uploadTokenRequired: true, currentUser: mockSignedInUser })
     render(<TokenlessBanner />, { wrapper: wrapper(['/gh/codecov']) })
 
     await waitFor(() => {
@@ -105,7 +158,7 @@ describe('TokenlessBanner', () => {
   })
 
   it('renders TokenNotRequiredBanner when uploadTokenRequired is false', async () => {
-    setup({ uploadTokenRequired: false })
+    setup({ uploadTokenRequired: false, currentUser: mockSignedInUser })
     render(<TokenlessBanner />, { wrapper: wrapper(['/gh/codecov']) })
 
     await waitFor(() => {
@@ -115,7 +168,7 @@ describe('TokenlessBanner', () => {
   })
 
   it('renders nothing if coming from onboarding', async () => {
-    setup({ uploadTokenRequired: true })
+    setup({ uploadTokenRequired: true, currentUser: mockSignedInUser })
     render(<TokenlessBanner />, {
       wrapper: wrapper(['/gh/codecov?source=onboarding']),
     })
@@ -128,4 +181,10 @@ describe('TokenlessBanner', () => {
       ).not.toBeInTheDocument()
     })
   })
+
+  it('renders nothing when currentUser is not provided', () => {
+    setup({ uploadTokenRequired: false, currentUser: mockSignedInUser })
+    const { container } = render(<TokenlessBanner />, { wrapper: wrapper() })
+    expect(container).toBeEmptyDOMElement()
+  })
 })

src/shared/GlobalTopBanners/TokenlessBanner/TokenlessBanner.tsx

@@ -4,6 +4,7 @@ import { useParams } from 'react-router-dom'
 import { ONBOARDING_SOURCE } from 'pages/TermsOfService/constants'
 import { useLocationParams } from 'services/navigation'
 import { useUploadTokenRequired } from 'services/uploadTokenRequired'
+import { useUser } from 'services/user'
 import { useFlags } from 'shared/featureFlags'
 
 const TokenRequiredBanner = lazy(() => import('./TokenRequiredBanner'))
@@ -20,11 +21,19 @@ const TokenlessBanner: React.FC = () => {
   })
   const { provider, owner } = useParams<UseParams>()
   const { data } = useUploadTokenRequired({ provider, owner, enabled: !!owner })
+  const { data: currentUser } = useUser()
   const { params } = useLocationParams()
   // @ts-expect-error useLocationParams needs to be typed
   const cameFromOnboarding = params['source'] === ONBOARDING_SOURCE
 
-  if (!tokenlessSection || !owner || !data || cameFromOnboarding) return null
+  if (
+    !tokenlessSection ||
+    !owner ||
+    !data ||
+    !currentUser?.user ||
+    cameFromOnboarding
+  )
+    return null
 
   return data?.uploadTokenRequired ? (
     <TokenRequiredBanner />

src/shared/utils/billing.ts

@@ -20,6 +20,7 @@ export const Plans = {
   USERS_TEAMY: 'users-teamy',
   USERS_ENTERPRISEM: 'users-enterprisem',
   USERS_ENTERPRISEY: 'users-enterprisey',
+  USERS_DEVELOPER: 'users-developer',
 } as const
 
 export type PlanName = (typeof Plans)[keyof typeof Plans]