+
@@ -129,7 +145,22 @@ const baseImageRow = {
}
describe('admin UsageTable tooltip', () => {
+ it('shows output TPS in the latency cell using total duration', () => {
+ const row = { ...baseImageRow, image_count: 0, billing_mode: 'token', output_tokens: 1000, duration_ms: 20_000, first_token_ms: 10_000 }
+ const wrapper = mount(UsageTable, {
+ props: {
+ data: [row, { ...row, request_id: 'no-duration', duration_ms: null }, { ...row, request_id: 'image', image_count: 1 }],
+ loading: false,
+ columns: [{ key: 'latency', label: 'Latency' }],
+ },
+ global: { stubs: { DataTable: DataTableStub, EmptyState: true, Icon: true, Teleport: true } },
+ })
+ expect(wrapper.findAll('[data-testid="output-tps"]').map(cell => cell.text())).toEqual(['50.0 tok/s', '—', '—'])
+ expect(wrapper.text()).toContain('Output TPS')
+ })
+
beforeEach(() => {
+ locale = 'en'
vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockReturnValue({
x: 0,
y: 0,
@@ -143,7 +174,11 @@ describe('admin UsageTable tooltip', () => {
} as DOMRect)
})
- it('marks only usage rows that actually applied long-context billing', () => {
+ it.each([
+ ['en', 'Long context', 'Long-context pricing was applied. Input and output rates depend on the pricing tier, not a uniform multiplier.'],
+ ['zh', '长上下文', '已应用长上下文计费。输入和输出费率取决于定价档位，并非统一倍率。'],
+ ] as const)('marks only applied long-context billing with localized text in %s', (language, label, tooltip) => {
+ locale = language
const wrapper = mount(UsageTable, {
props: {
data: [
@@ -157,6 +192,10 @@ describe('admin UsageTable tooltip', () => {
request_id: 'req-long-context-disabled',
long_context_billing_applied: false,
},
+ {
+ ...baseImageRow,
+ request_id: 'req-long-context-absent',
+ },
],
loading: false,
columns: [],
@@ -172,7 +211,12 @@ describe('admin UsageTable tooltip', () => {
})
expect(wrapper.findAll('[data-testid="long-context-billing-marker"]')).toHaveLength(1)
- expect(wrapper.get('[data-testid="long-context-billing-marker"]').text()).toBe('x2')
+ const marker = wrapper.get('[data-request-id="req-long-context-enabled"] [data-testid="long-context-billing-marker"]')
+ expect(marker.text()).toBe(label)
+ expect(marker.attributes('title')).toBe(tooltip)
+ expect(wrapper.find('[data-request-id="req-long-context-disabled"] [data-testid="long-context-billing-marker"]').exists()).toBe(false)
+ expect(wrapper.find('[data-request-id="req-long-context-absent"] [data-testid="long-context-billing-marker"]').exists()).toBe(false)
+ expect(wrapper.text()).not.toContain('x2')
})
it('keeps the request type badge and adds a separate badge only for native compaction rows', () => {
@@ -225,6 +269,22 @@ describe('admin UsageTable tooltip', () => {
expect(wrapper.get('[data-testid="native-compaction-badge"]').text()).toBe('Compaction')
})
+ it.each([
+ [0, '0.0x'],
+ [0.5, '0.50x'],
+ [undefined, '1.00x'],
+ ])('shows the stored user rate %s in cost details', async (rate, expected) => {
+ const wrapper = mount(UsageTable, {
+ props: { data: [{ ...baseImageRow, rate_multiplier: rate }], loading: false, columns: [] },
+ global: { stubs: { DataTable: DataTableStub, EmptyState: true, Icon: true, Teleport: true } },
+ })
+ const triggers = wrapper.findAll('.group.relative')
+ await triggers[triggers.length - 1].trigger('mouseenter')
+ const rateLabel = wrapper.get('.fixed').findAll('span').find(span => span.text() === 'Rate')!
+ expect(rateLabel.element.parentElement?.textContent).toContain(expected)
+ wrapper.unmount()
+ })
+
it('shows service tier and billing breakdown in cost tooltip', async () => {
const row = {
request_id: 'req-admin-1',
diff --git a/frontend/src/components/admin/user/BulkEditUserModal.vue b/frontend/src/components/admin/user/BulkEditUserModal.vue
index d511dff2f605..d38399a9c0c0 100644
--- a/frontend/src/components/admin/user/BulkEditUserModal.vue
+++ b/frontend/src/components/admin/user/BulkEditUserModal.vue
@@ -93,6 +93,7 @@
import { computed, ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { adminAPI } from '@/api/admin'
+import { extractApiErrorMessage } from '@/utils/apiError'
import type { BatchUpdateUserLimitsRequest } from '@/api/admin/users'
import { useAppStore } from '@/stores/app'
import BaseDialog from '@/components/common/BaseDialog.vue'
@@ -203,9 +204,7 @@ const handleSubmit = async () => {
emit('close')
} catch (error: any) {
appStore.showError(
- error.response?.data?.message
- || error.response?.data?.detail
- || t('admin.users.bulkLimits.failed')
+ extractApiErrorMessage(error, t('admin.users.bulkLimits.failed'))
)
} finally {
submitting.value = false
diff --git a/frontend/src/components/admin/user/UserPlatformQuotaModal.vue b/frontend/src/components/admin/user/UserPlatformQuotaModal.vue
index 73989b2db060..d1b4fda808d6 100644
--- a/frontend/src/components/admin/user/UserPlatformQuotaModal.vue
+++ b/frontend/src/components/admin/user/UserPlatformQuotaModal.vue
@@ -119,7 +119,7 @@ import { ref, reactive, watch, computed } from 'vue'
import { useI18n } from 'vue-i18n'
import { useAppStore } from '@/stores/app'
import { adminAPI } from '@/api/admin'
-import { PLATFORM_QUOTA_PLATFORMS } from '@/api/admin/users'
+import { platformQuotaPlatforms } from '@/api/admin/users'
import type { AdminUser, PlatformQuotaItem, PlatformQuotaPlatform, PlatformQuotaWindow } from '@/types'
import BaseDialog from '@/components/common/BaseDialog.vue'
@@ -175,7 +175,7 @@ function emptyRow(p: PlatformQuotaPlatform): QuotaRow {
function normalize(items: PlatformQuotaItem[]): QuotaRow[] {
const byPlatform = new Map
()
for (const it of items) byPlatform.set(it.platform, it)
- return PLATFORM_QUOTA_PLATFORMS.map((p) => {
+ return platformQuotaPlatforms().map((p) => {
const it = byPlatform.get(p)
if (!it) return emptyRow(p)
return {
@@ -204,7 +204,7 @@ async function load() {
savedConfigured.value = configuredPlatforms(data.platform_quotas || [])
} catch {
appStore.showError(t('admin.users.platformQuota.loadFailed'))
- quotas.value = PLATFORM_QUOTA_PLATFORMS.map(emptyRow)
+ quotas.value = platformQuotaPlatforms().map(emptyRow)
savedConfigured.value = new Set()
} finally {
loading.value = false
diff --git a/frontend/src/components/admin/user/__tests__/BulkEditUserModal.spec.ts b/frontend/src/components/admin/user/__tests__/BulkEditUserModal.spec.ts
index 1b0277e16dda..6f6bf9c573f4 100644
--- a/frontend/src/components/admin/user/__tests__/BulkEditUserModal.spec.ts
+++ b/frontend/src/components/admin/user/__tests__/BulkEditUserModal.spec.ts
@@ -59,6 +59,27 @@ describe('BulkEditUserModal', () => {
vi.restoreAllMocks()
})
+ it.each([
+ [{ message: 'Selected users are no longer available' }, 'Selected users are no longer available'],
+ [{ response: { data: { message: 'Legacy message' } } }, 'Legacy message'],
+ [{ response: { data: { detail: 'Legacy detail' } } }, 'Legacy detail'],
+ [{}, 'admin.users.bulkLimits.failed'],
+ ])('shows API error details and allows retry after failure', async (error, expected) => {
+ vi.spyOn(window, 'confirm').mockReturnValue(true)
+ batchUpdateLimits.mockRejectedValueOnce(error)
+ const wrapper = mountModal()
+ await wrapper.get('[data-test="enable-concurrency"]').trigger('click')
+ await wrapper.get('[data-test="concurrency-input"]').setValue('5')
+ await wrapper.get('form').trigger('submit')
+ await flushPromises()
+
+ expect(showError).toHaveBeenCalledWith(expected)
+ expect(wrapper.emitted('close')).toBeUndefined()
+ expect(wrapper.emitted('success')).toBeUndefined()
+ expect(wrapper.get('[data-test="submit"]').attributes('disabled')).toBeUndefined()
+ wrapper.unmount()
+ })
+
it('disables submission until at least one enabled field has a value', async () => {
const wrapper = mountModal()
diff --git a/frontend/src/components/admin/user/__tests__/UserPlatformQuotaModal.spec.ts b/frontend/src/components/admin/user/__tests__/UserPlatformQuotaModal.spec.ts
index 79d49e295dcc..e64048f0134d 100644
--- a/frontend/src/components/admin/user/__tests__/UserPlatformQuotaModal.spec.ts
+++ b/frontend/src/components/admin/user/__tests__/UserPlatformQuotaModal.spec.ts
@@ -101,28 +101,26 @@ describe('UserPlatformQuotaModal', () => {
expect(apiMocks.getPlatformQuotas).toHaveBeenCalledWith(99)
})
- it('空数据渲染全部 concrete platform 行', async () => {
+ it('renders all thirteen supported platforms with empty limits', async () => {
const w = await mountAndOpen()
- const html = w.html()
- expect(html).toContain('anthropic')
- expect(html).toContain('openai')
- expect(html).toContain('gemini')
- expect(html).toContain('antigravity')
- expect(html).toContain('grok')
- expect(html).toContain('kimi')
- expect(html).toContain('zhipu')
- expect(html).toContain('deepseek')
- expect(html).toContain('minimax')
- expect(html).toContain('opencode_go')
- expect(html).toContain('typesafe')
- expect(w.findAll('tbody tr')).toHaveLength(11)
+ const rows = w.findAll('tbody tr')
+ expect(rows.map(row => row.find('td').text())).toEqual([
+ 'anthropic', 'openai', 'gemini', 'antigravity', 'grok',
+ 'kimi', 'zhipu', 'deepseek', 'minimax', 'opencode_go', 'typesafe', 'command_code', 'cline',
+ ])
+ for (const row of rows) {
+ const inputs = row.findAll('input[type=number]')
+ expect(inputs).toHaveLength(3)
+ expect(inputs.map(input => input.element.value)).toEqual(['', '', ''])
+ }
+ w.unmount()
})
- it.each(['kimi', 'zhipu', 'deepseek', 'minimax', 'opencode_go', 'typesafe'] as const)(
+ it.each(['kimi', 'zhipu', 'deepseek', 'minimax', 'opencode_go', 'typesafe', 'command_code', 'cline'] as const)(
'saves edits to %s without erasing existing platform limits', async (platform) => {
const existing: PlatformQuotaUpdateItem[] = [
{ platform: 'openai', daily_limit_usd: 10, weekly_limit_usd: 20, monthly_limit_usd: 100 },
- ...(['kimi', 'zhipu', 'deepseek', 'minimax', 'opencode_go', 'typesafe'] as const).map(p => ({
+ ...(['kimi', 'zhipu', 'deepseek', 'minimax', 'opencode_go', 'typesafe', 'command_code', 'cline'] as const).map(p => ({
platform: p, daily_limit_usd: 0, weekly_limit_usd: null, monthly_limit_usd: 50,
})),
]
@@ -139,7 +137,7 @@ describe('UserPlatformQuotaModal', () => {
: item)
expect(apiMocks.updatePlatformQuotas).toHaveBeenCalledTimes(1)
expect(apiMocks.updatePlatformQuotas).toHaveBeenCalledWith(99, expect.arrayContaining(expected))
- expect(apiMocks.updatePlatformQuotas.mock.calls[0][1]).toHaveLength(11) // every concrete platform
+ expect(apiMocks.updatePlatformQuotas.mock.calls[0][1]).toHaveLength(13)
expect(w.emitted('success')).toHaveLength(1)
w.unmount()
},
@@ -154,13 +152,13 @@ describe('UserPlatformQuotaModal', () => {
})
const w = await mountAndOpen()
const inputs = w.findAll('input[type=number]')
- // 11 platforms × 3 windows = 33 inputs
- expect(inputs.length).toBe(33)
+ // 13 platforms × 3 windows = 39 inputs
+ expect(inputs.length).toBe(39)
// 第一个 input 是 anthropic.daily = 10
expect((inputs[0].element as HTMLInputElement).value).toBe('10')
})
- it('保存提交完整 platform payload 并保留 MiniMax 配额', async () => {
+ it('保存提交完整 13 platform payload', async () => {
apiMocks.getPlatformQuotas.mockResolvedValueOnce({
platform_quotas: [
{ platform: 'openai', daily_limit_usd: null, weekly_limit_usd: 20, monthly_limit_usd: null,
@@ -182,10 +180,7 @@ describe('UserPlatformQuotaModal', () => {
expect(apiMocks.updatePlatformQuotas).toHaveBeenCalledTimes(1)
const [uid, payload] = apiMocks.updatePlatformQuotas.mock.calls[0]
expect(uid).toBe(99)
- expect(payload).toHaveLength(11)
- expect(payload.map((p: any) => p.platform)).toEqual([
- 'anthropic', 'openai', 'gemini', 'antigravity', 'grok', 'kimi', 'zhipu', 'deepseek', 'minimax', 'opencode_go', 'typesafe',
- ])
+ expect(payload).toHaveLength(13) // 13 platforms always submitted
const openai = payload.find((p: any) => p.platform === 'openai')
expect(openai.weekly_limit_usd).toBe(20)
expect(payload.find((p: any) => p.platform === 'minimax')).toEqual({
@@ -253,7 +248,7 @@ describe('UserPlatformQuotaModal', () => {
it('未配置限额的平台重置按钮禁用并提示不可用', async () => {
const w = await mountAndOpen()
const resetBtns = w.findAll('button').filter((b) => b.text() === '↻')
- expect(resetBtns.length).toBe(33) // 11 平台 × 3 窗口
+ expect(resetBtns.length).toBe(39) // 13 平台 × 3 窗口
for (const b of resetBtns) {
expect((b.element as HTMLButtonElement).disabled).toBe(true)
expect(b.attributes('title')).toBe('admin.users.platformQuota.reset.unavailable')
diff --git a/frontend/src/components/auth/PendingOAuthCreateAccountForm.vue b/frontend/src/components/auth/PendingOAuthCreateAccountForm.vue
index 5a8ed84febc2..8c97d38b875f 100644
--- a/frontend/src/components/auth/PendingOAuthCreateAccountForm.vue
+++ b/frontend/src/components/auth/PendingOAuthCreateAccountForm.vue
@@ -168,6 +168,7 @@ const captchaEnabled = computed(
)
let countdownTimer: ReturnType | null = null
+let disposed = false
watch(
() => props.initialEmail,
@@ -288,6 +289,7 @@ async function handleSendCode() {
tencent_captcha_ticket: tencentCaptchaEnabled.value ? turnstileToken.value : undefined,
tencent_captcha_randstr: tencentCaptchaEnabled.value ? tencentCaptchaRandstr.value : undefined
})
+ if (disposed) return
sendCodeSuccess.value = true
startCountdown(response.countdown)
} catch (error: unknown) {
@@ -373,6 +375,7 @@ onMounted(async () => {
})
onUnmounted(() => {
+ disposed = true
clearCountdown()
})
diff --git a/frontend/src/components/auth/__tests__/PendingOAuthCreateAccountForm.spec.ts b/frontend/src/components/auth/__tests__/PendingOAuthCreateAccountForm.spec.ts
index a1a5841ea5b4..b006a4a3fd89 100644
--- a/frontend/src/components/auth/__tests__/PendingOAuthCreateAccountForm.spec.ts
+++ b/frontend/src/components/auth/__tests__/PendingOAuthCreateAccountForm.spec.ts
@@ -51,6 +51,30 @@ describe('PendingOAuthCreateAccountForm', () => {
})
})
+ it('does not restart the code cooldown after switching away during a send', async () => {
+ vi.useFakeTimers()
+ let finish!: (value: { countdown: number }) => void
+ sendPendingOAuthVerifyCode.mockImplementation(() => new Promise(resolve => { finish = resolve }))
+ const wrapper = mount(PendingOAuthCreateAccountForm, {
+ props: { testIdPrefix: 'oidc', initialEmail: 'user@example.com', isSubmitting: false },
+ global: { stubs: { TurnstileWidget: true } },
+ })
+ try {
+ await flushPromises()
+ await wrapper.get('[data-testid="oidc-create-account-send-code"]').trigger('click')
+ await flushPromises()
+ expect(sendPendingOAuthVerifyCode).toHaveBeenCalledTimes(1)
+ wrapper.unmount()
+ finish({ countdown: 60 })
+ await flushPromises()
+ expect(vi.getTimerCount()).toBe(0)
+ } finally {
+ wrapper.unmount()
+ vi.clearAllTimers()
+ vi.useRealTimers()
+ }
+ })
+
it('acquires separate proofs for pending OAuth send-code and create-account', async () => {
getPublicSettings.mockResolvedValue({
email_verify_enabled: true,
diff --git a/frontend/src/components/common/AnnouncementBell.vue b/frontend/src/components/common/AnnouncementBell.vue
index f271e9c64e2b..04127f0f6d57 100644
--- a/frontend/src/components/common/AnnouncementBell.vue
+++ b/frontend/src/components/common/AnnouncementBell.vue
@@ -376,14 +376,17 @@ function closeDetail() {
async function markAsRead(id: number) {
try {
- await announcementStore.markAsRead(id)
+ const marked = await announcementStore.markAsRead(id)
+ if (!marked) appStore.showError(t('common.unknownError'))
+ return marked
} catch (err: any) {
appStore.showError(err?.message || t('common.unknownError'))
+ return false
}
}
async function markAsReadAndClose(id: number) {
- await markAsRead(id)
+ if (!await markAsRead(id)) return
appStore.showSuccess(t('announcements.markedAsRead'))
closeDetail()
}
diff --git a/frontend/src/components/common/PlatformIcon.vue b/frontend/src/components/common/PlatformIcon.vue
index df1ec46db322..a60d2aea5388 100644
--- a/frontend/src/components/common/PlatformIcon.vue
+++ b/frontend/src/components/common/PlatformIcon.vue
@@ -54,6 +54,23 @@
d="M23.748 4.651c-.254-.124-.364.113-.512.233-.051.04-.094.09-.137.137-.372.397-.806.657-1.373.626-.829-.046-1.537.214-2.163.848-.133-.782-.575-1.248-1.247-1.548-.352-.155-.708-.311-.955-.65-.172-.24-.219-.509-.305-.774-.055-.16-.11-.323-.293-.35-.2-.031-.278.136-.356.276-.313.572-.434 1.202-.422 1.84.027 1.436.633 2.58 1.838 3.393.137.094.172.187.129.323-.082.28-.18.553-.266.833-.055.179-.137.218-.328.14a5.5 5.5 0 0 1-1.737-1.179c-.857-.828-1.631-1.743-2.597-2.46a12 12 0 0 0-.689-.47c-.985-.957.13-1.743.387-1.836.27-.098.094-.433-.778-.428-.872.003-1.67.295-2.687.685a3 3 0 0 1-.465.136a9.6 9.6 0 0 0-2.883-.101c-1.885.21-3.39 1.1-4.497 2.622C.082 8.776-.231 10.854.152 13.02c.403 2.284 1.568 4.175 3.36 5.653 1.857 1.533 3.997 2.284 6.438 2.14 1.482-.085 3.132-.284 4.994-1.86.47.234.962.328 1.78.398.629.058 1.235-.031 1.705-.129.735-.155.684-.836.418-.961-2.155-1.004-1.682-.595-2.112-.926 1.095-1.295 2.768-3.598 3.284-6.733.05-.346.115-.834.108-1.114-.004-.171.035-.238.23-.257a4.2 4.2 0 0 0 1.545-.475c1.397-.763 1.96-2.016 2.093-3.517.02-.23-.004-.467-.247-.588M11.58 18.168c-2.088-1.642-3.101-2.183-3.52-2.16-.39.024-.32.472-.234.763.09.288.207.487.371.74.114.167.192.416-.113.603-.673.416-1.842-.14-1.897-.168-1.361-.801-2.5-1.86-3.301-3.306-.775-1.393-1.225-2.888-1.299-4.482-.02-.385.094-.522.477-.592a4.7 4.7 0 0 1 1.53-.038c2.131.311 3.946 1.264 5.467 2.774.868.86 1.525 1.887 2.202 2.89.72 1.066 1.494 2.082 2.48 2.915.348.291.626.513.892.677-.802.09-2.14.109-3.055-.615zm1.001-6.44a.306.306 0 0 1 .415-.287a.3.3 0 0 1 .113.074a.3.3 0 0 1 .086.214c0 .17-.136.307-.308.307a.303.303 0 0 1-.306-.307m3.11 1.596c-.2.081-.4.151-.591.16a1.25 1.25 0 0 1-.798-.254c-.274-.23-.47-.358-.551-.758a1.7 1.7 0 0 1 .015-.588c.07-.327-.007-.537-.238-.727-.188-.156-.426-.199-.689-.199a.6.6 0 0 1-.254-.078a.253.253 0 0 1-.114-.358a1 1 0 0 1 .192-.21c.356-.202.767-.136 1.146.016.352.144.618.408 1.001.782.392.451.462.576.685.915.176.264.336.536.446.848.066.194-.02.353-.25.45"
/>
+
+
+
+