Skip to content
Open
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
76 changes: 65 additions & 11 deletions apps/mobile/src/features/pull-requests/PullRequestFiles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
} from "./usePullRequestDiff";
import { usePullRequestFileFilter } from "./usePullRequestFileFilter";
import { usePullRequestFilesViewed } from "./usePullRequestFilesViewed";
import { usePullRequestReviewDraft } from "./usePullRequestReviewDraft";
import { requestPullRequestFileJump } from "./pullRequestFileJump";
import { fileDirectory, groupByDirectory } from "./pullRequestFileSections";
import type { MessageResolver } from "../../i18n/messages";
Expand All @@ -52,7 +53,13 @@ function useChangedFiles(params: PullRequestDiffParams) {
).changeRequest;
const diff = usePullRequestDiff(params, terminology);
const viewed = usePullRequestFilesViewed(params, pr);
const filter = usePullRequestFileFilter(diff.parsed);
const reviewDraft = usePullRequestReviewDraft(params);
const filter = usePullRequestFileFilter(
diff.parsed,
viewed,
undefined,
reviewDraft.draft.comments.map((comment) => comment.path),
);
const parsed = filter.parsed;
return {
diff,
Expand All @@ -76,9 +83,10 @@ function describeFiles(
{ filter, viewed }: ChangedFiles,
resolve: MessageResolver,
) {
const hiding = filter.hiddenCount > 0 || filter.hiddenViewedCount > 0;
const count = parsed.fileCount;
return [
filter.hiddenCount
hiding
? resolve(
msg("{count, plural, one {{count} visible file} other {{count} visible files}}", {
count,
Expand All @@ -89,13 +97,20 @@ function describeFiles(
count,
}),
),
viewed.supported
? resolve(
msg("{count, plural, one {{count} viewed} other {{count} viewed}}", {
count: parsed.files.filter((file) => viewed.isViewed(file.path)).length,
}),
)
: null,
!viewed.supported
? null
: filter.hideViewedFiles
? resolve(
msg(
"{count, plural, one {{count} viewed file hidden} other {{count} viewed files hidden}}",
{ count: filter.hiddenViewedCount },
),
)
: resolve(
msg("{count, plural, one {{count} viewed} other {{count} viewed}}", {
count: filter.viewedCount,
}),
),
filter.hideTestFiles
? resolve(
msg("{count, plural, one {{count} test file hidden} other {{count} test files hidden}}", {
Expand Down Expand Up @@ -192,14 +207,26 @@ function FileFilterMenu({ filter }: { readonly filter: ChangedFiles["filter"] })
image: "line.3.horizontal.decrease",
state: filter.hideTestFiles ? "on" : "off",
},
...(filter.canHideViewedFiles
? [
{
id: "hide-viewed",
title: gt("Hide viewed files"),
image: "eye.slash",
state: filter.hideViewedFiles ? ("on" as const) : ("off" as const),
},
]
: []),
]}
onPressAction={filter.toggle}
onPressAction={({ nativeEvent }) =>
nativeEvent.event === "hide-viewed" ? filter.toggleViewedFiles() : filter.toggle()
}
>
<View pointerEvents="none">
<IconButton
icon="line.3.horizontal.decrease"
accessibilityLabel={gt("Filter review files")}
selected={filter.hideTestFiles}
selected={filter.hideTestFiles || filter.hideViewedFiles}
/>
</View>
</Menu>
Expand All @@ -209,6 +236,22 @@ function FileFilterMenu({ filter }: { readonly filter: ChangedFiles["filter"] })
function NoVisibleFiles({ files }: { readonly files: ChangedFiles }) {
const { diff, filter, parsed } = files;
const gt = useGT();
if (parsed.kind === "files" && parsed.files.length === 0 && filter.hiddenViewedCount > 0) {
return (
<EmptyState
title={diff.nextCursor ? gt("No unviewed files loaded yet") : gt("All files are hidden")}
detail={gt("Viewed files are hidden from this review.")}
action={
<Button
label={gt("Show viewed files")}
tone="contrast"
onPress={filter.showViewedFiles}
/>
}
variant="plain"
/>
);
}
if (parsed.kind === "files") {
return parsed.files.length === 0 && filter.hiddenCount > 0 ? (
<EmptyState
Expand Down Expand Up @@ -433,6 +476,17 @@ export function PullRequestFilesSheet({ route }: StaticScreenProps<PullRequestDi
selected: filter.hideTestFiles,
onPress: filter.toggle,
},
...(filter.canHideViewedFiles
? [
{
id: "hide-viewed",
title: gt("Hide viewed files"),
icon: "eye.slash",
selected: filter.hideViewedFiles,
onPress: filter.toggleViewedFiles,
},
]
: []),
],
},
]}
Expand Down
80 changes: 69 additions & 11 deletions apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1028,16 +1028,22 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
? result.parsed.files.find((file) => pullRequestDiffPathMatches(linkAnchor.digest, file.path))
?.path
: undefined;
const viewed = usePullRequestFilesViewed(route.params, commit ? null : detail.data);
const reviewDraft = usePullRequestReviewDraft(route.params);
const [pickedPath, setJumpPath] = useState<string | null>(null);
const filter = usePullRequestFileFilter(
result.parsed,
linkPath ?? (route.params.focus ? route.params.path : undefined),
viewed,
linkPath ?? (route.params.path || undefined),
[
...reviewDraft.draft.comments.map((comment) => comment.path),
...(pickedPath ? [pickedPath] : []),
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
],
);
const { refresh: refreshDetail } = detail;
useFocusEffect(refreshDetail);
const { loadMore } = result;
const parsed = filter.parsed;
const reviewDraft = usePullRequestReviewDraft(route.params);
const viewed = usePullRequestFilesViewed(route.params, commit ? null : detail.data);
const [commitViewedPaths, setCommitViewedPaths] = useState<ReadonlySet<string>>(() => new Set());
const permissions = usePullRequestPermissions(route.params, detail.data);
const scopeKey = pullRequestReviewKey(route.params);
Expand Down Expand Up @@ -1105,7 +1111,6 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
code: row.content ?? "",
});
};
const [pickedPath, setJumpPath] = useState<string | null>(null);
const jumpPath = pickedPath ?? linkPath ?? route.params.path;
const requestedFile =
result.parsed.kind === "files"
Expand Down Expand Up @@ -1163,18 +1168,25 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
.map((file) => file.id);
const [visibleFileId, setVisibleFileId] = useState<string | null>(null);
const nativeView = useRef<NativeReviewDiffViewHandle>(null);
// The filter the current jump was made under. Hiding or showing test files replaces the rows,
// so a jump made under the other filter has to run again. Native applies the entry
// The filters the current jump was made under. Hiding or showing files replaces the rows,
// so a jump made under other filters has to run again. Native applies the entry
// destination before its first viewport, so the first one counts as made.
const jumpedUnder = useRef<boolean | null>(targetFile ? filter.hideTestFiles : null);
const filterChoice = {
hideTestFiles: filter.hideTestFiles,
// Viewed marks can arrive after the first draw, so track what is hidden, not the setting.
hiddenViewedCount: filter.hiddenViewedCount,
};
const jumpedUnder = useRef<typeof filterChoice | null>(targetFile ? filterChoice : null);
const hasTestFiles =
result.parsed.kind === "files" &&
result.parsed.files.some((file) => isTestChangedFile(file.path));
const jumpStarted = () =>
jumpedUnder.current !== null && (!hasTestFiles || jumpedUnder.current === filter.hideTestFiles);
jumpedUnder.current !== null &&
(!hasTestFiles || jumpedUnder.current.hideTestFiles === filter.hideTestFiles) &&
jumpedUnder.current.hiddenViewedCount === filter.hiddenViewedCount;
const scrollToFile = (fileId: string) => {
if (!nativeView.current) return;
jumpedUnder.current = filter.hideTestFiles;
jumpedUnder.current = filterChoice;
void nativeView.current.scrollToFile(fileId, false).catch(() => {
jumpedUnder.current = null;
});
Expand Down Expand Up @@ -1224,7 +1236,7 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
nativeView,
jumpStarted,
setJumpStarted: (started) => {
jumpedUnder.current = started ? filter.hideTestFiles : null;
jumpedUnder.current = started ? filterChoice : null;
},
onDebug: bridge.onDebug,
loadMore,
Expand All @@ -1237,11 +1249,18 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
);
};
const visibleFile = data.files.find((file) => file.id === visibleFileId) ?? targetFile;
const toggleTestFiles = () => {
const keepVisibleFile = () => {
setJumpPath(visibleFile?.path ?? route.params.path);
setSelectedRowId(null);
};
const toggleTestFiles = () => {
keepVisibleFile();
filter.toggle();
};
const toggleViewedFiles = () => {
keepVisibleFile();
filter.toggleViewedFiles();
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
};
const title = commit ? gt("Commit changes") : gt("Changes");
const seekingFile = !targetFile && result.nextCursor !== null;
const loadingDiff = (result.isPending && !data.rows.length) || (seekingFile && !result.error);
Expand Down Expand Up @@ -1292,6 +1311,17 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
selected: filter.hideTestFiles,
onPress: toggleTestFiles,
},
...(filter.canHideViewedFiles
? [
{
id: "hide-viewed",
title: gt("Hide viewed files"),
icon: "eye.slash",
selected: filter.hideViewedFiles,
onPress: toggleViewedFiles,
},
]
: []),
...(selectedRow && selectedFile && canCommentOnDiff
? [
{
Expand Down Expand Up @@ -1329,6 +1359,15 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
count: filter.hiddenCount,
})}`
: ""
}${
filter.hiddenViewedCount
? ` · ${gt(
"{count, plural, one {{count} viewed hidden} other {{count} viewed hidden}}",
{
count: filter.hiddenViewedCount,
},
)}`
: ""
}`}
onBack={() => navigation.goBack()}
menus={verticalControls ? undefined : [diffMenu]}
Expand Down Expand Up @@ -1440,6 +1479,25 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
contentResetKey={`pull-request:${route.params.environmentId}:${route.params.repository}:${route.params.number}:${commit ?? "all"}`}
/>
</View>
) : filter.hiddenViewedCount > 0 &&
!data.rows.length &&
!result.isPending &&
!result.error &&
!seekingFile ? (
<View style={{ paddingTop: contentTopInset }}>
<EmptyState
title={gt("All files are hidden")}
detail={gt("Viewed files are hidden from this review.")}
action={
<Button
label={gt("Show viewed files")}
tone="contrast"
onPress={filter.showViewedFiles}
/>
}
variant="plain"
/>
</View>
) : filter.hiddenCount > 0 &&
!data.rows.length &&
!result.isPending &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { describe, expect, it } from "vite-plus/test";
import { buildNativeReviewDiffData } from "../review/nativeReviewDiffAdapter";
import { buildReviewParsedDiff } from "../review/reviewModel";
import { filterPullRequestTestFiles, shownPatchIndices } from "./pullRequestFileFilters";
import {
filterPullRequestTestFiles,
filterPullRequestViewedFiles,
shownPatchIndices,
viewedFilePaths,
} from "./pullRequestFileFilters";

