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

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

@@ -30,6 +30,13 @@ export type ConsoleE2eReviewCommentCall = {
   body: string;
 };
 
+export type ConsoleE2eRequestChangesCall = {
+  url: string;
+  changedFilePath: string | null;
+  body: string;
+  inlineCommentLocation: { line: number; side: string } | null;
+};
+
 type ConsoleFixtureListItem = {
   number: number;
   title: string;
@@ -370,6 +377,7 @@ const inlineCommentPullRequestDetail: PullRequestDetail = {
 
 const createStubIssueRepository = (
   reviewCommentCalls: ConsoleE2eReviewCommentCall[],
+  requestChangesCalls: ConsoleE2eRequestChangesCall[],
 ): IssueRepository => ({
   getAllIssues: () => notImplemented('getAllIssues'),
   getIssueByUrl: async (url: string): Promise<Issue | null> =>
@@ -402,7 +410,19 @@ const createStubIssueRepository = (
       : null,
   getPullRequestChangedFilePaths: async (): Promise<string[]> => [],
   approvePullRequest: async (): Promise<void> => undefined,
-  requestChangesWithInlineComment: async (): Promise<void> => undefined,
+  requestChangesWithInlineComment: async (
+    prUrl: string,
+    changedFilePath: string | null,
+    commentBody: string,
+    inlineCommentLocation?: { line: number; side: string } | null,
+  ): Promise<void> => {
+    requestChangesCalls.push({
+      url: prUrl,
+      changedFilePath,
+      body: commentBody,
+      inlineCommentLocation: inlineCommentLocation ?? null,
+    });
+  },
   createPullRequestReviewComment: async (
     prUrl: string,
     filePath: string,
@@ -469,6 +489,7 @@ export type ConsoleE2eHarness = {
   appRootUrl: string;
   consoleDataOutputDir: string;
   reviewCommentCalls: ConsoleE2eReviewCommentCall[];
+  requestChangesCalls: ConsoleE2eRequestChangesCall[];
   stop: () => Promise<void>;
 };
 
@@ -486,12 +507,16 @@ export const startConsoleE2eHarness = async (): Promise<ConsoleE2eHarness> => {
     pjcode === CONSOLE_E2E_PJCODE ? { pjcode, project } : null;
 
   const reviewCommentCalls: ConsoleE2eReviewCommentCall[] = [];
+  const requestChangesCalls: ConsoleE2eRequestChangesCall[] = [];
 
   const server = await startWebServer({
     accessToken: CONSOLE_E2E_TOKEN,
     uiDistDir,
     consoleDataOutputDir,
-    issueRepository: createStubIssueRepository(reviewCommentCalls),
+    issueRepository: createStubIssueRepository(
+      reviewCommentCalls,
+      requestChangesCalls,
+    ),
     resolveProject,
     issueTitleStateCache: new IssueTitleStateCache(),
     pullRequestStatusCache: new PullRequestStatusCache(),
@@ -518,6 +543,7 @@ export const startConsoleE2eHarness = async (): Promise<ConsoleE2eHarness> => {
     appRootUrl,
     consoleDataOutputDir,
     reviewCommentCalls,
+    requestChangesCalls,
     stop: async (): Promise<void> => {
       await closeServer(server);
       fs.rmSync(tmpRoot, { recursive: true, force: true });

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsoleItemDetail.stories.tsx

@@ -212,8 +212,8 @@ export const IssueWithLinkedPullRequest: Story = {
         commitsError: null,
       },
     ],
-    buildAddInlineComment: (prUrl) => async (path, line, side, body) => {
-      window.alert(`comment on ${prUrl} ${path}:${line} (${side})\n${body}`);
+    onAddInlineComment: async (path, line, side, body) => {
+      window.alert(`comment on ${path}:${line} (${side})\n${body}`);
     },
   },
 };

package/src/adapter/entry-points/console/ui/src/features/console/components/detail/ConsoleItemDetail.tsx

@@ -64,7 +64,6 @@ export type ConsoleItemDetailProps = {
   buildImageProxyUrl?: ImageProxyUrlBuilder;
   renderReferenceLink?: ConsoleReferenceLinkRenderer;
   onAddInlineComment?: ConsoleAddInlineComment;
-  buildAddInlineComment?: (prUrl: string) => ConsoleAddInlineComment;
 };
 
 export const ConsoleItemDetail = ({
@@ -93,7 +92,6 @@ export const ConsoleItemDetail = ({
   buildImageProxyUrl,
   renderReferenceLink,
   onAddInlineComment,
-  buildAddInlineComment,
 }: ConsoleItemDetailProps) => {
   const resolvedState = state?.state ?? 'open';
   const merged = state?.merged ?? false;
@@ -283,11 +281,7 @@ export const ConsoleItemDetail = ({
             now={now}
             buildImageProxyUrl={buildImageProxyUrl}
             renderReferenceLink={renderReferenceLink}
-            onAddInlineComment={
-              buildAddInlineComment
-                ? buildAddInlineComment(related.pullRequest.url)
-                : undefined
-            }
+            onAddInlineComment={onAddInlineComment}
           />
         ))}
 

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

@@ -187,28 +187,39 @@ describe('ConsoleItemDetailContainer', () => {
     ]);
   });
 
-  it('routes an inline review comment on an issue related pull request to that pull request url', async () => {
+  it('collects an inline comment on an issue related pull request diff, enables Reject, and submits it as the request-changes review for that pull request url', async () => {
     const operations = buildOperations();
+    const onQueueAction = jest.fn();
     const relatedPullRequest = consoleRelatedPullRequestsFixture[0];
-    const { container, findByRole, getAllByRole, getByPlaceholderText } =
-      render(
-        <ConsoleItemDetailContainer
-          tab="unread"
-          item={issueItem}
-          caches={buildCaches({
-            relatedPrs: [relatedPullRequest],
-            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={jest.fn()}
-        />,
-      );
+    const {
+      container,
+      findByRole,
+      getAllByRole,
+      getByPlaceholderText,
+      getByText,
+    } = render(
+      <ConsoleItemDetailContainer
+        tab="unread"
+        item={issueItem}
+        caches={buildCaches({
+          relatedPrs: [relatedPullRequest],
+          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),
@@ -230,13 +241,31 @@ describe('ConsoleItemDetailContainer', () => {
     expect(submitButton).not.toBeNull();
     fireEvent.click(submitButton as Element);
 
-    const addInlineReviewComment =
-      operations.addInlineReviewComment as jest.Mock;
     await waitFor(() => {
-      expect(addInlineReviewComment).toHaveBeenCalledTimes(1);
+      expect(getByText('Reject')).not.toBeDisabled();
     });
-    const call = addInlineReviewComment.mock.calls[0];
-    expect(call[0]).toBe(relatedPullRequest.url);
-    expect(call[4]).toBe('Please rename this variable.');
+    expect(operations.addInlineReviewComment).not.toHaveBeenCalled();
+
+    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?.[1]).toBe(relatedPullRequest.url);
+    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.',
+      },
+    ]);
+    expect(reviewCall?.[3][0].body).not.toBe('');
   });
 });

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

@@ -77,12 +77,6 @@ export const ConsoleItemDetailContainer = ({
   const [pendingReviewComments, setPendingReviewComments] = useState<
     ConsolePendingReviewComment[]
   >([]);
-  const buildAddInlineComment = useCallback(
-    (prUrl: string): ConsoleAddInlineComment =>
-      (path, line, side, body) =>
-        operations.addInlineReviewComment(prUrl, path, line, side, body),
-    [operations],
-  );
   const addInlineComment = useCallback<ConsoleAddInlineComment>(
     async (path, line, side, body) => {
       setPendingReviewComments((previous) => [
@@ -175,8 +169,7 @@ export const ConsoleItemDetailContainer = ({
       now={now}
       buildImageProxyUrl={resolveImageProxyUrl}
       renderReferenceLink={renderReferenceLink}
-      onAddInlineComment={item.isPr ? addInlineComment : undefined}
-      buildAddInlineComment={buildAddInlineComment}
+      onAddInlineComment={addInlineComment}
       commentComposer={
         <ConsoleCommentComposer
           isPr={item.isPr}