Skip to content

fix(pull): Handle SegmentsResult union in ImpactedFileSchema #4107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −28
Open

fix(pull): Handle SegmentsResult union in ImpactedFileSchema #4107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions ...equestPage/PullCoverage/routes/FilesChangedTab/FilesChanged/PullFileDiff/PullFileDiff.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { Fragment, useMemo } from 'react'
import { useLocation, useParams } from 'react-router-dom'

import { useNavLinks } from 'services/navigation/useNavLinks'
import {
type PullImpactedFile,
useSingularImpactedFileComparison,
} from 'services/pull/useSingularImpactedFileComparison'
import { type Segment } from 'services/pull/fragments'
import { useSingularImpactedFileComparison } from 'services/pull/useSingularImpactedFileComparison'
import { useRepoOverview } from 'services/repo'
import A from 'ui/A'
import CodeRendererInfoRow from 'ui/CodeRenderer/CodeRendererInfoRow'
Expand All @@ -14,7 +12,7 @@ import { CoverageValue } from 'ui/VirtualRenderers/types'
import { LineData } from 'ui/VirtualRenderers/VirtualDiffRenderer'

function transformSegmentsToLineData(
segments: PullImpactedFile['segments']['results'] | undefined
segments: Segment[] | undefined
) {
if (!segments) {
return []
Expand Down
8 changes: 3 additions & 5 deletions ...ages/PullRequestPage/PullCoverage/routes/IndirectChangesTab/PullFileDiff/PullFileDiff.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { Fragment, useMemo } from 'react'
import { useLocation, useParams } from 'react-router-dom'

import { useNavLinks } from 'services/navigation/useNavLinks'
import {
PullImpactedFile,
useSingularImpactedFileComparison,
} from 'services/pull/useSingularImpactedFileComparison'
import { type Segment } from 'services/pull/fragments'
import { useSingularImpactedFileComparison } from 'services/pull/useSingularImpactedFileComparison'
import { useRepoOverview } from 'services/repo'
import A from 'ui/A'
import CodeRendererInfoRow from 'ui/CodeRenderer/CodeRendererInfoRow'
Expand All @@ -16,7 +14,7 @@ import {
} from 'ui/VirtualRenderers/VirtualDiffRenderer'

function transformSegmentsToLineData(
segments: PullImpactedFile['segments']['results'] | undefined
segments: Segment[] | undefined
) {
if (!segments) {
return []
Expand Down
53 changes: 36 additions & 17 deletions src/services/pull/fragments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@ fragment FileComparisonWithBase on Pull {
}
}
}
... on UnknownPath {
message
}
... on ProviderError {
message
}
}
}
}
Expand All @@ -254,6 +260,22 @@ fragment FileComparisonWithBase on Pull {

const CoverageLineSchema = z.enum(['H', 'M', 'P'])

export const SegmentSchema = z.object({
header: z.string(),
hasUnintendedChanges: z.boolean(),
lines: z.array(
z.object({
baseNumber: z.string().nullable(),
headNumber: z.string().nullable(),
baseCoverage: CoverageLineSchema.nullable(),
headCoverage: CoverageLineSchema.nullable(),
content: z.string().nullable(),
})
),
})

export type Segment = z.infer<typeof SegmentSchema>

export const ImpactedFileSchema = z.object({
headName: z.string().nullable(),
hashedPath: z.string(),
Expand All @@ -276,23 +298,20 @@ export const ImpactedFileSchema = z.object({
percentCovered: z.number().nullable(),
})
.nullable(),
segments: z.object({
results: z.array(
z.object({
header: z.string(),
hasUnintendedChanges: z.boolean(),
lines: z.array(
z.object({
baseNumber: z.string().nullable(),
headNumber: z.string().nullable(),
baseCoverage: CoverageLineSchema.nullable(),
headCoverage: CoverageLineSchema.nullable(),
content: z.string().nullable(),
})
),
})
),
}),
segments: z.discriminatedUnion('__typename', [
z.object({
__typename: z.literal('SegmentComparisons'),
results: z.array(SegmentSchema),
}),
z.object({
__typename: z.literal('UnknownPath'),
message: z.string().nullable(),
}),
z.object({
__typename: z.literal('ProviderError'),
message: z.string().nullable(),
}),
]),
})

export const ComparisonSchema = z.object({
Expand Down
5 changes: 4 additions & 1 deletion src/services/pull/utils/transformImpactedPullFileToDiff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ export function transformImpactedPullFileToDiff(
return {
fileLabel,
headName: impactedFile?.headName,
segments: impactedFile?.segments?.results,
segments:
impactedFile?.segments?.__typename === 'SegmentComparisons'
? impactedFile.segments.results
: [],
...(!!hashedPath && { hashedPath }),
}
}
Loading