fix: Seperate org name from error banner on 404 page (#3525)

src/App.test.tsx

@@ -1,4 +1,8 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import {
+  QueryClientProvider as QueryClientProviderV5,
+  QueryClient as QueryClientV5,
+} from '@tanstack/react-queryV5'
 import { render, screen, waitFor } from '@testing-library/react'
 import { graphql, http, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
@@ -121,32 +125,43 @@ const mockRepoOverview = {
   },
 }
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      retry: false,
+const mockNavigatorData = {
+  owner: {
+    isCurrentUserPartOfOrg: true,
+    repository: {
+      __typename: 'Repository',
+      name: 'test-repo',
     },
   },
+}
+
+const queryClient = new QueryClient({
+  defaultOptions: { queries: { retry: false } },
+})
+const queryClientV5 = new QueryClientV5({
+  defaultOptions: { queries: { retry: false } },
 })
 
 let testLocation: ReturnType<typeof useLocation>
 const wrapper =
   (initialEntries = ['']): React.FC<React.PropsWithChildren> =>
   ({ children }) => (
-    <QueryClientProvider client={queryClient}>
-      <MemoryRouter initialEntries={initialEntries}>
-        <Suspense fallback={<p>Loading</p>}>
-          {children}
-          <Route
-            path="*"
-            render={({ location }) => {
-              testLocation = location
-              return null
-            }}
-          />
-        </Suspense>
-      </MemoryRouter>
-    </QueryClientProvider>
+    <QueryClientProviderV5 client={queryClientV5}>
+      <QueryClientProvider client={queryClient}>
+        <MemoryRouter initialEntries={initialEntries}>
+          <Suspense fallback={<p>Loading</p>}>
+            {children}
+            <Route
+              path="*"
+              render={({ location }) => {
+                testLocation = location
+                return null
+              }}
+            />
+          </Suspense>
+        </MemoryRouter>
+      </QueryClientProvider>
+    </QueryClientProviderV5>
   )
 
 const server = setupServer()
@@ -231,6 +246,9 @@ describe('App', () => {
       }),
       graphql.query('GetUploadTokenRequired', (info) => {
         return HttpResponse.json({ data: { owner: null } })
+      }),
+      graphql.query('NavigatorData', () => {
+        return HttpResponse.json({ data: mockNavigatorData })
       })
     )
   }

src/layouts/BaseLayout/BaseLayout.test.tsx

