From 6844052f1c84dbf34a17f974b5bd739184e281c5 Mon Sep 17 00:00:00 2001
From: Oleksandr Mazepa <omazepa@atlassian.com>
Date: Wed, 4 Feb 2026 18:33:04 +0200
Subject: [PATCH] AXON-1861: Disable merge button if PR is draft

---
 .../pullrequest/PullRequestHeader.tsx         |  2 +-
 .../{ => header-actions}/ApproveButton.tsx    |  2 +-
 .../header-actions/MergeButton.tsx            | 40 +++++++++++++++++++
 .../{ => header-actions}/MergeDialog.tsx      | 23 +++++------
 .../PullRequestHeaderActions.tsx              |  8 ++--
 .../RequestChangesButton.tsx                  |  4 +-
 6 files changed, 58 insertions(+), 21 deletions(-)
 rename src/react/atlascode/pullrequest/{ => header-actions}/ApproveButton.tsx (94%)
 create mode 100644 src/react/atlascode/pullrequest/header-actions/MergeButton.tsx
 rename src/react/atlascode/pullrequest/{ => header-actions}/MergeDialog.tsx (95%)
 rename src/react/atlascode/pullrequest/{ => header-actions}/PullRequestHeaderActions.tsx (91%)
 rename src/react/atlascode/pullrequest/{ => header-actions}/RequestChangesButton.tsx (90%)

diff --git a/src/react/atlascode/pullrequest/PullRequestHeader.tsx b/src/react/atlascode/pullrequest/PullRequestHeader.tsx
index 23d34305a..4a6122d75 100644
--- a/src/react/atlascode/pullrequest/PullRequestHeader.tsx
+++ b/src/react/atlascode/pullrequest/PullRequestHeader.tsx
@@ -1,8 +1,8 @@
 import { AppBar, Box, Link, Toolbar, Typography } from '@mui/material';
 import React from 'react';
 
+import { PullRequestHeaderActions } from './header-actions/PullRequestHeaderActions';
 import { PullRequestDetailsControllerApi, PullRequestDetailsState } from './pullRequestDetailsController';