function patch(path: string) {
return `diff --git a/${path} b/${path}\n--- a/${path}\n+++ b/${path}\n@@ -1 +1 @@\n-old\n+new\n`;
Expand Down Expand Up @@ -42,6 +47,31 @@ describe("mobile PR test file filter", () => {
expect(visible.files[1]).toBe(parsed.files[2]);
});

it("hides viewed files except those kept on screen", () => {
const parsed = buildReviewParsedDiff(
["src/read.ts", "src/opened.ts", "src/drafted.ts", "src/unread.ts"].map(patch).join("\n"),
"pr",
);
const paths = viewedFilePaths(
parsed,
(path) => path !== "src/unread.ts",
(path) => path === "src/opened.ts" || path === "src/drafted.ts",
);
expect(paths).toEqual({
viewed: ["src/read.ts", "src/opened.ts", "src/drafted.ts"],
hidden: ["src/read.ts"],
});
const visible = filterPullRequestViewedFiles(parsed, new Set(paths.hidden));
if (parsed.kind !== "files" || visible.kind !== "files") throw new Error("Expected files");
expect(visible.files.map((file) => file.path)).toEqual([
"src/opened.ts",
"src/drafted.ts",
"src/unread.ts",
]);
expect(visible.fileCount).toBe(3);
expect(filterPullRequestViewedFiles(parsed, new Set())).toBe(parsed);
});

it("uses the current path when a file is renamed out of a test directory", () => {
const parsed = buildReviewParsedDiff(
"diff --git a/tests/helper.ts b/src/helper.ts\nsimilarity index 100%\nrename from tests/helper.ts\nrename to src/helper.ts\n",
Expand Down
39 changes: 30 additions & 9 deletions apps/mobile/src/features/pull-requests/pullRequestFileFilters.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import { isTestChangedFile } from "@t3tools/shared/changedFileKind";
import type { ReviewParsedDiff } from "../review/reviewModel";

export function filterPullRequestTestFiles(
parsed: ReviewParsedDiff,
hideTestFiles: boolean,
includePath?: string,
): ReviewParsedDiff {
if (!hideTestFiles || parsed.kind !== "files") return parsed;
const files = parsed.files.filter(
(file) => file.path === includePath || !isTestChangedFile(file.path),
);
function keepFiles(parsed: ReviewParsedDiff, keep: (path: string) => boolean): ReviewParsedDiff {
if (parsed.kind !== "files") return parsed;
const files = parsed.files.filter((file) => keep(file.path));
if (files.length === parsed.files.length) return parsed;
return {
...parsed,
Expand All @@ -20,6 +14,33 @@ export function filterPullRequestTestFiles(
};
}

export function filterPullRequestTestFiles(
parsed: ReviewParsedDiff,
hideTestFiles: boolean,
includePath?: string,
): ReviewParsedDiff {
if (!hideTestFiles) return parsed;
return keepFiles(parsed, (path) => path === includePath || !isTestChangedFile(path));
}

/** Viewed files among `parsed`, and those the filter hides: every one not kept on screen. */
export function viewedFilePaths(
parsed: ReviewParsedDiff,
isViewed: (path: string) => boolean,
isKept: (path: string) => boolean,
) {
const viewed =
parsed.kind === "files" ? parsed.files.map((file) => file.path).filter(isViewed) : [];
return { viewed, hidden: viewed.filter((path) => !isKept(path)) };
}

export function filterPullRequestViewedFiles(
parsed: ReviewParsedDiff,
hiddenPaths: ReadonlySet<string>,
): ReviewParsedDiff {
return keepFiles(parsed, (path) => !hiddenPaths.has(path));
}

/** Patches to load around `index` (or from the top): the next three files the review will show. */
export function shownPatchIndices(
files: ReadonlyArray<{ readonly path: string }>,
Expand Down
Loading
Loading