fix: Initial set of parsing errors (#3774)

Author: nsdeschenes

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentOrgPlan.test.tsx

@@ -318,7 +318,9 @@ describe('CurrentOrgPlan', () => {
   describe('when plan value is not provided', () => {
     beforeEach(() => {
       setup({
-        accountDetails: { ...mockedAccountDetails },
+        accountDetails: mockedAccountDetails as z.infer<
+          typeof AccountDetailsSchema
+        >,
       })
     })
 

src/pages/RepoPage/CoverageTab/OverviewTab/subroute/FileExplorer/FileExplorer.test.jsx

@@ -32,6 +32,7 @@ const server = setupServer()
 const mockListData = {
   username: 'nicholas-codecov',
   repository: {
+    __typename: 'Repository',
     branch: {
       head: {
         pathContents: {
@@ -57,6 +58,7 @@ const mockListData = {
 const mockUnknownPath = {
   username: 'nicholas-codecov',
   repository: {
+    __typename: 'Repository',
     branch: {
       head: {
         pathContents: {
@@ -71,6 +73,7 @@ const mockUnknownPath = {
 const mockMissingCoverage = {
   username: 'nicholas-codecov',
   repository: {
+    __typename: 'Repository',
     branch: {
       head: {
         pathContents: {
@@ -85,6 +88,7 @@ const mockMissingCoverage = {
 const mockTreeData = {
   username: 'nicholas-codecov',
   repository: {
+    __typename: 'Repository',
     branch: {
       head: {
         pathContents: {

src/pages/RepoPage/CoverageTab/OverviewTab/subroute/Sunburst/Sunburst.jsx

@@ -29,7 +29,7 @@ function Sunburst() {
     return <Placeholder />
   }
 
-  if (isError) {
+  if (isError || !data) {
     return <p>The sunburst chart failed to load.</p>
   }
 

src/pages/RepoPage/CoverageTab/OverviewTab/subroute/Sunburst/Sunburst.test.jsx

@@ -57,6 +57,8 @@ const treeMock = [
   },
 ]
 
+const mockNullTree = null
+
 const overviewMock = {
   owner: {
     isCurrentUserActivated: true,
@@ -77,15 +79,13 @@ const repoConfigMock = {
   owner: {
     repository: {
       __typename: 'Repository',
-      repositoryConfig: {
-        indicationRange: { upperRange: 80, lowerRange: 60 },
-      },
+      repositoryConfig: { indicationRange: { upperRange: 80, lowerRange: 60 } },
     },
   },
 }
 
 describe('Sunburst', () => {
-  function setup({ coverageTreeStatus = 200 }) {
+  function setup({ coverageTreeStatus = 200, coverageTreeData = treeMock }) {
     server.use(
       graphql.query('GetRepoOverview', () => {
         return HttpResponse.json({ data: overviewMock })
@@ -94,21 +94,35 @@ describe('Sunburst', () => {
         return HttpResponse.json({ data: repoConfigMock })
       }),
       http.get('/internal/:provider/:owner/:repo/coverage/tree', () => {
-        return HttpResponse.json(treeMock, {
+        return HttpResponse.json(coverageTreeData, {
           status: coverageTreeStatus,
         })
       })
     )
   }
 
   describe('successful call', () => {
-    it('renders something', async () => {
-      setup({ coverageTreeStatus: 200 })
-      render(<Sunburst />, { wrapper })
+    describe('with valid tree data', () => {
+      it('renders something', async () => {
+        setup({ coverageTreeStatus: 200 })
+        render(<Sunburst />, { wrapper })
 
-      const chart = await screen.findByText('Chart Mocked')
+        const chart = await screen.findByText('Chart Mocked')
 
-      expect(chart).toBeInTheDocument()
+        expect(chart).toBeInTheDocument()
+      })
+    })
+
+    describe('with invalid tree data', () => {
+      it('renders something', async () => {
+        setup({ coverageTreeStatus: 200, coverageTreeData: mockNullTree })
+        render(<Sunburst />, { wrapper })
+
+        const chart = await screen.findByText(
+          'The sunburst chart failed to load.'
+        )
+        expect(chart).toBeInTheDocument()
+      })
     })
   })
 

src/services/account/useAccountDetails.ts

@@ -119,39 +119,41 @@ export const SubscriptionDetailSchema = z
   })
   .nullable()
 
-export const AccountDetailsSchema = z.object({
-  activatedStudentCount: z.number(),
-  activatedUserCount: z.number(),
-  checkoutSessionId: z.string().nullable(),
-  delinquent: z.boolean().nullable(),
-  email: z.string().nullable(),
-  inactiveUserCount: z.number(),
-  integrationId: z.number().nullable(),
-  name: z.string().nullable(),
-  nbActivePrivateRepos: z.number().nullable(),
-  planAutoActivate: z.boolean().nullable(),
-  planProvider: z.string().nullable(),
-  repoTotalCredits: z.number(),
-  rootOrganization: z
-    .object({
-      username: z.string().nullish(),
-    })
-    .nullable(),
-  scheduleDetail: z
-    .object({
-      scheduledPhase: z
-        .object({
-          quantity: z.number(),
-          plan: z.string(),
-          startDate: z.number(),
-        })
-        .nullable(),
-    })
-    .nullable(),
-  studentCount: z.number(),
-  subscriptionDetail: SubscriptionDetailSchema,
-  usesInvoice: z.boolean(),
-})
+export const AccountDetailsSchema = z
+  .object({
+    activatedStudentCount: z.number(),
+    activatedUserCount: z.number(),
+    checkoutSessionId: z.string().nullable(),
+    delinquent: z.boolean().nullable(),
+    email: z.string().nullable(),
+    inactiveUserCount: z.number(),
+    integrationId: z.number().nullable(),
+    name: z.string().nullable(),
+    nbActivePrivateRepos: z.number().nullable(),
+    planAutoActivate: z.boolean().nullable(),
+    planProvider: z.string().nullable(),
+    repoTotalCredits: z.number(),
+    rootOrganization: z
+      .object({
+        username: z.string().nullish(),
+      })
+      .nullable(),
+    scheduleDetail: z
+      .object({
+        scheduledPhase: z
+          .object({
+            quantity: z.number(),
+            plan: z.string(),
+            startDate: z.number(),
+          })
+          .nullable(),
+      })
+      .nullable(),
+    studentCount: z.number(),
+    subscriptionDetail: SubscriptionDetailSchema,
+    usesInvoice: z.boolean(),
+  })
+  .nullish()
 
 export interface UseAccountDetailsArgs {
   provider: Provider

src/services/charts/SunburstCoverageQueryOpts.ts

@@ -29,7 +29,7 @@ const SunburstSchema: z.ZodType<SunburstResponse> = baseResponseSchema.extend({
   children: z.lazy(() => SunburstSchema.array()).optional(),
 })
 
-const ResponseSchema = z.array(SunburstSchema)
+const ResponseSchema = z.array(SunburstSchema).nullable()
 
 interface SunburstCoverageArgs {
   provider: Provider

src/services/pathContents/branch/dir/useRepoBranchContents.test.tsx

@@ -325,14 +325,12 @@ describe('useRepoBranchContents', () => {
     })
 
     describe('request rejects', () => {
-      const oldConsoleError = console.error
-
       beforeEach(() => {
-        console.error = () => null
+        vi.spyOn(console, 'error').mockImplementation(() => {})
       })
 
       afterEach(() => {
-        console.error = oldConsoleError
+        vi.restoreAllMocks()
       })
 
       describe('on repository not found', () => {

src/services/pathContents/branch/dir/useRepoBranchContents.tsx

@@ -81,13 +81,15 @@ export type PathContentResultType = z.infer<typeof PathContentsResultSchema>
 const RepositorySchema = z.object({
   __typename: z.literal('Repository'),
   repositoryConfig: RepositoryConfigSchema,
-  branch: z.object({
-    head: z
-      .object({
-        deprecatedPathContents: PathContentsUnionSchema.nullish(),
-      })
-      .nullable(),
-  }),
+  branch: z
+    .object({
+      head: z
+        .object({
+          deprecatedPathContents: PathContentsUnionSchema.nullish(),
+        })
+        .nullable(),
+    })
+    .nullable(),
 })
 
 const BranchContentsSchema = z.object({

src/services/user/useInternalUser.ts

@@ -13,7 +13,7 @@ const OwnerSchema = z
     service: z.string(),
     stats: z
       .object({
-        repos: z.number().nullable(),
+        repos: z.number().nullish(),
       })
       .nullable(),
     username: z.string(),