Skip to content

Commit f30c0ae

Browse files
nicholas-codecovnicholas-codecov
committed
migrate current use of rejectNetworkError to updated version
1 parent 6df04f2 commit f30c0ae

File tree

50 files changed

+427
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+427
-391
lines changed

‎src/layouts/BaseLayout/hooks/NavigatorDataQueryOpts.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
RepoOwnerNotActivatedErrorSchema,
77
} from 'services/repo'
88
import Api from 'shared/api'
9-
import { rejectNetworkError } from 'shared/api/helpers'
9+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
1010

1111
const RepositorySchema = z.object({
1212
__typename: z.literal('Repository'),
@@ -71,10 +71,11 @@ export const NavigatorDataQueryOpts = ({
7171

7272
if (!parsedData.success) {
7373
return rejectNetworkError({
74-
status: 404,
75-
data: {},
76-
dev: 'NavigatorDataQueryOpts - 404 Failed to parse data',
77-
error: parsedData.error,
74+
errorName: 'Parsing Error',
75+
errorDetails: {
76+
callingFn: 'NavigatorDataQueryOpts',
77+
error: parsedData.error,
78+
},
7879
})
7980
}
8081

‎src/pages/AccountSettings/tabs/OktaAccess/hooks/useUpdateOktaConfig.tsx

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import z from 'zod'
66

77
import { useAddNotification } from 'services/toastNotification'
88
import Api from 'shared/api'
9-
import { Provider, rejectNetworkError } from 'shared/api/helpers'
9+
import { Provider } from 'shared/api/helpers'
10+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
1011
import A from 'ui/A'
1112

1213
import { OktaConfigQueryOpts } from '../queries/OktaConfigQueryOpts'
@@ -105,10 +106,11 @@ export const useUpdateOktaConfig = ({ provider, owner }: URLParams) => {
105106
const parsedData = ResponseSchema.safeParse(data)
106107
if (!parsedData.success) {
107108
return rejectNetworkError({
108-
status: 404,
109-
data: {},
110-
dev: 'useUpdateOktaConfig - 404 failed to parse',
111-
error: parsedData.error,
109+
errorName: 'Parsing Error',
110+
errorDetails: {
111+
callingFn: 'useUpdateOktaConfig',
112+
error: parsedData.error,
113+
},
112114
})
113115
}
114116

‎src/pages/AccountSettings/tabs/OktaAccess/queries/OktaConfigQueryOpts.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { queryOptions as queryOptionsV5 } from '@tanstack/react-queryV5'
22
import { z } from 'zod'
33

44
import Api from 'shared/api'
5-
import { rejectNetworkError } from 'shared/api/helpers'
5+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
66

77
export const OktaConfigSchema = z.object({
88
enabled: z.boolean(),
@@ -66,10 +66,11 @@ export function OktaConfigQueryOpts({
6666

6767
if (!parsedRes.success) {
6868
return rejectNetworkError({
69-
status: 404,
70-
data: {},
71-
dev: 'OktaConfigQueryOpts - 404 failed to parse',
72-
error: parsedRes.error,
69+
errorName: 'Parsing Error',
70+
errorDetails: {
71+
callingFn: 'OktaConfigQueryOpts',
72+
error: parsedRes.error,
73+
},
7374
})
7475
}
7576

‎src/pages/AccountSettings/tabs/OrgUploadToken/TokenlessSection/useSetUploadTokenRequired.tsx

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import { z } from 'zod'
44

55
import { useAddNotification } from 'services/toastNotification'
66
import Api from 'shared/api'
7-
import { Provider, rejectNetworkError } from 'shared/api/helpers'
7+
import { Provider } from 'shared/api/helpers'
8+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
89

910
const TOAST_DURATION = 10000
1011

@@ -75,10 +76,11 @@ export const useSetUploadTokenRequired = ({
7576
const parsedData = ResponseSchema.safeParse(res.data)
7677
if (!parsedData.success) {
7778
return rejectNetworkError({
78-
status: 404,
79-
data: {},
80-
dev: 'useSetUploadTokenRequired - 404 failed to parse',
81-
error: parsedData.error,
79+
errorName: 'Parsing Error',
80+
errorDetails: {
81+
callingFn: 'useSetUploadTokenRequired',
82+
error: parsedData.error,
83+
},
8284
})
8385
}
8486

‎src/pages/CommitDetailPage/Header/HeaderDefault/queries/CommitHeaderDataQueryOpts.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
RepoOwnerNotActivatedErrorSchema,
77
} from 'services/repo'
88
import Api from 'shared/api'
9-
import { rejectNetworkError } from 'shared/api/helpers'
9+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
1010
import A from 'ui/A'
1111

1212
const RepositorySchema = z.object({
@@ -108,26 +108,27 @@ export const CommitHeaderDataQueryOpts = ({
108108

109109
if (!parsedData.success) {
110110
return rejectNetworkError({
111-
status: 404,
112-
data: {},
113-
dev: 'CommitHeaderDataQueryOpts - 404 Failed to parse schema',
114-
error: parsedData.error,
111+
errorName: 'Parsing Error',
112+
errorDetails: {
113+
callingFn: 'CommitHeaderDataQueryOpts',
114+
error: parsedData.error,
115+
},
115116
})
116117
}
117118

118119
const data = parsedData.data
119120

120121
if (data?.owner?.repository?.__typename === 'NotFoundError') {
121122
return rejectNetworkError({
122-
status: 404,
123-
data: {},
124-
dev: 'CommitHeaderDataQueryOpts - 404 Not Found',
123+
errorName: 'Not Found Error',
124+
errorDetails: { callingFn: 'CommitHeaderDataQueryOpts' },
125125
})
126126
}
127127

128128
if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
129129
return rejectNetworkError({
130-
status: 403,
130+
errorName: 'Owner Not Activated',
131+
errorDetails: { callingFn: 'CommitHeaderDataQueryOpts' },
131132
data: {
132133
detail: (
133134
<p>
@@ -138,7 +139,6 @@ export const CommitHeaderDataQueryOpts = ({
138139
</p>
139140
),
140141
},
141-
dev: 'CommitHeaderDataQueryOpts - 403 Owner Not Activated',
142142
})
143143
}
144144

‎src/pages/CommitDetailPage/Header/HeaderTeam/queries/CommitHeaderDataTeamQueryOpts.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
RepoOwnerNotActivatedErrorSchema,
1313
} from 'services/repo'
1414
import Api from 'shared/api'
15-
import { rejectNetworkError } from 'shared/api/helpers'
15+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
1616
import A from 'ui/A'
1717

1818
const CoverageObjSchema = z.object({
@@ -167,26 +167,27 @@ export const CommitHeaderDataTeamQueryOpts = ({
167167

168168
if (!parsedData.success) {
169169
return rejectNetworkError({
170-
status: 404,
171-
data: {},
172-
dev: 'CommitHeaderDataTeamQueryOpts - 404 Failed to parse schema',
173-
error: parsedData.error,
170+
errorName: 'Parsing Error',
171+
errorDetails: {
172+
callingFn: 'CommitHeaderDataTeamQueryOpts',
173+
error: parsedData.error,
174+
},
174175
})
175176
}
176177

177178
const data = parsedData.data
178179

179180
if (data?.owner?.repository?.__typename === 'NotFoundError') {
180181
return rejectNetworkError({
181-
status: 404,
182-
data: {},
183-
dev: 'CommitHeaderDataTeamQueryOpts - 404 Not Found',
182+
errorName: 'Not Found Error',
183+
errorDetails: { callingFn: 'CommitHeaderDataTeamQueryOpts' },
184184
})
185185
}
186186

187187
if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
188188
return rejectNetworkError({
189-
status: 403,
189+
errorName: 'Owner Not Activated',
190+
errorDetails: { callingFn: 'CommitHeaderDataTeamQueryOpts' },
190191
data: {
191192
detail: (
192193
<p>
@@ -197,7 +198,6 @@ export const CommitHeaderDataTeamQueryOpts = ({
197198
</p>
198199
),
199200
},
200-
dev: 'CommitHeaderDataTeamQueryOpts - 403 Owner Not Activated',
201201
})
202202
}
203203

‎src/pages/CommitDetailPage/queries/CommitPageDataQueryOpts.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
RepoOwnerNotActivatedErrorSchema,
1313
} from 'services/repo'
1414
import Api from 'shared/api'
15-
import { rejectNetworkError } from 'shared/api/helpers'
15+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
1616
import A from 'ui/A'
1717

1818
const BundleAnalysisReportSchema = z.object({
@@ -161,26 +161,27 @@ export const CommitPageDataQueryOpts = ({
161161

162162
if (!parsedData.success) {
163163
return rejectNetworkError({
164-
status: 404,
165-
data: {},
166-
dev: 'CommitPageDataQueryOpts - 404 Failed to parse schema',
167-
error: parsedData.error,
164+
errorName: 'Parsing Error',
165+
errorDetails: {
166+
callingFn: 'CommitPageDataQueryOpts',
167+
error: parsedData.error,
168+
},
168169
})
169170
}
170171

171172
const { data } = parsedData
172173

173174
if (data?.owner?.repository?.__typename === 'NotFoundError') {
174175
return rejectNetworkError({
175-
status: 404,
176-
data: {},
177-
dev: 'CommitPageDataQueryOpts - 404 Not found',
176+
errorName: 'Not Found Error',
177+
errorDetails: { callingFn: 'CommitPageDataQueryOpts' },
178178
})
179179
}
180180

181181
if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
182182
return rejectNetworkError({
183-
status: 403,
183+
errorName: 'Owner Not Activated',
184+
errorDetails: { callingFn: 'CommitPageDataQueryOpts' },
184185
data: {
185186
detail: (
186187
<p>
@@ -191,7 +192,6 @@ export const CommitPageDataQueryOpts = ({
191192
</p>
192193
),
193194
},
194-
dev: 'CommitPageDataQueryOpts - 403 Owner not activated',
195195
})
196196
}
197197

‎src/pages/PlanPage/queries/PlanPageDataQueryOpts.ts

+12-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { queryOptions as queryOptionsV5 } from '@tanstack/react-queryV5'
22
import { z } from 'zod'
33

44
import Api from 'shared/api'
5-
import { rejectNetworkError } from 'shared/api/helpers'
5+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
66

77
const RequestSchema = z.object({
88
owner: z
@@ -14,15 +14,13 @@ const RequestSchema = z.object({
1414
.nullable(),
1515
})
1616

17-
const query = `
18-
query PlanPageData($username: String!) {
19-
owner(username: $username) {
20-
username
21-
isCurrentUserPartOfOrg
22-
numberOfUploads
23-
}
17+
const query = `query PlanPageData($username: String!) {
18+
owner(username: $username) {
19+
username
20+
isCurrentUserPartOfOrg
21+
numberOfUploads
2422
}
25-
`
23+
}`
2624

2725
type PlanPageDataQueryArgs = {
2826
owner: string
@@ -50,10 +48,11 @@ export function PlanPageDataQueryOpts({
5048

5149
if (!parsedRes.success) {
5250
return rejectNetworkError({
53-
status: 404,
54-
data: {},
55-
dev: 'usePlanPageData - 404 schema parsing failed',
56-
error: parsedRes.error,
51+
errorName: 'Parsing Error',
52+
errorDetails: {
53+
callingFn: 'PlanPageDataQueryOpts',
54+
error: parsedRes.error,
55+
},
5756
})
5857
}
5958

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/queries/EnterpriseAccountDetailsQueryOpts.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { queryOptions as queryOptionsV5 } from '@tanstack/react-queryV5'
22
import { z } from 'zod'
33

44
import Api from 'shared/api/api'
5-
import { rejectNetworkError } from 'shared/api/helpers'
5+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
66

77
const AccountSchema = z.object({
88
name: z.string(),
@@ -62,10 +62,11 @@ export function EnterpriseAccountDetailsQueryOpts({
6262

6363
if (!parsedRes.success) {
6464
return rejectNetworkError({
65-
status: 404,
66-
data: {},
67-
dev: 'useEnterpriseAccountDetails - 404 Failed to parse data',
68-
error: parsedRes.error,
65+
errorName: 'Parsing Error',
66+
errorDetails: {
67+
callingFn: 'EnterpriseAccountDetailsQueryOpts',
68+
error: parsedRes.error,
69+
},
6970
})
7071
}
7172

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/queries/InfiniteAccountOrganizationsQueryOpts.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { z } from 'zod'
44
import { OrderingDirection } from 'types'
55

66
import Api from 'shared/api/api'
7-
import { rejectNetworkError } from 'shared/api/helpers'
7+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
88
import { mapEdges } from 'shared/utils/graphql'
99

1010
const RequestSchema = z.object({
@@ -102,20 +102,22 @@ export function InfiniteAccountOrganizationsQueryOpts({
102102

103103
if (!parsedRes.success) {
104104
return rejectNetworkError({
105-
status: 404,
106-
data: {},
107-
dev: 'useInfiniteAccountOrganizations - 404 Failed to parse data',
108-
error: parsedRes.error,
105+
errorName: 'Parsing Error',
106+
errorDetails: {
107+
callingFn: 'InfiniteAccountOrganizationsQueryOpts',
108+
error: parsedRes.error,
109+
},
109110
})
110111
}
111112

112113
const account = parsedRes?.data?.owner?.account
113114

114115
if (!account) {
115116
return rejectNetworkError({
116-
status: 404,
117-
data: {},
118-
dev: 'useInfiniteAccountOrganizations - 404 Cannot find Account for Owner',
117+
errorName: 'Not Found Error',
118+
errorDetails: {
119+
callingFn: 'InfiniteAccountOrganizationsQueryOpts',
120+
},
119121
})
120122
}
121123

‎src/pages/PlanPage/subRoutes/CurrentOrgPlan/useCurrentOrgPlanPageData.tsx

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-queryV5'
22
import { z } from 'zod'
33

44
import Api from 'shared/api'
5-
import { NetworkErrorObject, rejectNetworkError } from 'shared/api/helpers'
5+
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
66
import { Plans } from 'shared/utils/billing'
77

88
const PlanSchema = z.object({
@@ -72,11 +72,12 @@ export const useCurrentOrgPlanPageData = ({
7272
const parsedRes = CurrentOrgPlanPageDataSchema.safeParse(res?.data)
7373
if (!parsedRes.success) {
7474
return rejectNetworkError({
75-
status: 404,
76-
error: parsedRes.error,
77-
data: {},
78-
dev: 'useCurrentOrgPlanPageData - 404 failed to parse',
79-
} satisfies NetworkErrorObject)
75+
errorName: 'Parsing Error',
76+
errorDetails: {
77+
callingFn: 'useCurrentOrgPlanPageData',
78+
error: parsedRes.error,
79+
},
80+
})
8081
}
8182

8283
return parsedRes.data?.owner ?? null

0 commit comments

Comments
 (0)