优化:产品查询数据库分页并修复报告测试契约
This commit is contained in:
@@ -4,7 +4,7 @@ import fs from 'node:fs';
|
||||
import ts from 'typescript';
|
||||
import React from 'react';
|
||||
import { renderToStaticMarkup } from 'react-dom/server';
|
||||
import { buildAgentReportLayout, agentReportPrimary, agentReportSupplementary } from '../src/agent/agentReportLayout.ts';
|
||||
import { buildAgentReportLayout, agentReportPrimary, agentReportSupplementary, partitionAgentReportVisuals } from '../src/agent/agentReportLayout.ts';
|
||||
import { stripDuplicateFirstMarkdownH1 } from '../src/analysisReportTitle.ts';
|
||||
import { tableTextAlignment } from '../src/tableTextAlignment.ts';
|
||||
import { sanitizeAnalysisDisplayText } from '../src/analysisDisplayText.ts';
|
||||
@@ -26,7 +26,7 @@ const Document=load('../src/agent/AgentDeliverable.tsx','AgentDeliverable',{
|
||||
ReportVisualFigure:({visual,image})=>image?.svg?React.createElement('figure',{'data-chart':visual.id},visual.title):React.createElement('table',{'data-fallback':visual.id},React.createElement('tbody',null,React.createElement('tr',null,React.createElement('td',null,visual.title)))),
|
||||
reportVisualImageSource:image=>image?.svg||'',reportVisuals:()=>figures,
|
||||
useReportVisualImages:()=>({authorized:true,loading:false,images}),analysisSnapshotResult:turn=>turn.result,
|
||||
reportSnapshotIdentity:()=>'',analysisScopeText:()=>'',stripDuplicateFirstMarkdownH1,buildAgentReportLayout,agentReportPrimary,agentReportSupplementary,
|
||||
reportSnapshotIdentity:()=>'',analysisScopeText:()=>'',stripDuplicateFirstMarkdownH1,buildAgentReportLayout,agentReportPrimary,agentReportSupplementary,partitionAgentReportVisuals,
|
||||
captureReportLongImage:()=>{},downloadAuthorizedReport:()=>{},documentCss:'',
|
||||
});
|
||||
const answer='# 原始报告\n\n原始导读。\n\n## 月度趋势\n\n原始分析。\n\n| 月份 | 值 |\n|---|---|\n| 10月 | 95.46% |\n\n## 报废大类\n\n原始说明。';
|
||||
|
||||
@@ -5,6 +5,8 @@ import ts from 'typescript';
|
||||
import React from 'react';
|
||||
import { renderToStaticMarkup } from 'react-dom/server';
|
||||
import { emptyAnalysisNotice } from '../src/analysisConversationState.ts';
|
||||
import { analysisChartReferences } from '../src/analysisChartReferences.ts';
|
||||
import { parseAnalysisVisuals } from '../src/analysisVisualsModel.ts';
|
||||
import { sanitizeAnalysisDisplayText } from '../src/analysisDisplayText.ts';
|
||||
import {
|
||||
analysisMemberListFullyRead,
|
||||
@@ -116,7 +118,7 @@ test('member-list display is opt-in and historical plain answers do not acquire
|
||||
const start = source.indexOf('export const AgentConversationTurn');
|
||||
const code = source.slice(start).replace('export const AgentConversationTurn', 'const AgentConversationTurn');
|
||||
const view = {
|
||||
React, memo: value => value, useMemo: callback => callback(), useState: value => [value, () => {}], useEffect: () => {},
|
||||
React, memo: value => value, useCallback: callback => callback, analysisChartReferences, parseAnalysisVisuals, useMemo: callback => callback(), useState: value => [value, () => {}], useEffect: () => {},
|
||||
useAnalysisVisualRecovery: turn => ({ turn, available: false, recovering: false, error: turn.recoveryError || '' }),
|
||||
analysisSnapshotResult: turn => turn.result || turn, partialAnswerIsOnlyProgress: () => false, analysisIsRunning: () => false,
|
||||
executionEvents: () => [], RunStatus: () => null, authoredReport: () => null, analysisScopeText: () => '', emptyAnalysisNotice,
|
||||
@@ -140,6 +142,7 @@ return AgentConversationTurn;`, {
|
||||
assert.match(empty, /<button>重新分析<\/button>/);
|
||||
assert.match(render({id:'failed-turn',status:'FAILED',answer:'',completion:{reason:'任务理解未完成,请重试'}}), /任务理解未完成,请重试/);
|
||||
const recovery = render({ id: 'old-turn', status: 'PARTIAL', answer: '原答案', recoveryError: '图表恢复暂不可用' });
|
||||
assert.match(recovery, /role="alert">图表恢复暂不可用/);
|
||||
// 图表恢复失败按正式约定静默省略,保留原回答。
|
||||
assert.doesNotMatch(recovery, /role="alert"|图表恢复暂不可用/);
|
||||
assert.match(recovery, /原答案/);
|
||||
});
|
||||
|
||||
@@ -90,3 +90,12 @@ test('changing only the trend object does not recalculate the unchanged product
|
||||
assert.equal(f.requests.length,3);assert.equal(f.requests[2].params.dimension,'period');assert.equal(ui.table?.dimension,'product');
|
||||
assert.equal(ui.trend,undefined);assert.equal(ui.trendPending,true);f.unmount();
|
||||
});
|
||||
|
||||
|
||||
test('product page changes reload only fine table rows and export remains the complete scope',async()=>{
|
||||
const f=fixture();f.props.productKeys=['P1'];f.render();f.catalog[0].resolve(catalogData);await tick();f.render().choose('加工废');f.render();
|
||||
assert.deepEqual(f.requests[1].params.productKeys,['P1']);assert.equal(f.requests[0].params.productKeys,undefined);
|
||||
f.requests[0].resolve({...response,dimension:'period'});f.requests[1].resolve({...response,dimension:'product'});await tick();f.render();
|
||||
f.props.productKeys=['P2'];f.render();assert.equal(f.requests.length,3);assert.deepEqual(f.requests[2].params.productKeys,['P2']);assert.equal(f.render().trend?.dimension,'period');
|
||||
const promise=f.render().exportTable();assert.equal(f.requests[3].params.productKeys,undefined);assert.equal(f.requests[3].params.dimension,'product');f.requests[3].resolve(response);await promise;f.unmount();
|
||||
});
|
||||
|
||||
@@ -158,7 +158,7 @@ test('single-stage detail callback freezes the clicked quarterly/yearly row inst
|
||||
for(const stage of ['black','bright']) {
|
||||
const ui=new Function('freezeSourceRecordsQuery','stage',transpile(`
|
||||
const applied={year:2026,month:10,product:'产品A',stage,columnFilters:[{field:'customer',stages:[stage],operator:'in',values:['001']}]};
|
||||
const current={release:{id:'release-A'}},drilledProduct='产品A';let records;
|
||||
const currentSummary={release:{id:'release-A'}},drilledProduct='产品A';let records;
|
||||
const setRecordVisible=()=>{},setRecords=value=>records=value;
|
||||
${callback}
|
||||
return {openDetail,get:()=>records};
|
||||
|
||||
@@ -248,3 +248,13 @@ test('fine defect expansion and Excel share authorized parent/child values, pres
|
||||
assert.equal(fields.some(f=>f.key.startsWith('black-defect-')||f.key.startsWith('black-fine-')),false);
|
||||
assert.equal(data.groups[0].children[0].rate,0);
|
||||
});
|
||||
|
||||
|
||||
test('remote page two is not sliced again and full export includes every row',async()=>{
|
||||
const all=Array.from({length:35},(_,i)=>({...row,key:String(i),label:'产品'+i}));let changed;
|
||||
const ui=fixture({rows:all.slice(15,30),view:'product',remotePage:{current:2,pageSize:15,total:35,onChange:(...args)=>changed=args},loadExportData:async()=>({rows:all})});
|
||||
assert.equal(find(ui.tree,n=>n.type==='Table').props.dataSource.length,15);
|
||||
const pagination=find(ui.tree,n=>n.type==='Pagination');assert.equal(pagination.props.total,35);assert.equal(pagination.props.current,2);
|
||||
pagination.props.onChange(3,15);assert.deepEqual(changed,[3,15]);
|
||||
await ui.ref.exportExcel();assert.equal(ui.exported.workbook.getWorksheet('质量汇总').rowCount,37);assert.equal(ui.exported.rows[0].key,'0');assert.equal(ui.exported.rows.at(-1).key,'34');
|
||||
});
|
||||
|
||||
@@ -28,7 +28,7 @@ function fixture() {
|
||||
const hook = new Function('hooks', 'api', 'overviewQuery', 'splitMetricsLoad', `const {useState,useEffect}=hooks;${code};return usePriorityMetrics;`)(hooks, api, overviewQuery, splitMetricsLoad);
|
||||
const onUnauthorized = error => { unauthorized.push(error); return error.status === 403; };
|
||||
return { props, requests, unauthorized, render() { let result, count = 0; do {
|
||||
dirty = false; index = 0; pending = []; result = hook(props.query, props.enabled, props.refresh, onUnauthorized);
|
||||
dirty = false; index = 0; pending = []; result = hook(props.query, props.enabled, props.refresh, onUnauthorized, props.forceOverview);
|
||||
pending.forEach(run => run()); assert.ok(++count < 10);
|
||||
} while (dirty); return result; }, unmount() { effects.forEach(e => e?.cleanup?.()); } };
|
||||
}
|
||||
@@ -93,12 +93,21 @@ test('inactive pages neither start requests nor accept late results', async () =
|
||||
test('refresh generations cannot qualify retained old table and trend results as current', () => {
|
||||
const source=name=>fs.readFileSync(new URL(`../src/${name}`,import.meta.url),'utf8');
|
||||
const general=source('QueryPage.tsx');
|
||||
const metricExpression=general.match(/const metricKey = useMemo\(\(\) => ([^;]+), \[metricParams, queryRevision\]\);/)[1];
|
||||
const key=new Function('metricParams','queryRevision',`return ${metricExpression}`);
|
||||
const metricExpression=general.match(/const metricKey = useMemo\(\(\) => ([^;]+), \[metricParams, queryRevision[^\]]*\]\);/)[1];
|
||||
const key=new Function('metricParams','queryRevision',`const productPagingScope=true,productPage={key:'page2'};return ${metricExpression}`);
|
||||
assert.notEqual(key(query,0),key(query,1));
|
||||
const stage=source('StageProductPage.tsx');
|
||||
const expression=stage.match(/const queryKey=([^;]+);/)[1];
|
||||
const stageKey=new Function('applied','revision','refreshKey',`return ${expression}`);
|
||||
const stageKey=new Function('applied','revision','refreshKey',`const productPagingScope=true,productPage={key:'page2'};return ${expression}`);
|
||||
assert.notEqual(stageKey(query,0,0),stageKey(query,0,1));
|
||||
assert.notEqual(stageKey(query,0,0),stageKey(query,1,0));
|
||||
});
|
||||
|
||||
|
||||
test('paged month and search tables keep their first response small',async()=>{
|
||||
for(const change of [{month:2},{quarter:1},{productSearch:'P'}]) {
|
||||
const f=fixture();f.props.query={...query,...change};f.props.forceOverview=true;
|
||||
assert.equal(f.render().split,true);assert.equal(f.requests[0].params.view,'overall');
|
||||
for(const key of Object.keys(change))assert.equal(f.requests[0].params[key],change[key]);f.unmount();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import ts from 'typescript';
|
||||
import {shouldPageProducts,pageSelection,PRODUCT_PAGE_SIZE,canReadProductPage} from '../src/productPagination.ts';
|
||||
const query={releaseId:'r1',year:2026,view:'product'};
|
||||
const tick = () => new Promise(resolve => setImmediate(resolve));
|
||||
function fixture() {
|
||||
const slots = [], effects = [], requests = []; let index = 0, dirty = false, pending = [];
|
||||
const props = { query, enabled: true, refresh: 0 }; const unauthorized = [];
|
||||
const hooks = {
|
||||
useState(initial) { const n = index++; if (!(n in slots)) slots[n] = initial;
|
||||
return [slots[n], value => { slots[n] = value; dirty = true; }]; },
|
||||
useEffect(fn, deps) { const n = index++, old = effects[n];
|
||||
if (!old || deps.some((d, i) => !Object.is(d, old.deps[i]))) pending.push(() => {
|
||||
old?.cleanup?.(); effects[n] = { deps, cleanup: fn() };
|
||||
}); },
|
||||
};
|
||||
const api = { productPage(params,page,pageSize,order,signal) { let resolve, reject;
|
||||
const promise = new Promise((r, j) => { resolve = r; reject = j; });
|
||||
requests.push({ params, page, pageSize, order, signal, resolve, reject }); return promise;
|
||||
} };
|
||||
const source = fs.readFileSync(new URL('../src/useProductPage.ts', import.meta.url), 'utf8');
|
||||
const code = ts.transpileModule(source.slice(source.indexOf('export function')).replace('export function', 'function'),
|
||||
{ compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText;
|
||||
const hook = new Function('hooks', 'api', 'pageSelection', 'PRODUCT_PAGE_SIZE', `const {useState,useEffect}=hooks;${code};return useProductPage;`)(hooks, api, pageSelection, PRODUCT_PAGE_SIZE);
|
||||
const onUnauthorized = error => { unauthorized.push(error); return error.status === 403; };
|
||||
return { props, requests, unauthorized, render() { let result, count = 0; do {
|
||||
dirty = false; index = 0; pending = []; result = hook(props.query, props.enabled, props.refresh, 'brightQualifiedDesc', onUnauthorized);
|
||||
pending.forEach(run => run()); assert.ok(++count < 10);
|
||||
} while (dirty); return result; }, unmount() { effects.forEach(e => e?.cleanup?.()); } };
|
||||
}
|
||||
|
||||
|
||||
const response=(request,total=80)=>({release:{id:request.params.releaseId},rows:[{key:'P'}],total,page:request.page,pageSize:request.pageSize,order:request.order});
|
||||
test('only unpinned product tables use server pagination',()=>{
|
||||
assert.equal(shouldPageProducts(query),true);
|
||||
for(const extra of [{view:'overall'},{product:'P'},{releaseId:undefined}])assert.equal(shouldPageProducts({...query,...extra}),false);
|
||||
assert.equal(shouldPageProducts({...query,month:2,productSearch:'x'}),true);
|
||||
});
|
||||
test('page changes fetch only the selected page; year and size changes reset immediately',async()=>{
|
||||
const f=fixture();let value=f.render();assert.equal(f.requests[0].page,1);
|
||||
f.requests[0].resolve(response(f.requests[0]));await tick();value=f.render();assert.equal(value.pagination.total,80);
|
||||
value.pagination.onChange(3,15);f.render();assert.equal(f.requests[1].page,3);assert.equal(f.render().value,null);
|
||||
f.requests[1].resolve(response(f.requests[1]));await tick();value=f.render();
|
||||
value.pagination.onChange(3,50);f.render();assert.equal(f.requests[2].page,1);assert.equal(f.requests[2].pageSize,50);
|
||||
f.props.query={...query,year:2025};f.render();assert.equal(f.requests[3].page,1);assert.equal(f.requests[3].pageSize,50);
|
||||
assert.equal(f.requests[2].signal.aborted,true);f.requests[2].resolve(response(f.requests[2]));await tick();assert.equal(f.render().value,null);f.unmount();
|
||||
});
|
||||
test('empty out-of-range pages recover to the valid last page',async()=>{
|
||||
const f=fixture();f.render().pagination.onChange(9,15);f.render();f.requests[1].resolve(response(f.requests[1],20));await tick();f.render();
|
||||
assert.equal(f.requests[2].page,2);f.requests[2].resolve(response(f.requests[2],20));await tick();assert.equal(f.render().pagination.current,2);f.unmount();
|
||||
});
|
||||
test('refresh, inactive pages, errors and authorization cannot qualify stale rows',async()=>{
|
||||
const f=fixture();f.render();f.requests[0].resolve(response(f.requests[0]));await tick();assert.ok(f.render().value);
|
||||
f.props.refresh++;assert.equal(f.render().value,null);f.requests[1].reject(Error('retry'));await tick();assert.equal(f.render().error,'retry');
|
||||
f.props.refresh++;f.render();f.requests[2].reject({status:403});await tick();assert.equal(f.unauthorized.filter(e=>e.status===403).length,1);assert.equal(f.render().value,null);
|
||||
f.props.enabled=false;f.render();assert.equal(f.requests[2].signal.aborted,true);f.unmount();
|
||||
});
|
||||
test('wrong release replies are rejected instead of displayed',async()=>{
|
||||
const f=fixture();f.render();f.requests[0].resolve({...response(f.requests[0]),release:{id:'old'}});await tick();assert.match(f.render().error,/范围已变化/);f.unmount();
|
||||
});
|
||||
|
||||
test('annual aggregate keeps priority while narrow pages avoid a serial round trip',()=>{
|
||||
assert.equal(canReadProductPage(query,false),false);assert.equal(canReadProductPage(query,true),true);
|
||||
for(const narrow of [{month:2},{quarter:1},{productSearch:'P'},{monthStart:1,monthEnd:5}])assert.equal(canReadProductPage({...query,...narrow},false),true);
|
||||
});
|
||||
@@ -27,7 +27,16 @@ for(const type of ['line','area'])test(`900px report ${type} keeps a positive pl
|
||||
assert.equal(points.length,18);
|
||||
const ys=points.filter((_,i)=>i%2===1);
|
||||
assert.ok(Math.max(...ys)-Math.min(...ys)>8,'different rates must not become a flat line');
|
||||
ys.forEach((y,i)=>assert.ok(Math.abs(y-(rect.y+rect.height*(1-v.series[0].values[i])))<.001));
|
||||
const series=chart.getModel().getSeriesByIndex(0).getData();
|
||||
const [low,high]=chart.getModel().getComponent('yAxis').axis.scale.getExtent();
|
||||
assert.ok(low>0 && high-low<20,'rate trends retain their focused percentage axis');
|
||||
ys.forEach((y,i)=>{
|
||||
const expected=v.series[0].values[i]*100;
|
||||
assert.ok(Math.abs(series.get('y',i)-expected)<1e-10,'the plotted value preserves the formal rate');
|
||||
assert.ok(expected>=low&&expected<=high,'the value must fit inside the actual axis');
|
||||
const pixel=rect.y+rect.height*(high-expected)/(high-low);
|
||||
assert.ok(Math.abs(y-pixel)<.001,'SVG coordinates match the formal rate on the actual axis');
|
||||
});
|
||||
assert.match(chart.renderToSVGString(),/<svg/);
|
||||
} finally {chart.dispose();}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user