github-issue-tower-defence-management 2.17.0 → 2.18.0

package/bin/adapter/entry-points/console/ui-dist/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>TDPM Console</title>
-    <script type="module" crossorigin src="/assets/index-DKxao68k.js"></script>
+    <script type="module" crossorigin src="/assets/index-CfqusL5j.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DshIymWu.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-issue-tower-defence-management",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "",
   "main": "bin/index.js",
   "scripts": {

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

@@ -608,6 +608,40 @@ test('posts a comment and moves the item to Awaiting Workspace when the Comment
   });
 });
 
+test('posts an ok comment and moves the item to Awaiting Workspace when the ok & Awaiting Workspace button is clicked', async ({
+  page,
+}) => {
+  await page.goto(harness.appRootUrl);
+
+  await itemRowByText(
+    page,
+    'Resolve the shared GitHub token rate-limit exhaustion blocker',
+  ).click();
+
+  await expect(page.locator('.console-composer-input')).toBeInViewport();
+
+  await page
+    .getByRole('button', { name: 'ok & Awaiting Workspace', exact: true })
+    .click();
+
+  await expect
+    .poll(
+      () =>
+        harness.commentCalls.some(
+          (c) =>
+            c.url ===
+              'https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/720' &&
+            c.body === 'ok',
+        ),
+      { timeout: 10000 },
+    )
+    .toBe(true);
+
+  await expect(tabByLabel(page, 'Workflow Blocker')).toHaveCount(0, {
+    timeout: 8000,
+  });
+});
+
 test('project switcher appears at the left end of the tab bar and opens a dropdown on click', async ({
   page,
 }) => {

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

@@ -58,3 +58,11 @@ export const ComposerWithMoveToAwaitingWorkspace: Story = {
     onSubmitAndMoveToAwaitingWorkspace: acceptComment,
   },
 };
+
+export const ComposerWithAllActionButtons: Story = {
+  args: {
+    initiallyOpen: true,
+    onOkAndAwaitingWorkspace: () => {},
+    onSubmitAndMoveToAwaitingWorkspace: acceptComment,
+  },
+};

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

@@ -1,4 +1,4 @@
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import { act, fireEvent, render, waitFor } from '@testing-library/react';
 import type { ConsoleComment } from '../../logic/types';
 import {
   appendAttachmentMarkdown,
@@ -329,14 +329,93 @@ describe('ConsoleCommentComposer', () => {
     });
   });
 
