Merge remote-tracking branch 'origin/master' into fix/ui-editor-enexpected-select

apps/admin-web/src/pages/AdminCreationEntrySwitchPage.test.tsx

@@ -1,328 +0,0 @@
-/* @vitest-environment jsdom */
-
-import {
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-  within,
-} from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { beforeEach, expect, test, vi } from 'vitest';
-
-import {
-  getAdminCreationEntryConfig,
-  upsertAdminCreationEntryBanners,
-  upsertAdminCreationEntryConfig,
-  upsertAdminPublicWorkInteractions,
-} from '../api/adminApiClient';
-import type {
-  AdminCreationEntryConfigResponse,
-  UnifiedCreationSpecPayload,
-} from '../api/adminApiTypes';
-import { AdminCreationEntrySwitchPage } from './AdminCreationEntrySwitchPage';
-
-vi.mock('../api/adminApiClient', () => ({
-  formatAdminApiError: vi.fn((error: unknown) =>
-    error instanceof Error ? error.message : '请求失败',
-  ),
-  getAdminCreationEntryConfig: vi.fn(),
-  isAdminApiError: vi.fn(() => false),
-  upsertAdminCreationEntryBanners: vi.fn(),
-  upsertAdminCreationEntryConfig: vi.fn(),
-  upsertAdminPublicWorkInteractions: vi.fn(),
-}));
-
-const puzzleSpec: UnifiedCreationSpecPayload = {
-  playId: 'puzzle',
-  title: '拼图',
-  mudPointCost: 10,
-  workspaceStage: 'puzzle-agent-workspace',
-  generationStage: 'puzzle-generating',
-  resultStage: 'puzzle-result',
-  fields: [
-    {
-      id: 'pictureDescription',
-      kind: 'text',
-      label: '画面描述',
-      required: true,
-    },
-  ],
-};
-
-const configResponse: AdminCreationEntryConfigResponse = {
-  eventBanners: [
-    {
-      title: '创作公告',
-      description: '',
-      coverImageSrc: '',
-      prizePoolMudPoints: 0,
-      startsAtText: '',
-      endsAtText: '',
-      renderMode: 'html',
-      htmlCode: '<section>后台公告</section>',
-    },
-  ],
-  publicWorkInteractions: [
-    {
-      sourceType: 'puzzle',
-      likeEnabled: true,
-      remixEnabled: true,
-      likeDisabledMessage: '拼图点赞暂不可用。',
-      remixDisabledMessage: '拼图作品改造暂不可用。',
-    },
-  ],
-  entries: [
-    {
-      id: 'puzzle',
-      title: '拼图',
-      subtitle: '拼图关卡创作',
-      badge: '可创建',
-      imageSrc: '/creation-type-references/puzzle.webp',
-      visible: true,
-      open: true,
-      sortOrder: 30,
-      categoryId: 'recommended',
-      categoryLabel: '热门推荐',
-      categorySortOrder: 20,
-      updatedAtMicros: 1,
-      unifiedCreationSpec: puzzleSpec,
-    },
-  ],
-};
-
-beforeEach(() => {
-  vi.clearAllMocks();
-  vi.mocked(getAdminCreationEntryConfig).mockResolvedValue(configResponse);
-  vi.mocked(upsertAdminCreationEntryBanners).mockResolvedValue(configResponse);
-  vi.mocked(upsertAdminCreationEntryConfig).mockResolvedValue(configResponse);
-  vi.mocked(upsertAdminPublicWorkInteractions).mockResolvedValue(
-    configResponse,
-  );
-});
-
-test('创作入口后台展示并保存统一创作契约', async () => {
-  const user = userEvent.setup();
-  const { container } = render(
-    <AdminCreationEntrySwitchPage
-      token="admin-token"
-      onUnauthorized={vi.fn()}
-    />,
-  );
-
-  await screen.findByText('pictureDescription');
-  expect(
-    container.querySelector('.admin-subsection .admin-info-list'),
-  ).not.toBeNull();
-  expect(
-    container.querySelector('.admin-subsection .admin-info-list')?.textContent,
-  ).toContain('拼图');
-  expect(container.querySelector('.admin-panel .admin-panel')).toBeNull();
-  expect(container.querySelector('.admin-muted')).toBeNull();
-  expect(screen.queryByLabelText('契约 JSON')).toBeNull();
-  expect(screen.queryByText('puzzle-generating')).toBeNull();
-
-  await user.click(screen.getByRole('button', { name: '修改契约' }));
-  const dialog = screen.getByRole('dialog', { name: '统一创作契约' });
-  expect(within(dialog).queryByLabelText('玩法 ID')).toBeNull();
-  expect(within(dialog).queryByLabelText('工作台阶段')).toBeNull();
-  expect(within(dialog).queryByLabelText('生成阶段')).toBeNull();
-  expect(within(dialog).queryByLabelText('结果阶段')).toBeNull();
-  fireEvent.change(within(dialog).getByLabelText('泥点消耗'), {
-    target: { value: '12' },
-  });
-  await user.click(within(dialog).getByRole('button', { name: '应用修改' }));
-
-  expect(screen.queryByRole('dialog', { name: '统一创作契约' })).toBeNull();
-  expect(screen.getByText('12泥点数')).toBeTruthy();
-
-  await user.click(screen.getByRole('button', { name: '保存入库' }));
-  await user.click(screen.getByRole('button', { name: '确认' }));
-
-  await waitFor(() => {
-    expect(upsertAdminCreationEntryConfig).toHaveBeenCalledWith(
-      'admin-token',
-      expect.objectContaining({
-        id: 'puzzle',
-        unifiedCreationSpec: {
-          ...puzzleSpec,
-          mudPointCost: 12,
-        },
-      }),
-    );
-  });
-});
-
-test('创作入口后台拒绝 playId 不一致的统一创作契约', async () => {
-  const user = userEvent.setup();
-  vi.mocked(getAdminCreationEntryConfig).mockResolvedValueOnce({
-    ...configResponse,
-    entries: [
-      {
-        ...configResponse.entries[0]!,
-        unifiedCreationSpec: {
-          ...puzzleSpec,
-          playId: 'match3d',
-        },
-      },
-    ],
-  });
-  render(
-    <AdminCreationEntrySwitchPage
-      token="admin-token"
-      onUnauthorized={vi.fn()}
-    />,
-  );
-
-  await screen.findByText('pictureDescription');
-  await user.click(screen.getByRole('button', { name: '保存入库' }));
-
-  expect(
-    await screen.findByText('统一创作契约 playId 必须与入口 ID 一致'),
-  ).toBeTruthy();
-  expect(upsertAdminCreationEntryConfig).not.toHaveBeenCalled();
-});
-
-test('创作入口后台用表单保存公告配置', async () => {
-  const user = userEvent.setup();
-  render(
-    <AdminCreationEntrySwitchPage
-      mode="announcements"
-      token="admin-token"
-      onUnauthorized={vi.fn()}
-    />,
-  );
-
-  expect(
-    await screen.findAllByRole('heading', { name: '创作入口公告' }),
-  ).toHaveLength(2);
-  expect(screen.queryByLabelText('公告代码 JSON')).toBeNull();
-  fireEvent.change(await screen.findByLabelText('公告 1 标题'), {
-    target: { value: '周末创作赛' },
-  });
-  fireEvent.change(screen.getByLabelText('公告 1 HTML'), {
-    target: { value: '<section>新的入口公告</section>' },
-  });
-  await user.click(screen.getByRole('button', { name: '新增公告' }));
-  fireEvent.change(screen.getByLabelText('公告 2 标题'), {
-    target: { value: '第二条公告' },
-  });
-  fireEvent.change(screen.getByLabelText('公告 2 HTML'), {
-    target: { value: '<section>轮播第二条</section>' },
-  });
-  await user.click(screen.getByRole('button', { name: '保存公告' }));
-  await user.click(screen.getByRole('button', { name: '确认' }));
-
-  await waitFor(() => {
-    expect(upsertAdminCreationEntryBanners).toHaveBeenCalled();
-  });
-  const [, payload] = vi.mocked(upsertAdminCreationEntryBanners).mock.calls[0]!;
-  expect(JSON.parse(payload.eventBannersJson)).toEqual([
-    {
-      title: '周末创作赛',
-      htmlCode: '<section>新的入口公告</section>',
-    },
-    {
-      title: '第二条公告',
-      htmlCode: '<section>轮播第二条</section>',
-    },
-  ]);
-  expect(JSON.parse(payload.eventBannersJson)[0]).not.toHaveProperty(
-    'description',
-  );
-  expect(JSON.parse(payload.eventBannersJson)[0]).not.toHaveProperty(
-    'coverImageSrc',
-  );
-});
-
-test('创作入口后台用表单保存作品互动配置', async () => {
-  const user = userEvent.setup();
-  render(
-    <AdminCreationEntrySwitchPage
-      token="admin-token"
-      onUnauthorized={vi.fn()}
-    />,
-  );
-
-  await screen.findByText('作品互动');
-  const likeToggle = screen.getAllByRole('checkbox')[0]!;
-  await user.click(likeToggle);
-  fireEvent.change(screen.getByLabelText('拼图 / puzzle 点赞关闭提示'), {
-    target: { value: '拼图点赞维护中。' },
-  });
-  await user.click(screen.getByRole('button', { name: '保存作品互动' }));
-  await user.click(screen.getByRole('button', { name: '确认' }));
-
-  await waitFor(() => {
-    expect(upsertAdminPublicWorkInteractions).toHaveBeenCalledWith(
-      'admin-token',
-      {
-        publicWorkInteractions: [
-          {
-            sourceType: 'puzzle',
-            likeEnabled: false,
-            remixEnabled: true,
-            likeDisabledMessage: '拼图点赞维护中。',
-            remixDisabledMessage: '拼图作品改造暂不可用。',
-          },
-        ],
-      },
-    );
-  });
-});
-
-test('创作入口后台把旧结构化公告回显成 HTML 表单', async () => {
-  vi.mocked(getAdminCreationEntryConfig).mockResolvedValueOnce({
-    ...configResponse,
-    eventBanners: [
-      {
-        title: '旧公告 <标题>',
-        description: '旧描述 & 需要转义',
-        coverImageSrc: '/legacy.png',
-        prizePoolMudPoints: 120,
-        startsAtText: '2026-06-01',
-        endsAtText: '2026-06-30',
-        renderMode: 'structured',
-      },
-    ],
-  });
-
-  render(
-    <AdminCreationEntrySwitchPage
-      mode="announcements"
-      token="admin-token"
-      onUnauthorized={vi.fn()}
-    />,
-  );
-
-  expect(await screen.findByLabelText('公告 1 标题')).toHaveProperty(
-    'value',
-    '旧公告 <标题>',
-  );
-  expect(screen.getByLabelText('公告 1 HTML')).toHaveProperty(
-    'value',
-    '<section><h1>旧公告 &lt;标题&gt;</h1><p>旧描述 &amp; 需要转义</p></section>',
-  );
-});
-
-test('创作入口后台拒绝空公告表单', async () => {
-  const user = userEvent.setup();
-  render(
-    <AdminCreationEntrySwitchPage
-      mode="announcements"
-      token="admin-token"
-      onUnauthorized={vi.fn()}
-    />,
-  );
-
-  fireEvent.change(await screen.findByLabelText('公告 1 标题'), {
-    target: { value: '' },
-  });
-  fireEvent.change(screen.getByLabelText('公告 1 HTML'), {
-    target: { value: '' },
-  });
-  await user.click(screen.getByRole('button', { name: '保存公告' }));
-
-  expect(await screen.findByText('公告 1 标题和 HTML 都不能为空')).toBeTruthy();
-  expect(upsertAdminCreationEntryBanners).not.toHaveBeenCalled();
-});

