Merge branch 'main' into gh-eng-3352-chore-remove-use-of-barrel-files-in-services-pull

Author: nsdeschenes

package.json

@@ -6,6 +6,7 @@
     "dev": "yarn start",
     "start": "vite --host",
     "build": "tsc -b && vite build",
+    "preview": "vite preview",
     "test": "vitest run --config ./vitest.config.mjs",
     "test:changed": "vitest run --changed --config ./vitest.config.mjs",
     "test:watch": "vitest watch --changed --config ./vitest.config.mjs",

src/layouts/BaseLayout/BaseLayout.test.tsx

@@ -12,7 +12,7 @@ import { type Mock } from 'vitest'
 import config from 'config'
 
 import { useImage } from 'services/image'
-import { useImpersonate } from 'services/impersonate'
+import { useImpersonate } from 'services/impersonate/useImpersonate'
 import { useInternalUser, useUser } from 'services/user'
 import { Plans } from 'shared/utils/billing'
 
@@ -21,7 +21,7 @@ import BaseLayout from './BaseLayout'
 vi.mock('services/image')
 const mockedUseImage = useImage as Mock
 
-vi.mock('services/impersonate')
+vi.mock('services/impersonate/useImpersonate')
 const mockedUseImpersonate = useImpersonate as Mock
 
 vi.mock('shared/GlobalTopBanners', () => ({

src/layouts/BaseLayout/BaseLayout.tsx

@@ -13,7 +13,7 @@ import { OnboardingContainerProvider } from 'pages/OwnerPage/OnboardingContainer
 import { RepoBreadcrumbProvider } from 'pages/RepoPage/context'
 import TermsOfService from 'pages/TermsOfService'
 import { useEventContext } from 'services/events/hooks'
-import { useImpersonate } from 'services/impersonate'
+import { useImpersonate } from 'services/impersonate/useImpersonate'
 import { useTracking } from 'services/tracking'
 import GlobalBanners from 'shared/GlobalBanners'
 import GlobalTopBanners from 'shared/GlobalTopBanners'

src/layouts/EnterpriseLoginLayout/Header/Header.tsx

@@ -1,7 +1,7 @@
 import cs from 'classnames'
 
 import { CodecovIcon } from 'assets/svg/codecov'
-import { useImpersonate } from 'services/impersonate'
+import { useImpersonate } from 'services/impersonate/useImpersonate'
 import A from 'ui/A'
 
 function Header() {

src/layouts/Header/Header.test.tsx

@@ -7,7 +7,7 @@ import { type Mock, vi } from 'vitest'
 
 import config from 'config'
 
-import { useImpersonate } from 'services/impersonate'
+import { useImpersonate } from 'services/impersonate/useImpersonate'
 import { User } from 'services/user'
 import { Plans } from 'shared/utils/billing'
 
@@ -32,7 +32,7 @@ vi.mock('src/layouts/Header/components/ThemeToggle', () => ({
   default: () => 'Theme Toggle',
 }))
 
-vi.mock('services/impersonate')
+vi.mock('services/impersonate/useImpersonate')
 const mockedUseImpersonate = useImpersonate as Mock
 
 const mockUser = {

src/layouts/Header/Header.tsx

@@ -3,7 +3,7 @@ import { useRouteMatch } from 'react-router-dom'
 
 import config from 'config'
 
-import { useImpersonate } from 'services/impersonate'
+import { useImpersonate } from 'services/impersonate/useImpersonate'
 import { useUser } from 'services/user'
 
 import AdminLink from './components/AdminLink'

src/layouts/shared/NetworkErrorBoundary/NetworkErrorBoundary.jsx

@@ -14,6 +14,12 @@ import upsideDownUmbrella from './assets/error-upsidedown-umbrella.svg'
 import styles from './NetworkErrorBoundary.module.css'
 
 const errorToUI = {
+  400: {
+    illustration: upsideDownUmbrella,
+    title: 'Bad Request',
+    description: null,
+    showDocs: true,
+  },
   401: {
     illustration: openUmbrella,
     title: <a href="/login">Please log in.</a>,

src/layouts/shared/NetworkErrorBoundary/NetworkErrorBoundary.test.jsx

@@ -225,6 +225,64 @@ describe('NetworkErrorBoundary', () => {
     })
   })
 
+  describe('when the children component has a 400 error', () => {
+    describe('when not running in self-hosted mode', () => {
+      it('renders a Bad Request', async () => {
+        const { user } = setup()
+        render(<App status={400} />, {
+          wrapper: wrapper(),
+        })
+
+        const textBox = await screen.findByRole('textbox')
+        await user.type(textBox, 'fail')
+
+        const badRequest = await screen.findByText(/Bad Request/)
+        expect(badRequest).toBeInTheDocument()
+      })
+
+      it('renders return to previous page button', async () => {
+        const { user } = setup()
+        render(<App status={400} />, {
+          wrapper: wrapper(),
+        })
+
+        const textBox = await screen.findByRole('textbox')
+        await user.type(textBox, 'fail')
+
+        const button = await screen.findByText('Return to previous page')
+        expect(button).toBeInTheDocument()
+      })
+    })
+
+    describe('when running in self hosted mode', () => {
+      it('renders a Bad Request', async () => {
+        const { user } = setup({ isSelfHosted: true })
+        render(<App status={400} />, {
+          wrapper: wrapper(),
+        })
+
+        const textBox = await screen.findByRole('textbox')
+        await user.type(textBox, 'fail')
+
+        const badRequest = await screen.findByText(/Bad Request/)
+        expect(badRequest).toBeInTheDocument()
+      })
+
+      it('renders return to previous page button', async () => {
+        const { user } = setup({ isSelfHosted: true })
+        render(<App status={400} />, {
+          wrapper: wrapper(),
+        })
+
+        const textBox = await screen.findByRole('textbox')
+        await user.type(textBox, 'fail')
+
+        const button = await screen.findByText('Return to previous page')
+        expect(button).toBeInTheDocument()
+      })
+    })
+  })
+
   describe('when the children component has a 404 error', () => {
     describe('when not running in self-hosted mode', () => {
       it('renders a Not found', async () => {

src/pages/AccountSettings/tabs/Admin/Admin.jsx

@@ -2,12 +2,13 @@ import { useParams } from 'react-router-dom'
 
 import { useUser } from 'services/user'
 
-import DeletionCard from './DeletionCard'
 import DetailsSection from './DetailsSection'
 import GithubIntegrationSection from './GithubIntegrationSection'
 import ManageAdminCard from './ManageAdminCard'
 import StudentSection from './StudentSection'
 
+import DeletionCard from '../DeletionCard'
+
 function Admin() {
   const { owner } = useParams()
   const { data: currentUser } = useUser()

src/pages/AccountSettings/tabs/Admin/Admin.test.jsx

@@ -14,7 +14,7 @@ vi.mock('./GithubIntegrationSection', () => ({
   default: () => 'GithubIntegrationSection',
 }))
 vi.mock('./ManageAdminCard', () => ({ default: () => 'ManageAdminCard' }))
-vi.mock('./DeletionCard', () => ({ default: () => 'DeletionCard' }))
+vi.mock('../DeletionCard', () => ({ default: () => 'DeletionCard' }))
 
 const user = {
   me: {