Skip to content

Commit 89fbbe9

Browse files
fix(mobile): pull request diffs page past test-only pages while test files are hidden
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent db99db4 commit 89fbbe9

5 files changed

Lines changed: 65 additions & 17 deletions

File tree

‎apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { usePullRequestFilesViewed } from "./usePullRequestFilesViewed";
3535
import { usePullRequestPermissions } from "./usePullRequestPermissions";
3636
import { usePullRequestAction } from "./usePullRequestAction";
3737
import { annotatePullRequestDiff, reviewPosition } from "./pullRequestDiffComments";
38-
import { usePullRequestFileFilter } from "./usePullRequestFileFilter";
38+
import { usePullRequestFileFilter, usePullRequestHideTestFiles } from "./usePullRequestFileFilter";
3939
import {
4040
handlePullRequestDiffDebugEvent,
4141
pullRequestDiffInitialPosition,
@@ -897,11 +897,14 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
897897
(detail.data ?? route.params.initialSummary)?.provider,
898898
).changeRequest;
899899
const [jumpPath, setJumpPath] = useState(route.params.path);
900-
const result = usePullRequestDiff(route.params, terminology, jumpPath ? [jumpPath] : []);
901-
const filter = usePullRequestFileFilter(
902-
result.parsed,
903-
route.params.focus ? route.params.path : undefined,
904-
);
900+
const includePath = route.params.focus ? route.params.path : undefined;
901+
const hideTestFiles = usePullRequestHideTestFiles();
902+
// Pages on past pages the filter empties, so the screen has a file to open at.
903+
const result = usePullRequestDiff(route.params, terminology, jumpPath ? [jumpPath] : [], {
904+
hideTestFiles,
905+
includePath,
906+
});
907+
const filter = usePullRequestFileFilter(result.parsed, includePath);
905908
const { refresh: refreshDetail } = detail;
906909
useFocusEffect(refreshDetail);
907910
const { loadMore } = result;
@@ -1057,7 +1060,7 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
10571060
filter.toggle();
10581061
};
10591062
const title = commit ? "Commit changes" : "Changes";
1060-
const seekingFile = Boolean(jumpPath) && !requestedFile && result.nextCursor !== null;
1063+
const seekingFile = !targetFile && result.nextCursor !== null;
10611064
const loadingDiff = (result.isPending && !data.rows.length) || (seekingFile && !result.error);
10621065
return (
10631066
<View className={Platform.OS === "android" ? "flex-1 bg-header" : "flex-1 bg-screen"}>

‎apps/mobile/src/features/pull-requests/pullRequestDiffPages.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,23 @@ describe("paged mobile pull request diffs", () => {
184184
expect(walk(1, ["d.ts"])).toEqual({ cursors: [null, "2"], frontier: "3" });
185185
});
186186

187+
it("pages past test-only pages until a file the screen shows loads", () => {
188+
const answers = new Map<string | null, PullRequestDiffResult>([
189+
[null, { ...diff("a.test.ts"), nextCursor: "2" }],
190+
["2", { ...diff("b.test.ts"), nextCursor: "3" }],
191+
["3", { ...diff("c.ts"), nextCursor: "4" }],
192+
["4", diff("d.ts")],
193+
]);
194+
const read = (cursor: string | null) => answers.get(cursor) ?? null;
195+
const paths = (page: PullRequestDiffPage) => [page.result.patch.split(" ")[2]!.slice(2)];
196+
const cursors = (shown?: (path: string) => boolean) =>
197+
walkPullRequestDiffPages(read, 1, [], paths, shown).pages.map((page) => page.cursor);
198+
199+
expect(cursors()).toEqual([null]);
200+
expect(cursors((path) => !path.includes(".test."))).toEqual([null, "2", "3"]);
201+
expect(cursors(() => false)).toEqual([null, "2", "3", "4"]);
202+
});
203+
187204
it("keeps pages loaded while seeking one file when the wanted file moves to an earlier page", () => {
188205
const answers = new Map<string | null, PullRequestDiffResult>([
189206
[null, { ...diff("a.ts"), nextCursor: "2" }],

‎apps/mobile/src/features/pull-requests/pullRequestDiffPages.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,21 @@ export function getCachedPullRequestDiffPages(
5454
}
5555

5656
/**
57-
* Follows each loaded page's next cursor until `count` pages and every wanted path have loaded.
58-
* `frontier` is the cursor the walk stopped on: the last page read, or the one still loading or
57+
* Follows each loaded page's next cursor until `count` pages and every wanted path have loaded,
58+
* and, given `shown`, until a file the screen shows has loaded: a screen with nothing to show
59+
* has no scroll position to page further from. `frontier` is the cursor the walk stopped on: the last page read, or the one still loading or
5960
* failed. A page whose answer changed leads to its new cursors, so stale later pages drop out.
6061
*/
6162
export function walkPullRequestDiffPages(
6263
read: (cursor: string | null) => PullRequestDiffResult | null,
6364
count: number,
6465
wanted: readonly string[],
6566
paths: (page: PullRequestDiffPage) => readonly string[],
67+
shown?: (path: string) => boolean,
6668
): { readonly pages: readonly PullRequestDiffPage[]; readonly frontier: string | null } {
6769
const pages: PullRequestDiffPage[] = [];
6870
const missing = new Set(wanted);
71+
let showing = !shown;
6972
const seen = new Set<string | null>();
7073
let cursor: string | null = null;
7174
for (;;) {
@@ -74,9 +77,12 @@ export function walkPullRequestDiffPages(
7477
if (result === null) return { pages, frontier: cursor };
7578
const page = { cursor, result };
7679
pages.push(page);
77-
for (const path of paths(page)) missing.delete(path);
80+
for (const path of paths(page)) {
81+
missing.delete(path);
82+
if (shown?.(path)) showing = true;
83+
}
7884
const next = result.nextCursor;
79-
if (next === null || seen.has(next) || (pages.length >= count && missing.size === 0))
85+
if (next === null || seen.has(next) || (pages.length >= count && missing.size === 0 && showing))
8086
return { pages, frontier: cursor };
8187
cursor = next;
8288
}

‎apps/mobile/src/features/pull-requests/usePullRequestDiff.ts‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
requestPullRequestDiffPaths,
2121
walkPullRequestDiffPages,
2222
} from "./pullRequestDiffPages";
23+
import { isPullRequestTestFile } from "./pullRequestFileFilters";
2324

2425
export type PullRequestParams = {
2526
readonly environmentId: string;
@@ -99,12 +100,17 @@ const parseCache = new WeakMap<PullRequestDiffResult, ReviewParsedDiff>();
99100
// Reads the cached pages in order and mounts the next one a reader still needs, so paging toward
100101
// a wanted file continues as each page lands, without the screen asking again.
101102
const diffPagesFamily = Atom.family((key: string) => {
102-
const [target, count, wanted] = JSON.parse(key) as [
103+
const [target, count, wanted, until] = JSON.parse(key) as [
103104
PullRequestDiffTarget,
104105
number,
105106
readonly string[],
107+
PullRequestDiffShownFiles | null,
106108
];
107109
const scope = JSON.stringify(target);
110+
const shown = until
111+
? (path: string) =>
112+
!until.hideTestFiles || path === until.includePath || !isPullRequestTestFile(path)
113+
: undefined;
108114
return Atom.make((get) =>
109115
walkPullRequestDiffPages(
110116
(cursor) =>
@@ -117,17 +123,28 @@ const diffPagesFamily = Atom.family((key: string) => {
117123
const parsed = parsePullRequestDiffPage(page, parseCache, scope);
118124
return parsed.kind === "files" ? parsed.files.map((file) => file.path) : [];
119125
},
126+
shown,
120127
),
121128
);
122129
});
123130

124131
const NO_PATHS: readonly string[] = [];
125132

126-
/** `wantedPaths` keeps paging until those files have loaded or the diff ends. */
133+
/** The test file filter a screen applies, as `usePullRequestFileFilter` takes it. */
134+
export interface PullRequestDiffShownFiles {
135+
readonly hideTestFiles: boolean;
136+
readonly includePath?: string | undefined;
137+
}
138+
139+
/**
140+
* `wantedPaths` keeps paging until those files have loaded or the diff ends, and `shownFiles`
141+
* until a file that filter keeps has loaded.
142+
*/
127143
export function usePullRequestDiff(
128144
params: PullRequestDiffParams,
129145
terminology: ChangeRequestTerminology,
130146
wantedPaths: readonly string[] = NO_PATHS,
147+
shownFiles?: PullRequestDiffShownFiles,
131148
) {
132149
const reference = pullRequestTarget(params);
133150
const target: PullRequestDiffTarget = {
@@ -143,7 +160,9 @@ export function usePullRequestDiff(
143160
const requested = requestPullRequestDiffPaths(stored, key, wantedPaths);
144161
if (requested !== stored) setRequested(requested);
145162
const { pages, frontier } = useAtomValue(
146-
diffPagesFamily(JSON.stringify([target, requested.count, requested.wanted])),
163+
diffPagesFamily(
164+
JSON.stringify([target, requested.count, requested.wanted, shownFiles ?? null]),
165+
),
147166
);
148167
const query = useEnvironmentQuery(composerPullRequests.diff(pageTarget(target, frontier)));
149168
const parsed = getCachedPullRequestDiffPages(pages, key, terminology, parseCache);

‎apps/mobile/src/features/pull-requests/usePullRequestFileFilter.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ import type { ReviewParsedDiff } from "../review/reviewModel";
55
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
66
import { filterPullRequestTestFiles } from "./pullRequestFileFilters";
77

8-
export function usePullRequestFileFilter(parsed: ReviewParsedDiff, includePath?: string) {
8+
export function usePullRequestHideTestFiles(): boolean {
99
const preferences = useAtomValue(mobilePreferencesAtom);
10+
return AsyncResult.isSuccess(preferences) && preferences.value.pullRequestHideTestFiles === true;
11+
}
12+
13+
export function usePullRequestFileFilter(parsed: ReviewParsedDiff, includePath?: string) {
1014
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
11-
const hideTestFiles =
12-
AsyncResult.isSuccess(preferences) && preferences.value.pullRequestHideTestFiles === true;
15+
const hideTestFiles = usePullRequestHideTestFiles();
1316
const visible = useMemo(
1417
() => filterPullRequestTestFiles(parsed, hideTestFiles, includePath),
1518
[parsed, hideTestFiles, includePath],

0 commit comments

Comments
 (0)