Repository navigation
feat(web): hide viewed files in the pull request Code tab #31163
+205
−78
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ import { | |
| ChevronDownIcon, | ||
| ChevronRightIcon, | ||
| Columns2Icon, | ||
| EyeOffIcon, | ||
| FlaskConicalOffIcon, | ||
| FolderTreeIcon, | ||
| InfoIcon, | ||
|
|
@@ -149,6 +150,7 @@ type ReviewAnnotation = DiffLineAnnotation<ReviewAnnotationGroup>; | |
| const COMMIT_PAGE_SIZE = 10; | ||
|
|
||
| const PULL_REQUEST_FILE_TREE_STORAGE_KEY = "t3code.pullRequestFileTreeOpen"; | ||
| const PULL_REQUEST_HIDE_VIEWED_FILES_STORAGE_KEY = "t3code.pullRequestHideViewedFiles"; | ||
|
|
||
| interface DiffSlice { | ||
| readonly source: PullRequestDiffResult; | ||
|
|
@@ -401,6 +403,11 @@ function PullRequestCodeTab({ | |
| Schema.Boolean, | ||
| ); | ||
| const [hideTestFiles, setHideTestFiles] = useHideTestFiles(); | ||
| const [hideViewedFiles, setHideViewedFiles] = useLocalStorage( | ||
| PULL_REQUEST_HIDE_VIEWED_FILES_STORAGE_KEY, | ||
| false, | ||
| Schema.Boolean, | ||
| ); | ||
| const [selectedLines, setSelectedLines] = useState<{ | ||
| id: string; | ||
| range: SelectedLineRange; | ||
|
|
@@ -603,15 +610,28 @@ function PullRequestCodeTab({ | |
| const testFileCount = loadedFiles.filter((file) => | ||
| isTestChangedFile(resolveFileDiffPath(file)), | ||
| ).length; | ||
| // A filter never hides the file being jumped to or one holding unsent review comments. | ||
| const isPinned = (path: string) => | ||
| path === revealRequest?.path || | ||
| path === linkPath || | ||
| path === draft?.path || | ||
| pendingComments.some((comment) => comment.path === path); | ||
| const reviewFiles = hideTestFiles | ||
| ? loadedFiles.filter((file) => { | ||
| const path = resolveFileDiffPath(file); | ||
| return isPinned(path) || !isTestChangedFile(path); | ||
| }) | ||
| : loadedFiles; | ||
| const hiddenTestFileCount = loadedFiles.length - reviewFiles.length; | ||
| const viewedFileCount = reviewFiles.filter((file) => | ||
| isFileViewed(resolveFileDiffPath(file)), | ||
| ).length; | ||
| const files = hideViewedFiles | ||
| ? reviewFiles.filter((file) => { | ||
| const path = resolveFileDiffPath(file); | ||
| return isPinned(path) || !isFileViewed(path); | ||
|
Comment on lines
+629
to
+632
Contributor
There was a problem hiding this comment. Preserve open thread replies and edits. If a user enables this filter while composing a reply on an expanded viewed file, the file is removed and its
 |
||
| }) | ||
| : reviewFiles; | ||
| const omittedFileStats = new Map( | ||
| loadedSlices.flatMap((slice) => | ||
| slice.omittedFileStats.map((file) => [file.path, file] as const), | ||
|
|
@@ -805,11 +825,12 @@ function PullRequestCodeTab({ | |
| }; | ||
|
|
||
| const setFileViewed = (fileKey: string, viewed: boolean, extendRange: boolean) => { | ||
| // Include files hidden as viewed: the Shift-click anchor is usually one of them. | ||
| const rangeFiles = reviewFiles.map((file) => ({ | ||
| fileKey: buildFileDiffRenderKey(file), | ||
| path: resolveFileDiffPath(file), | ||
| })); | ||
| const range = getFileViewedRange(rangeFiles, fileKey, extendRange ? lastViewedFileKey : null); | ||
| setLastViewedFileKey(fileKey); | ||
| for (const file of range) setViewed(file.path, viewed); | ||
| setFoldChoices((current) => | ||
|
|
@@ -1190,10 +1211,10 @@ function PullRequestCodeTab({ | |
| {hiddenTestFileCount} test {hiddenTestFileCount === 1 ? "file" : "files"} hidden | ||
| </Button> | ||
| ) : null} | ||
| {filesViewed.enabled && reviewFiles.length > 0 ? ( | ||
| <span className="flex min-w-0 items-center gap-1 tabular-nums"> | ||
| <span className="shrink-0"> | ||
| {viewedFileCount} / {reviewFiles.length} | ||
| </span> | ||
| <span className="truncate"> | ||
| {viewedFilesStore === "environment" ? `viewed in ${APP_BASE_NAME}` : "viewed"} | ||
|
|
@@ -1423,6 +1444,26 @@ function PullRequestCodeTab({ | |
| </TooltipPopup> | ||
| </Tooltip> | ||
| ) : null} | ||
| {viewedFileCount > 0 || hideViewedFiles ? ( | ||
|
coderabbitai[bot] marked this conversation as resolved.
Resolved
|
||
| <Tooltip> | ||
| <TooltipTrigger | ||
| render={ | ||
| <Toggle | ||
| aria-label="Hide viewed files" | ||
| variant="ghost" | ||
| size="sm" | ||
| pressed={hideViewedFiles} | ||
| onPressedChange={(pressed) => setHideViewedFiles(Boolean(pressed))} | ||
| /> | ||
| } | ||
| > | ||
| <EyeOffIcon className="size-3.5" /> | ||
| </TooltipTrigger> | ||
| <TooltipPopup side="top"> | ||
| {hideViewedFiles ? "Show viewed files" : "Hide viewed files"} | ||
| </TooltipPopup> | ||
| </Tooltip> | ||
| ) : null} | ||
| {fileKeys.length > 0 ? ( | ||
| <Tooltip> | ||
| <TooltipTrigger | ||
|
|
@@ -1539,78 +1580,83 @@ function PullRequestCodeTab({ | |
| return withToolbar(rawSlicesView); | ||
| } | ||
|
|
||
| const orphanThreads = detail.reviewThreads.filter((thread) => !placedThreadIds.has(thread.id)); | ||
| const orphanFiles = new Map<string, PullRequestReviewThread[]>(); | ||
| for (const thread of orphanThreads) { | ||
| const existing = orphanFiles.get(thread.path); | ||
| if (existing) existing.push(thread); | ||
| else orphanFiles.set(thread.path, [thread]); | ||
| } | ||
| const orphanConversations = | ||
| orphanFiles.size > 0 ? ( | ||
| <div className="shrink-0 border-b border-border/60"> | ||
| <Collapsible open={orphansOpen} onOpenChange={setOrphansOpen}> | ||
| <h2> | ||
| <CollapsibleTrigger className="flex w-full items-center gap-1.5 px-4 py-2 text-left text-xs text-muted-foreground"> | ||
| <span> | ||
| {nextCursor === null | ||
| ? "Conversations not on the current diff" | ||
| : "Conversations not on the diff loaded so far"} | ||
| </span> | ||
| <ChevronRightIcon | ||
| aria-hidden | ||
| className={cn("size-3.5 transition-transform", orphansOpen && "rotate-90")} | ||
| /> | ||
| <span aria-hidden className="tabular-nums"> | ||
| {orphanThreads.length} | ||
| </span> | ||
| <span className="sr-only"> | ||
| {orphanThreads.length === 1 | ||
| ? "1 conversation" | ||
| : `${orphanThreads.length} conversations`} | ||
| </span> | ||
| </CollapsibleTrigger> | ||
| </h2> | ||
| <CollapsiblePanel> | ||
| <div className="max-h-64 space-y-1 overflow-auto px-1 pb-1"> | ||
| {[...orphanFiles].map(([path, threads]) => ( | ||
| <div key={path}> | ||
| <Tooltip> | ||
| <TooltipTrigger | ||
| render={<p className="truncate px-3 text-xs text-muted-foreground">{path}</p>} | ||
| /> | ||
| <TooltipPopup side="top">{path}</TooltipPopup> | ||
| </Tooltip> | ||
| <div className="mt-1 space-y-2"> | ||
| {threads.map((thread) => ( | ||
| <div key={thread.id}> | ||
| {thread.line === null ? null : ( | ||
| <p className="px-3 text-xs text-muted-foreground">Line {thread.line}</p> | ||
| )} | ||
| {renderThreadCard(thread)} | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </CollapsiblePanel> | ||
| </Collapsible> | ||
| </div> | ||
| ) : null; | ||
|
|
||
| if (items.length === 0 && nextCursor === null) { | ||
| const noFilesMessage = | ||
| commit === null ? `This ${term} has no file changes.` : "This commit has no file changes."; | ||
| return withToolbar( | ||
| <> | ||
| {orphanConversations} | ||
| <p className="px-4 py-5 text-sm text-muted-foreground"> | ||
| {loadedFiles.length > 0 ? "All files are hidden." : noFilesMessage} | ||
| </p> | ||
| </>, | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <div className="flex h-full min-h-0 flex-col"> | ||
| {toolbar} | ||
| {orphanConversations} | ||
| <div className="flex min-h-0 flex-1 overflow-hidden"> | ||
| <div | ||
| className="relative min-h-0 min-w-0 flex-1" | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🟡 Medium
pullRequest/PullRequestCodeTab.tsx:591With Hide viewed files enabled, Shift-clicking a later file marks only that file viewed instead of the full range. Marking the anchor viewed removes it from
annotatedFiles, sogetFileViewedRangecannot findlastViewedFileKey; calculate the range from the list before the viewed-file filter, while retaining the test-file filter.🤖 Copy this AI Prompt to have your agent fix this:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in aa788a2. The range is now found among the files left after the test filter, so a hidden anchor still counts. Covered by a new browser test that fails without the fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I'm unable to act on this request because you do not have permissions within this repository.