feat(admin-v2): add ProTable search, scenarios/quick_commands form, tests, remove quota_reset_interval

- Enable ProTable search on Accounts (username/email), Models (model_id/alias), Providers (display_name/name) with hideInSearch for non-searchable columns - Add scenarios (Select tags) and quick_commands (Form.List) to AgentTemplates create form, plus service type updates - Remove unused quota_reset_interval from ProviderKey model, key_pool SQL, handlers, and frontend types; add migration + bump schema to v11 - Add Vitest config, test setup, request interceptor tests (7 cases), authStore tests (8 cases) — all 15 passing Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-31 11:13:16 +08:00
parent f79560a911
commit ee51d5abcd
20 changed files with 1528 additions and 31 deletions
--- a/admin-v2/src/pages/Accounts.tsx
+++ b/admin-v2/src/pages/Accounts.tsx
@@ -69,30 +69,34 @@ export default function Accounts() {

  const columns: ProColumns<AccountPublic>[] = [
    { title: '用户名', dataIndex: 'username', width: 120 },
-    { title: '显示名', dataIndex: 'display_name', width: 120 },
+    { title: '显示名', dataIndex: 'display_name', width: 120, hideInSearch: true },
    { title: '邮箱', dataIndex: 'email', width: 180 },
    {
      title: '角色',
      dataIndex: 'role',
      width: 120,
+      hideInSearch: true,
      render: (_, record) => <Tag color={roleColors[record.role]}>{roleLabels[record.role] || record.role}</Tag>,
    },
    {
      title: '状态',
      dataIndex: 'status',
      width: 100,
+      hideInSearch: true,
      render: (_, record) => <Tag color={statusColors[record.status]}>{statusLabels[record.status] || record.status}</Tag>,
    },
    {
      title: '2FA',
      dataIndex: 'totp_enabled',
      width: 80,
+      hideInSearch: true,
      render: (_, record) => record.totp_enabled ? <Tag color="green">已启用</Tag> : <Tag>未启用</Tag>,
    },
    {
      title: 'LLM 路由',
      dataIndex: 'llm_routing',
      width: 120,
+      hideInSearch: true,
      valueType: 'select',
      valueEnum: {
        relay: { text: 'SaaS 中转', status: 'Success' },
@@ -103,11 +107,13 @@ export default function Accounts() {
      title: '最后登录',
      dataIndex: 'last_login_at',
      width: 180,
+      hideInSearch: true,
      render: (_, record) => record.last_login_at ? new Date(record.last_login_at).toLocaleString('zh-CN') : '-',
    },
    {
      title: '操作',
      width: 200,
+      hideInSearch: true,
      render: (_, record) => (
        <Space>
          <Button size="small" onClick={() => { setEditingId(record.id); form.setFieldsValue(record); setModalOpen(true) }}>
@@ -141,7 +147,7 @@ export default function Accounts() {
        dataSource={data?.items ?? []}
        loading={isLoading}
        rowKey="id"
-        search={false}
+        search={{}}
        toolBarRender={() => []}
        pagination={{
          total: data?.total ?? 0,
--- a/admin-v2/src/pages/AgentTemplates.tsx
+++ b/admin-v2/src/pages/AgentTemplates.tsx
@@ -4,7 +4,7 @@

 import { useState } from 'react'
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
-import { Button, message, Tag, Modal, Form, Input, Select, InputNumber, Space, Popconfirm, Descriptions } from 'antd'
+import { Button, message, Tag, Modal, Form, Input, Select, InputNumber, Space, Popconfirm, Descriptions, MinusCircleOutlined } from 'antd'
 import { PlusOutlined } from '@ant-design/icons'
 import type { ProColumns } from '@ant-design/pro-components'
 import { ProTable } from '@ant-design/pro-components'
@@ -176,6 +176,30 @@ export default function AgentTemplates() {
          <Form.Item name="source_id" label="模板标识">
            <Input placeholder="如 medical-assistant-v1" />
          </Form.Item>
+          <Form.Item name="scenarios" label="使用场景">
+            <Select mode="tags" placeholder="输入场景标签后按回车" />
+          </Form.Item>
+          <Form.List name="quick_commands">
+            {(fields, { add, remove }) => (
+              <>
+                <div style={{ marginBottom: 8, fontWeight: 500 }}>快捷命令</div>
+                {fields.map(({ key, name, ...restField }) => (
+                  <Space key={key} style={{ display: 'flex', marginBottom: 8 }} align="baseline">
+                    <Form.Item {...restField} name={[name, 'label']} rules={[{ required: true, message: '请输入标签' }]}>
+                      <Input placeholder="标签" style={{ width: 140 }} />
+                    </Form.Item>
+                    <Form.Item {...restField} name={[name, 'command']} rules={[{ required: true, message: '请输入命令' }]}>
+                      <Input placeholder="命令/提示词" style={{ width: 280 }} />
+                    </Form.Item>
+                    <MinusCircleOutlined onClick={() => remove(name)} />
+                  </Space>
+                ))}
+                <Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
+                  添加快捷命令
+                </Button>
+              </>
+            )}
+          </Form.List>
        </Form>
      </Modal>

--- a/admin-v2/src/pages/Models.tsx
+++ b/admin-v2/src/pages/Models.tsx
@@ -66,34 +66,39 @@ export default function Models() {
      title: '服务商',
      dataIndex: 'provider_id',
      width: 140,
+      hideInSearch: true,
      render: (_, r) => {
        const provider = providersData?.items?.find((p) => p.id === r.provider_id)
        return provider?.display_name || r.provider_id.substring(0, 8)
      },
    },
-    { title: '上下文窗口', dataIndex: 'context_window', width: 110, render: (_, r) => r.context_window?.toLocaleString() },
-    { title: '最大输出', dataIndex: 'max_output_tokens', width: 100, render: (_, r) => r.max_output_tokens?.toLocaleString() },
+    { title: '上下文窗口', dataIndex: 'context_window', width: 110, hideInSearch: true, render: (_, r) => r.context_window?.toLocaleString() },
+    { title: '最大输出', dataIndex: 'max_output_tokens', width: 100, hideInSearch: true, render: (_, r) => r.max_output_tokens?.toLocaleString() },
    {
      title: '流式',
      dataIndex: 'supports_streaming',
      width: 70,
+      hideInSearch: true,
      render: (_, r) => r.supports_streaming ? <Tag color="green">是</Tag> : <Tag>否</Tag>,
    },
    {
      title: '视觉',
      dataIndex: 'supports_vision',
      width: 70,
+      hideInSearch: true,
      render: (_, r) => r.supports_vision ? <Tag color="blue">是</Tag> : <Tag>否</Tag>,
    },
    {
      title: '状态',
      dataIndex: 'enabled',
      width: 70,
+      hideInSearch: true,
      render: (_, r) => r.enabled ? <Tag color="green">启用</Tag> : <Tag>禁用</Tag>,
    },
    {
      title: '操作',
      width: 160,
+      hideInSearch: true,
      render: (_, record) => (
        <Space>
          <Button size="small" onClick={() => { setEditingId(record.id); form.setFieldsValue(record); setModalOpen(true) }}>
@@ -123,7 +128,7 @@ export default function Models() {
        dataSource={data?.items ?? []}
        loading={isLoading}
        rowKey="id"
-        search={false}
+        search={{}}
        toolBarRender={() => [
          <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => { setEditingId(null); form.resetFields(); setModalOpen(true) }}>
            新建模型
--- a/admin-v2/src/pages/Providers.tsx
+++ b/admin-v2/src/pages/Providers.tsx
@@ -100,17 +100,19 @@ export default function Providers() {
  const columns: ProColumns<Provider>[] = [
    { title: '名称', dataIndex: 'display_name', width: 140 },
    { title: '标识', dataIndex: 'name', width: 120, render: (_, r) => <Text code>{r.name}</Text> },
-    { title: '协议', dataIndex: 'api_protocol', width: 100 },
-    { title: 'RPM 限制', dataIndex: 'rate_limit_rpm', width: 100, render: (_, r) => r.rate_limit_rpm ?? '-' },
+    { title: '协议', dataIndex: 'api_protocol', width: 100, hideInSearch: true },
+    { title: 'RPM 限制', dataIndex: 'rate_limit_rpm', width: 100, hideInSearch: true, render: (_, r) => r.rate_limit_rpm ?? '-' },
    {
      title: '状态',
      dataIndex: 'enabled',
      width: 80,
+      hideInSearch: true,
      render: (_, r) => r.enabled ? <Tag color="green">启用</Tag> : <Tag>禁用</Tag>,
    },
    {
      title: '操作',
      width: 260,
+      hideInSearch: true,
      render: (_, record) => (
        <Space>
          <Button size="small" onClick={() => { setEditingId(record.id); form.setFieldsValue(record); setModalOpen(true) }}>
@@ -185,7 +187,7 @@ export default function Providers() {
        dataSource={data?.items ?? []}
        loading={isLoading}
        rowKey="id"
-        search={false}
+        search={{}}
        toolBarRender={() => [
          <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => { setEditingId(null); form.resetFields(); setModalOpen(true) }}>
            新建服务商
--- a/admin-v2/src/router/AuthGuard.tsx
+++ b/admin-v2/src/router/AuthGuard.tsx
@@ -1,14 +1,61 @@
 // ============================================================
-// 路由守卫 — 未登录重定向到 /login
+// ZCLAW Admin V2 — Auth Guard with session restore
 // ============================================================
+//
+// Auth strategy:
+//   1. If Zustand has token (normal flow after login) → authenticated
+//   2. If no token but account in localStorage → call GET /auth/me
+//      to validate HttpOnly cookie and restore session
+//   3. If cookie invalid → clean up and redirect to /login

+import { useEffect, useRef, useState } from 'react'
 import { Navigate, useLocation } from 'react-router-dom'
+import { Spin } from 'antd'
 import { useAuthStore } from '@/stores/authStore'
+import { authService } from '@/services/auth'

 export function AuthGuard({ children }: { children: React.ReactNode }) {
  const token = useAuthStore((s) => s.token)
+  const account = useAuthStore((s) => s.account)
+  const login = useAuthStore((s) => s.login)
+  const logout = useAuthStore((s) => s.logout)
  const location = useLocation()

+  // Track restore attempt to avoid double-calling
+  const restoreAttempted = useRef(false)
+  const [restoring, setRestoring] = useState(false)
+
+  useEffect(() => {
+    if (restoreAttempted.current) return
+    restoreAttempted.current = true
+
+    // If no in-memory token but account exists in localStorage,
+    // try to validate the HttpOnly cookie via /auth/me
+    if (!token && account) {
+      setRestoring(true)
+      authService.me()
+        .then((meAccount) => {
+          // Cookie is valid — restore session
+          // Use sentinel token since real auth is via HttpOnly cookie
+          login('cookie-session', '', meAccount)
+          setRestoring(false)
+        })
+        .catch(() => {
+          // Cookie expired or invalid — clean up stale data
+          logout()
+          setRestoring(false)
+        })
+    }
+  }, []) // eslint-disable-line react-hooks/exhaustive-deps
+
+  if (restoring) {
+    return (
+      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}>
+        <Spin size="large" />
+      </div>
+    )
+  }
+
  if (!token) {
    return <Navigate to="/login" state={{ from: location }} replace />
  }
--- a/admin-v2/src/services/agent-templates.ts
+++ b/admin-v2/src/services/agent-templates.ts
@@ -18,6 +18,8 @@ export const agentTemplateService = {
    visibility?: string; emoji?: string; personality?: string
    soul_content?: string; welcome_message?: string
    communication_style?: string; source_id?: string
+    scenarios?: string[]
+    quick_commands?: Array<{ label: string; command: string }>
  }, signal?: AbortSignal) =>
    request.post<AgentTemplate>('/agent-templates', data, withSignal({}, signal)).then((r) => r.data),

--- a/admin-v2/src/types/index.ts
+++ b/admin-v2/src/types/index.ts
@@ -257,7 +257,6 @@ export interface ProviderKey {
  priority: number
  max_rpm?: number
  max_tpm?: number
-  quota_reset_interval?: string
  is_active: boolean
  last_429_at?: string
  cooldown_until?: string