chore: Convert to TS - services charts, user, orgUploadToken, image

src/services/charts/index.ts

@@ -1,2 +1 @@
-export * from './useLegacyRepoCoverage'
 export * from './useSunburstCoverage'

src/services/image/useImage.test.js → src/services/image/useImage.test.ts

@@ -15,15 +15,15 @@ describe('useImage', () => {
 
   describe('successful network request', () => {
     beforeAll(() => {
-      global.Image = class {
+      ;(global as any).Image = class {
         constructor() {
           setTimeout(() => {
-            this.onload()
+            ;(this as any).onload()
           }, 100)
         }
 
         decode() {
-          return new Promise((resolve) => resolve())
+          return new Promise<void>((resolve) => resolve())
         }
       }
     })
@@ -44,10 +44,10 @@ describe('useImage', () => {
 
   describe('unsuccessful network request', () => {
     beforeAll(() => {
-      global.Image = class {
+      ;(global as any).Image = class {
         constructor() {
           setTimeout(() => {
-            this.onload()
+            ;(this as any).onload()
           }, 100)
         }
 

src/services/image/useImage.js → src/services/image/useImage.ts

@@ -1,8 +1,8 @@
 import { useEffect, useMemo, useState } from 'react'
 
-export function imagePromiseFactory({ src }) {
+export function imagePromiseFactory({ src }: { src: string }) {
   return new Promise((resolveSource, rejectSource) => {
-    return new Promise((resolveImage, rejectImage) => {
+    return new Promise<void>((resolveImage, rejectImage) => {
       const image = new Image()
       image.src = src
       image.onload = () =>
@@ -19,7 +19,7 @@ export function imagePromiseFactory({ src }) {
 
 const imageExtCache = new Map()
 
-export function useImage({ src }) {
+export function useImage({ src }: { src: string }) {
   const [, setIsLoading] = useState(true)
 
   let imageCache = useMemo(
@@ -39,12 +39,12 @@ export function useImage({ src }) {
     let unMounted = false
     imageCache
       .get(src)
-      .promise.then((src) => {
+      .promise.then((src: string) => {
         if (unMounted) return
         imageCache.set(src, { ...imageCache.get(src), cache: 'resolved', src })
         setIsLoading(false)
       })
-      .catch((error) => {
+      .catch((error: Error) => {
         if (unMounted) return
         imageCache.set(src, {
           ...imageCache.get(src),

src/services/orgUploadToken/useOrgUploadToken.ts

@@ -2,6 +2,7 @@ import { useQuery } from '@tanstack/react-query'
 import { z } from 'zod'
 
 import Api from 'shared/api'
+import { NetworkErrorObject, rejectNetworkError } from 'shared/api/helpers'
 
 const RequestSchema = z.object({
   owner: z
@@ -42,11 +43,11 @@ export const useOrgUploadToken = ({
         const parsedRes = RequestSchema.safeParse(res?.data)
 
         if (!parsedRes.success) {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
-            data: null,
-            dev: 'Failed parse for GetOrgUploadToken',
-          })
+            data: {},
+            dev: 'useOrgUploadToken - 404 Failed to parse data',
+          } satisfies NetworkErrorObject)
         }
 
         return parsedRes?.data?.owner?.orgUploadToken ?? null

src/services/pathContents/branch/file/usePrefetchBranchFileEntry.test.jsx → src/services/pathContents/branch/file/usePrefetchBranchFileEntry.test.tsx

@@ -4,6 +4,8 @@ import { graphql, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
 import { MemoryRouter, Route } from 'react-router-dom'
 
+import { PrefetchBranchFileEntryCoverage } from 'services/pathContents/utils'
+
 import { usePrefetchBranchFileEntry } from './usePrefetchBranchFileEntry'
 
 const server = setupServer()
@@ -21,7 +23,7 @@ const queryClient = new QueryClient({
   },
 })
 
-const wrapper = ({ children }) => (
+const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => (
   <MemoryRouter
     initialEntries={['/gh/codecov/test-repo/tree/main/src/file.js']}
   >
@@ -120,21 +122,28 @@ describe('usePrefetchBranchFileEntry', () => {
 
     await result.current.runPrefetch()
 
-    await waitFor(() => queryClient.getQueryState().isFetching)
+    await waitFor(() => {
+      if (queryClient.isFetching()) {
+        throw new Error('still fetching')
+      }
+    })
+
+    const data = queryClient.getQueryCache().getAll()[0]?.state
+      .data as NonNullable<PrefetchBranchFileEntryCoverage>
 
-    expect(queryClient.getQueryState().data.content).toBe(
+    expect(data.content).toBe(
       mockData.owner.repository.commit.coverageAnalytics.coverageFile.content
     )
-    expect(queryClient.getQueryState().data.coverage).toStrictEqual({
+    expect(data.coverage).toStrictEqual({
       1: 1,
       2: 1,
       4: 1,
       5: 1,
       7: 1,
       8: 1,
     })
-    expect(queryClient.getQueryState().data.flagNames).toStrictEqual(['a', 'b'])
-    expect(queryClient.getQueryState().data.isCriticalFile).toBe(true)
-    expect(queryClient.getQueryState().data.totals).toBe(0)
+    expect(data.flagNames).toStrictEqual(['a', 'b'])
+    expect(data.isCriticalFile).toBe(true)
+    expect(data.totals).toBe(0)
   })
 })

src/services/pathContents/branch/file/usePrefetchBranchFileEntry.js → src/services/pathContents/branch/file/usePrefetchBranchFileEntry.ts

@@ -6,13 +6,22 @@ import Api from 'shared/api'
 
 import { queryForCommitFile as query } from '../../constants'
 
+interface URLParams {
+  provider: string
+  owner: string
+  repo: string
+}
+
 export function usePrefetchBranchFileEntry({
   branch,
   path,
   flags = [],
-  options = {},
+}: {
+  branch: string
+  path: string
+  flags?: string[]
 }) {
-  const { provider, owner, repo } = useParams()
+  const { provider, owner, repo } = useParams<URLParams>()
   const queryClient = useQueryClient()
 
   const runPrefetch = async () =>

src/services/pathContents/utils.ts

@@ -30,3 +30,7 @@ export function extractCoverageFromResponse(
     ...(hashedPath && { hashedPath }),
   }
 }
+
+export type PrefetchBranchFileEntryCoverage = ReturnType<
+  typeof extractCoverageFromResponse
+>

src/services/user/useIsCurrentUserAnAdmin.test.jsx → src/services/user/useIsCurrentUserAnAdmin.test.tsx

@@ -11,7 +11,7 @@ const queryClient = new QueryClient({
 })
 
 const wrapper =
-  (initialEntries = '/gh/codecov') =>
+  (initialEntries = '/gh/codecov'): React.FC<React.PropsWithChildren> =>
   ({ children }) => (
     <QueryClientProvider client={queryClient}>
       <MemoryRouter initialEntries={[initialEntries]}>

src/services/user/useIsCurrentUserAnAdmin.js → src/services/user/useIsCurrentUserAnAdmin.ts

@@ -1,6 +1,6 @@
 import { useOwner } from './useOwner'
 
-export function useIsCurrentUserAnAdmin({ owner }) {
+export function useIsCurrentUserAnAdmin({ owner }: { owner: string }) {
   const { data: ownerData } = useOwner({ username: owner })
 
   return !!ownerData?.isAdmin

src/services/user/useOnboardUser.test.jsx → src/services/user/useOnboardUser.test.tsx

@@ -18,7 +18,7 @@ const queryClient = new QueryClient({
   defaultOptions: { queries: { retry: false } },
 })
 const wrapper =
-  (initialEntries = '/gh') =>
+  (initialEntries = '/gh'): React.FC<React.PropsWithChildren> =>
   ({ children }) => (
     <QueryClientProvider client={queryClient}>
       <MemoryRouter initialEntries={[initialEntries]}>

src/services/user/useOnboardUser.js → src/services/user/useOnboardUser.ts

@@ -43,8 +43,12 @@ fragment CurrentUserFragment on Me {
 }
 `
 
-export function useOnboardUser(opts) {
-  const { provider } = useParams()
+interface URLParams {
+  provider: string
+}
+
+export function useOnboardUser(opts?: Record<string, unknown>) {
+  const { provider } = useParams<URLParams>()
   const queryClient = useQueryClient()
   const mutation = `
       mutation OnboardUser($input: OnboardUserInput!) {
@@ -61,9 +65,9 @@ export function useOnboardUser(opts) {
     `
 
   return useMutation({
-    mutationFn: (input) => {
-      const formData = input?.formData
-      const selectedOrg = input?.selectedOrg
+    mutationFn: (input: { formData?: unknown; selectedOrg?: string }) => {
+      const formData = input.formData
+      const selectedOrg = input.selectedOrg
 
       return Api.graphqlMutation({
         provider,

src/services/user/useResyncUser.test.jsx → src/services/user/useResyncUser.test.tsx

@@ -1,4 +1,8 @@
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import {
+  QueryClient,
+  QueryClientProvider,
+  QueryFilters,
+} from '@tanstack/react-query'
 import { renderHook, waitFor } from '@testing-library/react'
 import { graphql, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
@@ -10,7 +14,7 @@ const queryClient = new QueryClient({
   defaultOptions: { queries: { retry: false } },
 })
 const wrapper =
-  (initialEntries = '/gh') =>
+  (initialEntries = '/gh'): React.FC<React.PropsWithChildren> =>
   ({ children }) => (
     <QueryClientProvider client={queryClient}>
       <MemoryRouter initialEntries={[initialEntries]}>
@@ -115,9 +119,8 @@ describe('useResyncUser', () => {
       await waitFor(() => expect(invalidateQueriesSpy).toHaveBeenCalledTimes(4))
 
       // Mock returning the data returned being as large as the page size
-      getQueriesDataSpy.mockReturnValue([
-        0,
-        { pages: { repos: Array.from({ length: 20 }) } },
+      getQueriesDataSpy.mockImplementation(({ queryKey }: QueryFilters) => [
+        [queryKey!, { pages: { repos: Array.from({ length: 20 }) } }],
       ])
 
       vi.advanceTimersByTime(POLLING_INTERVAL)