Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ const mockCachedBundles = {
bundleAnalysisReport: {
__typename: 'BundleAnalysisReport',
bundles: [
{ name: 'bundle1', isCached: true },
{ name: 'bundle2', isCached: false },
{ name: 'bundle1', cacheConfig: true },
{ name: 'bundle2', cacheConfig: false },
],
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ const mockCachedBundles = {
bundleAnalysisReport: {
__typename: 'BundleAnalysisReport',
bundles: [
{ name: 'bundle1', isCached: true },
{ name: 'bundle2', isCached: false },
{ name: 'bundle1', cacheConfig: true },
{ name: 'bundle2', cacheConfig: false },
],
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ const mockBundles = {
bundleAnalysisReport: {
__typename: 'BundleAnalysisReport',
bundles: [
{ name: 'bundle1', isCached: true },
{ name: 'bundle2', isCached: false },
{ name: 'bundle1', cacheConfig: true },
{ name: 'bundle2', cacheConfig: false },
],
},
},
Expand Down Expand Up @@ -140,7 +140,7 @@ describe('ConfigureCachedBundleModal', () => {
results: info.variables.bundles.map(
(bundle: { bundleName: string; toggleCaching: boolean }) => ({
bundleName: bundle.bundleName,
isCached: bundle.toggleCaching,
cacheConfig: bundle.toggleCaching,
})
),
error: null,
Expand Down Expand Up @@ -430,8 +430,8 @@ describe('ConfigureCachedBundleModal', () => {
const unmodifiedCache = queryClientV5.getQueryData(cacheQueryKey)
expect(unmodifiedCache).toEqual({
bundles: [
{ bundleName: 'bundle1', isCached: true },
{ bundleName: 'bundle2', isCached: false },
{ bundleName: 'bundle1', cacheConfig: true },
{ bundleName: 'bundle2', cacheConfig: false },
],
})

Expand All @@ -452,8 +452,8 @@ describe('ConfigureCachedBundleModal', () => {
const modifiedCache = queryClientV5.getQueryData(cacheQueryKey)
expect(modifiedCache).toEqual({
bundles: [
{ bundleName: 'bundle1', isCached: true },
{ bundleName: 'bundle2', isCached: true },
{ bundleName: 'bundle1', cacheConfig: true },
{ bundleName: 'bundle2', cacheConfig: true },
],
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export const ConfigureCachedBundleModal = ({
select: (data) =>
data.bundles.map((bundle) => ({
bundleName: bundle.bundleName,
toggleCaching: bundle.isCached,
toggleCaching: bundle.cacheConfig,
})),
enabled: isOpen && !!defaultBranch,
})
Expand Down
4 changes: 2 additions & 2 deletions src/services/bundleAnalysis/CachedBundlesQueryOpts.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const mockBranchBundles = {
bundleAnalysis: {
bundleAnalysisReport: {
__typename: 'BundleAnalysisReport',
bundles: [{ name: 'bundle1', isCached: true }],
bundles: [{ name: 'bundle1', cacheConfig: true }],
},
},
},
Expand Down Expand Up @@ -141,7 +141,7 @@ describe('CachedBundlesQueryOpts', () => {
)

const expectedResponse = {
bundles: [{ bundleName: 'bundle1', isCached: true }],
bundles: [{ bundleName: 'bundle1', cacheConfig: true }],
}

await waitFor(() =>
Expand Down
8 changes: 4 additions & 4 deletions src/services/bundleAnalysis/CachedBundlesQueryOpts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import A from 'ui/A'

const BundleSchema = z.object({
name: z.string(),
isCached: z.boolean(),
cacheConfig: z.boolean(),
})

const BundleAnalysisReportSchema = z.object({
Expand Down Expand Up @@ -73,7 +73,7 @@ const query = `query CachedBundleList(
... on BundleAnalysisReport {
bundles {
name
isCached
cacheConfig
}
}
... on MissingHeadReport {
Expand Down Expand Up @@ -156,14 +156,14 @@ export const CachedBundlesQueryOpts = ({
})
}

let bundles: Array<{ bundleName: string; isCached: boolean }> = []
let bundles: Array<{ bundleName: string; cacheConfig: boolean }> = []
if (
data?.owner?.repository?.branch?.head?.bundleAnalysis
?.bundleAnalysisReport?.__typename === 'BundleAnalysisReport'
) {
bundles =
data.owner.repository.branch.head.bundleAnalysis?.bundleAnalysisReport?.bundles?.map(
({ name, isCached }) => ({ bundleName: name, isCached })
({ name, cacheConfig }) => ({ bundleName: name, cacheConfig })
)
}

Expand Down
4 changes: 2 additions & 2 deletions src/services/bundleAnalysis/useUpdateBundleCache.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useUpdateBundleCache } from './useUpdateBundleCache'
const mockSuccessfulResponse = {
data: {
updateBundleCacheConfig: {
results: [{ bundleName: 'bundle-1', isCached: true }],
results: [{ bundleName: 'bundle-1', cacheConfig: true }],
error: null,
},
},
Expand Down Expand Up @@ -111,7 +111,7 @@ describe('useUpdateBundleCache', () => {
await waitFor(() => expect(result.current.isSuccess).toBe(true))

expect(result.current.data).toEqual([
{ bundleName: 'bundle-1', isCached: true },
{ bundleName: 'bundle-1', cacheConfig: true },
])
})
})
Expand Down
7 changes: 3 additions & 4 deletions src/services/bundleAnalysis/useUpdateBundleCache.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const UpdateBundleCacheInputSchema = z.array(
const UpdateBundleCacheOutputSchema = z.array(
z.object({
bundleName: z.string(),
isCached: z.boolean(),
cacheConfig: z.boolean(),
})
)

Expand All @@ -38,8 +38,7 @@ const MutationRequestSchema = z.object({
.nullable(),
})

const query = `
mutation UpdateBundleCacheConfig(
const query = `mutation UpdateBundleCacheConfig(
$owner: String!
$repo: String!
$bundles: [BundleCacheConfigInput!]!
Expand All @@ -49,7 +48,7 @@ mutation UpdateBundleCacheConfig(
) {
results {
bundleName
isCached
cacheConfig
}
error {
__typename
Expand Down