-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove feature flag and refactor commit file diff
- Loading branch information
1 parent
67d18db
commit 5568558
Showing
2 changed files
with
185 additions
and
166 deletions.
There are no files selected for viewing
166 changes: 0 additions & 166 deletions
166
...Coverage/routes/IndirectChangesTab/IndirectChangesTable/CommitFileDiff/CommitFileDiff.jsx
This file was deleted.
Oops, something went wrong.
185 changes: 185 additions & 0 deletions
185
...Coverage/routes/IndirectChangesTab/IndirectChangesTable/CommitFileDiff/CommitFileDiff.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,185 @@ | ||
import PropTypes from 'prop-types' | ||
import { Fragment, useMemo } from 'react' | ||
import { useParams } from 'react-router-dom' | ||
|
||
import { useIgnoredIds } from 'pages/CommitDetailPage/hooks/useIgnoredIds' | ||
import { | ||
type ImpactedFileType, | ||
useComparisonForCommitAndParent, | ||
} from 'services/comparison/useComparisonForCommitAndParent' | ||
import { transformImpactedFileToDiff } from 'services/comparison/utils' | ||
import { useNavLinks } from 'services/navigation' | ||
import { useRepoOverview } from 'services/repo' | ||
import A from 'ui/A' | ||
import CodeRendererInfoRow from 'ui/CodeRenderer/CodeRendererInfoRow' | ||
import CriticalFileLabel from 'ui/CodeRenderer/CriticalFileLabel' | ||
import { | ||
type CoverageValue, | ||
type LineData, | ||
VirtualDiffRenderer, | ||
} from 'ui/VirtualRenderers/VirtualDiffRenderer' | ||
|
||
function transformSegmentsToLineData( | ||
segments: ImpactedFileType['segments']['results'] | undefined, | ||
ignoredUploadIds: number[] | ||
) { | ||
if (!segments) { | ||
return [] | ||
} | ||
|
||
const ignoredUploadIdsSet = new Set(ignoredUploadIds) | ||
|
||
return segments.map((segment) => { | ||
// we need to create a string of the diff content for the virtual diff renderer text area | ||
let newDiffContent = '' | ||
const lineData: LineData[] = [] | ||
|
||
segment.lines.forEach((line, lineIndex) => { | ||
newDiffContent += line.content | ||
|
||
// only add a newline if it's not the last line | ||
if (lineIndex !== segment.lines.length - 1) { | ||
newDiffContent += '\n' | ||
} | ||
|
||
lineData.push({ | ||
headNumber: line?.headNumber, | ||
baseNumber: line?.baseNumber, | ||
headCoverage: line?.headCoverage as CoverageValue, | ||
baseCoverage: line?.baseCoverage as CoverageValue, | ||
hitCount: line?.coverageInfo?.hitUploadIds?.reduce( | ||
(count, value) => | ||
ignoredUploadIdsSet.has(value) ? count : count + 1, | ||
0 | ||
), | ||
}) | ||
}) | ||
|
||
return { ...segment, lineData, newDiffContent } | ||
}) | ||
} | ||
|
||
function DiffRenderer({ | ||
impactedFile, | ||
path, | ||
}: { | ||
impactedFile: ImpactedFileType | ||
path: string | ||
}) { | ||
const { commitFileDiff } = useNavLinks() | ||
const { owner, repo, provider, commit } = useParams<URLParams>() | ||
const { data: overview } = useRepoOverview({ provider, owner, repo }) | ||
const { data: ignoredUploadIds } = useIgnoredIds() | ||
|
||
const fileDiff = useMemo(() => { | ||
const transformedData = transformImpactedFileToDiff(impactedFile) | ||
|
||
const modifiedSegments = transformSegmentsToLineData( | ||
transformedData?.segments, | ||
ignoredUploadIds | ||
) | ||
|
||
return { ...transformedData, segments: modifiedSegments } | ||
}, [ignoredUploadIds, impactedFile]) | ||
|
||
let fullFilePath = commitFileDiff.path({ commit, tree: path }) | ||
if (overview?.coverageEnabled && overview?.bundleAnalysisEnabled) { | ||
fullFilePath = `${fullFilePath}?dropdown=coverage` | ||
} | ||
|
||
return ( | ||
<> | ||
{fileDiff.isCriticalFile && <CriticalFileLabel variant="borderTop" />} | ||
{fileDiff.segments?.map((segment, segmentIndex) => { | ||
return ( | ||
<Fragment key={`${fileDiff.headName}-${segmentIndex}`}> | ||
<CodeRendererInfoRow> | ||
<div className="flex w-full justify-between"> | ||
<div className="flex gap-1"> | ||
<span data-testid="patch">{segment?.header}</span> | ||
{fileDiff.fileLabel && ( | ||
<span className="border-l-2 pl-2"> | ||
{fileDiff.fileLabel} | ||
</span> | ||
)} | ||
</div> | ||
{/* @ts-expect-error TODO: Anchor tag */} | ||
<A href={fullFilePath} isExternal hook="commit full file"> | ||
View full file | ||
</A> | ||
</div> | ||
</CodeRendererInfoRow> | ||
<VirtualDiffRenderer | ||
key={segmentIndex} | ||
code={segment.newDiffContent} | ||
fileName={fileDiff.headName ?? ''} | ||
hashedPath={impactedFile.hashedPath} | ||
lineData={segment.lineData} | ||
/> | ||
</Fragment> | ||
) | ||
})} | ||
</> | ||
) | ||
} | ||
|
||
function ErrorDisplayMessage() { | ||
return ( | ||
<p className="border border-solid border-ds-gray-tertiary p-4"> | ||
There was a problem getting the source code from your provider. Unable to | ||
show line by line coverage. | ||
<br /> | ||
<span> | ||
If you continue to experience this issue, please try{' '} | ||
<A | ||
to={{ | ||
pageName: 'login', | ||
}} | ||
hook={undefined} | ||
isExternal={undefined} | ||
> | ||
logging in | ||
</A>{' '} | ||
again to refresh your credentials. | ||
</span> | ||
</p> | ||
) | ||
} | ||
|
||
interface URLParams { | ||
provider: string | ||
owner: string | ||
repo: string | ||
commit: string | ||
} | ||
|
||
interface CommitFileDiffProps { | ||
path: string | null | undefined | ||
} | ||
|
||
function CommitFileDiff({ path }: CommitFileDiffProps) { | ||
const { owner, repo, provider, commit } = useParams<URLParams>() | ||
|
||
const { data: comparisonData } = useComparisonForCommitAndParent({ | ||
provider, | ||
owner, | ||
repo, | ||
commitid: commit, | ||
path: path ?? '', | ||
filters: { | ||
hasUnintendedChanges: true, | ||
}, | ||
}) | ||
|
||
if (!comparisonData || !comparisonData?.impactedFile || !path) { | ||
return <ErrorDisplayMessage /> | ||
} | ||
|
||
return <DiffRenderer impactedFile={comparisonData.impactedFile} path={path} /> | ||
} | ||
|
||
CommitFileDiff.propTypes = { | ||
path: PropTypes.string, | ||
} | ||
|
||
export default CommitFileDiff |