-import { PullRequestHeaderActions } from './PullRequestHeaderActions';
 
 interface PullRequestHeaderProps {
     state: PullRequestDetailsState;
diff --git a/src/react/atlascode/pullrequest/ApproveButton.tsx b/src/react/atlascode/pullrequest/header-actions/ApproveButton.tsx
similarity index 94%
rename from src/react/atlascode/pullrequest/ApproveButton.tsx
rename to src/react/atlascode/pullrequest/header-actions/ApproveButton.tsx
index b11284a19..6b924e0de 100644
--- a/src/react/atlascode/pullrequest/ApproveButton.tsx
+++ b/src/react/atlascode/pullrequest/header-actions/ApproveButton.tsx
@@ -2,7 +2,7 @@ import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import { Box, Button, Typography } from '@mui/material';
 import React, { useCallback } from 'react';
 
-import { ApprovalStatus } from '../../../bitbucket/model';
+import { ApprovalStatus } from '../../../../bitbucket/model';
 
 type ApproveButtonProps = {
     hidden?: boolean;
diff --git a/src/react/atlascode/pullrequest/header-actions/MergeButton.tsx b/src/react/atlascode/pullrequest/header-actions/MergeButton.tsx
new file mode 100644
index 000000000..5373dc8e4
--- /dev/null
+++ b/src/react/atlascode/pullrequest/header-actions/MergeButton.tsx
@@ -0,0 +1,40 @@
+import { Button, Tooltip, Typography } from '@mui/material';
+import React from 'react';
+
+type MergeButtonProps = {
+    prState: string;
+    isMerging: boolean;
+    isDraft: boolean;
+    onClick: () => void;
+};
+
+export const MergeButton: React.FC<MergeButtonProps> = ({ prState, isMerging, isDraft, onClick }) => {
+    const isDisabled = prState !== 'OPEN' || isMerging || isDraft;
+    const buttonText = prState === 'OPEN' ? 'Merge' : 'Merged';
+
+    let tooltipText = ''; // do not show tooltip when enabled
+    if (isDraft) {
+        tooltipText = 'This is a draft pull request. Mark as "ready for review" to enable merging.';
+    } else if (prState !== 'OPEN') {
+        tooltipText = `Pull request has "${prState.toLowerCase()}" state and cannot be merged.`;
+    } else if (isMerging) {
+        tooltipText = 'Merging in progress';
+    }
+
+    return (
+        <Tooltip title={tooltipText}>
+            {/*
+            By default disabled elements like <button> do not trigger user interactions so a Tooltip will not activate on normal events like hover.
+            To accommodate disabled elements, add a simple wrapper element, such as a span.
+            https://mui.com/material-ui/react-tooltip/#disabled-elements
+            */}
+            <div>
+                <Button color="primary" variant="contained" onClick={onClick} disabled={isDisabled} title={tooltipText}>
+                    <Typography variant="button" noWrap>
+                        {buttonText}
+                    </Typography>
+                </Button>
+            </div>
+        </Tooltip>
+    );
+};
diff --git a/src/react/atlascode/pullrequest/MergeDialog.tsx b/src/react/atlascode/pullrequest/header-actions/MergeDialog.tsx
similarity index 95%
rename from src/react/atlascode/pullrequest/MergeDialog.tsx
rename to src/react/atlascode/pullrequest/header-actions/MergeDialog.tsx
index fcddac333..23f5a94dc 100644
--- a/src/react/atlascode/pullrequest/MergeDialog.tsx
+++ b/src/react/atlascode/pullrequest/header-actions/MergeDialog.tsx
@@ -21,10 +21,11 @@ import {
 import { makeStyles } from '@mui/styles';
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { DetailedSiteInfo } from '../../../atlclients/authInfo';
-import { Commit, MergeStrategy, PullRequestData } from '../../../bitbucket/model';
-import { JiraTransitionMenu } from './JiraTransitionMenu';
-import { MergeChecks } from './MergeChecks';
+import { DetailedSiteInfo } from '../../../../atlclients/authInfo';
+import { Commit, MergeStrategy, PullRequestData } from '../../../../bitbucket/model';
+import { JiraTransitionMenu } from '../JiraTransitionMenu';
+import { MergeChecks } from '../MergeChecks';
+import { MergeButton } from './MergeButton';
 
 const useStyles = makeStyles((theme: Theme) => ({
     table: {
@@ -210,16 +211,12 @@ export const MergeDialog: React.FC<MergeDialogProps> = ({
     return (
         <Box>
             <Box hidden={loadState.basicData}>
-                <Button
-                    color={'primary'}
-                    variant={'contained'}
+                <MergeButton
+                    prState={prData.state}
+                    isMerging={isMerging}
+                    isDraft={prData.draft}
                     onClick={handleOpen}
-                    disabled={prData.state !== 'OPEN' || isMerging}
-                >
-                    <Typography variant={'button'} noWrap>
-                        {prData.state === 'OPEN' ? 'Merge' : 'Merged'}
-                    </Typography>
-                </Button>
+                ></MergeButton>
             </Box>
             <Box hidden={!loadState.basicData}>
                 <CircularProgress />
diff --git a/src/react/atlascode/pullrequest/PullRequestHeaderActions.tsx b/src/react/atlascode/pullrequest/header-actions/PullRequestHeaderActions.tsx
similarity index 91%
rename from src/react/atlascode/pullrequest/PullRequestHeaderActions.tsx
rename to src/react/atlascode/pullrequest/header-actions/PullRequestHeaderActions.tsx
index f2476b989..6012fb1fc 100644
--- a/src/react/atlascode/pullrequest/PullRequestHeaderActions.tsx
+++ b/src/react/atlascode/pullrequest/header-actions/PullRequestHeaderActions.tsx
@@ -2,12 +2,12 @@ import { RefreshButton } from '@atlassianlabs/guipi-core-components';
 import { Box } from '@mui/material';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import { ApprovalStatus } from '../../../bitbucket/model';
-import { CopyLinkButton } from '../common/CopyLinkButton';
+import { ApprovalStatus } from '../../../../bitbucket/model';
+import { CopyLinkButton } from '../../common/CopyLinkButton';
+import { PullRequestDetailsControllerApi } from '../pullRequestDetailsController';
+import { PullRequestDetailsState } from '../pullRequestDetailsController';
 import { ApproveButton } from './ApproveButton';
 import { MergeDialog } from './MergeDialog';
-import { PullRequestDetailsControllerApi } from './pullRequestDetailsController';
-import { PullRequestDetailsState } from './pullRequestDetailsController';
 import { RequestChangesButton } from './RequestChangesButton';
 
 export interface PullRequestHeaderActionsProps {
diff --git a/src/react/atlascode/pullrequest/RequestChangesButton.tsx b/src/react/atlascode/pullrequest/header-actions/RequestChangesButton.tsx
similarity index 90%
rename from src/react/atlascode/pullrequest/RequestChangesButton.tsx
rename to src/react/atlascode/pullrequest/header-actions/RequestChangesButton.tsx
index 064fd790e..6b7461695 100644
--- a/src/react/atlascode/pullrequest/RequestChangesButton.tsx
+++ b/src/react/atlascode/pullrequest/header-actions/RequestChangesButton.tsx
@@ -1,8 +1,8 @@
 import { Box, Button, Typography } from '@mui/material';
 import React, { useCallback } from 'react';
 
-import { ApprovalStatus } from '../../../bitbucket/model';
-import StoppedIcon from '../icons/StoppedIcon';
+import { ApprovalStatus } from '../../../../bitbucket/model';
+import StoppedIcon from '../../icons/StoppedIcon';
 type RequestChangesButtonProps = {
     hidden?: boolean;
     status: ApprovalStatus;