Skip to content

Commit 6fc34b6

Browse files
nsdeschenesnsdeschenes
authored
Merge branch 'main' into gh-eng-3382-render-only-three-levels-of-the-sunburst
2 parents 80253a1 + 52909c8 commit 6fc34b6

File tree

163 files changed

+1255
-1379
lines changed

Some content is hidden

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

163 files changed

+1255
-1379
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { queryOptions as queryOptionsV5 } from '@tanstack/react-queryV5'
22
import { z } from 'zod'
33

4-
import {
5-
RepoNotFoundErrorSchema,
6-
RepoOwnerNotActivatedErrorSchema,
7-
} from 'services/repo'
4+
import { RepoNotFoundErrorSchema } from 'services/repo/schemas/RepoNotFoundError'
5+
import { RepoOwnerNotActivatedErrorSchema } from 'services/repo/schemas/RepoOwnerNotActivatedError'
86
import Api from 'shared/api'
97
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
108

@@ -67,15 +65,13 @@ export const NavigatorDataQueryOpts = ({
6765
repo,
6866
},
6967
}).then((res) => {
68+
const callingFn = 'NavigatorDataQueryOpts'
7069
const parsedData = RequestSchema.safeParse(res.data)
7170

7271
if (!parsedData.success) {
7372
return rejectNetworkError({
7473
errorName: 'Parsing Error',
75-
errorDetails: {
76-
callingFn: 'NavigatorDataQueryOpts',
77-
error: parsedData.error,
78-
},
74+
errorDetails: { callingFn, error: parsedData.error },
7975
})
8076
}
8177

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,13 @@ export const useUpdateOktaConfig = ({ provider, owner }: URLParams) => {
103103
})
104104
},
105105
onSuccess: ({ data }) => {
106+
const callingFn = 'useUpdateOktaConfig'
106107
const parsedData = ResponseSchema.safeParse(data)
108+
107109
if (!parsedData.success) {
108110
return rejectNetworkError({
109111
errorName: 'Parsing Error',
110-
errorDetails: {
111-
callingFn: 'useUpdateOktaConfig',
112-
error: parsedData.error,
113-
},
112+
errorDetails: { callingFn, error: parsedData.error },
114113
})
115114
}
116115

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe('useOktaConfig', () => {
9393
consoleSpy.mockRestore()
9494
})
9595

96-
it('rejects with 404 status', async () => {
96+
it('rejects with 400 status', async () => {
9797
setup({})
9898

9999
const { result } = renderHook(

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,13 @@ export function OktaConfigQueryOpts({
6262
username,
6363
},
6464
}).then((res) => {
65+
const callingFn = 'OktaConfigQueryOpts'
6566
const parsedRes = OktaConfigRequestSchema.safeParse(res?.data)
6667

6768
if (!parsedRes.success) {
6869
return rejectNetworkError({
6970
errorName: 'Parsing Error',
70-
errorDetails: {
71-
callingFn: 'OktaConfigQueryOpts',
72-
error: parsedRes.error,
73-
},
71+
errorDetails: { callingFn, error: parsedRes.error },
7472
})
7573
}
7674

‎src/pages/AccountSettings/tabs/OrgUploadToken/TokenlessSection/constants.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export const ADMIN_TOKEN_REQUIRED_BANNER = 'admin-token-required-banner'
2+
export const MEMBER_TOKEN_REQUIRED_BANNER = 'member-token-required-banner'
3+
export const ADMIN_TOKEN_NOT_REQUIRED_BANNER = 'admin-token-not-required-banner'
4+
export const MEMBER_TOKEN_NOT_REQUIRED_BANNER =
5+
'member-token-not-required-banner'

‎src/pages/AccountSettings/tabs/OrgUploadToken/TokenlessSection/index.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
export { default } from './TokenlessSection'
2+
export {
3+
ADMIN_TOKEN_REQUIRED_BANNER,
4+
MEMBER_TOKEN_REQUIRED_BANNER,
5+
ADMIN_TOKEN_NOT_REQUIRED_BANNER,
6+
MEMBER_TOKEN_NOT_REQUIRED_BANNER,
7+
} from './constants'

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ import { useAddNotification } from 'services/toastNotification'
66
import Api from 'shared/api'
77
import { Provider } from 'shared/api/helpers'
88
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
9+
import { removeFromLocalStorage } from 'ui/TopBanner/TopBanner'
10+
11+
import {
12+
ADMIN_TOKEN_NOT_REQUIRED_BANNER,
13+
ADMIN_TOKEN_REQUIRED_BANNER,
14+
MEMBER_TOKEN_NOT_REQUIRED_BANNER,
15+
MEMBER_TOKEN_REQUIRED_BANNER,
16+
} from './constants'
917

1018
const TOAST_DURATION = 10000
1119

@@ -73,14 +81,13 @@ export const useSetUploadTokenRequired = ({
7381
},
7482
mutationPath: 'setUploadTokenRequired',
7583
}).then((res) => {
84+
const callingFn = 'useSetUploadTokenRequired'
7685
const parsedData = ResponseSchema.safeParse(res.data)
86+
7787
if (!parsedData.success) {
7888
return rejectNetworkError({
7989
errorName: 'Parsing Error',
80-
errorDetails: {
81-
callingFn: 'useSetUploadTokenRequired',
82-
error: parsedData.error,
83-
},
90+
errorDetails: { callingFn, error: parsedData.error },
8491
})
8592
}
8693

@@ -102,6 +109,13 @@ export const useSetUploadTokenRequired = ({
102109
disappearAfter: TOAST_DURATION,
103110
})
104111

112+
// we want to show the banners again when this setting is changed
113+
// even if the user dismissed them in the past
114+
removeFromLocalStorage(MEMBER_TOKEN_NOT_REQUIRED_BANNER)
115+
removeFromLocalStorage(ADMIN_TOKEN_NOT_REQUIRED_BANNER)
116+
removeFromLocalStorage(MEMBER_TOKEN_REQUIRED_BANNER)
117+
removeFromLocalStorage(ADMIN_TOKEN_REQUIRED_BANNER)
118+
105119
// only want to invalidate the query if the mutation was successful
106120
// otherwise we're just going to re-fetch the same data
107121
queryClient.invalidateQueries(['GetUploadTokenRequired'])

‎src/pages/AdminSettings/AdminAccess/AdminAccessTable/useAdminAccessList.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ export const useAdminAccessList = () => {
3838
path: `/users?is_admin=true&page=${pageParam}`,
3939
signal,
4040
}).then((res) => {
41+
const callingFn = 'useAdminAccessList'
4142
const parsedData = RequestSchema.safeParse(res)
4243

4344
if (!parsedData.success) {
4445
return rejectNetworkError({
4546
errorName: 'Parsing Error',
46-
errorDetails: {
47-
callingFn: 'useAdminAccessList',
48-
error: parsedData.error,
49-
},
47+
errorDetails: { callingFn, error: parsedData.error },
5048
})
5149
}
5250
return parsedData.data

‎src/pages/CommitDetailPage/CommitCoverage/routes/CommitDetailFileExplorer/hooks/useRepoCommitContentsTable.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const mockCommitContentData = {
2222
results: [
2323
{
2424
name: 'src',
25-
path: null,
25+
path: 'src',
2626
percentCovered: 50.0,
2727
hits: 24,
2828
misses: 24,
@@ -34,7 +34,7 @@ const mockCommitContentData = {
3434
},
3535
{
3636
name: 'file.ts',
37-
path: null,
37+
path: 'file.ts',
3838
percentCovered: 50.0,
3939
hits: 24,
4040
misses: 24,

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { queryOptions as queryOptionsV5 } from '@tanstack/react-queryV5'
22
import { z } from 'zod'
33

4-
import {
5-
RepoNotFoundErrorSchema,
6-
RepoOwnerNotActivatedErrorSchema,
7-
} from 'services/repo'
4+
import { RepoNotFoundErrorSchema } from 'services/repo/schemas/RepoNotFoundError'
5+
import { RepoOwnerNotActivatedErrorSchema } from 'services/repo/schemas/RepoOwnerNotActivatedError'
86
import Api from 'shared/api'
97
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
108
import A from 'ui/A'
@@ -104,15 +102,13 @@ export const CommitHeaderDataQueryOpts = ({
104102
commitId,
105103
},
106104
}).then((res) => {
105+
const callingFn = 'CommitHeaderDataQueryOpts'
107106
const parsedData = CommitHeaderDataSchema.safeParse(res?.data)
108107

109108
if (!parsedData.success) {
110109
return rejectNetworkError({
111110
errorName: 'Parsing Error',
112-
errorDetails: {
113-
callingFn: 'CommitHeaderDataQueryOpts',
114-
error: parsedData.error,
115-
},
111+
errorDetails: { callingFn, error: parsedData.error },
116112
})
117113
}
118114

@@ -121,14 +117,14 @@ export const CommitHeaderDataQueryOpts = ({
121117
if (data?.owner?.repository?.__typename === 'NotFoundError') {
122118
return rejectNetworkError({
123119
errorName: 'Not Found Error',
124-
errorDetails: { callingFn: 'CommitHeaderDataQueryOpts' },
120+
errorDetails: { callingFn },
125121
})
126122
}
127123

128124
if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
129125
return rejectNetworkError({
130126
errorName: 'Owner Not Activated',
131-
errorDetails: { callingFn: 'CommitHeaderDataQueryOpts' },
127+
errorDetails: { callingFn },
132128
data: {
133129
detail: (
134130
<p>

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ import { MissingBaseReportSchema } from 'services/comparison/schemas/MissingBase
77
import { MissingComparisonSchema } from 'services/comparison/schemas/MissingComparison'
88
import { MissingHeadCommitSchema } from 'services/comparison/schemas/MissingHeadCommit'
99
import { MissingHeadReportSchema } from 'services/comparison/schemas/MissingHeadReport'
10-
import {
11-
RepoNotFoundErrorSchema,
12-
RepoOwnerNotActivatedErrorSchema,
13-
} from 'services/repo'
10+
import { RepoNotFoundErrorSchema } from 'services/repo/schemas/RepoNotFoundError'
11+
import { RepoOwnerNotActivatedErrorSchema } from 'services/repo/schemas/RepoOwnerNotActivatedError'
1412
import Api from 'shared/api'
1513
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
1614
import A from 'ui/A'
@@ -163,15 +161,13 @@ export const CommitHeaderDataTeamQueryOpts = ({
163161
commitId,
164162
},
165163
}).then((res) => {
164+
const callingFn = 'CommitHeaderDataTeamQueryOpts'
166165
const parsedData = CommitHeaderDataTeamSchema.safeParse(res?.data)
167166

168167
if (!parsedData.success) {
169168
return rejectNetworkError({
170169
errorName: 'Parsing Error',
171-
errorDetails: {
172-
callingFn: 'CommitHeaderDataTeamQueryOpts',
173-
error: parsedData.error,
174-
},
170+
errorDetails: { callingFn, error: parsedData.error },
175171
})
176172
}
177173

@@ -180,14 +176,14 @@ export const CommitHeaderDataTeamQueryOpts = ({
180176
if (data?.owner?.repository?.__typename === 'NotFoundError') {
181177
return rejectNetworkError({
182178
errorName: 'Not Found Error',
183-
errorDetails: { callingFn: 'CommitHeaderDataTeamQueryOpts' },
179+
errorDetails: { callingFn },
184180
})
185181
}
186182

187183
if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
188184
return rejectNetworkError({
189185
errorName: 'Owner Not Activated',
190-
errorDetails: { callingFn: 'CommitHeaderDataTeamQueryOpts' },
186+
errorDetails: { callingFn },
191187
data: {
192188
detail: (
193189
<p>

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ import { MissingBaseReportSchema } from 'services/comparison/schemas/MissingBase
77
import { MissingComparisonSchema } from 'services/comparison/schemas/MissingComparison'
88
import { MissingHeadCommitSchema } from 'services/comparison/schemas/MissingHeadCommit'
99
import { MissingHeadReportSchema } from 'services/comparison/schemas/MissingHeadReport'
10-
import {
11-
RepoNotFoundErrorSchema,
12-
RepoOwnerNotActivatedErrorSchema,
13-
} from 'services/repo'
10+
import { RepoNotFoundErrorSchema } from 'services/repo/schemas/RepoNotFoundError'
11+
import { RepoOwnerNotActivatedErrorSchema } from 'services/repo/schemas/RepoOwnerNotActivatedError'
1412
import Api from 'shared/api'
1513
import { rejectNetworkError } from 'shared/api/rejectNetworkError'
1614
import A from 'ui/A'
@@ -157,15 +155,13 @@ export const CommitPageDataQueryOpts = ({
157155
commitId,
158156
},
159157
}).then((res) => {
158+
const callingFn = 'CommitPageDataQueryOpts'
160159
const parsedData = CommitPageDataSchema.safeParse(res?.data)
161160

162161
if (!parsedData.success) {
163162
return rejectNetworkError({
164163
errorName: 'Parsing Error',
165-
errorDetails: {
166-
callingFn: 'CommitPageDataQueryOpts',
167-
error: parsedData.error,
168-
},
164+
errorDetails: { callingFn, error: parsedData.error },
169165
})
170166
}
171167

@@ -174,14 +170,14 @@ export const CommitPageDataQueryOpts = ({
174170
if (data?.owner?.repository?.__typename === 'NotFoundError') {
175171
return rejectNetworkError({
176172
errorName: 'Not Found Error',
177-
errorDetails: { callingFn: 'CommitPageDataQueryOpts' },
173+
errorDetails: { callingFn },
178174
})
179175
}
180176

181177
if (data?.owner?.repository?.__typename === 'OwnerNotActivatedError') {
182178
return rejectNetworkError({
183179
errorName: 'Owner Not Activated',
184-
errorDetails: { callingFn: 'CommitPageDataQueryOpts' },
180+
errorDetails: { callingFn },
185181
data: {
186182
detail: (
187183
<p>

‎src/pages/MembersPage/MembersActivation/Activation/Activation.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useAccountDetails } from 'services/account/useAccountDetails'
44
import { TrialStatuses, usePlanData } from 'services/account/usePlanData'
55
import A from 'ui/A/A'
66

7-
import ChangePlanLink from './ChangePlanLink'
7+
import ChangePlanLink from './ChangePlanLink/ChangePlanLink'
88

99
function Activation() {
1010
const { owner, provider } = useParams()

‎src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { BillingRate, Plans } from 'shared/utils/billing'
99

1010
import Activation from './Activation'
1111

12-
vi.mock('./ChangePlanLink', () => ({
12+
vi.mock('./ChangePlanLink/ChangePlanLink', () => ({
1313
default: vi.fn(() => 'ChangePlanLink'),
1414
}))
1515

‎src/pages/MembersPage/MembersActivation/Activation/ChangePlanLink/ChangePlanLink.jsx

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)