Skip to content

Commit 3566f99

Browse files
authored
fix: Migrate from isCached to cacheConfig (#3718)
1 parent 9227c55 commit 3566f99

File tree

8 files changed

+23
-24
lines changed

8 files changed

+23
-24
lines changed

src/pages/RepoPage/BundlesTab/BundleContent/BundleSelection/BundleSelection.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ const mockCachedBundles = {
7272
bundleAnalysisReport: {
7373
__typename: 'BundleAnalysisReport',
7474
bundles: [
75-
{ name: 'bundle1', isCached: true },
76-
{ name: 'bundle2', isCached: false },
75+
{ name: 'bundle1', cacheConfig: true },
76+
{ name: 'bundle2', cacheConfig: false },
7777
],
7878
},
7979
},

src/pages/RepoPage/ConfigTab/tabs/ConfigurationManager/ConfigurationManager.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ const mockCachedBundles = {
6666
bundleAnalysisReport: {
6767
__typename: 'BundleAnalysisReport',
6868
bundles: [
69-
{ name: 'bundle1', isCached: true },
70-
{ name: 'bundle2', isCached: false },
69+
{ name: 'bundle1', cacheConfig: true },
70+
{ name: 'bundle2', cacheConfig: false },
7171
],
7272
},
7373
},

src/pages/RepoPage/shared/ConfigureCachedBundleModal/ConfigureCachedBundleModal.test.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ const mockBundles = {
4141
bundleAnalysisReport: {
4242
__typename: 'BundleAnalysisReport',
4343
bundles: [
44-
{ name: 'bundle1', isCached: true },
45-
{ name: 'bundle2', isCached: false },
44+
{ name: 'bundle1', cacheConfig: true },
45+
{ name: 'bundle2', cacheConfig: false },
4646
],
4747
},
4848
},
@@ -140,7 +140,7 @@ describe('ConfigureCachedBundleModal', () => {
140140
results: info.variables.bundles.map(
141141
(bundle: { bundleName: string; toggleCaching: boolean }) => ({
142142
bundleName: bundle.bundleName,
143-
isCached: bundle.toggleCaching,
143+
cacheConfig: bundle.toggleCaching,
144144
})
145145
),
146146
error: null,
@@ -430,8 +430,8 @@ describe('ConfigureCachedBundleModal', () => {
430430
const unmodifiedCache = queryClientV5.getQueryData(cacheQueryKey)
431431
expect(unmodifiedCache).toEqual({
432432
bundles: [
433-
{ bundleName: 'bundle1', isCached: true },
434-
{ bundleName: 'bundle2', isCached: false },
433+
{ bundleName: 'bundle1', cacheConfig: true },
434+
{ bundleName: 'bundle2', cacheConfig: false },
435435
],
436436
})
437437

@@ -452,8 +452,8 @@ describe('ConfigureCachedBundleModal', () => {
452452
const modifiedCache = queryClientV5.getQueryData(cacheQueryKey)
453453
expect(modifiedCache).toEqual({
454454
bundles: [
455-
{ bundleName: 'bundle1', isCached: true },
456-
{ bundleName: 'bundle2', isCached: true },
455+
{ bundleName: 'bundle1', cacheConfig: true },
456+
{ bundleName: 'bundle2', cacheConfig: true },
457457
],
458458
})
459459
})

src/pages/RepoPage/shared/ConfigureCachedBundleModal/ConfigureCachedBundleModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export const ConfigureCachedBundleModal = ({
206206
select: (data) =>
207207
data.bundles.map((bundle) => ({
208208
bundleName: bundle.bundleName,
209-
toggleCaching: bundle.isCached,
209+
toggleCaching: bundle.cacheConfig,
210210
})),
211211
enabled: isOpen && !!defaultBranch,
212212
})

src/services/bundleAnalysis/CachedBundlesQueryOpts.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const mockBranchBundles = {
2222
bundleAnalysis: {
2323
bundleAnalysisReport: {
2424
__typename: 'BundleAnalysisReport',
25-
bundles: [{ name: 'bundle1', isCached: true }],
25+
bundles: [{ name: 'bundle1', cacheConfig: true }],
2626
},
2727
},
2828
},
@@ -141,7 +141,7 @@ describe('CachedBundlesQueryOpts', () => {
141141
)
142142

143143
const expectedResponse = {
144-
bundles: [{ bundleName: 'bundle1', isCached: true }],
144+
bundles: [{ bundleName: 'bundle1', cacheConfig: true }],
145145
}
146146

147147
await waitFor(() =>

src/services/bundleAnalysis/CachedBundlesQueryOpts.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import A from 'ui/A'
1212

1313
const BundleSchema = z.object({
1414
name: z.string(),
15-
isCached: z.boolean(),
15+
cacheConfig: z.boolean(),
1616
})
1717

1818
const BundleAnalysisReportSchema = z.object({
@@ -73,7 +73,7 @@ const query = `query CachedBundleList(
7373
... on BundleAnalysisReport {
7474
bundles {
7575
name
76-
isCached
76+
cacheConfig
7777
}
7878
}
7979
... on MissingHeadReport {
@@ -156,14 +156,14 @@ export const CachedBundlesQueryOpts = ({
156156
})
157157
}
158158

159-
let bundles: Array<{ bundleName: string; isCached: boolean }> = []
159+
let bundles: Array<{ bundleName: string; cacheConfig: boolean }> = []
160160
if (
161161
data?.owner?.repository?.branch?.head?.bundleAnalysis
162162
?.bundleAnalysisReport?.__typename === 'BundleAnalysisReport'
163163
) {
164164
bundles =
165165
data.owner.repository.branch.head.bundleAnalysis?.bundleAnalysisReport?.bundles?.map(
166-
({ name, isCached }) => ({ bundleName: name, isCached })
166+
({ name, cacheConfig }) => ({ bundleName: name, cacheConfig })
167167
)
168168
}
169169

src/services/bundleAnalysis/useUpdateBundleCache.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { useUpdateBundleCache } from './useUpdateBundleCache'
1111
const mockSuccessfulResponse = {
1212
data: {
1313
updateBundleCacheConfig: {
14-
results: [{ bundleName: 'bundle-1', isCached: true }],
14+
results: [{ bundleName: 'bundle-1', cacheConfig: true }],
1515
error: null,
1616
},
1717
},
@@ -111,7 +111,7 @@ describe('useUpdateBundleCache', () => {
111111
await waitFor(() => expect(result.current.isSuccess).toBe(true))
112112

113113
expect(result.current.data).toEqual([
114-
{ bundleName: 'bundle-1', isCached: true },
114+
{ bundleName: 'bundle-1', cacheConfig: true },
115115
])
116116
})
117117
})

src/services/bundleAnalysis/useUpdateBundleCache.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const UpdateBundleCacheInputSchema = z.array(
1414
const UpdateBundleCacheOutputSchema = z.array(
1515
z.object({
1616
bundleName: z.string(),
17-
isCached: z.boolean(),
17+
cacheConfig: z.boolean(),
1818
})
1919
)
2020

@@ -38,8 +38,7 @@ const MutationRequestSchema = z.object({
3838
.nullable(),
3939
})
4040

41-
const query = `
42-
mutation UpdateBundleCacheConfig(
41+
const query = `mutation UpdateBundleCacheConfig(
4342
$owner: String!
4443
$repo: String!
4544
$bundles: [BundleCacheConfigInput!]!
@@ -49,7 +48,7 @@ mutation UpdateBundleCacheConfig(
4948
) {
5049
results {
5150
bundleName
52-
isCached
51+
cacheConfig
5352
}
5453
error {
5554
__typename

0 commit comments

Comments
 (0)