update hooks and query options to use new rejectNetworkError

codecov · Oct 30, 2024 · 9db3a96 · 9db3a96
1 parent 3e11000
commit 9db3a96
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 33 deletions.
diff --git a/src/services/bundleAnalysis/BranchBundlesNamesQueryOpts.tsx b/src/services/bundleAnalysis/BranchBundlesNamesQueryOpts.tsx
@@ -7,6 +7,7 @@ import {
   RepoOwnerNotActivatedErrorSchema,
 } from 'services/repo'
 import Api from 'shared/api'
+import { rejectNetworkError } from 'shared/api/helpers'
 import A from 'ui/A'
 
 const BundleSchema = z.object({
@@ -123,23 +124,26 @@ export const BranchBundlesNamesQueryOpts = ({
         const parsedData = BranchBundleSummaryDataSchema.safeParse(res?.data)
 
         if (!parsedData.success) {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
+            dev: 'BranchBundlesNamesQueryOpts - 404 Failed to parse',
+            error: parsedData.error,
           })
         }
 
         const data = parsedData.data
 
         if (data?.owner?.repository?.__typename === 'NotFoundError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
+            dev: 'BranchBundlesNamesQueryOpts - 404 Repository not found',
           })
         }
 
         if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 403,
             data: {
               detail: (
@@ -151,6 +155,7 @@ export const BranchBundlesNamesQueryOpts = ({
                 </p>
               ),
             },
+            dev: 'BranchBundlesNamesQueryOpts - 403 Owner not activated',
           })
         }
 

diff --git a/src/services/bundleAnalysis/BundleTrendDataQueryOpts.tsx b/src/services/bundleAnalysis/BundleTrendDataQueryOpts.tsx
@@ -8,7 +8,7 @@ import {
   RepoOwnerNotActivatedErrorSchema,
 } from 'services/repo'
 import Api from 'shared/api'
-import { NetworkErrorObject } from 'shared/api/helpers'
+import { rejectNetworkError } from 'shared/api/helpers'
 import A from 'ui/A'
 
 export const BUNDLE_TREND_INTERVALS = [
@@ -197,25 +197,26 @@ export const BundleTrendDataQueryOpts = ({
         const parsedData = RequestSchema.safeParse(res?.data)
 
         if (!parsedData.success) {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
-            dev: 'useBundleTrendData - 404 Failed to parse schema',
-          } satisfies NetworkErrorObject)
+            dev: 'BundleTrendDataQueryOpts - 404 Failed to parse schema',
+            error: parsedData.error,
+          })
         }
 
         const data = parsedData.data
 
         if (data?.owner?.repository?.__typename === 'NotFoundError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
-            dev: 'useBundleTrendData - 404 Not found error',
-          } satisfies NetworkErrorObject)
+            dev: 'BundleTrendDataQueryOpts - 404 Not found error',
+          })
         }
 
         if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 403,
             data: {
               detail: (
@@ -227,8 +228,8 @@ export const BundleTrendDataQueryOpts = ({
                 </p>
               ),
             },
-            dev: 'useBundleTrendData - 403 Owner not activated',
-          } satisfies NetworkErrorObject)
+            dev: 'BundleTrendDataQueryOpts - 403 Owner not activated',
+          })
         }
 
         const bundleReport =

diff --git a/src/services/bundleAnalysis/useBranchBundleSummary.tsx b/src/services/bundleAnalysis/useBranchBundleSummary.tsx
@@ -11,6 +11,7 @@ import {
   useRepoOverview,
 } from 'services/repo'
 import Api from 'shared/api'
+import { rejectNetworkError } from 'shared/api/helpers'
 import A from 'ui/A'
 
 const BundleSchema = z.object({
@@ -160,23 +161,26 @@ export const BranchBundleSummaryQueryOpts = ({
         const parsedData = BranchBundleSummaryDataSchema.safeParse(res?.data)
 
         if (!parsedData.success) {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
+            dev: 'BranchBundleSummaryQueryOpts - 404 Failed to parse',
+            error: parsedData.error,
           })
         }
 
         const data = parsedData.data
 
         if (data?.owner?.repository?.__typename === 'NotFoundError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
+            dev: 'BranchBundleSummaryQueryOpts - 404 Repository not found',
           })
         }
 
         if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 403,
             data: {
               detail: (
@@ -188,6 +192,7 @@ export const BranchBundleSummaryQueryOpts = ({
                 </p>
               ),
             },
+            dev: 'BranchBundleSummaryQueryOpts - 403 Owner not activated',
           })
         }
 

