Skip to content

Commit 79696a5

Browse files
fix(web): keep PR check counts in sync
1 parent 43879d9 commit 79696a5

4 files changed

Lines changed: 64 additions & 10 deletions

File tree

‎apps/web/src/components/chat/ThreadDetailsPrRow.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
buildFixFindingsHandoff,
3333
buildResolveConflictsPrompt,
3434
classifyPullRequestChecks,
35+
resolvePullRequestDetailChecks,
3536
describePullRequestChecks,
3637
isPullRequestConflicting,
3738
resolvePullRequestMergeMethod,
@@ -135,12 +136,7 @@ export function ThreadDetailsPrRow({
135136
const checksSettledEmpty = useEnvironmentQuerySelector(checksAtom, isSettledWithoutChecks);
136137
const checksQuery = useEnvironmentQueryRefresh(checksAtom);
137138
const checksAreNewer = useEnvironmentQueryIsNewer(checksAtom, detailAtom);
138-
const detail =
139-
detailData === null
140-
? null
141-
: checksData !== null && checksAreNewer
142-
? { ...detailData, ...checksData }
143-
: detailData;
139+
const detail = resolvePullRequestDetailChecks(detailData, checksData, checksAreNewer);
144140
const open = reference !== null && (detail?.state ?? pr?.state) === "open";
145141
const refreshKey = `${environmentId}:${project?.id}:${reference?.host}:${reference?.repository}:${number}`;
146142
useLiveRefresh(

‎apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import {
4646
checkoutFailureDescription,
4747
readPullRequestDetailSnapshot,
4848
resolveDisplayedPullRequestDetail,
49+
resolvePullRequestDetailChecks,
4950
resolvePullRequestReferenceHost,
5051
resolvePullRequestPrimaryControl,
5152
allowsSinglePullRequestMerge,
@@ -1245,6 +1246,27 @@ describe("cached pull request detail", () => {
12451246
...overrides,
12461247
}) as PullRequestDetail;
12471248

1249+
it("uses fresh checks for detail counts without replacing other PR fields", () => {
1250+
const pending = (name: string): PullRequestCheck => ({
1251+
name,
1252+
status: "pending",
1253+
url: null,
1254+
description: null,
1255+
});
1256+
const original = detail({ checks: [pending("build"), pending("test")] });
1257+
const checks = [pending("build"), { ...pending("test"), status: "success" as const }];
1258+
expect(resolvePullRequestDetailChecks(original, { state: "closed", checks }, true)).toEqual({
1259+
...original,
1260+
state: "closed",
1261+
checks,
1262+
});
1263+
expect(resolvePullRequestDetailChecks(original, { state: "closed", checks }, false)).toBe(
1264+
original,
1265+
);
1266+
expect(resolvePullRequestDetailChecks(original, null, true)).toBe(original);
1267+
expect(resolvePullRequestDetailChecks(null, { state: "closed", checks }, true)).toBeNull();
1268+
});
1269+
12481270
const makeStorage = () => {
12491271
const held = new Map<string, string>();
12501272
return {

‎apps/web/src/components/pullRequest/pullRequestDetail.logic.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
type PullRequestActor,
1111
type PullRequestBaseComparison,
1212
type PullRequestCheck,
13+
type PullRequestChecks,
1314
type PullRequestChecksState as ContractPullRequestChecksState,
1415
type PullRequestComment,
1516
type PullRequestCommit,
@@ -1419,3 +1420,11 @@ export function resolveDisplayedPullRequestDetail(input: {
14191420
return null;
14201421
}
14211422
}
1423+
1424+
export function resolvePullRequestDetailChecks(
1425+
detail: PullRequestDetail | null,
1426+
checks: PullRequestChecks | null,
1427+
checksAreNewer: boolean,
1428+
): PullRequestDetail | null {
1429+
return detail !== null && checks !== null && checksAreNewer ? { ...detail, ...checks } : detail;
1430+
}

‎apps/web/src/components/pullRequest/usePullRequestDetail.ts‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {
77
} from "@t3tools/contracts";
88
import { useEffect, useEffectEvent, useState } from "react";
99

10+
import { usePullRequestChecksRefresh } from "~/hooks/usePullRequestChecksRefresh";
11+
import { useServerConfigs } from "~/state/entities";
1012
import { useEnvironmentQuery } from "~/state/query";
1113
import { useEnvironmentScope } from "~/state/session";
1214
import {
@@ -18,6 +20,7 @@ import {
1820
import {
1921
readPullRequestDetailSnapshot,
2022
resolveDisplayedPullRequestDetail,
23+
resolvePullRequestDetailChecks,
2124
writePullRequestDetailSnapshot,
2225
} from "./pullRequestDetail.logic";
2326
import { pullRequestChecksState } from "./pullRequestPresentation";
@@ -42,11 +45,35 @@ export function usePullRequestDetail(
4245
const scopeKey = `${environmentId}:${pullRequestRefKey(reference)}`;
4346
const canWriteSourceControl = useEnvironmentScope(environmentId, AuthSourceControlWriteScope);
4447
const detailQuery = useEnvironmentQuery(
45-
pullRequestEnvironment.detail({ environmentId, input: reference }),
48+
pullRequestEnvironment.detail({ environmentId, input: { ...reference, allowStale: false } }),
4649
);
4750
const activityQuery = useEnvironmentQuery(
4851
pullRequestEnvironment.activity({ environmentId, input: reference }),
4952
);
53+
const serverConfigs = useServerConfigs();
54+
const supportsChecks =
55+
serverConfigs.get(environmentId)?.environment.capabilities.pullRequestChecks === true;
56+
const checksQuery = useEnvironmentQuery(
57+
supportsChecks && detailQuery.data !== null
58+
? pullRequestEnvironment.checks({ environmentId, input: reference })
59+
: null,
60+
);
61+
const liveDetail = resolvePullRequestDetailChecks(
62+
detailQuery.data,
63+
checksQuery.data,
64+
checksQuery.dataUpdatedAt >= detailQuery.dataUpdatedAt,
65+
);
66+
usePullRequestChecksRefresh({
67+
refresh: () => {
68+
if (!checksQuery.isPending && !detailQuery.isPending) checksQuery.refresh();
69+
},
70+
enabled:
71+
liveDetail?.state === "open" &&
72+
supportsChecks &&
73+
!(checksQuery.isSuccess && checksQuery.data === null),
74+
key: `workspace-pr-checks:${environmentId}:${reference.projectId}:${reference.host}:${reference.repository}:${reference.number}`,
75+
checks: liveDetail?.checks ?? [],
76+
});
5077
const [cachedDetail, setCachedDetail] = useState(() =>
5178
readPullRequestDetailSnapshot(
5279
typeof window === "undefined" ? undefined : window.localStorage,
@@ -79,16 +106,16 @@ export function usePullRequestDetail(
79106
useEffect(() => {
80107
if (detailQuery.data !== null) saveDetailSnapshot(detailQuery.data);
81108
}, [detailQuery.data]);
82-
const detailSummary = pullRequestDetailSummary(detailQuery.data);
109+
const detailSummary = pullRequestDetailSummary(liveDetail);
83110
const observedSummary = useSharedPullRequestSummary(
84111
environmentId,
85112
reference,
86113
detailSummary,
87-
detailQuery.dataUpdatedAt,
114+
Math.max(detailQuery.dataUpdatedAt, checksQuery.dataUpdatedAt),
88115
);
89116
const activity = activityQuery.data;
90117
const resolvedCoreDetail = resolveDisplayedPullRequestDetail({
91-
live: detailQuery.data,
118+
live: liveDetail,
92119
cached: cachedDetail,
93120
reference,
94121
});

0 commit comments

Comments
 (0)