Merge branch 'main' into cy/ts_shared_p5

Author: calvin-codecov

.git-blame-ignore-revs

@@ -9,3 +9,6 @@ e75fbde94a6ef3d80c5696255b742e9264ec52cf
 # Add tailwind and tanstack query lints + lint fixes
 
 ab88e32678c4a1a054a8c525a9f346d5a984e1c9
+
+# Fixing lint errors - https://github.com/codecov/gazebo/pull/3524
+0899f21d7fe6eae4248cce5fdd65c7043f4e247f

src/pages/AccountSettings/AccountSettings.jsx

@@ -8,7 +8,6 @@ import { SentryRoute } from 'sentry'
 import SidebarLayout from 'layouts/SidebarLayout'
 import { usePlanData } from 'services/account'
 import { useIsCurrentUserAnAdmin, useUser } from 'services/user'
-import { isEnterprisePlan } from 'shared/utils/billing'
 import LoadingLogo from 'ui/LoadingLogo'
 
 import AccountSettingsSideMenu from './AccountSettingsSideMenu'
@@ -34,7 +33,7 @@ function AccountSettings() {
   const { data: currentUser } = useUser()
 
   const { data } = usePlanData({ provider, owner })
-  const viewOktaAccess = isEnterprisePlan(data?.plan?.value)
+  const viewOktaAccess = data?.plan?.isEnterprisePlan
 
   const isViewingPersonalSettings =
     currentUser?.user?.username?.toLowerCase() === owner?.toLowerCase()

src/pages/AccountSettings/AccountSettings.test.jsx

@@ -161,6 +161,7 @@ describe('AccountSettings', () => {
               plan: {
                 ...mockPlanData,
                 value: planValue,
+                isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
               },
             },
           },

src/pages/AccountSettings/AccountSettingsSideMenu.jsx

@@ -4,7 +4,6 @@ import config from 'config'
 
 import { usePlanData } from 'services/account'
 import { useIsCurrentUserAnAdmin, useUser } from 'services/user'
-import { isEnterprisePlan } from 'shared/utils/billing'
 import Sidemenu from 'ui/Sidemenu'
 
 function defaultLinks({ internalAccessTab, viewOktaAccess }) {
@@ -66,7 +65,7 @@ function AccountSettingsSideMenu() {
     currentUser?.user?.username?.toLowerCase() === owner?.toLowerCase()
 
   const { data } = usePlanData({ provider, owner })
-  const viewOktaAccess = isEnterprisePlan(data?.plan?.value)
+  const viewOktaAccess = data?.plan?.isEnterprisePlan
 
   const links = generateLinks({
     isAdmin,

src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx

@@ -149,6 +149,7 @@ describe('AccountSettingsSideMenu', () => {
               plan: {
                 ...mockPlanData,
                 value: planValue,
+                isEnterprisePlan: planValue === Plans.USERS_ENTERPRISEM,
               },
             },
           },

src/pages/CommitDetailPage/CommitCoverage/UploadsCard/RenderError.tsx

@@ -123,7 +123,7 @@ const FlagError = () => (
 interface RenderErrorProps {
   errors: (UploadErrorObject | null)[]
   state: (typeof UploadStateEnum)[keyof typeof UploadStateEnum]
-  flags: string[] | null
+  flags: string[] | null | undefined
 }
 
 const RenderError = ({ errors, state, flags }: RenderErrorProps) => {

src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx

@@ -212,6 +212,7 @@ describe('DefaultOrgSelector', () => {
               hasPrivateRepos: privateRepos,
               plan: {
                 ...mockTrialData,
+                isEnterprisePlan: false,
                 trialStatus,
                 value,
               },

src/pages/EnterpriseLandingPage/EnterpriseLandingPage.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 } from '@testing-library/react'
 import { graphql, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
@@ -11,16 +15,23 @@ import EnterpriseLandingPage from './EnterpriseLandingPage'
 vi.mock('config')
 
 const server = setupServer()
-const queryClient = new QueryClient()
+const queryClient = new QueryClient({
+  defaultOptions: { queries: { retry: false } },
+})
+const queryClientV5 = new QueryClientV5({
+  defaultOptions: { queries: { retry: false } },
+})
 
 const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => (
-  <QueryClientProvider client={queryClient}>
-    <ThemeContextProvider>
-      <MemoryRouter initialEntries={['/']}>
-        <Route path="/">{children}</Route>
-      </MemoryRouter>
-    </ThemeContextProvider>
-  </QueryClientProvider>
+  <QueryClientProviderV5 client={queryClientV5}>
+    <QueryClientProvider client={queryClient}>
+      <ThemeContextProvider>
+        <MemoryRouter initialEntries={['/']}>
+          <Route path="/">{children}</Route>
+        </MemoryRouter>
+      </ThemeContextProvider>
+    </QueryClientProvider>
+  </QueryClientProviderV5>
 )
 
 const mockServiceProviders = {
@@ -43,6 +54,7 @@ beforeAll(() => {
 
 afterEach(() => {
   queryClient.clear()
+  queryClientV5.clear()
   server.resetHandlers()
 })
 

src/pages/EnterpriseLandingPage/EnterpriseLandingPage.tsx

@@ -1,5 +1,7 @@
+import { useSuspenseQuery as useSuspenseQueryV5 } from '@tanstack/react-queryV5'
+
 import rocketImg from 'assets/enterprise-rocket.png'
-import { useLoginProviders } from 'services/config/useLoginProviders'
+import { LoginProvidersQueryOpts } from 'services/config/LoginProvidersQueryOpts'
 import { LoginProvidersEnum } from 'shared/utils/loginProviders'
 
 import ProviderCard from './ProviderCard/ProviderCard'
@@ -8,7 +10,7 @@ import { useEnterpriseRedirect } from './useEnterpriseRedirect'
 function EnterpriseLandingPage() {
   useEnterpriseRedirect()
 
-  const { data } = useLoginProviders()
+  const { data } = useSuspenseQueryV5(LoginProvidersQueryOpts())
 
   return (
     <div className="flex flex-col gap-5">

src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.tsx

@@ -1,4 +1,4 @@
-import { EnterpriseLoginProviders } from 'services/config/useLoginProviders'
+import { EnterpriseLoginProviders } from 'services/config/LoginProvidersQueryOpts'
 import { Theme, useThemeContext } from 'shared/ThemeContext'
 import {
   loginProviderImage,