github-issue-tower-defence-management 1.160.0 → 1.162.0

package/src/adapter/entry-points/console/consoleOperationApi.test.ts

@@ -38,6 +38,35 @@ describe('consoleOperationApi', () => {
     baseDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-op-'));
     issueRepository = mock<IssueRepository>();
     issueRepository.get.mockResolvedValue(issue);
+    issueRepository.getOpenPullRequest.mockResolvedValue({
+      url: 'https://github.com/o/r/pull/1',
+      branchName: null,
+      createdAt: new Date(0),
+      isDraft: false,
+      isConflicted: false,
+      mergeable: 'MERGEABLE',
+      isPassedAllCiJob: true,
+      isCiStateSuccess: true,
+      isResolvedAllReviewComments: true,
+      isBranchOutOfDate: false,
+      missingRequiredCheckNames: [],
+    });
+    issueRepository.getPullRequestDetail.mockResolvedValue({
+      title: 'Test PR',
+      state: 'open',
+      merged: false,
+      isDraft: false,
+      additions: 0,
+      deletions: 0,
+      changedFiles: 0,
+      headRefName: 'feature',
+      baseRefName: 'main',
+      author: 'other-user',
+      files: [],
+    });
+    issueRepository.getAuthenticatedUserLogin.mockResolvedValue(
+      'authenticated-user',
+    );
     project = {
       ...mock<Project>(),
       id: 'PVT_1',
@@ -124,10 +153,10 @@ describe('consoleOperationApi', () => {
   };
 
   describe('handleReview', () => {
-    it('approves and sets Awaiting workspace then records done', async () => {
+    it('approves and merges, sets Awaiting workspace then records done', async () => {
       const response = await handleReview(context, {
         pjcode: 'acme',
-        action: 'approve',
+        action: 'approve_and_merge',
         prUrl: 'https://github.com/o/r/pull/1',
         projectItemId: 'PVTI_a',
       });
@@ -135,6 +164,9 @@ describe('consoleOperationApi', () => {
       expect(issueRepository.approvePullRequest).toHaveBeenCalledWith(
         'https://github.com/o/r/pull/1',
       );
+      expect(issueRepository.mergePullRequest).toHaveBeenCalledWith(
+        'https://github.com/o/r/pull/1',
+      );
       expect(issueRepository.updateStatus).toHaveBeenCalledWith(
         project,
         expect.objectContaining({
@@ -159,7 +191,7 @@ describe('consoleOperationApi', () => {
 
       await handleReview(contextRecordingResolvedUrls, {
         pjcode: 'acme',
-        action: 'approve',
+        action: 'approve_and_merge',
         prUrl: 'https://github.com/acme-labs/acme-portal-mock/pull/178',
         projectItemId: 'PVTI_resolver',
       });
@@ -374,7 +406,7 @@ describe('consoleOperationApi', () => {
     it('rejects a missing prUrl', async () => {
       const response = await handleReview(context, {
         pjcode: 'acme',
-        action: 'approve',
+        action: 'approve_and_merge',
         projectItemId: 'PVTI_c',
       });
       expect(response.statusCode).toBe(400);
@@ -392,17 +424,17 @@ describe('consoleOperationApi', () => {
     it('rejects a missing projectItemId', async () => {
       const response = await handleReview(context, {
         pjcode: 'acme',
-        action: 'approve',
+        action: 'approve_and_merge',
         prUrl: 'https://github.com/o/r/pull/1',
       });
       expect(response.statusCode).toBe(400);
     });
 
-    it('approves using the request project item id without a GraphQL item fetch', async () => {
+    it('merges without approving using the request project item id without a GraphQL item fetch', async () => {
       issueRepository.get.mockResolvedValue(null);
       const response = await handleReview(context, {
         pjcode: 'acme',
-        action: 'approve',
+        action: 'approve_and_merge',
         prUrl: 'https://github.com/o/r/pull/1',
         projectItemId: 'PVTI_c',
       });
@@ -422,12 +454,108 @@ describe('consoleOperationApi', () => {
       });
       const response = await handleReview(contextWithoutStatus, {
         pjcode: 'acme',
-        action: 'approve',
+        action: 'approve_and_merge',
         prUrl: 'https://github.com/o/r/pull/1',
         projectItemId: 'PVTI_c',
       });
       expect(response.statusCode).toBe(400);
     });
+
+    it('skips approval and merges directly when the pull request author matches the authenticated account', async () => {
+      issueRepository.getPullRequestDetail.mockResolvedValue({
+        title: 'Self PR',
+        state: 'open',
+        merged: false,
+        isDraft: false,
+        additions: 0,
+        deletions: 0,
+        changedFiles: 0,
+        headRefName: 'feature',
+        baseRefName: 'main',
+        author: 'authenticated-user',
+        files: [],
+      });
+      const response = await handleReview(context, {
+        pjcode: 'acme',
+        action: 'approve_and_merge',
+        prUrl: 'https://github.com/o/r/pull/1',
+        projectItemId: 'PVTI_self',
+      });
+      expect(response.statusCode).toBe(200);
+      expect(issueRepository.approvePullRequest).not.toHaveBeenCalled();
+      expect(issueRepository.mergePullRequest).toHaveBeenCalledWith(
+        'https://github.com/o/r/pull/1',
+      );
+    });
+
+    it('returns 400 when the pull request has a merge conflict', async () => {
+      issueRepository.getOpenPullRequest.mockResolvedValue({
+        url: 'https://github.com/o/r/pull/1',
+        branchName: null,
+        createdAt: new Date(0),
+        isDraft: false,
+        isConflicted: true,
+        mergeable: 'CONFLICTING',
+        isPassedAllCiJob: true,
+        isCiStateSuccess: true,
+        isResolvedAllReviewComments: true,
+        isBranchOutOfDate: false,
+        missingRequiredCheckNames: [],
+      });
+      const response = await handleReview(context, {
+        pjcode: 'acme',
+        action: 'approve_and_merge',
+        prUrl: 'https://github.com/o/r/pull/1',
+        projectItemId: 'PVTI_conflict',
+      });
+      expect(response.statusCode).toBe(400);
+      expect(response.body).toMatchObject({
+        error: 'Cannot merge: pull request has a merge conflict',
+      });
+      expect(issueRepository.mergePullRequest).not.toHaveBeenCalled();
+    });
+
+    it('returns 400 with check names when required checks are not green', async () => {
+      issueRepository.getOpenPullRequest.mockResolvedValue({
+        url: 'https://github.com/o/r/pull/1',
+        branchName: null,
+        createdAt: new Date(0),
+        isDraft: false,
+        isConflicted: false,
+        mergeable: 'MERGEABLE',
+        isPassedAllCiJob: false,
+        isCiStateSuccess: false,
+        isResolvedAllReviewComments: true,
+        isBranchOutOfDate: false,
+        missingRequiredCheckNames: ['test', 'lint'],
+      });
+      const response = await handleReview(context, {
+        pjcode: 'acme',
+        action: 'approve_and_merge',
+        prUrl: 'https://github.com/o/r/pull/1',
+        projectItemId: 'PVTI_ci',
+      });
+      expect(response.statusCode).toBe(400);
+      expect(response.body).toMatchObject({
+        error: 'Cannot merge: required checks are not green: test, lint',
+      });
+      expect(issueRepository.mergePullRequest).not.toHaveBeenCalled();
+    });
+
+    it('returns 400 when the pull request is not found or already closed', async () => {
+      issueRepository.getOpenPullRequest.mockResolvedValue(null);
+      const response = await handleReview(context, {
+        pjcode: 'acme',
+        action: 'approve_and_merge',
+        prUrl: 'https://github.com/o/r/pull/1',
+        projectItemId: 'PVTI_gone',
+      });
+      expect(response.statusCode).toBe(400);
+      expect(response.body).toMatchObject({
+        error: 'Cannot merge: pull request not found or already closed',
+      });
+      expect(issueRepository.mergePullRequest).not.toHaveBeenCalled();
+    });
   });
 
   describe('handleTriage', () => {

package/src/adapter/entry-points/console/consoleOperationApi.ts

@@ -323,10 +323,32 @@ export const handleReview = async (
     return ok();
   }
 
-  if (action === 'approve') {
-    await context.resolveIssueRepository(prUrl).approvePullRequest(prUrl);
+  if (action === 'approve_and_merge') {
+    const issueRepository = context.resolveIssueRepository(prUrl);
+    const prStatus = await issueRepository.getOpenPullRequest(prUrl);
+    if (prStatus === null) {
+      return badRequest(
+        'Cannot merge: pull request not found or already closed',
+      );
+    }
+    if (prStatus.isConflicted) {
+      return badRequest('Cannot merge: pull request has a merge conflict');
+    }
+    if (!prStatus.isPassedAllCiJob) {
+      const missing = prStatus.missingRequiredCheckNames;
+      const detail = missing.length > 0 ? `: ${missing.join(', ')}` : '';
+      return badRequest(`Cannot merge: required checks are not green${detail}`);
+    }
+    const prDetail = await issueRepository.getPullRequestDetail(prUrl);
+    const authenticatedUser = await issueRepository.getAuthenticatedUserLogin();
+    const isSelfAuthored =
+      prDetail !== null && prDetail.author === authenticatedUser;
+    if (!isSelfAuthored) {
+      await issueRepository.approvePullRequest(prUrl);
+    }
+    await issueRepository.mergePullRequest(prUrl);
     const failure = await updateStatusByName(
-      context.resolveIssueRepository(prUrl),
+      issueRepository,
       project,
       prUrl,
       projectItemId,

package/src/adapter/entry-points/console/ui/e2e/consoleTestHarness.ts

@@ -379,6 +379,16 @@ const awaitingQualityCheckPullRequest: RelatedPullRequest = {
   missingRequiredCheckNames: ['build', 'test'],
 };
 
+const awaitingQualityCheckPullRequestMergeReady: RelatedPullRequest = {
+  ...awaitingQualityCheckPullRequest,
+  isConflicted: false,
+  mergeable: 'MERGEABLE',
+  isPassedAllCiJob: true,
+  isCiStateSuccess: true,
+  isBranchOutOfDate: false,
+  missingRequiredCheckNames: [],
+};
+
 const inlineCommentPullRequestDetail: PullRequestDetail = {
   title: 'Add inline review comments on the related pull request diff',
   state: 'open',
@@ -428,7 +438,7 @@ const createStubIssueRepository = (
     url: string,
   ): Promise<RelatedPullRequest | null> =>
     url === CONSOLE_E2E_AWAITING_QUALITY_CHECK_PR_URL
-      ? awaitingQualityCheckPullRequest
+      ? awaitingQualityCheckPullRequestMergeReady
       : null,
   getOpenPullRequestCiStatus: async (
     url: string,
@@ -457,7 +467,9 @@ const createStubIssueRepository = (
       ]),
     ),
   getPullRequestChangedFilePaths: async (): Promise<string[]> => [],
+  getAuthenticatedUserLogin: async (): Promise<string> => 'test-user',
   approvePullRequest: async (): Promise<void> => undefined,
+  mergePullRequest: async (): Promise<void> => undefined,
   requestChangesWithInlineComment: async (
     prUrl: string,
     changedFilePath: string | null,

package/src/adapter/entry-points/console/ui/src/features/console/components/content/ConsoleMermaidDiagram.test.tsx

@@ -1,4 +1,4 @@
-import { render, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { renderMermaidToSvg } from '../../lib/mermaidLoader';
 import { ConsoleMermaidDiagram } from './ConsoleMermaidDiagram';
 
@@ -35,4 +35,40 @@ describe('ConsoleMermaidDiagram', () => {
     });
     expect(getByText('bad diagram')).toBeInTheDocument();
   });
+
+  it('opens the enlarged view carrying the same diagram', async () => {
+    mockedRender.mockResolvedValue('<svg id="ok"></svg>');
+    const { container } = render(
+      <ConsoleMermaidDiagram code="graph TD; A-->B;" />,
+    );
+    await waitFor(() => {
+      expect(container.querySelector('svg#ok')).not.toBeNull();
+    });
+    expect(screen.queryByRole('dialog')).toBeNull();
+    fireEvent.click(screen.getByText('Enlarge diagram'));
+    const dialog = screen.getByRole('dialog');
+    expect(dialog.querySelector('svg#ok')).not.toBeNull();
+  });
+
+  it('closes the enlarged view again', async () => {
+    mockedRender.mockResolvedValue('<svg id="ok"></svg>');
+    const { container } = render(
+      <ConsoleMermaidDiagram code="graph TD; A-->B;" />,
+    );
+    await waitFor(() => {
+      expect(container.querySelector('svg#ok')).not.toBeNull();
+    });
+    fireEvent.click(screen.getByText('Enlarge diagram'));
+    fireEvent.click(screen.getByLabelText('Close enlarged diagram'));
+    expect(screen.queryByRole('dialog')).toBeNull();
+  });
+
+  it('offers no enlarged view while the diagram failed to render', async () => {
+    mockedRender.mockRejectedValue(new Error('parse error'));
+    render(<ConsoleMermaidDiagram code="bad diagram" />);
+    await waitFor(() => {
+      expect(screen.getByText(/Mermaid render error/)).toBeInTheDocument();
+    });
+    expect(screen.queryByText('Enlarge diagram')).toBeNull();
+  });
 });

package/src/adapter/entry-points/console/ui/src/features/console/components/content/ConsoleMermaidDiagram.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import { renderMermaidToSvg } from '../../lib/mermaidLoader';
+import { ConsoleMermaidDiagramModalScreen } from './ConsoleMermaidDiagramModalScreen';
 
 export type ConsoleMermaidDiagramProps = {
   code: string;
@@ -12,6 +13,7 @@ type MermaidRenderState =
 
 export const ConsoleMermaidDiagram = ({ code }: ConsoleMermaidDiagramProps) => {
   const [state, setState] = useState<MermaidRenderState>({ status: 'loading' });
+  const [isEnlarged, setIsEnlarged] = useState<boolean>(false);
   const containerRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -61,5 +63,22 @@ export const ConsoleMermaidDiagram = ({ code }: ConsoleMermaidDiagramProps) => {
     );
   }
 
-  return <div ref={containerRef} className="console-mermaid-rendered" />;
+  return (
+    <div className="console-mermaid">
+      <div ref={containerRef} className="console-mermaid-rendered" />
+      <button
+        type="button"
+        className="console-mermaid-enlarge"
+        onClick={() => setIsEnlarged(true)}
+      >
+        Enlarge diagram
+      </button>
+      {isEnlarged && (
+        <ConsoleMermaidDiagramModalScreen
+          svg={state.svg}
+          onClose={() => setIsEnlarged(false)}
+        />
+      )}
+    </div>
+  );
 };

package/src/adapter/entry-points/console/ui/src/features/console/components/content/ConsoleMermaidDiagramModalScreen.stories.tsx

@@ -0,0 +1,27 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { ConsoleMermaidDiagramModalScreen } from './ConsoleMermaidDiagramModalScreen';
+
+const wideDiagramSvg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1600 320" width="100%" style="max-width: 1600px;">
+  <rect x="0" y="0" width="1600" height="320" fill="#0d1117" />
+  <rect x="40" y="60" width="320" height="90" fill="#161b22" stroke="#30363d" />
+  <text x="60" y="110" fill="#e6edf3" font-size="20">Deal</text>
+  <rect x="640" y="60" width="320" height="90" fill="#161b22" stroke="#30363d" />
+  <text x="660" y="110" fill="#e6edf3" font-size="20">InformationMemorandum</text>
+  <rect x="1240" y="60" width="320" height="90" fill="#161b22" stroke="#30363d" />
+  <text x="1260" y="110" fill="#e6edf3" font-size="20">RequirementCoverage</text>
+  <line x1="360" y1="105" x2="640" y2="105" stroke="#8b949e" stroke-width="2" />
+  <line x1="960" y1="105" x2="1240" y2="105" stroke="#8b949e" stroke-width="2" />
+</svg>`;
+
+const meta: Meta<typeof ConsoleMermaidDiagramModalScreen> = {
+  title: 'Console/ConsoleMermaidDiagramModalScreen',
+  component: ConsoleMermaidDiagramModalScreen,
+};
+
+export default meta;
+
+type Story = StoryObj<typeof ConsoleMermaidDiagramModalScreen>;
+
+export const WideDiagram: Story = {
+  args: { svg: wideDiagramSvg, onClose: () => {} },
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/content/ConsoleMermaidDiagramModalScreen.test.tsx

@@ -0,0 +1,85 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { MERMAID_ZOOM_MAX_SCALE } from '../../lib/mermaidZoom';
+import { ConsoleMermaidDiagramModalScreen } from './ConsoleMermaidDiagramModalScreen';
+
+const svgFixture = '<svg id="enlarged"></svg>';
+
+describe('ConsoleMermaidDiagramModalScreen', () => {
+  it('shows the diagram at the minimum scale first', () => {
+    const { container } = render(
+      <ConsoleMermaidDiagramModalScreen svg={svgFixture} onClose={() => {}} />,
+    );
+    expect(container.querySelector('svg#enlarged')).not.toBeNull();
+    expect(screen.getByText('100%')).toBeInTheDocument();
+    const canvas = container.querySelector<HTMLElement>(
+      '.console-mermaid-modal-canvas',
+    );
+    expect(canvas?.style.width).toBe('100%');
+  });
+
+  it('widens the canvas when zooming in', () => {
+    const { container } = render(
+      <ConsoleMermaidDiagramModalScreen svg={svgFixture} onClose={() => {}} />,
+    );
+    fireEvent.click(screen.getByLabelText('Zoom in'));
+    expect(screen.getByText('150%')).toBeInTheDocument();
+    const canvas = container.querySelector<HTMLElement>(
+      '.console-mermaid-modal-canvas',
+    );
+    expect(canvas?.style.width).toBe('150%');
+  });
+
+  it('lets the diagram outgrow the width mermaid fixed on it', () => {
+    const { container } = render(
+      <ConsoleMermaidDiagramModalScreen
+        svg='<svg id="enlarged" style="max-width: 320px;"></svg>'
+        onClose={() => {}}
+      />,
+    );
+    const diagram = container.querySelector<SVGSVGElement>('svg#enlarged');
+    expect(diagram?.style.maxWidth).toBe('');
+    expect(diagram?.style.width).toBe('100%');
+    expect(diagram?.style.height).toBe('auto');
+  });
+
+  it('cannot zoom out below the minimum', () => {
+    render(
+      <ConsoleMermaidDiagramModalScreen svg={svgFixture} onClose={() => {}} />,
+    );
+    expect(screen.getByLabelText('Zoom out')).toBeDisabled();
+  });
+
+  it('stops zooming in at the maximum', () => {
+    render(
+      <ConsoleMermaidDiagramModalScreen svg={svgFixture} onClose={() => {}} />,
+    );
+    const zoomIn = screen.getByLabelText('Zoom in');
+    for (let step = 0; step < 20; step += 1) {
+      if (!(zoomIn as HTMLButtonElement).disabled) {
+        fireEvent.click(zoomIn);
+      }
+    }
+    expect(
+      screen.getByText(`${MERMAID_ZOOM_MAX_SCALE * 100}%`),
+    ).toBeInTheDocument();
+    expect(zoomIn).toBeDisabled();
+  });
+
+  it('closes on the close control', () => {
+    const onClose = jest.fn();
+    render(
+      <ConsoleMermaidDiagramModalScreen svg={svgFixture} onClose={onClose} />,
+    );
+    fireEvent.click(screen.getByLabelText('Close enlarged diagram'));
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it('closes on the escape key', () => {
+    const onClose = jest.fn();
+    render(
+      <ConsoleMermaidDiagramModalScreen svg={svgFixture} onClose={onClose} />,
+    );
+    fireEvent.keyDown(document, { key: 'Escape' });
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+});

package/src/adapter/entry-points/console/ui/src/features/console/components/content/ConsoleMermaidDiagramModalScreen.tsx

@@ -0,0 +1,97 @@
+import { useEffect, useRef, useState } from 'react';
+import {
+  formatMermaidZoomScale,
+  isMermaidZoomScaleAtMaximum,
+  isMermaidZoomScaleAtMinimum,
+  MERMAID_ZOOM_MIN_SCALE,
+  mermaidZoomCanvasWidth,
+  mermaidZoomScaleIn,
+  mermaidZoomScaleOut,
+} from '../../lib/mermaidZoom';
+
+export type ConsoleMermaidDiagramModalScreenProps = {
+  svg: string;
+  onClose: () => void;
+};
+
+export const ConsoleMermaidDiagramModalScreen = ({
+  svg,
+  onClose,
+}: ConsoleMermaidDiagramModalScreenProps) => {
+  const [scale, setScale] = useState<number>(MERMAID_ZOOM_MIN_SCALE);
+  const canvasRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const canvas = canvasRef.current;
+    if (canvas === null) {
+      return;
+    }
+    canvas.innerHTML = svg;
+    const diagram = canvas.querySelector('svg');
+    if (diagram !== null) {
+      diagram.style.removeProperty('max-width');
+      diagram.style.setProperty('width', '100%');
+      diagram.style.setProperty('height', 'auto');
+    }
+  }, [svg]);
+
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === 'Escape') {
+        onClose();
+      }
+    };
+    document.addEventListener('keydown', handleKeyDown);
+    return () => {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [onClose]);
+
+  return (
+    <div
+      className="console-mermaid-modal"
+      role="dialog"
+      aria-modal="true"
+      aria-label="Enlarged diagram"
+    >
+      <div className="console-mermaid-modal-bar">
+        <button
+          type="button"
+          className="console-mermaid-modal-button"
+          aria-label="Zoom out"
+          disabled={isMermaidZoomScaleAtMinimum(scale)}
+          onClick={() => setScale(mermaidZoomScaleOut(scale))}
+        >
+          −
+        </button>
+        <span className="console-mermaid-modal-scale">
+          {formatMermaidZoomScale(scale)}
+        </span>
+        <button
+          type="button"
+          className="console-mermaid-modal-button"
+          aria-label="Zoom in"
+          disabled={isMermaidZoomScaleAtMaximum(scale)}
+          onClick={() => setScale(mermaidZoomScaleIn(scale))}
+        >
+          +
+        </button>
+        <button
+          type="button"
+          className="console-mermaid-modal-close"
+          aria-label="Close enlarged diagram"
+          onClick={onClose}
+        >
+          ✕
+        </button>
+      </div>
+      <div className="console-mermaid-modal-viewport">
+        <div
+          ref={canvasRef}
+          className="console-mermaid-modal-canvas"
+          style={{ width: mermaidZoomCanvasWidth(scale) }}
+        />
+      </div>
+    </div>
+  );
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOperationMenu.test.tsx

@@ -32,7 +32,7 @@ describe('ConsoleOperationMenu', () => {
         handlers={handlers}
       />,
     );
-    expect(getByText('Approve')).toBeInTheDocument();
+    expect(getByText('Approve & Merge')).toBeInTheDocument();
     expect(getByText('+1 day')).toBeInTheDocument();
     expect(getByText('Awaiting Workspace')).toBeInTheDocument();
     expect(getByText('Close')).toBeInTheDocument();
@@ -100,7 +100,7 @@ describe('ConsoleOperationMenu', () => {
         handlers={handlers}
       />,
     );
-    expect(queryByText('Approve')).toBeNull();
+    expect(queryByText('Approve & Merge')).toBeNull();
     expect(queryByText('Close')).not.toBeNull();
   });
 
@@ -121,7 +121,7 @@ describe('ConsoleOperationMenu', () => {
     expect(getByText('Close as not planned')).toBeInTheDocument();
     expect(getByText('+1 day')).toBeInTheDocument();
     expect(queryByText('Move to Okinawa')).toBeNull();
-    expect(queryByText('Approve')).toBeNull();
+    expect(queryByText('Approve & Merge')).toBeNull();
   });
 
   it('shows the review group on the workflow-blocker tab when the item has a pull request', () => {
@@ -136,7 +136,7 @@ describe('ConsoleOperationMenu', () => {
         handlers={handlers}
       />,
     );
-    expect(getByText('Approve')).toBeInTheDocument();
+    expect(getByText('Approve & Merge')).toBeInTheDocument();
     expect(getByText('Close')).toBeInTheDocument();
   });
 

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsolePullRequestReviewActions.test.tsx

@@ -13,7 +13,7 @@ describe('ConsolePullRequestReviewActions', () => {
       'Unnecessary',
       'Totally wrong',
       'Reject',
-      'Approve',
+      'Approve & Merge',
     ]);
   });
 
@@ -25,7 +25,7 @@ describe('ConsolePullRequestReviewActions', () => {
       />,
     );
     expect(getByText('Reject')).toBeDisabled();
-    expect(getByText('Approve')).not.toBeDisabled();
+    expect(getByText('Approve & Merge')).not.toBeDisabled();
     rerender(
       <ConsolePullRequestReviewActions
         onReview={() => {}}
@@ -82,12 +82,12 @@ describe('ConsolePullRequestReviewActions', () => {
     fireEvent.click(getByText('Unnecessary'));
     fireEvent.click(getByText('Totally wrong'));
     fireEvent.click(getByText('Reject'));
-    fireEvent.click(getByText('Approve'));
+    fireEvent.click(getByText('Approve & Merge'));
     expect(onReview.mock.calls.map((call) => call[0])).toEqual([
       'unnecessary',
       'totally_wrong',
       'request_changes',
-      'approve',
+      'approve_and_merge',
     ]);
   });
 });

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsolePullRequestReviewActions.tsx

@@ -13,7 +13,7 @@ const REVIEW_BUTTONS: {
   { action: 'unnecessary', label: 'Unnecessary', variant: 'unneeded' },
   { action: 'totally_wrong', label: 'Totally wrong', variant: 'wrong' },
   { action: 'request_changes', label: 'Reject', variant: 'reject' },
-  { action: 'approve', label: 'Approve', variant: 'approve' },
+  { action: 'approve_and_merge', label: 'Approve & Merge', variant: 'approve' },
 ];
 
 const REJECT_REQUIREMENT_MESSAGE =