Skip to content

Commit 5b5bd16

Browse files
fix(web): PR merge buttons stay in place while the stack loads (pingdotgg#26077)
Co-authored-by: maria-rcks <[email protected]>
1 parent b5d9f85 commit 5b5bd16

4 files changed

Lines changed: 95 additions & 45 deletions

File tree

‎apps/web/src/components/pullRequest/PullRequestDetailActions.tsx‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ export function PullRequestResolveConflictsButton({
191191
export function PullRequestPrimaryAction({
192192
pullRequestKey,
193193
primaryAction,
194+
mergeBlockedReason,
194195
autoMergeArmed,
195196
armedAutoMergeLabel,
196197
pendingAutoMergeLabel,
@@ -203,6 +204,7 @@ export function PullRequestPrimaryAction({
203204
}: {
204205
pullRequestKey: string;
205206
primaryAction: ReturnType<typeof resolvePullRequestPrimaryControl> | null;
207+
mergeBlockedReason: string | null;
206208
autoMergeArmed: boolean;
207209
armedAutoMergeLabel: string;
208210
pendingAutoMergeLabel: string;
@@ -263,10 +265,14 @@ export function PullRequestPrimaryAction({
263265
size="xs"
264266
variant="default"
265267
disabled={actionPending}
266-
{...inlineConfirm.props(
267-
"enable-auto-merge",
268-
() => void perform("enable-auto-merge", selectedMergeMethod),
269-
)}
268+
aria-disabled={mergeBlockedReason !== null || undefined}
269+
aria-description={mergeBlockedReason ?? undefined}
270+
{...(mergeBlockedReason === null
271+
? inlineConfirm.props(
272+
"enable-auto-merge",
273+
() => void perform("enable-auto-merge", selectedMergeMethod),
274+
)
275+
: {})}
270276
aria-label={
271277
pendingAction === "enable-auto-merge"
272278
? "Enabling..."
@@ -299,11 +305,12 @@ export function PullRequestPrimaryAction({
299305
}
300306
/>
301307
<TooltipPopup side="top">
302-
{pendingAction === "enable-auto-merge"
303-
? "Enabling..."
304-
: inlineConfirm.isArmed("enable-auto-merge")
305-
? "Confirm auto-merge?"
306-
: pendingAutoMergeLabel}
308+
{mergeBlockedReason ??
309+
(pendingAction === "enable-auto-merge"
310+
? "Enabling..."
311+
: inlineConfirm.isArmed("enable-auto-merge")
312+
? "Confirm auto-merge?"
313+
: pendingAutoMergeLabel)}
307314
</TooltipPopup>
308315
</Tooltip>
309316
) : primaryAction === "auto-merge-armed" ? (
@@ -329,10 +336,11 @@ export function PullRequestPrimaryAction({
329336
size="xs"
330337
variant="default"
331338
disabled={actionPending}
332-
{...inlineConfirm.props(
333-
"merge",
334-
() => void perform("merge", selectedMergeMethod),
335-
)}
339+
aria-disabled={mergeBlockedReason !== null || undefined}
340+
aria-description={mergeBlockedReason ?? undefined}
341+
{...(mergeBlockedReason === null
342+
? inlineConfirm.props("merge", () => void perform("merge", selectedMergeMethod))
343+
: {})}
336344
aria-label={
337345
pendingAction === "merge"
338346
? "Merging..."
@@ -365,11 +373,12 @@ export function PullRequestPrimaryAction({
365373
}
366374
/>
367375
<TooltipPopup side="top">
368-
{pendingAction === "merge"
369-
? "Merging..."
370-
: inlineConfirm.isArmed("merge")
371-
? "Confirm merge?"
372-
: selectedMergeMethodLabel}
376+
{mergeBlockedReason ??
377+
(pendingAction === "merge"
378+
? "Merging..."
379+
: inlineConfirm.isArmed("merge")
380+
? "Confirm merge?"
381+
: selectedMergeMethodLabel)}
373382
</TooltipPopup>
374383
</Tooltip>
375384
) : (primaryAction === "merged" || primaryAction === "closed") &&

‎apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,12 @@ export function PullRequestDetailPanel({
553553
stackPending: !nativeStackQuery.isFresh,
554554
stackError: nativeStackQuery.error,
555555
});
556+
const stackOwnsMerge = supportsStackActions && nativeStack !== null;
557+
const mergeBlockedReason = canMergeSinglePullRequest
558+
? null
559+
: nativeStackQuery.error
560+
? "Couldn't check stack membership"
561+
: "Checking stack membership…";
556562
const activityPending = activityQuery.isPending && activity === null;
557563
const activityError = activity === null ? activityQuery.error : null;
558564
const refreshDetail = () => {
@@ -1143,9 +1149,9 @@ export function PullRequestDetailPanel({
11431149
checksState,
11441150
autoMergeEnabled: detail.autoMergeEnabled,
11451151
hasMergeMethod: allowedMergeMethods.length > 0,
1146-
canMerge: canMergeSinglePullRequest && can("merge"),
1152+
canMerge: !stackOwnsMerge && can("merge"),
11471153
canMarkReady: can("ready"),
1148-
canEnableAutoMerge: canMergeSinglePullRequest && can("enable-auto-merge"),
1154+
canEnableAutoMerge: !stackOwnsMerge && can("enable-auto-merge"),
11491155
})
11501156
: null;
11511157
const showsDraftToggle =
@@ -1291,6 +1297,15 @@ export function PullRequestDetailPanel({
12911297
<div className="mr-4 flex h-7 shrink-0 select-none items-center justify-end gap-1">
12921298
{detail ? (
12931299
<TooltipProvider delay={150} closeDelay={150} timeout={400}>
1300+
{context === "page" ? (
1301+
<PullRequestThreadLinks
1302+
display="count"
1303+
environmentId={environmentId}
1304+
reference={reference}
1305+
url={detail.url}
1306+
threadRef={null}
1307+
/>
1308+
) : null}
12941309
{!nativeStack && supportsStackActions && nativeStackQuery.error ? (
12951310
<Button variant="ghost" size="xs" onClick={nativeStackQuery.refresh}>
12961311
Retry stack lookup
@@ -1307,33 +1322,17 @@ export function PullRequestDetailPanel({
13071322
environmentId={environmentId}
13081323
onSelect={onSelectPullRequest}
13091324
mergeMethod={selectedMergeMethod}
1310-
canMerge={
1311-
nativeStackQuery.isFresh &&
1312-
supportsStackActions &&
1313-
can("merge") &&
1314-
allowedMergeMethods.length > 0
1315-
}
1316-
canRebase={
1317-
nativeStackQuery.isFresh &&
1318-
supportsStackActions &&
1319-
detail.viewerPermissions.stackRebase === true
1320-
}
1325+
stale={!nativeStackQuery.isFresh}
1326+
canMerge={supportsStackActions && can("merge") && allowedMergeMethods.length > 0}
1327+
canRebase={supportsStackActions && detail.viewerPermissions.stackRebase === true}
13211328
onActed={() => {
13221329
refreshDetail();
13231330
onActed?.();
13241331
}}
13251332
/>
13261333
) : null}
1327-
{context === "page" ? (
1328-
<PullRequestThreadLinks
1329-
display="count"
1330-
environmentId={environmentId}
1331-
reference={reference}
1332-
url={detail.url}
1333-
threadRef={null}
1334-
/>
1335-
) : null}
13361334
<PullRequestPrimaryAction
1335+
mergeBlockedReason={mergeBlockedReason}
13371336
pullRequestKey={pullRequestKey}
13381337
primaryAction={primaryAction}
13391338
autoMergeArmed={autoMergeArmed}

‎apps/web/src/components/pullRequest/PullRequestStackMenu.tsx‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export function PullRequestStackMenu({
3535
stack,
3636
reference,
3737
environmentId,
38+
stale,
3839
canMerge,
3940
canRebase,
4041
mergeMethod,
@@ -50,6 +51,7 @@ export function PullRequestStackMenu({
5051
stack: PullRequestStack;
5152
reference: PullRequestRef;
5253
environmentId: EnvironmentId;
54+
stale: boolean;
5355
canMerge: boolean;
5456
canRebase: boolean;
5557
mergeMethod: PullRequestMergeMethod;
@@ -73,12 +75,13 @@ export function PullRequestStackMenu({
7375
const hasUnknownHead = expectedStackHeads.length !== unmerged.length;
7476
const mergeDisabled =
7577
pending ||
78+
stale ||
7679
selectedLayer?.state !== "open" ||
7780
mergeLayers.some((layer) => !layer.headSha) ||
7881
mergeHasClosed ||
7982
mergeLayers.length === 0 ||
8083
mergeLayers.some((layer) => layer.isDraft);
81-
const rebaseDisabled = pending || hasUnknownHead || hasClosed || unmerged.length === 0;
84+
const rebaseDisabled = pending || stale || hasUnknownHead || hasClosed || unmerged.length === 0;
8285
const run = async () => {
8386
if (
8487
pending ||
@@ -213,8 +216,10 @@ export function PullRequestStackMenu({
213216
<Button
214217
variant="default"
215218
size="xs"
216-
disabled={mergeDisabled}
217-
onClick={() => setConfirmation("merge")}
219+
disabled={mergeDisabled && !stale}
220+
aria-disabled={mergeDisabled || undefined}
221+
aria-description={stale ? (notice ?? undefined) : undefined}
222+
onClick={mergeDisabled ? undefined : () => setConfirmation("merge")}
218223
>
219224
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
220225
Merge stack
@@ -223,8 +228,9 @@ export function PullRequestStackMenu({
223228
}
224229
/>
225230
<TooltipPopup>
226-
Merge stack through #{reference.number} into {stack.base} ({mergeLayers.length}{" "}
227-
{mergeLayers.length === 1 ? terminology.singular : terminology.plural})
231+
{stale
232+
? notice
233+
: `Merge stack through #${reference.number} into ${stack.base} (${mergeLayers.length} ${mergeLayers.length === 1 ? terminology.singular : terminology.plural})`}
228234
</TooltipPopup>
229235
</Tooltip>
230236
) : null}

‎apps/web/src/components/pullRequest/useInlineActionConfirm.browser.test.tsx‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,39 @@ it("stops swallowing Escape once the armed button unmounts", async () => {
7676
await screen.rerender(<ToolbarWithMergeButton shown />);
7777
await expect.element(screen.getByRole("button")).toHaveTextContent("Merge");
7878
});
79+
80+
it.each(["merge", "enable-auto-merge"] as const)(
81+
"keeps a blocked %s action reachable without arming or performing it",
82+
async (primaryAction) => {
83+
const perform = vi.fn(async () => true);
84+
const { PullRequestPrimaryAction } = await import("./PullRequestDetailActions");
85+
const control = (mergeBlockedReason: string | null) => (
86+
<PullRequestPrimaryAction
87+
pullRequestKey="owner/repo/7"
88+
primaryAction={primaryAction}
89+
mergeBlockedReason={mergeBlockedReason}
90+
autoMergeArmed={false}
91+
armedAutoMergeLabel="Auto-merge enabled"
92+
pendingAutoMergeLabel="Auto-merge (squash)"
93+
selectedMergeMethod="squash"
94+
selectedMergeMethodLabel="Squash and merge"
95+
statePresentation={null}
96+
pendingAction={null}
97+
perform={perform}
98+
resolveConflicts={null}
99+
/>
100+
);
101+
await using screen = await render(control("Checking stack membership…"));
102+
const button = screen.getByRole("button");
103+
await userEvent.tab();
104+
await expect.element(button).toHaveFocus();
105+
await expect.element(button).toHaveAccessibleDescription("Checking stack membership…");
106+
await userEvent.keyboard("{Enter}{Enter} ");
107+
expect(perform).not.toHaveBeenCalled();
108+
await screen.rerender(control(null));
109+
await userEvent.click(button);
110+
expect(perform).not.toHaveBeenCalled();
111+
await userEvent.click(button);
112+
expect(perform).toHaveBeenCalledExactlyOnceWith(primaryAction, "squash");
113+
},
114+
);

0 commit comments

Comments
 (0)