Skip to content

Commit e53d00c

Browse files
committed
fix(web): PR merge buttons stay in place while the stack loads
Merge and Merge stack were hidden until the stack lookup finished, so they popped in and pushed the stack picker out from under the cursor. They now render disabled while the lookup runs, and linked threads sit left of the stack picker as in single PRs. Fixes #25993
1 parent d0b81ce commit e53d00c

3 files changed

Lines changed: 44 additions & 37 deletions

File tree

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

Lines changed: 16 additions & 12 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;
@@ -262,7 +264,7 @@ export function PullRequestPrimaryAction({
262264
<Button
263265
size="xs"
264266
variant="default"
265-
disabled={actionPending}
267+
disabled={actionPending || mergeBlockedReason !== null}
266268
{...inlineConfirm.props(
267269
"enable-auto-merge",
268270
() => void perform("enable-auto-merge", selectedMergeMethod),
@@ -299,11 +301,12 @@ export function PullRequestPrimaryAction({
299301
}
300302
/>
301303
<TooltipPopup side="top">
302-
{pendingAction === "enable-auto-merge"
303-
? "Enabling..."
304-
: inlineConfirm.isArmed("enable-auto-merge")
305-
? "Confirm auto-merge?"
306-
: pendingAutoMergeLabel}
304+
{mergeBlockedReason ??
305+
(pendingAction === "enable-auto-merge"
306+
? "Enabling..."
307+
: inlineConfirm.isArmed("enable-auto-merge")
308+
? "Confirm auto-merge?"
309+
: pendingAutoMergeLabel)}
307310
</TooltipPopup>
308311
</Tooltip>
309312
) : primaryAction === "auto-merge-armed" ? (
@@ -328,7 +331,7 @@ export function PullRequestPrimaryAction({
328331
<Button
329332
size="xs"
330333
variant="default"
331-
disabled={actionPending}
334+
disabled={actionPending || mergeBlockedReason !== null}
332335
{...inlineConfirm.props(
333336
"merge",
334337
() => void perform("merge", selectedMergeMethod),
@@ -365,11 +368,12 @@ export function PullRequestPrimaryAction({
365368
}
366369
/>
367370
<TooltipPopup side="top">
368-
{pendingAction === "merge"
369-
? "Merging..."
370-
: inlineConfirm.isArmed("merge")
371-
? "Confirm merge?"
372-
: selectedMergeMethodLabel}
371+
{mergeBlockedReason ??
372+
(pendingAction === "merge"
373+
? "Merging..."
374+
: inlineConfirm.isArmed("merge")
375+
? "Confirm merge?"
376+
: selectedMergeMethodLabel)}
373377
</TooltipPopup>
374378
</Tooltip>
375379
) : (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
@@ -547,6 +547,12 @@ export function PullRequestDetailPanel({
547547
stackPending: !nativeStackQuery.isFresh,
548548
stackError: nativeStackQuery.error,
549549
});
550+
const stackOwnsMerge = supportsStackActions && nativeStack !== null;
551+
const mergeBlockedReason = canMergeSinglePullRequest
552+
? null
553+
: nativeStackQuery.error
554+
? "Couldn't check stack membership"
555+
: "Checking stack membership…";
550556
const activityPending = activityQuery.isPending && activity === null;
551557
const activityError = activity === null ? activityQuery.error : null;
552558
const refreshDetail = () => {
@@ -1137,9 +1143,9 @@ export function PullRequestDetailPanel({
11371143
checksState,
11381144
autoMergeEnabled: detail.autoMergeEnabled,
11391145
hasMergeMethod: allowedMergeMethods.length > 0,
1140-
canMerge: canMergeSinglePullRequest && can("merge"),
1146+
canMerge: !stackOwnsMerge && can("merge"),
11411147
canMarkReady: can("ready"),
1142-
canEnableAutoMerge: canMergeSinglePullRequest && can("enable-auto-merge"),
1148+
canEnableAutoMerge: !stackOwnsMerge && can("enable-auto-merge"),
11431149
})
11441150
: null;
11451151
const showsDraftToggle =
@@ -1285,6 +1291,15 @@ export function PullRequestDetailPanel({
12851291
<div className="mr-4 flex h-7 shrink-0 items-center justify-end gap-1">
12861292
{detail ? (
12871293
<TooltipProvider delay={150} closeDelay={150} timeout={400}>
1294+
{context === "page" ? (
1295+
<PullRequestThreadLinks
1296+
display="count"
1297+
environmentId={environmentId}
1298+
reference={reference}
1299+
url={detail.url}
1300+
threadRef={null}
1301+
/>
1302+
) : null}
12881303
{!nativeStack && supportsStackActions && nativeStackQuery.error ? (
12891304
<Button variant="ghost" size="xs" onClick={nativeStackQuery.refresh}>
12901305
Retry stack lookup
@@ -1301,33 +1316,17 @@ export function PullRequestDetailPanel({
13011316
environmentId={environmentId}
13021317
onSelect={onSelectPullRequest}
13031318
mergeMethod={selectedMergeMethod}
1304-
canMerge={
1305-
nativeStackQuery.isFresh &&
1306-
supportsStackActions &&
1307-
can("merge") &&
1308-
allowedMergeMethods.length > 0
1309-
}
1310-
canRebase={
1311-
nativeStackQuery.isFresh &&
1312-
supportsStackActions &&
1313-
detail.viewerPermissions.stackRebase === true
1314-
}
1319+
stale={!nativeStackQuery.isFresh}
1320+
canMerge={supportsStackActions && can("merge") && allowedMergeMethods.length > 0}
1321+
canRebase={supportsStackActions && detail.viewerPermissions.stackRebase === true}
13151322
onActed={() => {
13161323
refreshDetail();
13171324
onActed?.();
13181325
}}
13191326
/>
13201327
) : null}
1321-
{context === "page" ? (
1322-
<PullRequestThreadLinks
1323-
display="count"
1324-
environmentId={environmentId}
1325-
reference={reference}
1326-
url={detail.url}
1327-
threadRef={null}
1328-
/>
1329-
) : null}
13301328
<PullRequestPrimaryAction
1329+
mergeBlockedReason={mergeBlockedReason}
13311330
pullRequestKey={pullRequestKey}
13321331
primaryAction={primaryAction}
13331332
autoMergeArmed={autoMergeArmed}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export function PullRequestStackMenu({
3434
stack,
3535
reference,
3636
environmentId,
37+
stale,
3738
canMerge,
3839
canRebase,
3940
mergeMethod,
@@ -49,6 +50,7 @@ export function PullRequestStackMenu({
4950
stack: PullRequestStack;
5051
reference: PullRequestRef;
5152
environmentId: EnvironmentId;
53+
stale: boolean;
5254
canMerge: boolean;
5355
canRebase: boolean;
5456
mergeMethod: PullRequestMergeMethod;
@@ -72,12 +74,13 @@ export function PullRequestStackMenu({
7274
const hasUnknownHead = expectedStackHeads.length !== unmerged.length;
7375
const mergeDisabled =
7476
pending ||
77+
stale ||
7578
selectedLayer?.state !== "open" ||
7679
mergeLayers.some((layer) => !layer.headSha) ||
7780
mergeHasClosed ||
7881
mergeLayers.length === 0 ||
7982
mergeLayers.some((layer) => layer.isDraft);
80-
const rebaseDisabled = pending || hasUnknownHead || hasClosed || unmerged.length === 0;
83+
const rebaseDisabled = pending || stale || hasUnknownHead || hasClosed || unmerged.length === 0;
8184
const run = async () => {
8285
if (
8386
pending ||
@@ -217,8 +220,9 @@ export function PullRequestStackMenu({
217220
}
218221
/>
219222
<TooltipPopup>
220-
Merge stack through #{reference.number} into {stack.base} ({mergeLayers.length}{" "}
221-
{mergeLayers.length === 1 ? terminology.singular : terminology.plural})
223+
{stale
224+
? notice
225+
: `Merge stack through #${reference.number} into ${stack.base} (${mergeLayers.length} ${mergeLayers.length === 1 ? terminology.singular : terminology.plural})`}
222226
</TooltipPopup>
223227
</Tooltip>
224228
) : null}

0 commit comments

Comments
 (0)