diff --git a/src/services/bundleAnalysis/useBundleAssetModules.tsx b/src/services/bundleAnalysis/useBundleAssetModules.tsx
@@ -10,6 +10,7 @@ import {
   RepoOwnerNotActivatedErrorSchema,
 } from 'services/repo'
 import Api from 'shared/api'
+import { rejectNetworkError } from 'shared/api/helpers'
 import A from 'ui/A'
 
 const BundleAssetModuleSchema = z.object({
@@ -185,23 +186,26 @@ export const BundleAssetModulesQueryOpts = ({
         const parsedData = RequestSchema.safeParse(res.data)
 
         if (!parsedData.success) {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
+            dev: 'BundleAssetModulesQueryOpts - 404 Failed to parse',
+            error: parsedData.error,
           })
         }
 
         const data = parsedData.data
 
         if (data?.owner?.repository?.__typename === 'NotFoundError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
+            dev: 'BundleAssetModulesQueryOpts - 404 Repository not found',
           })
         }
 
         if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 403,
             data: {
               detail: (
@@ -213,6 +217,7 @@ export const BundleAssetModulesQueryOpts = ({
                 </p>
               ),
             },
+            dev: 'BundleAssetModulesQueryOpts - 403 Owner not activated',
           })
         }
 

diff --git a/src/services/bundleAnalysis/useBundleAssets.tsx b/src/services/bundleAnalysis/useBundleAssets.tsx
@@ -12,7 +12,7 @@ import {
   RepoOwnerNotActivatedErrorSchema,
 } from 'services/repo'
 import Api from 'shared/api'
-import { type NetworkErrorObject } from 'shared/api/helpers'
+import { rejectNetworkError } from 'shared/api/helpers'
 import { mapEdges } from 'shared/utils/graphql'
 import A from 'ui/A'
 
@@ -286,24 +286,26 @@ export const BundleAssetsQueryOpts = ({
         const parsedData = RequestSchema.safeParse(res?.data)
 
         if (!parsedData.success) {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
-            dev: 'useBundleAssets - 404 schema parsing failed',
-          } satisfies NetworkErrorObject)
+            dev: 'BundleAssetsQueryOpts - 404 schema parsing failed',
+            error: parsedData.error,
+          })
         }
 
         const data = parsedData.data
 
         if (data?.owner?.repository?.__typename === 'NotFoundError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
+            dev: 'BundleAssetsQueryOpts - 404 Repository not found',
           })
         }
 
         if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 403,
             data: {
               detail: (
@@ -315,6 +317,7 @@ export const BundleAssetsQueryOpts = ({
                 </p>
               ),
             },
+            dev: 'BundleAssetsQueryOpts - 403 Owner not activated',
           })
         }
 

diff --git a/src/services/bundleAnalysis/useBundleSummary.tsx b/src/services/bundleAnalysis/useBundleSummary.tsx
@@ -11,7 +11,7 @@ import {
   useRepoOverview,
 } from 'services/repo'
 import Api from 'shared/api/api'
-import { NetworkErrorObject, rejectNetworkError } from 'shared/api/helpers'
+import { rejectNetworkError } from 'shared/api/helpers'
 import A from 'ui/A'
 
 const BundleDataSchema = z.object({
@@ -162,23 +162,23 @@ export const BundleSummaryQueryOpts = ({
           return rejectNetworkError({
             status: 404,
             data: {},
-            dev: 'useBundleSummary - 404 Failed to parse data',
+            dev: 'BundleSummaryQueryOpts - 404 Failed to parse data',
             error: parsedData.error,
           })
         }
 
         const data = parsedData.data
 
         if (data?.owner?.repository?.__typename === 'NotFoundError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 404,
             data: {},
-            dev: 'useBundleSummary - 404 Not found error',
-          } satisfies NetworkErrorObject)
+            dev: 'BundleSummaryQueryOpts - 404 Not found error',
+          })
         }
 
         if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
-          return Promise.reject({
+          return rejectNetworkError({
             status: 403,
             data: {
               detail: (
@@ -190,8 +190,8 @@ export const BundleSummaryQueryOpts = ({
                 </p>
               ),
             },
-            dev: 'useBundleSummary - 403 Owner not activated',
-          } satisfies NetworkErrorObject)
+            dev: 'BundleSummaryQueryOpts - 403 Owner not activated',
+          })
         }
 
         let bundleSummary = null