Merge branch 'main' into Ajay/3003-migrate-is-pro-plan

Author: ajay-sentry

package.json

@@ -151,7 +151,7 @@
     "eslint-plugin-testing-library": "^6.4.0",
     "http-proxy-middleware": "^2.0.7",
     "husky": "^9.1.4",
-    "jsdom": "^25.0.0",
+    "jsdom": "^25.0.1",
     "lint-staged": "^15.2.8",
     "msw": "^2.4.11",
     "postcss": "^8.4.31",

src/layouts/BaseLayout/BaseLayout.test.tsx

@@ -208,6 +208,11 @@ beforeAll(() => {
   server.listen({ onUnhandledRequest: 'warn' })
 })
 
+beforeEach(() => {
+  vi.resetModules()
+  vi.restoreAllMocks()
+})
+
 afterEach(() => {
   queryClient.clear()
   queryClientV5.clear()
@@ -588,4 +593,27 @@ describe('BaseLayout', () => {
       expect(errorMainAppUI).toBeInTheDocument()
     })
   })
+
+  describe('When Header has a network call error', async () => {
+    it('renders nothing for the errored header', async () => {
+      vi.spyOn(
+        await import('layouts/Header'),
+        'default'
+      ).mockImplementationOnce(() => {
+        throw new Error('Simulated Header Error')
+      })
+
+      setup({ currentUser: userHasDefaultOrg })
+      render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
+
+      const header = screen.queryByText(/Header/)
+      expect(header).not.toBeInTheDocument()
+
+      const mainAppContent = await screen.findByText('hello')
+      expect(mainAppContent).toBeInTheDocument()
+
+      const footerContent = await screen.findByText(/Footer/)
+      expect(footerContent).toBeInTheDocument()
+    })
+  })
 })

src/layouts/BaseLayout/BaseLayout.tsx

@@ -7,6 +7,7 @@ import Header from 'layouts/Header'
 import ErrorBoundary from 'layouts/shared/ErrorBoundary'
 import { EmptyErrorComponent } from 'layouts/shared/ErrorBoundary/ErrorBoundary'
 import NetworkErrorBoundary from 'layouts/shared/NetworkErrorBoundary'
+import SilentNetworkErrorWrapper from 'layouts/shared/SilentNetworkErrorWrapper'
 import ToastNotifications from 'layouts/ToastNotifications'
 import { RepoBreadcrumbProvider } from 'pages/RepoPage/context'
 import { useImpersonate } from 'services/impersonate'
@@ -110,7 +111,7 @@ function BaseLayout({ children }: React.PropsWithChildren) {
         {/* Header */}
         <Suspense>
           <ErrorBoundary errorComponent={<EmptyErrorComponent />}>
-            <NetworkErrorBoundary>
+            <SilentNetworkErrorWrapper>
               {isFullExperience || isImpersonating ? (
                 <>
                   <GlobalTopBanners />
@@ -121,7 +122,7 @@ function BaseLayout({ children }: React.PropsWithChildren) {
                   {showDefaultOrgSelector ? <InstallationHelpBanner /> : null}
                 </>
               )}
-            </NetworkErrorBoundary>
+            </SilentNetworkErrorWrapper>
           </ErrorBoundary>
         </Suspense>
 

src/pages/AccountSettings/AccountSettings.test.jsx

@@ -164,6 +164,9 @@ describe('AccountSettings', () => {
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
                 isProPlan: false,
+                isTeamPlan:
+                  planValue === Plans.USERS_TEAMM ||
+                  planValue === Plans.USERS_TEAMY,
               },
             },
           },

src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx

@@ -152,6 +152,9 @@ describe('AccountSettingsSideMenu', () => {
                 isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
                 isFreePlan: planValue === Plans.USERS_BASIC,
                 isProPlan: false,
+                isTeamPlan:
+                  planValue === Plans.USERS_TEAMM ||
+                  planValue === Plans.USERS_TEAMY,
               },
             },
           },

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

@@ -159,6 +159,7 @@ const wrapper =
   )
 
 beforeAll(() => {
+  console.error = () => {}
   server.listen({
     onUnhandledRequest: 'warn',
   })
@@ -169,6 +170,7 @@ afterEach(() => {
 })
 afterAll(() => {
   server.close()
+  vi.resetAllMocks()
 })
 
 describe('DefaultOrgSelector', () => {
@@ -213,8 +215,10 @@ describe('DefaultOrgSelector', () => {
               plan: {
                 ...mockTrialData,
                 isEnterprisePlan: false,
-                isFreePlan: false,
                 isProPlan: false,
+                isFreePlan: value === Plans.USERS_BASIC,
+                isTeamPlan:
+                  value === Plans.USERS_TEAMM || value === Plans.USERS_TEAMY,
                 trialStatus,
                 value,
               },
@@ -1295,7 +1299,7 @@ describe('DefaultOrgSelector', () => {
 
   describe('on fetch next page', () => {
     it('renders next page', async () => {
-      const { user, fetchNextPage } = setup({
+      const { fetchNextPage } = setup({
         useUserData: mockUserData,
         myOrganizationsData: {
           me: {
@@ -1317,12 +1321,6 @@ describe('DefaultOrgSelector', () => {
       render(<DefaultOrgSelector />, { wrapper: wrapper() })
       mocks.useIntersection.mockReturnValue({ isIntersecting: true })
 
-      const selectOrg = await screen.findByRole('button', {
-        name: 'Select an organization',
-      })
-
-      await user.click(selectOrg)
-
       await waitFor(() => expect(fetchNextPage).toHaveBeenCalled())
       await waitFor(() => expect(fetchNextPage).toHaveBeenCalledWith('MTI='))
     })

src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx

@@ -29,6 +29,7 @@ const mockPlanData = {
   isEnterprisePlan: false,
   isFreePlan: true,
   isProPlan: false,
+  isTeamPlan: false,
   baseUnitPrice: 10,
   benefits: [],
   billingRate: BillingRate.MONTHLY,

src/pages/MembersPage/MembersActivation/MembersActivation.test.jsx

@@ -43,6 +43,7 @@ const mockPlanData = {
   isEnterprisePlan: false,
   isFreePlan: false,
   isProPlan: false,
+  isTeamPlan: false,
 }
 
 const server = setupServer()

src/pages/MembersPage/MembersList/MembersList.test.jsx

@@ -131,6 +131,9 @@ describe('MembersList', () => {
                 ...mockPlanData,
                 value: planName,
                 isFreePlan: planName === Plans.USERS_BASIC,
+                isTeamPlan:
+                  planName === Plans.USERS_TEAMM ||
+                  planName === Plans.USERS_TEAMY,
                 planUserCount,
                 hasSeatsLeft,
               },