npm - github-issue-tower-defence-management - Versions diffs - 1.101.6 → 1.101.8 - Mend

github-issue-tower-defence-management 1.101.6 → 1.101.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

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

@@ -4,8 +4,8 @@
     <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-DX0mapkS.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-D4zghbcI.css">
+    <script type="module" crossorigin src="/assets/index-_g2CqG11.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-ES6SLB1Y.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

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

package/src/adapter/entry-points/console/consoleServer.test.ts CHANGED Viewed

@@ -652,6 +652,49 @@ describe('consoleServer new routes integration', () => {
     }
   });
+  it('returns 502 with the underlying error message when an operation rejects', async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
+    const issueRepository = mock<IssueRepository>();
+    issueRepository.get.mockResolvedValue({
+      ...mock<Issue>(),
+      itemId: 'PVTI_loaded',
+    });
+    issueRepository.approvePullRequest.mockRejectedValue(
+      new Error('Failed to approve PR https://github.com/o/r/pull/1: HTTP 422'),
+    );
+    const server = await startConsoleServer({
+      accessToken: testToken,
+      uiDistDir: path.join(tmpDir, 'ui-dist'),
+      consoleDataOutputDir: null,
+      inTmuxDataDir: null,
+      dashboardDir: null,
+      issueRepository,
+      resolveProject: async (pjcode) =>
+        pjcode === 'umino' ? { pjcode, project: buildProject() } : null,
+      port: 0,
+    });
+    try {
+      const response = await request(
+        server,
+        'POST',
+        `/api/review?k=${testToken}`,
+        {
+          pjcode: 'umino',
+          action: 'approve',
+          prUrl: 'https://github.com/o/r/pull/1',
+          projectItemId: 'PVTI_op',
+        },
+      );
+      expect(response.statusCode).toBe(502);
+      expect(JSON.parse(response.body)).toEqual({
+        error: 'Failed to approve PR https://github.com/o/r/pull/1: HTTP 422',
+      });
+    } finally {
+      await closeServer(server);
+      fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+  });
   it('rejects an operation api with a malformed json body', async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'console-server-'));
     const issueRepository = mock<IssueRepository>();

package/src/adapter/entry-points/console/consoleServer.ts CHANGED Viewed

@@ -372,6 +372,32 @@ const handleReadApi = async (
   }
 };
