Update useBranchCoverageMeasurements to use repository instead of rep…

…ositoryDeprecated
codecov · May 6, 2024 · 5d09455 · 5d09455
1 parent d701376
commit 5d09455
Showing 1 changed file with 27 additions and 16 deletions.
diff --git a/src/services/charts/useBranchCoverageMeasurements.tsx b/src/services/charts/useBranchCoverageMeasurements.tsx
@@ -6,6 +6,7 @@ import {
   RepoOwnerNotActivatedErrorSchema,
 } from 'services/repo'
 import Api from 'shared/api'
+import { NetworkErrorObject } from 'shared/api/helpers'
 import A from 'ui/A'
 
 const MEASUREMENT_INTERVALS = {
@@ -45,18 +46,18 @@ const GetBranchCoverageMeasurementsSchema = z.object({
     .nullable(),
 })
 
-const query = `
-  query GetBranchCoverageMeasurements(
-    $owner: String!
-    $repo: String!
-    $branch: String
-    $after: DateTime!
-    $before: DateTime!
-    $interval: MeasurementInterval!
-  ) {
-    owner(username: $owner) {
-      repository: repositoryDeprecated(name: $repo) {
-        __typename
+const query = `query GetBranchCoverageMeasurements(
+  $owner: String!
+  $repo: String!
+  $branch: String
+  $after: DateTime!
+  $before: DateTime!
+  $interval: MeasurementInterval!
+) {
+  owner(username: $owner) {
+    repository: repository(name: $repo) {
+      __typename
+      ... on Repository {
         measurements(
           interval: $interval
           after: $after
@@ -67,8 +68,15 @@ const query = `
           max
         }
       }
+      ... on NotFoundError {
+        message
+      }
+      ... on OwnerNotActivatedError {
+        message
+      }
     }
-  }`
+  }
+}`
 
 interface UseBranchCoverageMeasurementsArgs {
   provider: string
@@ -126,7 +134,8 @@ export const useBranchCoverageMeasurements = ({
           return Promise.reject({
             status: 404,
             data: {},
-          })
+            dev: 'useBranchCoverageMeasurements - 404 Failed to parse data',
+          } satisfies NetworkErrorObject)
         }
 
         const data = parsedData.data
@@ -135,7 +144,8 @@ export const useBranchCoverageMeasurements = ({
           return Promise.reject({
             status: 404,
             data: {},
-          })
+            dev: 'useBranchCoverageMeasurements - 404 Not found error',
+          } satisfies NetworkErrorObject)
         }
 
         if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
@@ -151,7 +161,8 @@ export const useBranchCoverageMeasurements = ({
                 </p>
               ),
             },
-          })
+            dev: 'useBranchCoverageMeasurements - 403 Owner not activated',
+          } satisfies NetworkErrorObject)
         }
 
         return {