feat: 修改社区模板市场入口放到日报二级菜单下, 增加跳转github

2026-10-03 18:33:14 +08:00 · 2026-09-15 11:03:00 +08:00
parent ff212d594c
commit 67dc45819e
10 changed files with 1075 additions and 273 deletions
@@ -911,10 +911,23 @@ describe('daily report controls', () => {
    expect(onChange).toHaveBeenCalledWith('mobile-magazine')
  })

-  it('does not select a market template before it is installed', async () => {
+  it('keeps market browsing on the community page instead of the generation form', async () => {
    const user = userEvent.setup()
    const onChange = vi.fn()
    Object.assign(window.api, {
+      listReportTemplates: vi.fn(async () => [
+        {
+          id: 'community.github.tracememo.quickread',
+          version: '1.0.0',
+          interfaceVersion: '1',
+          source: 'installed' as const,
+          name: '极简速读',
+          author: 'fixture',
+          entryPath: '/tmp/entry.html',
+          capture: { width: 414, maxWidth: 414, maxHeight: 2000 },
+          license: { spdx: 'MIT' }
+        }
+      ]),
      listReportTemplateCatalog: vi.fn(async () => ({
        success: true,
        catalog: {
@@ -931,11 +944,10 @@ describe('daily report controls', () => {
              tags: [],
              license: 'MIT',
              minAppVersion: null,
-              download: 'https://raw.githubusercontent.com/Wxw-Gu/TraceMemo/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/packages/community.github.example.market/1.0.0/template.zip',
+              download: 'https://example.com/template.zip',
              sizeBytes: 1,
              sha256: 'a'.repeat(64),
-              preview: 'https://raw.githubusercontent.com/Wxw-Gu/TraceMemo/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/previews/community.github.example.market.png',
-              status: 'published'
+              status: 'published' as const
            }
          ]
        }
@@ -943,12 +955,18 @@ describe('daily report controls', () => {
    })

    render(<ReportTemplateSelector value="v1" onChange={onChange} />)
-    const marketItem = (await screen.findByText('市场测试模板')).closest('.report-template-item')
-    expect(marketItem).not.toBeNull()
-    await user.click(within(marketItem!).getByRole('button', { name: '查看版式' }))
-    const dialog = screen.getByRole('dialog', { name: '市场测试模板' })
-    expect(within(dialog).getByRole('button', { name: '请先安装' })).toBeDisabled()
-    expect(within(dialog).queryByRole('button', { name: '选择此模板' })).not.toBeInTheDocument()
-    expect(onChange).not.toHaveBeenCalled()
+
+    // 已安装的市场模板仍可在生成页选用，但不再提供卸载入口。
+    expect(await screen.findByText('极简速读')).toBeVisible()
+    expect(screen.getByText('已安装市场模板')).toBeVisible()
+    expect(screen.queryByRole('button', { name: '卸载' })).not.toBeInTheDocument()
+    // 未安装的远端模板只出现在社区模板市场页。
+    expect(screen.queryByText('市场测试模板')).not.toBeInTheDocument()
+    expect(screen.queryByText('安装')).not.toBeInTheDocument()
+
+    await user.click(screen.getByRole('radio', { name: /极简速读/ }))
+    expect(onChange).toHaveBeenCalledWith(
+      'external:community.github.tracememo.quickread@1.0.0'
+    )
  })
 })
@@ -0,0 +1,204 @@
+import { render, screen, waitFor, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ReportTemplateMarketWorkspace } from '../../src/renderer/src/components/reports/ReportTemplateMarketWorkspace'
+
+const installed = {
+  id: 'community.github.tracememo.quickread',
+  version: '1.0.0',
+  interfaceVersion: '1',
+  source: 'installed' as const,
+  name: '极简速读',
+  author: 'fixture',
+  entryPath: '/tmp/entry.html',
+  capture: { width: 414, maxWidth: 414, maxHeight: 2000 },
+  license: { spdx: 'MIT' }
+}
+
+const availableEntry = {
+  id: 'community.github.tracememo.paperdaily',
+  version: '1.0.2',
+  interfaceVersion: '1',
+  name: '霓光指挥日报',
+  description: '霓光主题的桌面指挥日报。',
+  author: 'fixture',
+  platform: 'desktop' as const,
+  tags: [],
+  license: 'MIT',
+  minAppVersion: null,
+  download: 'https://example.com/template.zip',
+  sizeBytes: 1,
+  sha256: 'a'.repeat(64),
+  preview: 'https://example.com/preview.png',
+  status: 'published' as const
+}
+
+const listReportTemplates = vi.fn()
+const listReportTemplateCatalog = vi.fn()
+const installReportTemplateFromCatalog = vi.fn()
+const uninstallReportTemplate = vi.fn()
+
+describe('ReportTemplateMarketWorkspace', () => {
+  beforeEach(() => {
+    listReportTemplates.mockReset().mockResolvedValue([installed])
+    listReportTemplateCatalog.mockReset().mockResolvedValue({
+      success: true,
+      catalog: { schemaVersion: '1', status: 'published', templates: [availableEntry] }
+    })
+    installReportTemplateFromCatalog.mockReset().mockResolvedValue({ success: true })
+    uninstallReportTemplate.mockReset().mockResolvedValue({ success: true })
+    Object.defineProperty(window, 'api', {
+      configurable: true,
+      value: {
+        listReportTemplates,
+        listReportTemplateCatalog,
+        installReportTemplateFromCatalog,
+        uninstallReportTemplate
+      }
+    })
+  })
+
+  it('lists builtin, installed and installable market templates with all market actions', async () => {
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={vi.fn()} />)
+
+    expect(await screen.findByText('极简速读')).toBeVisible()
+    expect(screen.getByText('霓光指挥日报')).toBeVisible()
+    expect(screen.getByText('经典日报')).toBeVisible()
+    expect(screen.getByText('已安装市场模板')).toBeVisible()
+    expect(screen.getByText('已安装 1 个市场模板，另有 1 个可以安装。')).toBeVisible()
+    expect(screen.getByRole('button', { name: '安装' })).toBeEnabled()
+    expect(screen.getByRole('button', { name: '卸载' })).toBeEnabled()
+    expect(screen.queryByRole('button', { name: '当前使用' })).not.toBeInTheDocument()
+  })
+
+  it('links to the community template repository for submitting new templates', async () => {
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={vi.fn()} />)
+
+    const link = await screen.findByRole('link', { name: '前往提交模板' })
+    expect(link).toHaveAttribute('href', 'https://github.com/Wxw-Gu/TraceMemo-Templates')
+    expect(link).toHaveAttribute('target', '_blank')
+    expect(
+      screen.getByText(
+        '如果想提供给其他人模板样式，可以来 TraceMemo-Templates 项目里提交 PR，方便给其他用户使用。'
+      )
+    ).toBeVisible()
+  })
+
+  it('uninstalls a market template and refreshes the list', async () => {
+    const user = userEvent.setup()
+    uninstallReportTemplate.mockImplementation(async () => {
+      listReportTemplates.mockResolvedValue([])
+      return { success: true }
+    })
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={vi.fn()} />)
+
+    await user.click(await screen.findByRole('button', { name: '卸载' }))
+
+    await waitFor(() =>
+      expect(uninstallReportTemplate).toHaveBeenCalledWith(installed.id, installed.version)
+    )
+    expect(await screen.findByText('已安装 0 个市场模板，另有 1 个可以安装。')).toBeVisible()
+  })
+
+  it('falls back to the default template when the active market template is uninstalled', async () => {
+    const user = userEvent.setup()
+    const onChange = vi.fn()
+    uninstallReportTemplate.mockResolvedValue({ success: true })
+    render(
+      <ReportTemplateMarketWorkspace
+        value={`external:${installed.id}@${installed.version}`}
+        onChange={onChange}
+      />
+    )
+
+    await user.click(await screen.findByRole('button', { name: '卸载' }))
+
+    expect(onChange).toHaveBeenCalledWith('v1')
+  })
+
+  it('reports an uninstall failure without dropping the installed template', async () => {
+    const user = userEvent.setup()
+    uninstallReportTemplate.mockResolvedValue({ success: false, error: '模板正在使用中' })
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={vi.fn()} />)
+
+    await user.click(await screen.findByRole('button', { name: '卸载' }))
+
+    expect(await screen.findByText('模板市场：模板正在使用中')).toBeVisible()
+    expect(screen.getByText('极简速读')).toBeVisible()
+  })
+
+  it('installs a market template and refreshes the list', async () => {
+    const user = userEvent.setup()
+    installReportTemplateFromCatalog.mockImplementation(async () => {
+      listReportTemplates.mockResolvedValue([installed, { ...availableEntry, source: 'installed' }])
+      listReportTemplateCatalog.mockResolvedValue({
+        success: true,
+        catalog: { schemaVersion: '1', status: 'published', templates: [availableEntry] }
+      })
+      return { success: true }
+    })
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={vi.fn()} />)
+
+    await user.click(await screen.findByRole('button', { name: '安装' }))
+
+    await waitFor(() =>
+      expect(installReportTemplateFromCatalog).toHaveBeenCalledWith(
+        availableEntry.id,
+        availableEntry.version
+      )
+    )
+    expect(await screen.findByText('已安装 2 个市场模板，另有 0 个可以安装。')).toBeVisible()
+  })
+
+  it('reports an install failure without losing the catalog', async () => {
+    const user = userEvent.setup()
+    installReportTemplateFromCatalog.mockResolvedValue({ success: false, error: '下载校验失败' })
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={vi.fn()} />)
+
+    await user.click(await screen.findByRole('button', { name: '安装' }))
+
+    expect(await screen.findByText('模板市场：下载校验失败')).toBeVisible()
+    expect(screen.getByText('霓光指挥日报')).toBeVisible()
+  })
+
+  it('previews a market template and can switch to it once installed', async () => {
+    const user = userEvent.setup()
+    const onChange = vi.fn()
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={onChange} />)
+
+    const installedRow = (await screen.findByText('极简速读')).closest('.report-template-item')!
+    await user.click(within(installedRow as HTMLElement).getByRole('button', { name: '查看版式' }))
+    const dialog = await screen.findByRole('dialog', { name: '极简速读' })
+    await user.click(within(dialog).getByRole('button', { name: '选择此模板' }))
+
+    expect(onChange).toHaveBeenCalledWith(`external:${installed.id}@${installed.version}`)
+  })
+
+  it('does not let an uninstalled market template be selected from the preview', async () => {
+    const user = userEvent.setup()
+    const onChange = vi.fn()
+    render(<ReportTemplateMarketWorkspace value="v1" onChange={onChange} />)
+
+    const availableRow = (await screen.findByText('霓光指挥日报')).closest('.report-template-item')!
+    await user.click(within(availableRow as HTMLElement).getByRole('button', { name: '查看版式' }))
+    const dialog = await screen.findByRole('dialog', { name: '霓光指挥日报' })
+
+    expect(within(dialog).getByRole('button', { name: '请先安装' })).toBeDisabled()
+    expect(within(dialog).queryByRole('button', { name: '使用此模板' })).not.toBeInTheDocument()
+    expect(onChange).not.toHaveBeenCalled()
+  })
+
+  it('marks the active market template and hides the switch action', async () => {
+    render(
+      <ReportTemplateMarketWorkspace
+        value={`external:${installed.id}@${installed.version}`}
+        onChange={vi.fn()}
+      />
+    )
+
+    const installedRow = (await screen.findByText('极简速读')).closest('.report-template-item')!
+    expect(within(installedRow as HTMLElement).getByRole('button', { name: '当前使用' })).toBeDisabled()
+    expect(within(installedRow as HTMLElement).queryByRole('button', { name: '使用' })).toBeNull()
+    expect(within(installedRow as HTMLElement).getByRole('button', { name: '卸载' })).toBeEnabled()
+  })
+})