+const operationErrorMessage = (error: unknown): string => {
+  if (error instanceof Error && error.message.length > 0) {
+    return error.message;
+  }
+  return String(error);
+};
+const dispatchOperation = (
+  context: ConsoleOperationContext,
+  requestPath: string,
+  body: Record<string, unknown>,
+): Promise<{ statusCode: number; body: unknown }> | null => {
+  switch (requestPath) {
+    case '/api/review':
+      return handleReview(context, body);
+    case '/api/triage':
+      return handleTriage(context, body);
+    case '/api/intmux':
+      return handleIntmux(context, body);
+    case '/api/comment':
+      return handleComment(context, body);
+    default:
+      return null;
+  }
+};
 const handleOperationApi = async (
   options: ConsoleServerOptions,
   requestPath: string,
@@ -387,17 +413,18 @@ const handleOperationApi = async (
     resolveProject,
     consoleDataOutputDir: options.consoleDataOutputDir,
   };
-  switch (requestPath) {
-    case '/api/review':
-      return handleReview(context, body);
-    case '/api/triage':
-      return handleTriage(context, body);
-    case '/api/intmux':
-      return handleIntmux(context, body);
-    case '/api/comment':
-      return handleComment(context, body);
-    default:
-      return null;
+  const dispatched = dispatchOperation(context, requestPath, body);
+  if (dispatched === null) {
+    return null;
+  }
+  try {
+    return await dispatched;
+  } catch (error) {
+    console.error('console operation failed', error);
+    return {
+      statusCode: 502,
+      body: { error: operationErrorMessage(error) },
+    };
   }
 };

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

@@ -1,4 +1,4 @@
-import type { ReactNode, Ref } from 'react';
+import type { ReactNode } from 'react';
 import type { ImageProxyUrlBuilder } from '../../lib/imageProxy';
 import { colorFromEnum } from '../../logic/colors';
 import {
@@ -55,7 +55,6 @@ export type ConsoleItemDetailProps = {
   now: number;
   commentComposer: ReactNode;
   operationBar: ReactNode;
-  scrollRef?: Ref<HTMLElement>;
   buildImageProxyUrl?: ImageProxyUrlBuilder;
 };
@@ -81,7 +80,6 @@ export const ConsoleItemDetail = ({
   now,
   commentComposer,
   operationBar,
-  scrollRef,
   buildImageProxyUrl,
 }: ConsoleItemDetailProps) => {
   const resolvedState = state?.state ?? 'open';
@@ -100,170 +98,166 @@ export const ConsoleItemDetail = ({
     commitsAreLoading || commitsError !== null ? null : commits.length;
   return (
-    <>
-      <article className="console-detail" ref={scrollRef}>
-        {storyName !== null && (
-          <div className="console-detail-story">
-            <span className="console-storytag">
-              <span
-                className="console-story-dot"
-                style={{ backgroundColor: storyPalette.dot }}
-              />
-              {storyName}
-            </span>
-          </div>
-        )}
+    <article className="console-detail">
+      {storyName !== null && (
+        <div className="console-detail-story">
+          <span className="console-storytag">
+            <span
+              className="console-story-dot"
+              style={{ backgroundColor: storyPalette.dot }}
+            />
+            {storyName}
+          </span>
+        </div>
+      )}
-        {overlayStatus !== null && statusPalette !== null && (
-          <span
-            className="console-detail-status-chip"
-            style={{
-              color: statusPalette.fg,
-              borderColor: statusPalette.border,
-              backgroundColor: statusPalette.bg,
-            }}
-          >
-            {overlayStatus.name}
+      {overlayStatus !== null && statusPalette !== null && (
+        <span
+          className="console-detail-status-chip"
+          style={{
+            color: statusPalette.fg,
+            borderColor: statusPalette.border,
+            backgroundColor: statusPalette.bg,
+          }}
+        >
+          {overlayStatus.name}
+        </span>
+      )}
+      <h2 className="console-detail-title">
+        <ConsoleItemIcon
+          isPr={item.isPr}
+          state={resolvedState}
+          merged={merged}
+          isDraft={false}
+          stateReason=""
+        />
+        <span className="console-detail-title-text">{item.title}</span>
+        <span className="console-detail-number">
+          {item.isPr ? `PR #${item.number}` : `#${item.number}`}
+        </span>
+        {closedStateLabel !== null && (
+          <span className="console-detail-closed-label">
+            {closedStateLabel}
           </span>
         )}
+      </h2>
-        <h2 className="console-detail-title">
-          <ConsoleItemIcon
-            isPr={item.isPr}
-            state={resolvedState}
-            merged={merged}
-            isDraft={false}
-            stateReason=""
-          />
-          <span className="console-detail-title-text">{item.title}</span>
-          <span className="console-detail-number">
-            {item.isPr ? `PR #${item.number}` : `#${item.number}`}
-          </span>
-          {closedStateLabel !== null && (
-            <span className="console-detail-closed-label">
-              {closedStateLabel}
+      <div className="console-detail-subbar">
+        <a
+          href={item.url}
+          className="console-detail-link"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          {item.isPr ? `PR #${item.number}` : `Issue #${item.number}`}
+        </a>
+        <span className="console-detail-repo">{item.repo}</span>
+        <span className="console-detail-pill">
+          {item.isPr ? 'PR' : 'Issue'}
+        </span>
+      </div>
+      {item.labels.length > 0 && (
+        <div className="console-detail-labels">
+          {item.labels.map((label) => (
+            <span key={label} className="console-label-chip">
+              {label}
             </span>
-          )}
-        </h2>
+          ))}
+        </div>
+      )}
+      <div
+        className="console-detail-createdat"
+        title={formatFullTimestamp(item.createdAt)}
+      >
+        opened {formatRelativeTime(item.createdAt, now)}
+      </div>
-        <div className="console-detail-subbar">
+      <ConsolePanel
+        title="Description"
+        headerAction={
           <a
             href={item.url}
-            className="console-detail-link"
+            className="console-panel-open-link"
             target="_blank"
             rel="noopener noreferrer"
           >
-            {item.isPr ? `PR #${item.number}` : `Issue #${item.number}`}
+            open
           </a>
-          <span className="console-detail-repo">{item.repo}</span>
-          <span className="console-detail-pill">
-            {item.isPr ? 'PR' : 'Issue'}
-          </span>
-        </div>
-        {item.labels.length > 0 && (
-          <div className="console-detail-labels">
-            {item.labels.map((label) => (
-              <span key={label} className="console-label-chip">
-                {label}
-              </span>
-            ))}
-          </div>
+        }
+      >
+        {bodyError !== null ? (
+          <p role="alert" className="console-detail-body-error">
+            Failed to load description: {bodyError}
+          </p>
+        ) : bodyIsLoading ? (
+          <p className="console-detail-body-loading">Loading description...</p>
+        ) : (
+          <ConsoleMarkdownContent
+            body={body}
+            buildImageProxyUrl={buildImageProxyUrl}
+          />
         )}
+      </ConsolePanel>
-        <div
-          className="console-detail-createdat"
-          title={formatFullTimestamp(item.createdAt)}
-        >
-          opened {formatRelativeTime(item.createdAt, now)}
-        </div>
-        <ConsolePanel
-          title="Description"
-          headerAction={
-            <a
-              href={item.url}
-              className="console-panel-open-link"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              open
-            </a>
-          }
-        >
-          {bodyError !== null ? (
-            <p role="alert" className="console-detail-body-error">
-              Failed to load description: {bodyError}
-            </p>
-          ) : bodyIsLoading ? (
-            <p className="console-detail-body-loading">
-              Loading description...
-            </p>
-          ) : (
-            <ConsoleMarkdownContent
-              body={body}
-              buildImageProxyUrl={buildImageProxyUrl}
-            />
-          )}
+      {item.isPr && (
+        <ConsolePanel title="Changed files" count={filesCount}>
+          <ConsoleChangedFileList
+            files={files}
+            isLoading={filesAreLoading}
+            error={filesError}
+          />
         </ConsolePanel>
+      )}
-        {item.isPr && (
-          <ConsolePanel title="Changed files" count={filesCount}>
-            <ConsoleChangedFileList
-              files={files}
-              isLoading={filesAreLoading}
-              error={filesError}
-            />
-          </ConsolePanel>
-        )}
+      <ConsolePanel
+        title="Comments"
+        count={commentsCount}
+        defaultCollapsed={item.isPr}
+      >
+        <ConsoleCommentList
+          comments={comments}
+          isLoading={commentsAreLoading}
+          error={commentsError}
+          now={now}
+          buildImageProxyUrl={buildImageProxyUrl}
+        />
+      </ConsolePanel>
-        <ConsolePanel
-          title="Comments"
-          count={commentsCount}
-          defaultCollapsed={item.isPr}
-        >
-          <ConsoleCommentList
-            comments={comments}
-            isLoading={commentsAreLoading}
-            error={commentsError}
+      {item.isPr && (
+        <ConsolePanel title="Commits" count={commitsCount} defaultCollapsed>
+          <ConsoleCommitList
+            commits={commits}
+            isLoading={commitsAreLoading}
+            error={commitsError}
             now={now}
-            buildImageProxyUrl={buildImageProxyUrl}
           />
         </ConsolePanel>
+      )}
-        {item.isPr && (
-          <ConsolePanel title="Commits" count={commitsCount} defaultCollapsed>
-            <ConsoleCommitList
-              commits={commits}
-              isLoading={commitsAreLoading}
-              error={commitsError}
-              now={now}
-            />
-          </ConsolePanel>
-        )}
-        {!item.isPr &&
-          relatedPullRequests.map((related) => (
-            <ConsolePullRequestDetail
-              key={related.pullRequest.url}
-              pullRequest={related.pullRequest}
-              body={related.pullRequest.summary?.body ?? ''}
-              bodyIsLoading={false}
-              files={related.files}
-              filesAreLoading={related.filesAreLoading}
-              filesError={related.filesError}
-              commits={related.commits}
-              commitsAreLoading={related.commitsAreLoading}
-              commitsError={related.commitsError}
-              now={now}
-              buildImageProxyUrl={buildImageProxyUrl}
-            />
-          ))}
+      {!item.isPr &&
+        relatedPullRequests.map((related) => (
+          <ConsolePullRequestDetail
+            key={related.pullRequest.url}
+            pullRequest={related.pullRequest}
+            body={related.pullRequest.summary?.body ?? ''}
+            bodyIsLoading={false}
+            files={related.files}
+            filesAreLoading={related.filesAreLoading}
+            filesError={related.filesError}
+            commits={related.commits}
+            commitsAreLoading={related.commitsAreLoading}
+            commitsError={related.commitsError}
+            now={now}
+            buildImageProxyUrl={buildImageProxyUrl}
+          />
+        ))}
-        {commentComposer}
-      </article>
+      {commentComposer}
-      <footer className="console-actionbar">{operationBar}</footer>
-    </>
+      <div className="console-actionbar">{operationBar}</div>
+    </article>
   );
 };

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleErrorToast.stories.tsx ADDED Viewed

@@ -0,0 +1,23 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { ConsoleErrorToast } from './ConsoleUndoToast';
+const meta: Meta<typeof ConsoleErrorToast> = {
+  title: 'Console/ConsoleErrorToast',
+  component: ConsoleErrorToast,
+  args: {
+    message: '操作に失敗しました: HTTP 422 Review cannot be requested',
+    onDismiss: () => {},
+  },
+};
+export default meta;
+type Story = StoryObj<typeof ConsoleErrorToast>;
+export const ReviewRejectedByGitHub: Story = {};
+export const NetworkFailure: Story = {
+  args: {
+    message: '操作に失敗しました: network down',
+  },
+};

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleUndoToast.test.tsx CHANGED Viewed

@@ -1,5 +1,5 @@
 import { fireEvent, render } from '@testing-library/react';
-import { ConsoleUndoToast } from './ConsoleUndoToast';
+import { ConsoleErrorToast, ConsoleUndoToast } from './ConsoleUndoToast';
 describe('ConsoleUndoToast', () => {
   const baseProps = {
@@ -52,3 +52,46 @@ describe('ConsoleUndoToast', () => {
     expect(onUndo).toHaveBeenCalledTimes(1);
   });
 });
+describe('ConsoleErrorToast', () => {
+  it('shows the failure message with the error modifier class and alert role', () => {
+    const { getByText, container, getByRole } = render(
+      <ConsoleErrorToast
+        message="操作に失敗しました: HTTP 422"
+        onDismiss={() => {}}
+      />,
+    );
+    expect(getByText('操作に失敗しました: HTTP 422')).toBeInTheDocument();
+    expect(
+      container.querySelector('.console-undo-toast-error'),
+    ).toBeInTheDocument();
+    expect(getByRole('alert')).toBeInTheDocument();
+  });
+  it('does not render a countdown or progress bar', () => {
+    const { container } = render(
+      <ConsoleErrorToast
+        message="操作に失敗しました: boom"
+        onDismiss={() => {}}
+      />,
+    );
+    expect(
+      container.querySelector('.console-undo-toast-countdown'),
+    ).not.toBeInTheDocument();
+    expect(
+      container.querySelector('.console-undo-toast-bar'),
+    ).not.toBeInTheDocument();
+  });
+  it('invokes onDismiss when the Dismiss control is clicked', () => {
+    const onDismiss = jest.fn();
+    const { getByText } = render(
+      <ConsoleErrorToast
+        message="操作に失敗しました: boom"
+        onDismiss={onDismiss}
+      />,
+    );
+    fireEvent.click(getByText('Dismiss'));
+    expect(onDismiss).toHaveBeenCalledTimes(1);
+  });
+});

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleUndoToast.tsx CHANGED Viewed

@@ -34,3 +34,28 @@ export const ConsoleUndoToast = ({
     />
   </div>
 );
+export type ConsoleErrorToastProps = {
+  message: string;
+  onDismiss: () => void;
+};
+export const ConsoleErrorToast = ({
+  message,
+  onDismiss,
+}: ConsoleErrorToastProps) => (
+  <div
+    className="console-undo-toast console-undo-toast-error"
+    role="alert"
+    aria-live="assertive"
+  >
+    <span className="console-undo-toast-message">{message}</span>
+    <button
+      type="button"
+      className="console-undo-toast-undo"
+      onClick={onDismiss}
+    >
+      Dismiss
+    </button>
+  </div>
+);

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleActionQueue.test.ts CHANGED Viewed

@@ -8,11 +8,14 @@ const makeAction = (
 ) => ({
   message: 'Approved — PR #851',
   color: 'green' as const,
-  commit: jest.fn(),
+  commit: jest.fn<Promise<void>, []>().mockResolvedValue(undefined),
   advance: jest.fn(),
   ...overrides,
 });
+const flushMicrotasks = (): Promise<void> =>
+  Promise.resolve().then(() => undefined);
 describe('useConsoleActionQueue', () => {
   beforeEach(() => {
     jest.useFakeTimers();
@@ -114,4 +117,84 @@ describe('useConsoleActionQueue', () => {
     expect(first.commit).toHaveBeenCalledTimes(1);
     expect(second.commit).toHaveBeenCalledTimes(1);
   });
+  it('surfaces the failure reason when the timer commit rejects', async () => {
+    const { result } = renderHook(() => useConsoleActionQueue());
+    const action = makeAction({
+      commit: jest
+        .fn<Promise<void>, []>()
+        .mockRejectedValue(new Error('HTTP 422 review cannot be requested')),
+    });
+    act(() => {
+      result.current.enqueue(action);
+    });
+    expect(result.current.error).toBeNull();
+    await act(async () => {
+      jest.advanceTimersByTime(5000);
+      await flushMicrotasks();
+    });
+    expect(action.commit).toHaveBeenCalledTimes(1);
+    expect(result.current.error).toEqual({
+      message: 'Approved — PR #851',
+      reason: 'HTTP 422 review cannot be requested',
+    });
+  });
+  it('surfaces the failure reason when the previous action commit rejects on enqueue', async () => {
+    const { result } = renderHook(() => useConsoleActionQueue());
+    const first = makeAction({
+      commit: jest
+        .fn<Promise<void>, []>()
+        .mockRejectedValue(new Error('network down')),
+    });
+    const second = makeAction({
+      message: 'Rejected — PR #853',
+      color: 'amber',
+    });
+    act(() => {
+      result.current.enqueue(first);
+    });
+    await act(async () => {
+      jest.advanceTimersByTime(1000);
+      result.current.enqueue(second);
+      await flushMicrotasks();
+    });
+    expect(first.commit).toHaveBeenCalledTimes(1);
+    expect(result.current.error).toEqual({
+      message: 'Approved — PR #851',
+      reason: 'network down',
+    });
+  });
+  it('clears the surfaced error when dismissError is called', async () => {
+    const { result } = renderHook(() => useConsoleActionQueue());
+    const action = makeAction({
+      commit: jest.fn<Promise<void>, []>().mockRejectedValue(new Error('boom')),
+    });
+    act(() => {
+      result.current.enqueue(action);
+    });
+    await act(async () => {
+      jest.advanceTimersByTime(5000);
+      await flushMicrotasks();
+    });
+    expect(result.current.error).not.toBeNull();
+    act(() => {
+      result.current.dismissError();
+    });
+    expect(result.current.error).toBeNull();
+  });
+  it('does not surface an error when the commit resolves', async () => {
+    const { result } = renderHook(() => useConsoleActionQueue());
+    const action = makeAction();
+    act(() => {
+      result.current.enqueue(action);
+    });
+    await act(async () => {
+      jest.advanceTimersByTime(5000);
+      await flushMicrotasks();
+    });
+    expect(result.current.error).toBeNull();
+  });
 });