github-issue-tower-defence-management 1.117.6 → 1.117.8

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

@@ -4,11 +4,17 @@ import { ConsolePullRequestReviewActions } from './ConsolePullRequestReviewActio
 const meta: Meta<typeof ConsolePullRequestReviewActions> = {
   title: 'Console/ConsolePullRequestReviewActions',
   component: ConsolePullRequestReviewActions,
-  args: { onReview: () => {} },
+  args: { onReview: () => {}, rejectEnabled: false },
 };
 
 export default meta;
 
 type Story = StoryObj<typeof ConsolePullRequestReviewActions>;
 
-export const Default: Story = {};
+export const RejectDisabled: Story = {
+  args: { rejectEnabled: false },
+};
+
+export const RejectEnabled: Story = {
+  args: { rejectEnabled: true },
+};

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

@@ -4,7 +4,10 @@ import { ConsolePullRequestReviewActions } from './ConsolePullRequestReviewActio
 describe('ConsolePullRequestReviewActions', () => {
   it('renders the four buttons left to right', () => {
     const { getAllByRole } = render(
-      <ConsolePullRequestReviewActions onReview={() => {}} />,
+      <ConsolePullRequestReviewActions
+        onReview={() => {}}
+        rejectEnabled={false}
+      />,
     );
     expect(getAllByRole('button').map((button) => button.textContent)).toEqual([
       'Unnecessary',
@@ -14,10 +17,43 @@ describe('ConsolePullRequestReviewActions', () => {
     ]);
   });
 
-  it('reports each review action', () => {
+  it('disables Reject until an inline comment has been entered', () => {
+    const { getByText, rerender } = render(
+      <ConsolePullRequestReviewActions
+        onReview={() => {}}
+        rejectEnabled={false}
+      />,
+    );
+    expect(getByText('Reject')).toBeDisabled();
+    expect(getByText('Approve')).not.toBeDisabled();
+    rerender(
+      <ConsolePullRequestReviewActions
+        onReview={() => {}}
+        rejectEnabled={true}
+      />,
+    );
+    expect(getByText('Reject')).not.toBeDisabled();
+  });
+
+  it('does not report a reject action while disabled', () => {
+    const onReview = jest.fn();
+    const { getByText } = render(
+      <ConsolePullRequestReviewActions
+        onReview={onReview}
+        rejectEnabled={false}
+      />,
+    );
+    fireEvent.click(getByText('Reject'));
+    expect(onReview).not.toHaveBeenCalled();
+  });
+
+  it('reports each review action when reject is enabled', () => {
     const onReview = jest.fn();
     const { getByText } = render(
-      <ConsolePullRequestReviewActions onReview={onReview} />,
+      <ConsolePullRequestReviewActions
+        onReview={onReview}
+        rejectEnabled={true}
+      />,
     );
     fireEvent.click(getByText('Unnecessary'));
     fireEvent.click(getByText('Totally wrong'));

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

@@ -2,6 +2,7 @@ import type { ConsoleReviewAction } from '../../logic/operations';
 
 export type ConsolePullRequestReviewGroupProps = {
   onReview: (action: ConsoleReviewAction) => void;
+  rejectEnabled: boolean;
 };
 
 const REVIEW_BUTTONS: {
@@ -17,17 +18,27 @@ const REVIEW_BUTTONS: {
 
 export const ConsolePullRequestReviewActions = ({
   onReview,
+  rejectEnabled,
 }: ConsolePullRequestReviewGroupProps) => (
   <div className="console-op-group console-op-group-review">
-    {REVIEW_BUTTONS.map((button) => (
-      <button
-        key={button.action}
-        type="button"
-        className={`console-op-button console-op-button-${button.variant}`}
-        onClick={() => onReview(button.action)}
-      >
-        {button.label}
-      </button>
-    ))}
+    {REVIEW_BUTTONS.map((button) => {
+      const disabled = button.action === 'request_changes' && !rejectEnabled;
+      return (
+        <button
+          key={button.action}
+          type="button"
+          className={`console-op-button console-op-button-${button.variant}`}
+          disabled={disabled}
+          title={
+            disabled
+              ? 'Enter an inline comment on the diff to enable Reject'
+              : undefined
+          }
+          onClick={() => onReview(button.action)}
+        >
+          {button.label}
+        </button>
+      );
+    })}
   </div>
 );

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.test.ts

@@ -272,6 +272,69 @@ describe('useConsoleOperations', () => {
     });
   });
 
+  it('sends the entered inline comment as the request-changes body and anchor', async () => {
+    const fetchMock = captureFetch();
+    const { result } = setup();
+    await act(async () => {
+      await result.current.operations.reviewPullRequest(
+        prItem,
+        prItem.url,
+        'request_changes',
+        [
+          {
+            path: 'src/index.ts',
+            line: 17,
+            side: 'RIGHT',
+            body: 'Please rename this variable.',
+          },
+        ],
+      );
+    });
+    expect(fetchMock.mock.calls[0][0]).toBe('/api/review?k=token');
+    expect(lastBody(fetchMock)).toMatchObject({
+      pjcode: 'umino',
+      action: 'request_changes',
+      prUrl: prItem.url,
+      commentBody: 'src/index.ts:17 Please rename this variable.',
+      changedFilePath: 'src/index.ts',
+      line: 17,
+      side: 'RIGHT',
+    });
+  });
+
+  it('aggregates multiple entered inline comments into the request-changes body', async () => {
+    const fetchMock = captureFetch();
+    const { result } = setup();
+    await act(async () => {
+      await result.current.operations.reviewPullRequest(
+        prItem,
+        prItem.url,
+        'request_changes',
+        [
+          {
+            path: 'src/a.ts',
+            line: 3,
+            side: 'RIGHT',
+            body: 'First concern.',
+          },
+          {
+            path: 'src/b.ts',
+            line: 9,
+            side: 'LEFT',
+            body: 'Second concern.',
+          },
+        ],
+      );
+    });
+    expect(lastBody(fetchMock)).toMatchObject({
+      action: 'request_changes',
+      commentBody: 'src/a.ts:3 First concern.\n\nsrc/b.ts:9 Second concern.',
+      changedFilePath: 'src/a.ts',
+      line: 3,
+      side: 'RIGHT',
+    });
+  });
+
   it('invalidates the operated item body and comments cache on a review', async () => {
     captureFetch();
     localStorage.clear();

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.ts

@@ -9,8 +9,10 @@ import {
   postConsoleReviewComment,
 } from '../lib/consoleApi';
 import {
+  buildRequestChangesBody,
   type ConsoleCloseAction,
   type ConsoleNextActionDateAction,
+  type ConsolePendingReviewComment,
   type ConsoleReviewAction,
   TOTALLY_WRONG_COMMENT_BODY,
   UNNECESSARY_COMMENT_BODY,
@@ -35,6 +37,7 @@ export type ConsoleOperationsApi = {
     item: ConsoleListItem,
     prUrl: string,
     action: ConsoleReviewAction,
+    pendingReviewComments?: ConsolePendingReviewComment[],
   ) => Promise<void>;
   setNextActionDate: (
     item: ConsoleListItem,
@@ -71,6 +74,7 @@ const reviewRequest = (
   item: ConsoleListItem,
   prUrl: string,
   action: ConsoleReviewAction,
+  pendingReviewComments: ConsolePendingReviewComment[],
 ): ConsoleReviewRequest => {
   if (action === 'approve') {
     return {
@@ -81,12 +85,20 @@ const reviewRequest = (
     };
   }
   if (action === 'request_changes') {
+    const firstComment = pendingReviewComments[0];
     return {
       pjcode,
       action: 'request_changes',
       prUrl,
       projectItemId: item.projectItemId,
-      commentBody: '',
+      commentBody: buildRequestChangesBody(pendingReviewComments),
+      ...(firstComment === undefined
+        ? {}
+        : {
+            changedFilePath: firstComment.path,
+            line: firstComment.line,
+            side: firstComment.side,
+          }),
     };
   }
   if (action === 'totally_wrong') {
@@ -144,6 +156,7 @@ export const useConsoleOperations = (
       item: ConsoleListItem,
       prUrl: string,
       action: ConsoleReviewAction,
+      pendingReviewComments: ConsolePendingReviewComment[] = [],
     ) => {
       if (pjcode === null) {
         throw missingPjcodeError();
@@ -151,7 +164,7 @@ export const useConsoleOperations = (
       await postConsoleOperation(
         appendToken,
         REVIEW_OPERATION_PATH,
-        reviewRequest(pjcode, item, prUrl, action),
+        reviewRequest(pjcode, item, prUrl, action, pendingReviewComments),
       );
       markDone(item);
     },

package/src/adapter/entry-points/console/ui/src/features/console/lib/consoleApi.ts

@@ -25,6 +25,8 @@ export type ConsoleReviewRequest = {
   projectItemId: string;
   commentBody?: string;
   changedFilePath?: string;
+  line?: number;
+  side?: ConsoleReviewCommentSide;
 };
 
 export type ConsoleTriageRequest = {

package/src/adapter/entry-points/console/ui/src/features/console/logic/operations.test.ts

@@ -1,4 +1,5 @@
 import {
+  buildRequestChangesBody,
   IN_TMUX_BY_HUMAN_NAME,
   isTodoByHumanTab,
   STATUS_BUTTON_NAMES,
@@ -35,3 +36,26 @@ describe('isTodoByHumanTab', () => {
     expect(isTodoByHumanTab('prs')).toBe(false);
   });
 });
+
+describe('buildRequestChangesBody', () => {
+  it('renders a single inline comment with its file and line prefix', () => {
+    expect(
+      buildRequestChangesBody([
+        { path: 'src/a.ts', line: 12, side: 'RIGHT', body: 'Please fix.' },
+      ]),
+    ).toBe('src/a.ts:12 Please fix.');
+  });
+
+  it('joins multiple inline comments with blank lines', () => {
+    expect(
+      buildRequestChangesBody([
+        { path: 'src/a.ts', line: 3, side: 'RIGHT', body: 'First.' },
+        { path: 'src/b.ts', line: 9, side: 'LEFT', body: 'Second.' },
+      ]),
+    ).toBe('src/a.ts:3 First.\n\nsrc/b.ts:9 Second.');
+  });
+
+  it('returns an empty string when there are no comments', () => {
+    expect(buildRequestChangesBody([])).toBe('');
+  });
+});

package/src/adapter/entry-points/console/ui/src/features/console/logic/operations.ts

@@ -1,8 +1,23 @@
+import type { ConsoleReviewCommentSide } from '../lib/consoleApi';
 import type { ConsoleFieldOption, ConsoleTabName } from './types';
 
 export const TOTALLY_WRONG_COMMENT_BODY = 'totally wrong';
 export const UNNECESSARY_COMMENT_BODY = 'This pull request is unnecessary.';
 
+export type ConsolePendingReviewComment = {
+  path: string;
+  line: number;
+  side: ConsoleReviewCommentSide;
+  body: string;
+};
+
+export const buildRequestChangesBody = (
+  comments: ConsolePendingReviewComment[],
+): string =>
+  comments
+    .map((comment) => `${comment.path}:${comment.line} ${comment.body}`)
+    .join('\n\n');
+
 export type ConsoleReviewAction =
   | 'approve'
   | 'request_changes'

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsoleItemDetailContainer.test.tsx

@@ -111,9 +111,82 @@ describe('ConsoleItemDetailContainer', () => {
       prItem,
       prItem.url,
       'approve',
+      [],
     );
   });
 
+  it('disables Reject until an inline comment is entered and then commits it as the request-changes review', async () => {
+    const operations = buildOperations();
+    const onQueueAction = jest.fn();
+    const {
+      container,
+      findByRole,
+      getAllByRole,
+      getByPlaceholderText,
+      getByText,
+    } = render(
+      <ConsoleItemDetailContainer
+        tab="prs"
+        item={prItem}
+        caches={buildCaches({ prFiles: consoleChangedFilesFixture })}
+        operations={operations}
+        statusOptions={consoleStatusOptionsFixture}
+        storyOptions={consoleStoryOptionsFixture}
+        storyColors={consoleStoryColorsFixture}
+        storyName="TDPM Console port"
+        overlayStatus={null}
+        now={Date.parse('2026-06-19T12:00:00.000Z')}
+        onQueueAction={onQueueAction}
+      />,
+    );
+
+    await waitFor(() => {
+      expect(getByText('Reject')).toBeInTheDocument();
+    });
+    expect(getByText('Reject')).toBeDisabled();
+
+    const fileRow = await findByRole('button', {
+      name: new RegExp(consoleChangedFilesFixture[0].path),
+    });
+    fireEvent.click(fileRow);
+    const commentButton = getAllByRole('button', {
+      name: /^Comment on line/,
+    })[0];
+    fireEvent.click(commentButton);
+    fireEvent.change(
+      getByPlaceholderText('Leave a review comment on this line…'),
+      { target: { value: 'Please rename this variable.' } },
+    );
+    const submitButton = container.querySelector(
+      '.console-diff-composer-submit',
+    );
+    fireEvent.click(submitButton as Element);
+
+    await waitFor(() => {
+      expect(getByText('Reject')).not.toBeDisabled();
+    });
+
+    fireEvent.click(getByText('Reject'));
+    const rejectInput = onQueueAction.mock.calls.at(-1)?.[0];
+    expect(rejectInput.kind).toEqual({
+      type: 'review',
+      action: 'request_changes',
+    });
+    rejectInput.commit();
+    const reviewCall = (
+      operations.reviewPullRequest as jest.Mock
+    ).mock.calls.at(-1);
+    expect(reviewCall?.[2]).toBe('request_changes');
+    expect(reviewCall?.[3]).toEqual([
+      {
+        path: consoleChangedFilesFixture[0].path,
+        line: expect.any(Number),
+        side: expect.stringMatching(/LEFT|RIGHT/),
+        body: 'Please rename this variable.',
+      },
+    ]);
+  });
+
   it('routes an inline review comment on an issue related pull request to that pull request url', async () => {
     const operations = buildOperations();
     const relatedPullRequest = consoleRelatedPullRequestsFixture[0];

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsoleItemDetailContainer.tsx

@@ -1,16 +1,19 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useState } from 'react';
 import { ConsoleCommentComposer } from '../components/detail/ConsoleCommentComposer';
+import type { ConsoleAddInlineComment } from '../components/detail/ConsoleFileDiff';
 import { ConsoleItemDetail } from '../components/detail/ConsoleItemDetail';
 import { ConsoleOperationMenu } from '../components/operations/ConsoleOperationMenu';
 import type { ConsoleCaches } from '../hooks/useConsoleCaches';
 import { useConsoleItemDetailData } from '../hooks/useConsoleItemDetailData';
 import type { ConsoleOperationsApi } from '../hooks/useConsoleOperations';
 import { useConsoleToken } from '../hooks/useConsoleToken';
-import type { ConsoleReviewCommentSide } from '../lib/consoleApi';
 import { buildImageProxyUrl } from '../lib/imageProxy';
 import type { ConsoleActionKind } from '../logic/actionToast';
 import { resolveStoryColorEnum } from '../logic/grouping';
-import type { ConsoleOperationHandlers } from '../logic/operations';
+import type {
+  ConsoleOperationHandlers,
+  ConsolePendingReviewComment,
+} from '../logic/operations';
 import type {
   ConsoleColor,
   ConsoleFieldOption,
@@ -71,20 +74,23 @@ export const ConsoleItemDetailContainer = ({
     [caches.state],
   );
   const hasPullRequest = item.isPr || detail.relatedPullRequests.length > 0;
+  const [pendingReviewComments, setPendingReviewComments] = useState<
+    ConsolePendingReviewComment[]
+  >([]);
   const buildAddInlineComment = useCallback(
-    (prUrl: string) =>
-      (
-        path: string,
-        line: number,
-        side: ConsoleReviewCommentSide,
-        body: string,
-      ) =>
+    (prUrl: string): ConsoleAddInlineComment =>
+      (path, line, side, body) =>
         operations.addInlineReviewComment(prUrl, path, line, side, body),
     [operations],
   );
-  const addInlineComment = useMemo(
-    () => buildAddInlineComment(item.url),
-    [buildAddInlineComment, item.url],
+  const addInlineComment = useCallback<ConsoleAddInlineComment>(
+    async (path, line, side, body) => {
+      setPendingReviewComments((previous) => [
+        ...previous,
+        { path, line, side, body },
+      ]);
+    },
+    [],
   );
 
   const handlers: ConsoleOperationHandlers = {
@@ -92,10 +98,13 @@ export const ConsoleItemDetailContainer = ({
       const prUrl = item.isPr
         ? item.url
         : (detail.relatedPullRequests[0]?.pullRequest.url ?? item.url);
+      const reviewComments =
+        action === 'request_changes' ? pendingReviewComments : [];
       onQueueAction({
         kind: { type: 'review', action },
         item,
-        commit: () => operations.reviewPullRequest(item, prUrl, action),
+        commit: () =>
+          operations.reviewPullRequest(item, prUrl, action, reviewComments),
       });
     },
     onSetNextActionDate: (action) => {
@@ -180,6 +189,7 @@ export const ConsoleItemDetailContainer = ({
           tab={tab}
           item={item}
           hasPullRequest={hasPullRequest}
+          rejectEnabled={pendingReviewComments.length > 0}
           statusOptions={statusOptions}
           storyOptions={storyOptions}
           handlers={handlers}