@@ -1,4 +1,8 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import {
+  QueryClientProvider as QueryClientProviderV5,
+  QueryClient as QueryClientV5,
+} from '@tanstack/react-queryV5'
 import { render, screen, waitFor } from '@testing-library/react'
 import { graphql, http, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
@@ -156,34 +160,48 @@ const internalUserHasSyncedProviders = {
   termsAgreement: true,
 }
 
+const mockNavigatorData = {
+  owner: {
+    isCurrentUserPartOfOrg: true,
+    repository: {
+      __typename: 'Repository',
+      name: 'test-repo',
+    },
+  },
+}
+
+const server = setupServer()
 const queryClient = new QueryClient({
   defaultOptions: {
-    queries: {
-      retry: false,
-      suspense: false,
-    },
+    queries: { retry: false, suspense: false },
+  },
+})
+const queryClientV5 = new QueryClientV5({
+  defaultOptions: {
+    queries: { retry: false },
   },
 })
-const server = setupServer()
 
 let testLocation: ReturnType<typeof useLocation>
 const wrapper: (
   initialEntries?: string[]
 ) => React.FC<React.PropsWithChildren> =
   (initialEntries = ['/bb/batman/batcave']) =>
   ({ children }) => (
-    <QueryClientProvider client={queryClient}>
-      <MemoryRouter initialEntries={initialEntries}>
-        <Route path="/:provider/:owner/:repo">{children}</Route>
-        <Route
-          path="*"
-          render={({ location }) => {
-            testLocation = location
-            return null
-          }}
-        />
-      </MemoryRouter>
-    </QueryClientProvider>
+    <QueryClientProviderV5 client={queryClientV5}>
+      <QueryClientProvider client={queryClient}>
+        <MemoryRouter initialEntries={initialEntries}>
+          <Route path="/:provider/:owner/:repo">{children}</Route>
+          <Route
+            path="*"
+            render={({ location }) => {
+              testLocation = location
+              return null
+            }}
+          />
+        </MemoryRouter>
+      </QueryClientProvider>
+    </QueryClientProviderV5>
   )
 
 beforeAll(() => {
@@ -192,6 +210,7 @@ beforeAll(() => {
 
 afterEach(() => {
   queryClient.clear()
+  queryClientV5.clear()
   server.resetHandlers()
   vi.clearAllMocks()
 })
@@ -236,7 +255,7 @@ describe('BaseLayout', () => {
       }),
       // Self hosted only
       graphql.query('HasAdmins', (info) => {
-        return HttpResponse.json({ data: {} })
+        return HttpResponse.json({ data: { config: null } })
       }),
       graphql.query('Seats', (info) => {
         return HttpResponse.json({ data: {} })
@@ -261,6 +280,9 @@ describe('BaseLayout', () => {
       graphql.mutation('updateDefaultOrganization', (info) => {
         return HttpResponse.json({ data: {} })
       }),
+      graphql.query('NavigatorData', () => {
+        return HttpResponse.json({ data: mockNavigatorData })
+      }),
       http.get('/internal/users/current', (info) => {
         return HttpResponse.json({})
       })

src/layouts/BaseLayout/BaseLayout.tsx

@@ -1,5 +1,6 @@
+import { useQuery as useQueryV5 } from '@tanstack/react-queryV5'
 import { lazy, Suspense } from 'react'
-import { Redirect } from 'react-router-dom'
+import { Redirect, useParams } from 'react-router-dom'
 
 import Footer from 'layouts/Footer'
 import Header from 'layouts/Header'
@@ -14,6 +15,7 @@ import GlobalBanners from 'shared/GlobalBanners'
 import GlobalTopBanners from 'shared/GlobalTopBanners'
 import LoadingLogo from 'ui/LoadingLogo'
 
+import { NavigatorDataQueryOpts } from './hooks/NavigatorDataQueryOpts'
 import { useUserAccessGate } from './hooks/useUserAccessGate'
 
 const DefaultOrgSelector = lazy(() => import('pages/DefaultOrgSelector'))
@@ -65,19 +67,42 @@ function OnboardingOrChildren({
   return <>{children}</>
 }
 
+interface URLParams {
+  provider?: string
+  owner?: string
+  repo?: string
+}
+
 function BaseLayout({ children }: React.PropsWithChildren) {
+  const { provider, owner, repo } = useParams<URLParams>()
+  useTracking()
+  const { isImpersonating } = useImpersonate()
   const {
     isFullExperience,
     showAgreeToTerms,
     showDefaultOrgSelector,
     redirectToSyncPage,
-    isLoading,
+    isLoading: isUserAccessGateLoading,
   } = useUserAccessGate()
-  useTracking()
-  const { isImpersonating } = useImpersonate()
+
+  // we have to fetch the data for the navigator up here as we can't
+  // conditionally call a suspense query, as well we need a way to have the
+  // loader be shown while we're loading
+  const { data, isLoading: isNavigatorDataLoading } = useQueryV5({
+    enabled: !!provider && !!owner && !!repo,
+    ...NavigatorDataQueryOpts({
+      // if these aren't provided, the query is disabled so we don't need to
+      // worry about the empty strings causing errors
+      provider: provider ?? '',
+      owner: owner ?? '',
+      repo: repo ?? '',
+    }),
+  })
 
   // Pause rendering of a page till we know if the user is logged in or not
-  if (isLoading) return <FullPageLoader />
+  if (isUserAccessGateLoading || isNavigatorDataLoading) {
+    return <FullPageLoader />
+  }
 
   return (
     <>
@@ -89,7 +114,7 @@ function BaseLayout({ children }: React.PropsWithChildren) {
               {isFullExperience || isImpersonating ? (
                 <>
                   <GlobalTopBanners />
-                  <Header />
+                  <Header hasRepoAccess={data?.hasRepoAccess} />
                 </>
               ) : (
                 <>