chore: Remove new repo flag in LD (#3651)

codecov · Jan 11, 2025 · daaed4b · daaed4b
1 parent 5febc26
commit daaed4b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 68 deletions.
diff --git a/src/pages/RepoPage/CoverageOnboarding/CircleCI/CircleCI.test.tsx b/src/pages/RepoPage/CoverageOnboarding/CircleCI/CircleCI.test.tsx
@@ -8,18 +8,6 @@ import { MemoryRouter, Route } from 'react-router-dom'
 
 import CircleCI from './CircleCI'
 
-const mocks = vi.hoisted(() => ({
-  useFlags: vi.fn(),
-}))
-
-vi.mock('shared/featureFlags', async () => {
-  const actual = await vi.importActual('shared/featureFlags')
-  return {
-    ...actual,
-    useFlags: mocks.useFlags,
-  }
-})
-
 const mockGetRepo = {
   owner: {
     isAdmin: null,
@@ -45,6 +33,12 @@ const mockGetOrgUploadToken = {
   },
 }
 
+const mockNoUploadToken = {
+  owner: {
+    orgUploadToken: null,
+  },
+}
+
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
@@ -85,9 +79,6 @@ interface SetupArgs {
 
 describe('CircleCI', () => {
   function setup({ hasOrgUploadToken = false }: SetupArgs) {
-    mocks.useFlags.mockReturnValue({
-      newRepoFlag: hasOrgUploadToken,
-    })
     const mockMetricMutationVariables = vi.fn()
     const mockGetItem = vi.spyOn(window.localStorage.__proto__, 'getItem')
     mockGetItem.mockReturnValue(null)
@@ -97,7 +88,9 @@ describe('CircleCI', () => {
         return HttpResponse.json({ data: mockGetRepo })
       }),
       graphql.query('GetOrgUploadToken', () => {
-        return HttpResponse.json({ data: mockGetOrgUploadToken })
+        return HttpResponse.json({
+          data: hasOrgUploadToken ? mockGetOrgUploadToken : mockNoUploadToken,
+        })
       }),
       graphql.mutation('storeEventMetric', (info) => {
         mockMetricMutationVariables(info?.variables)

diff --git a/src/pages/RepoPage/CoverageOnboarding/CircleCI/CircleCI.tsx b/src/pages/RepoPage/CoverageOnboarding/CircleCI/CircleCI.tsx
@@ -9,7 +9,6 @@ import {
 import { useOrgUploadToken } from 'services/orgUploadToken'
 import { useRepo } from 'services/repo'
 import { Provider } from 'shared/api/helpers'
-import { useFlags } from 'shared/featureFlags'
 import { providerToInternalProvider } from 'shared/utils/provider'
 import A from 'ui/A'
 import { Card } from 'ui/Card'
@@ -40,16 +39,12 @@ interface URLParams {
 }
 
 function CircleCI() {
-  const { newRepoFlag: showOrgToken } = useFlags({
-    newRepoFlag: false,
-  })
   const { provider, owner, repo } = useParams<URLParams>()
   const providerName = providerToInternalProvider(provider)
   const { data } = useRepo({ provider, owner, repo })
   const { data: orgUploadToken } = useOrgUploadToken({
     provider,
     owner,
-    enabled: showOrgToken,
   })
 
   const uploadToken = orgUploadToken ?? data?.repository?.uploadToken ?? ''

diff --git a/src/pages/RepoPage/CoverageOnboarding/GitHubActions/GitHubActions.tsx b/src/pages/RepoPage/CoverageOnboarding/GitHubActions/GitHubActions.tsx
@@ -5,7 +5,6 @@ import { useOrgUploadToken } from 'services/orgUploadToken'
 import { useRepo } from 'services/repo'
 import { useUploadTokenRequired } from 'services/uploadTokenRequired'
 import { Provider } from 'shared/api/helpers'
-import { useFlags } from 'shared/featureFlags'
 import A from 'ui/A'
 import { Card } from 'ui/Card'
 
@@ -27,14 +26,10 @@ interface URLParams {
 }
 
 function GitHubActions() {
-  const { newRepoFlag: showOrgToken } = useFlags({
-    newRepoFlag: false,
-  })
   const { provider, owner, repo } = useParams<URLParams>()
   const { data: orgUploadToken } = useOrgUploadToken({
     provider,
     owner,
-    enabled: showOrgToken,
   })
 
   const [isUsingGlobalToken, setIsUsingGlobalToken] = useState<boolean>(true)

diff --git a/src/pages/RepoPage/CoverageOnboarding/GitHubActions/TokenStep.tsx b/src/pages/RepoPage/CoverageOnboarding/GitHubActions/TokenStep.tsx
@@ -16,7 +16,6 @@ import { useRepo } from 'services/repo'
 import { useUploadTokenRequired } from 'services/uploadTokenRequired'
 import { useIsCurrentUserAnAdmin } from 'services/user'
 import { Provider } from 'shared/api/helpers'
-import { useFlags } from 'shared/featureFlags'
 import { Theme, useThemeContext } from 'shared/ThemeContext'
 import A from 'ui/A'
 import Button from 'ui/Button'
@@ -186,14 +185,10 @@ const AddTokenStep = ({
   stepNum: number
   isUsingGlobalToken: boolean
 }) => {
-  const { newRepoFlag: showOrgToken } = useFlags({
-    newRepoFlag: false,
-  })
   const { provider, owner, repo } = useParams<URLParams>()
   const { data: orgUploadToken } = useOrgUploadToken({
     provider,
     owner,
-    enabled: showOrgToken,
   })
   const { data } = useRepo({ provider, owner, repo })
   const repoUploadToken = data?.repository?.uploadToken ?? ''
@@ -249,9 +244,6 @@ function TokenStepSection({
   showAddTokenStep,
   showTokenSelector,
 }: TokenStepSectionProps) {
-  const { newRepoFlag: showOrgToken } = useFlags({
-    newRepoFlag: false,
-  })
   const { provider, owner } = useParams<URLParams>()
   const { data: uploadTokenRequiredData } = useUploadTokenRequired({
     provider,
@@ -261,7 +253,6 @@ function TokenStepSection({
   const { data: orgUploadToken } = useOrgUploadToken({
     provider,
     owner,
-    enabled: showOrgToken,
   })
 
   const handleValueChange = (value: string) => {

diff --git a/src/pages/RepoPage/CoverageOnboarding/GitHubActions/WorkflowYMLStep.tsx b/src/pages/RepoPage/CoverageOnboarding/GitHubActions/WorkflowYMLStep.tsx
@@ -6,7 +6,6 @@ import {
 } from 'services/codecovEventMetrics'
 import { useOrgUploadToken } from 'services/orgUploadToken'
 import { Provider } from 'shared/api/helpers'
-import { useFlags } from 'shared/featureFlags'
 import A from 'ui/A'
 import { Card } from 'ui/Card'
 import { CodeSnippet } from 'ui/CodeSnippet'
@@ -33,13 +32,9 @@ function WorkflowYMLStep({
 }: WorkflowYMLStepProps) {
   const { mutate: storeEventMetric } = useStoreCodecovEventMetric()
   const { provider, owner, repo } = useParams<URLParams>()
-  const { newRepoFlag: showOrgToken } = useFlags({
-    newRepoFlag: false,
-  })
   const { data: orgUploadToken } = useOrgUploadToken({
     provider,
     owner,
-    enabled: showOrgToken,
   })
 
   const workflowYMLConfig = `- name: Upload coverage reports to Codecov

diff --git a/src/pages/RepoPage/CoverageOnboarding/OtherCI/OtherCI.test.tsx b/src/pages/RepoPage/CoverageOnboarding/OtherCI/OtherCI.test.tsx
@@ -7,18 +7,6 @@ import { MemoryRouter, Route } from 'react-router-dom'
 
 import OtherCI from './OtherCI'
 
-const mocks = vi.hoisted(() => ({
-  useFlags: vi.fn(),
-}))
-
-vi.mock('shared/featureFlags', async () => {
-  const actual = await vi.importActual('shared/featureFlags')
-  return {
-    ...actual,
-    useFlags: mocks.useFlags,
-  }
-})
-
 const mockGetRepo = {
   owner: {
     isAdmin: null,
@@ -44,6 +32,12 @@ const mockGetOrgUploadToken = {
   },
 }
 
+const mockNoUploadToken = {
+  owner: {
+    orgUploadToken: null,
+  },
+}
+
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
@@ -86,16 +80,15 @@ interface SetupArgs {
 describe('OtherCI', () => {
   function setup({ hasOrgUploadToken = false }: SetupArgs) {
     const user = userEvent.setup()
-    mocks.useFlags.mockReturnValue({
-      newRepoFlag: hasOrgUploadToken,
-    })
 
     server.use(
       graphql.query('GetRepo', () => {
         return HttpResponse.json({ data: mockGetRepo })
       }),
       graphql.query('GetOrgUploadToken', () => {
-        return HttpResponse.json({ data: mockGetOrgUploadToken })
+        return HttpResponse.json({
+          data: hasOrgUploadToken ? mockGetOrgUploadToken : mockNoUploadToken,
+        })
       })
     )
 

diff --git a/src/pages/RepoPage/CoverageOnboarding/OtherCI/OtherCI.tsx b/src/pages/RepoPage/CoverageOnboarding/OtherCI/OtherCI.tsx
@@ -5,7 +5,6 @@ import config from 'config'
 
 import { useOrgUploadToken } from 'services/orgUploadToken'
 import { useRepo } from 'services/repo'
-import { useFlags } from 'shared/featureFlags'
 import A from 'ui/A'
 import { Card } from 'ui/Card'
 import { CodeSnippet } from 'ui/CodeSnippet'
@@ -27,15 +26,11 @@ interface URLParams {
 }
 
 function OtherCI() {
-  const { newRepoFlag: showOrgToken } = useFlags({
-    newRepoFlag: false,
-  })
   const { provider, owner, repo } = useParams<URLParams>()
   const { data } = useRepo({ provider, owner, repo })
   const { data: orgUploadToken } = useOrgUploadToken({
     provider,
     owner,
-    enabled: showOrgToken,
   })
 
   const uploadToken = orgUploadToken ?? data?.repository?.uploadToken ?? ''

diff --git a/src/services/orgUploadToken/useOrgUploadToken.ts b/src/services/orgUploadToken/useOrgUploadToken.ts
@@ -21,14 +21,9 @@ const query = `query GetOrgUploadToken ($owner: String!) {
 interface UseOrgUploadTokenArgs {
   provider: string
   owner: string
-  enabled?: boolean
 }
 
-export const useOrgUploadToken = ({
-  provider,
-  owner,
-  enabled = true,
-}: UseOrgUploadTokenArgs) =>
+export const useOrgUploadToken = ({ provider, owner }: UseOrgUploadTokenArgs) =>
   useQuery({
     queryKey: ['GetOrgUploadToken', provider, owner],
     queryFn: ({ signal }) =>
@@ -52,5 +47,4 @@ export const useOrgUploadToken = ({
 
         return parsedRes?.data?.owner?.orgUploadToken ?? null
       }),
-    enabled,
   })