-  it('renders only the Comment button when onSubmitAndMoveToAwaitingWorkspace is not provided', () => {
+  it('renders only the Comment button when neither onOkAndAwaitingWorkspace nor onSubmitAndMoveToAwaitingWorkspace is provided', () => {
     const { queryByText, getByText } = render(
       <ConsoleCommentComposer initiallyOpen onSubmit={stubSubmit} />,
     );
     expect(getByText('Comment')).toBeInTheDocument();
+    expect(queryByText('ok & Awaiting Workspace')).toBeNull();
     expect(queryByText('Comment & Awaiting Workspace')).toBeNull();
   });
 
+  it('renders ok & Awaiting Workspace between Comment and Comment & Awaiting Workspace when both callbacks are provided', () => {
+    const { getAllByRole } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={stubSubmit}
+        onOkAndAwaitingWorkspace={() => {}}
+        onSubmitAndMoveToAwaitingWorkspace={stubSubmit}
+      />,
+    );
+    const buttons = getAllByRole('button').filter((b) =>
+      [
+        'Comment',
+        'ok & Awaiting Workspace',
+        'Comment & Awaiting Workspace',
+      ].includes(b.textContent ?? ''),
+    );
+    expect(buttons.map((b) => b.textContent)).toEqual([
+      'Comment',
+      'ok & Awaiting Workspace',
+      'Comment & Awaiting Workspace',
+    ]);
+  });
+
+  it('calls onOkAndAwaitingWorkspace when the ok & Awaiting Workspace button is clicked', () => {
+    const onOkAndAwaitingWorkspace = jest.fn();
+    const { getByText } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={stubSubmit}
+        onOkAndAwaitingWorkspace={onOkAndAwaitingWorkspace}
+      />,
+    );
+    fireEvent.click(getByText('ok & Awaiting Workspace'));
+    expect(onOkAndAwaitingWorkspace).toHaveBeenCalledTimes(1);
+  });
+
+  it('disables the ok & Awaiting Workspace button while a comment is being posted', async () => {
+    let resolvePost!: () => void;
+    const slowSubmit = async (_body: string): Promise<ConsoleComment> =>
+      new Promise((resolve) => {
+        resolvePost = () =>
+          resolve({
+            author: 'HiromiShikata',
+            body: _body,
+            createdAt: '2026-06-19T11:58:00.000Z',
+          });
+      });
+    const { getByPlaceholderText, getByText } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={slowSubmit}
+        onOkAndAwaitingWorkspace={() => {}}
+        onSubmitAndMoveToAwaitingWorkspace={stubSubmit}
+      />,
+    );
+    fireEvent.change(getByPlaceholderText('Leave a comment…'), {
+      target: { value: 'in-flight comment' },
+    });
+    fireEvent.click(getByText('Comment'));
+    await waitFor(() => {
+      expect(getByText('ok & Awaiting Workspace')).toBeDisabled();
+    });
+    await act(async () => {
+      resolvePost();
+    });
+  });
+
+  it('does not render ok & Awaiting Workspace when onOkAndAwaitingWorkspace is not provided', () => {
+    const { queryByText } = render(
+      <ConsoleCommentComposer
+        initiallyOpen
+        onSubmit={stubSubmit}
+        onSubmitAndMoveToAwaitingWorkspace={stubSubmit}
+      />,
+    );
+    expect(queryByText('ok & Awaiting Workspace')).toBeNull();
+  });
+
   it('renders both Comment and Comment & Awaiting Workspace buttons when onSubmitAndMoveToAwaitingWorkspace is provided', () => {
     const { getByText } = render(
       <ConsoleCommentComposer

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

@@ -9,6 +9,7 @@ export type ConsoleCommentComposerProps = {
   onSubmitAndMoveToAwaitingWorkspace?: (
     body: string,
   ) => Promise<ConsoleComment>;
+  onOkAndAwaitingWorkspace?: () => void;
   onUploadFile?: (file: File) => Promise<string>;
 };
 
@@ -82,6 +83,7 @@ export const ConsoleCommentComposer = ({
   onSubmit,
   onDraftChange,
   onSubmitAndMoveToAwaitingWorkspace,
+  onOkAndAwaitingWorkspace,
   onUploadFile,
 }: ConsoleCommentComposerProps) => {
   const [open, setOpen] = useState<boolean>(initiallyOpen);
@@ -244,6 +246,16 @@ export const ConsoleCommentComposer = ({
             >
               Comment
             </button>
+            {onOkAndAwaitingWorkspace !== undefined && (
+              <button
+                type="button"
+                className="console-composer-submit"
+                disabled={status.kind === 'posting'}
+                onClick={onOkAndAwaitingWorkspace}
+              >
+                ok &amp; Awaiting Workspace
+              </button>
+            )}
             {onSubmitAndMoveToAwaitingWorkspace !== undefined && (
               <button
                 type="button"

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

@@ -9,7 +9,6 @@ import type {
 } from '../../logic/types';
 import { ConsoleCloseActions } from './ConsoleCloseActions';
 import { ConsoleNextActionDateActions } from './ConsoleNextActionDateActions';
-import { ConsoleOkAndAwaitingWorkspaceActions } from './ConsoleOkAndAwaitingWorkspaceActions';
 import { ConsolePullRequestReviewActions } from './ConsolePullRequestReviewActions';
 import { ConsoleStatusActions } from './ConsoleStatusActions';
 
@@ -31,10 +30,6 @@ export const ConsoleOperationMenu = ({
 }: ConsoleOperationBarProps) => {
   return (
     <div className="console-operation-bar">
-      <ConsoleOkAndAwaitingWorkspaceActions
-        statusOptions={statusOptions}
-        onOkAndAwaitingWorkspace={handlers.onOkAndAwaitingWorkspace}
-      />
       {hasPullRequest && (
         <ConsolePullRequestReviewActions
           onReview={handlers.onReview}

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

@@ -318,6 +318,11 @@ export const ConsoleItemDetailContainer = ({
           initialDraft={initialCommentDraft}
           onSubmit={addComment}
           onDraftChange={onCommentDraftChange}
+          onOkAndAwaitingWorkspace={
+            awaitingWorkspaceOption !== null
+              ? () => handlers.onOkAndAwaitingWorkspace(awaitingWorkspaceOption)
+              : undefined
+          }
           onSubmitAndMoveToAwaitingWorkspace={
             addCommentAndMoveToAwaitingWorkspace
           }