apps/admin-web/src/pages/AdminWorkVisibilityPage.tsx

@@ -1,283 +0,0 @@
-import { Eye, EyeOff, RefreshCcw } from 'lucide-react';
-import { useEffect, useMemo, useState } from 'react';
-
-import {
-  listAdminWorkVisibility,
-  updateAdminWorkVisibility,
-} from '../api/adminApiClient';
-import type { AdminWorkVisibilityEntryPayload } from '../api/adminApiTypes';
-import { AdminUserReferenceButton } from '../components/AdminUserReferenceButton';
-import { useAdminWriteConfirm } from '../components/useAdminWriteConfirm';
-import { handlePageError } from './pageUtils';
-
-interface AdminWorkVisibilityPageProps {
-  token: string;
-  onUnauthorized: (message?: string) => void;
-}
-
-const sourceLabels: Record<string, string> = {
-  puzzle: '拼图',
-  'puzzle-clear': '拼消消',
-  'custom-world': '自定义世界',
-  'jump-hop': '跳一跳',
-  'wooden-fish': '敲木鱼',
-  match3d: '抓大鹅',
-  'square-hole': '方洞挑战',
-  'visual-novel': '视觉小说',
-  'big-fish': '大鱼吃小鱼',
-  'bark-battle': '汪汪声浪',
-};
-
-export function AdminWorkVisibilityPage({
-  token,
-  onUnauthorized,
-}: AdminWorkVisibilityPageProps) {
-  const [entries, setEntries] = useState<AdminWorkVisibilityEntryPayload[]>([]);
-  const [keyword, setKeyword] = useState('');
-  const [isLoading, setIsLoading] = useState(false);
-  const [savingKey, setSavingKey] = useState('');
-  const [errorMessage, setErrorMessage] = useState('');
-  const { confirmWrite, confirmDialog } = useAdminWriteConfirm();
-
-  useEffect(() => {
-    void refreshEntries();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [token]);
-
-  const filteredEntries = useMemo(() => {
-    const normalizedKeyword = keyword.trim().toLowerCase();
-    if (!normalizedKeyword) {
-      return entries;
-    }
-    return entries.filter((entry) =>
-      [
-        entry.sourceType,
-        sourceLabels[entry.sourceType] ?? '',
-        entry.title,
-        entry.subtitle,
-        entry.authorDisplayName,
-        entry.publicWorkCode,
-        entry.profileId,
-        entry.workId,
-      ]
-        .join(' ')
-        .toLowerCase()
-        .includes(normalizedKeyword),
-    );
-  }, [entries, keyword]);
-
-  async function refreshEntries() {
-    setIsLoading(true);
-    setErrorMessage('');
-    try {
-      const response = await listAdminWorkVisibility(token);
-      setEntries(sortEntries(response.entries));
-    } catch (error: unknown) {
-      handlePageError(error, onUnauthorized, setErrorMessage);
-    } finally {
-      setIsLoading(false);
-    }
-  }
-
-  async function handleToggle(entry: AdminWorkVisibilityEntryPayload) {
-    const nextVisible = !entry.visible;
-    const target =
-      entry.title.trim() || entry.publicWorkCode || entry.profileId;
-    const confirmed = await confirmWrite({
-      action: nextVisible ? '显示作品' : '隐藏作品',
-      target,
-    });
-    if (!confirmed) {
-      return;
-    }
-
-    const rowKey = buildEntryKey(entry);
-    setSavingKey(rowKey);
-    setErrorMessage('');
-    try {
-      const response = await updateAdminWorkVisibility(token, {
-        sourceType: entry.sourceType,
-        profileId: entry.profileId,
-        visible: nextVisible,
-      });
-      upsertEntry(response.entry);
-    } catch (error: unknown) {
-      handlePageError(error, onUnauthorized, setErrorMessage);
-    } finally {
-      setSavingKey('');
-    }
-  }
-
-  function upsertEntry(next: AdminWorkVisibilityEntryPayload) {
-    setEntries((current) =>
-      sortEntries([
-        ...current.filter(
-          (entry) => buildEntryKey(entry) !== buildEntryKey(next),
-        ),
-        next,
-      ]),
-    );
-  }
-
-  return (
-    <section className="admin-page admin-page-wide">
-      <div className="admin-page-heading">
-        <div>
-          <h2>作品可见性</h2>
-        </div>
-        <button
-          className="admin-secondary-button"
-          disabled={isLoading}
-          type="button"
-          onClick={refreshEntries}
-        >
-          <RefreshCcw size={17} aria-hidden="true" />
-          <span>{isLoading ? '刷新中' : '刷新'}</span>
-        </button>
-      </div>
-
-      <section className="admin-panel">
-        <label className="admin-field">
-          <span>搜索</span>
-          <input
-            placeholder="标题 / 作者 / 公开码 / profileId"
-            value={keyword}
-            onChange={(event) => setKeyword(event.target.value)}
-          />
-        </label>
-
-        {errorMessage ? (
-          <div className="admin-alert" role="status">
-            {errorMessage}
-          </div>
-        ) : null}
-
-        <div className="admin-table-wrap">
-          <table className="admin-table admin-table-wide">
-            <thead>
-              <tr>
-                <th>玩法</th>
-                <th>作品</th>
-                <th>作者</th>
-                <th>公开码</th>
-                <th>更新时间</th>
-                <th>状态</th>
-                <th>操作</th>
-              </tr>
-            </thead>
-            <tbody>
-              {filteredEntries.map((entry) => {
-                const rowKey = buildEntryKey(entry);
-                const isSaving = savingKey === rowKey;
-                return (
-                  <tr key={rowKey}>
-                    <td>
-                      <span className="admin-tag">
-                        {sourceLabels[entry.sourceType] ?? entry.sourceType}
-                      </span>
-                    </td>
-                    <td>
-                      <strong>{entry.title || entry.profileId}</strong>
-                      <small>{entry.subtitle || entry.profileId}</small>
-                    </td>
-                    <td>
-                      <div className="admin-inline-identity">
-                        <div>
-                          {entry.authorDisplayName || '玩家'}
-                          <small>{entry.ownerUserId}</small>
-                        </div>
-                        <AdminUserReferenceButton
-                          token={token}
-                          userId={entry.ownerUserId}
-                          onUnauthorized={onUnauthorized}
-                        />
-                      </div>
-                    </td>
-                    <td>
-                      <span className="admin-table-cell-ellipsis">
-                        {entry.publicWorkCode}
-                      </span>
-                      <small>{entry.profileId}</small>
-                    </td>
-                    <td>{formatMicros(entry.updatedAtMicros)}</td>
-                    <td>
-                      <span
-                        className={
-                          entry.visible
-                            ? 'admin-status admin-status-ok'
-                            : 'admin-status admin-status-error'
-                        }
-                      >
-                        {entry.visible ? '显示' : '隐藏'}
-                      </span>
-                    </td>
-                    <td>
-                      <button
-                        className={
-                          entry.visible
-                            ? 'admin-danger-button'
-                            : 'admin-secondary-button'
-                        }
-                        disabled={isSaving}
-                        type="button"
-                        onClick={() => handleToggle(entry)}
-                      >
-                        {entry.visible ? (
-                          <EyeOff size={16} aria-hidden="true" />
-                        ) : (
-                          <Eye size={16} aria-hidden="true" />
-                        )}
-                        <span>
-                          {isSaving
-                            ? '处理中'
-                            : entry.visible
-                              ? '隐藏'
-                              : '显示'}
-                        </span>
-                      </button>
-                    </td>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </table>
-        </div>
-
-        {!isLoading && filteredEntries.length === 0 ? (
-          <div className="admin-empty-state">暂无作品</div>
-        ) : null}
-      </section>
-
-      {confirmDialog}
-    </section>
-  );
-}
-
-function sortEntries(entries: AdminWorkVisibilityEntryPayload[]) {
-  return [...entries].sort((left, right) => {
-    const timeCompare = right.updatedAtMicros - left.updatedAtMicros;
-    if (timeCompare !== 0) {
-      return timeCompare;
-    }
-    const sourceCompare = left.sourceType.localeCompare(right.sourceType);
-    if (sourceCompare !== 0) {
-      return sourceCompare;
-    }
-    return left.profileId.localeCompare(right.profileId);
-  });
-}
-
-function buildEntryKey(entry: AdminWorkVisibilityEntryPayload) {
-  return `${entry.sourceType}:${entry.profileId}`;
-}
-
-function formatMicros(value: number) {
-  if (!Number.isFinite(value)) {
-    return '-';
-  }
-  const date = new Date(Math.floor(value / 1000));
-  if (!Number.isFinite(date.getTime())) {
-    return '-';
-  }
-  return date.toLocaleString('zh-CN', { hour12: false });
-}

apps/admin-web/tsconfig.json

@@ -15,10 +15,5 @@
     "noEmit": true,
     "types": ["vite/client"]
   },
-  "include": ["src", "vite.config.ts"],
-  "exclude": [
-    "src/pages/AdminCreationEntrySwitchPage.tsx",
-    "src/pages/AdminCreationEntrySwitchPage.test.tsx",
-    "src/pages/AdminWorkVisibilityPage.tsx"
-  ]
+  "include": ["src", "vite.config.ts"]
 }

apps/ai-game-creator-shell/src/features/asset-canvas/sharedImageCanvasFoundation.ts

@@ -1,16 +0,0 @@
-export type {
-  CanvasLayer,
-  CanvasViewport,
-  ImageCanvasAssetPort,
-  ImageCanvasCompletionPort,
-  ImageCanvasGenerationPort,
-  ImageCanvasProjectPort,
-} from '@genarrative/image-canvas-core';
-export {
-  CanvasViewport as SharedCanvasViewport,
-  CanvasWorld as SharedCanvasWorld,
-  LayerRenderer as SharedLayerRenderer,
-  Minimap as SharedMinimap,
-  SelectionOverlay as SharedSelectionOverlay,
-  ZoomControls as SharedZoomControls,
-} from '@genarrative/image-canvas-react';

apps/ai-game-creator-shell/src/features/ui-editor/types/UIRect.ts

@@ -1,9 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-/**
- * UI 布局在父级坐标系中的轴对齐矩形。
- *
- * `min` 是矩形的最小角，`size` 是沿两个坐标轴的尺寸。这里不规定 Y 轴方向，
- * 因而既能用于 Y 轴向上的游戏坐标，也能用于 Y 轴向下的画布坐标。
- */
-export type UIRect = { min: [number, number], size: [number, number], };

apps/ai-game-creator-shell/src/view/ui-editor/components/PrerequisiteIssues.tsx

@@ -1,27 +0,0 @@
-import type { UiEditorPrerequisiteIssue } from '../../../features/ui-editor/requisites';
-
-export function PrerequisiteIssues({
-  issues,
-}: {
-  issues: UiEditorPrerequisiteIssue[];
-}) {
-  if (issues.length === 0) {
-    return (
-      <div className="rounded-xl border border-emerald-200 bg-emerald-50 p-3 text-xs text-emerald-800">
-        当前 State 已满足该工具的前置数据要求。
-      </div>
-    );
-  }
-  return (
-    <div className="rounded-xl border border-amber-200 bg-amber-50 p-3 text-xs text-amber-900">
-      <strong>还不能执行此操作</strong>
-      <ul className="mt-2 space-y-1 pl-4">
-        {issues.map((issue, index) => (
-          <li key={`${issue.code}-${issue.resourceId ?? 'none'}-${index}`}>
-            {issue.message}
-          </li>
-        ))}
-      </ul>
-    </div>
-  );
-}