From 33afdb9f11dd2d4885bcf954a847f64fa196df62 Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 17 Nov 2026 15:34:31 +0800 Subject: [PATCH] =?UTF-8?q?test(web):=20=E4=BF=9D=E5=AD=98=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=E5=9B=9E=E5=BD=92=EF=BC=88F03=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E5=88=86=E5=8C=BA=E6=8F=90=E4=BA=A4=E8=BD=BD=E8=8D=B7=E4=BA=92?= =?UTF-8?q?=E4=B8=8D=E5=A4=B9=E5=B8=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/SystemSettings.test.tsx | 48 ++++++++++++++++++++++- web/src/SystemSettings.tsx | 69 ++++++++++++++++++++++----------- 2 files changed, 94 insertions(+), 23 deletions(-) diff --git a/web/src/SystemSettings.test.tsx b/web/src/SystemSettings.test.tsx index c8384af..e0d4922 100644 --- a/web/src/SystemSettings.test.tsx +++ b/web/src/SystemSettings.test.tsx @@ -1,6 +1,12 @@ import { renderToStaticMarkup } from 'react-dom/server' import { describe, expect, it, vi } from 'vitest' -import { SystemSettingsView, ppSourceConnections, visibleSaveMessage } from './SystemSettings' +import { + SystemSettingsView, + ppSourceConnections, + refreshSettingsInput, + serviceSettingsInput, + visibleSaveMessage, +} from './SystemSettings' import { AuthContext } from './auth' import type { MonitorOverview } from './monitor' import type { CatalogSource } from './sourceCatalog' @@ -641,3 +647,43 @@ describe('ppSourceConnections(数据源配置的清单规则)', () => { expect(ppSourceConnections([])).toEqual([]) }) }) + +// F03 回归:分区保存不能夹带另一分区未保存的草稿。 +describe('保存边界(F03)', () => { + const server = { + document_refresh_seconds: 15, + resource_refresh_seconds: 30, + stalled_after_seconds: 1800, + finalizing_after_seconds: 7200, + ingestion_concurrency: 2, + test_weknora_base_url: 'https://server.test', + production_weknora_base_url: 'https://server.prod', + production_tenant_id: '10000', + production_knowledge_base_id: 'kb-server', + } as unknown as UISettings + + it('保存刷新策略时忽略服务分区里未保存的地址', () => { + const input = refreshSettingsInput(server, { + documentRefresh: 60, + resourceRefresh: 60, + stalled: 3600, + finalizing: 14400, + concurrency: 4, + }) + expect(input.test_weknora_base_url).toBe('https://server.test') + expect(input.production_weknora_base_url).toBe('https://server.prod') + expect(input.document_refresh_seconds).toBe(60) + }) + + it('保存服务配置时忽略刷新分区里未保存的参数', () => { + const input = serviceSettingsInput(server, { + testEndpoint: 'https://draft.test', + endpoint: 'https://draft.prod', + productionTenantID: '20000', + productionKnowledgeBaseID: 'kb-draft', + }) + expect(input.document_refresh_seconds).toBe(15) + expect(input.ingestion_concurrency).toBe(2) + expect(input.test_weknora_base_url).toBe('https://draft.test') + }) +}) diff --git a/web/src/SystemSettings.tsx b/web/src/SystemSettings.tsx index 12194ad..8aadd5f 100644 --- a/web/src/SystemSettings.tsx +++ b/web/src/SystemSettings.tsx @@ -75,6 +75,44 @@ const secondsLabel = (value: number) => value < 60 ? `${value}秒` : value < 3600 ? `${value / 60}分钟` : `${value / 3600}小时` export const visibleSaveMessage = (message: string | null, dirty: boolean) => (dirty ? null : message) +// 保存边界是纯函数:服务分区只取服务草稿,刷新分区只取刷新草稿, +// 另一侧一律用服务器当前值。组件与测试共用同一实现。 +export interface ServiceDrafts { + testEndpoint: string + endpoint: string + productionTenantID: string + productionKnowledgeBaseID: string +} +export interface RefreshDrafts { + documentRefresh: 15 | 30 | 60 + resourceRefresh: 30 | 60 + stalled: 1800 | 3600 + finalizing: 7200 | 14400 + concurrency: number +} +export const serviceSettingsInput = (settings: UISettings, drafts: ServiceDrafts): UISettingsCandidateInput => ({ + document_refresh_seconds: settings.document_refresh_seconds, + resource_refresh_seconds: settings.resource_refresh_seconds, + stalled_after_seconds: settings.stalled_after_seconds, + finalizing_after_seconds: settings.finalizing_after_seconds, + ingestion_concurrency: settings.ingestion_concurrency, + test_weknora_base_url: drafts.testEndpoint.trim(), + production_weknora_base_url: drafts.endpoint.trim(), + production_tenant_id: drafts.productionTenantID.trim(), + production_knowledge_base_id: drafts.productionKnowledgeBaseID.trim(), +}) +export const refreshSettingsInput = (settings: UISettings, drafts: RefreshDrafts): UISettingsCandidateInput => ({ + document_refresh_seconds: drafts.documentRefresh, + resource_refresh_seconds: drafts.resourceRefresh, + stalled_after_seconds: drafts.stalled, + finalizing_after_seconds: drafts.finalizing, + ingestion_concurrency: drafts.concurrency, + test_weknora_base_url: settings.test_weknora_base_url, + production_weknora_base_url: settings.production_weknora_base_url, + production_tenant_id: settings.production_tenant_id, + production_knowledge_base_id: settings.production_knowledge_base_id, +}) + type ServiceHealthView = MonitorOverview['health'][number] type ServiceView = MonitorOverview['services'][number] @@ -201,28 +239,15 @@ export function SystemSettingsView({ ) // 保存边界:服务分区只带上自己这一组的输入,另一组一律用服务器当前值。 // 否则“改了地址没保存、切到刷新策略保存”会把未确认的地址一起写进去。 - const serviceInput = (): UISettingsCandidateInput => ({ - document_refresh_seconds: settings?.document_refresh_seconds ?? documentRefresh, - resource_refresh_seconds: settings?.resource_refresh_seconds ?? resourceRefresh, - stalled_after_seconds: settings?.stalled_after_seconds ?? stalled, - finalizing_after_seconds: settings?.finalizing_after_seconds ?? finalizing, - ingestion_concurrency: settings?.ingestion_concurrency ?? concurrency, - test_weknora_base_url: testEndpoint.trim(), - production_weknora_base_url: endpoint.trim(), - production_tenant_id: productionTenantID.trim(), - production_knowledge_base_id: productionKnowledgeBaseID.trim(), - }) - const refreshInput = (): UISettingsCandidateInput => ({ - document_refresh_seconds: documentRefresh, - resource_refresh_seconds: resourceRefresh, - stalled_after_seconds: stalled, - finalizing_after_seconds: finalizing, - ingestion_concurrency: concurrency, - test_weknora_base_url: settings?.test_weknora_base_url ?? '', - production_weknora_base_url: settings?.production_weknora_base_url ?? '', - production_tenant_id: settings?.production_tenant_id ?? '', - production_knowledge_base_id: settings?.production_knowledge_base_id ?? '', - }) + // 两个分区都有独立草稿;缺 settings 时按钮本就不可点,这里只防一手。 + const serviceInput = (): UISettingsCandidateInput => + settings + ? serviceSettingsInput(settings, { testEndpoint, endpoint, productionTenantID, productionKnowledgeBaseID }) + : ({} as UISettingsCandidateInput) + const refreshInput = (): UISettingsCandidateInput => + settings + ? refreshSettingsInput(settings, { documentRefresh, resourceRefresh, stalled, finalizing, concurrency }) + : ({} as UISettingsCandidateInput) const saveEndpoint = () => { setDirty(false) onSave(serviceInput())