Show local image previews while uploads run in background
This commit is contained in:
@@ -5,18 +5,22 @@ export async function canvasMemberScenario({root,act,h,useCanvasTree,makeCanvasN
|
||||
const frame=makeCanvasNode('frame',{x:100,y:100});frame.id='frame';frame.data.subgraph={boardId:child};
|
||||
const icon=makeCanvasNode('icon',{x:10,y:20});icon.id='moving';
|
||||
const other=makeCanvasNode('text',{x:950,y:100});other.id='other';
|
||||
let records,tree,posts,saves,release,mode,receipt,key,body,capability=true;
|
||||
let records,tree,posts,saves,release,mode,receipt,key,body,capability=true,capMode="",capCalls=0;
|
||||
const json=(v,status=200)=>new Response(JSON.stringify(v),{status,headers:{'content-type':'application/json'}});
|
||||
function Fixture(){tree=useCanvasTree(parent,'w',records.get(parent).document,records.get(parent));return null;}
|
||||
const reset=async(nextMode='success')=>{
|
||||
await act(async()=>{root.render(null);await tick();});localStorage.clear();
|
||||
records=new Map([[parent,{version:1,document:{...emptyCanvas(),schema_version:2,nodes:[structuredClone(frame),structuredClone(other)]}}],[child,{version:1,document:{...emptyCanvas(),schema_version:2,nodes:[structuredClone(icon)]}}]]);
|
||||
posts=[];saves=[];release=null;mode=nextMode;receipt=null;key=null;body=null;
|
||||
posts=[];saves=[];release=null;mode=nextMode;receipt=null;key=null;body=null;capMode=nextMode;capCalls=0;
|
||||
if(mode==='queued'){const second=structuredClone(icon);second.id='moving-two';second.position={x:100,y:20};records.get(child).document.nodes.push(second);mode='delayed';}
|
||||
mock(async(url,options={})=>{
|
||||
const parts=new URL(url,'http://localhost').pathname.split('/'),id=parts[6],suffix=parts.slice(8).join('/'),method=options.method||'GET';
|
||||
if(suffix==='ai/runs')return json({runs:[]});
|
||||
if(suffix==='capabilities')return json({subgraphs:{member_positions:capability}});
|
||||
if(suffix==='capabilities'){
|
||||
capCalls++;if(capMode==='slowcap'){await new Promise(r=>setTimeout(r,2100));if(options.signal?.aborted)throw new DOMException('Aborted','AbortError');}
|
||||
if(capMode==='cap-failure'&&capCalls===1)throw new TypeError('network unavailable');
|
||||
return json({subgraphs:{member_positions:capability}});
|
||||
}
|
||||
if(!suffix&&method==='GET')return json(structuredClone(records.get(id)));
|
||||
if(!suffix&&method==='PATCH'){
|
||||
assert.equal(options.headers['If-Match'],`"${records.get(id).version}"`);
|
||||
@@ -40,7 +44,7 @@ export async function canvasMemberScenario({root,act,h,useCanvasTree,makeCanvasN
|
||||
});
|
||||
await act(async()=>{root.render(h(Fixture));await tick();await tick();});
|
||||
};
|
||||
const wait=async(check,label)=>{for(let i=0;i<60;i++){if(check())return;await act(async()=>{await new Promise(r=>setTimeout(r,30));});}throw new Error('Timeout '+label);};
|
||||
const wait=async(check,label)=>{for(let i=0;i<120;i++){if(check())return;await act(async()=>{await new Promise(r=>setTimeout(r,30));});}throw new Error('Timeout '+label);};
|
||||
const start=async()=>{
|
||||
await act(async()=>{tree.select(child+'::moving');tree.setDragging(true);tree.nodesChanged([{type:'position',id:child+'::moving',position:{x:950,y:200},dragging:false}]);tree.setDragging(false);void tree.moveMembers(parent,'frame',child,parent,['moving'],[parent,child]);await tick();});
|
||||
await wait(()=>posts.length,'move admission');
|
||||
@@ -78,6 +82,9 @@ export async function canvasMemberScenario({root,act,h,useCanvasTree,makeCanvasN
|
||||
await act(async()=>{release();await tick();});await wait(()=>!tree.memberJobs.length,'queue drained');
|
||||
assert.equal(saves.length,0);assert.equal(tree.rootDocument.nodes.filter(n=>n.id.startsWith('moving')).length,2);assert.equal(tree.current.current.get(child).nodes.length,0);
|
||||
console.log('PASS member queue: unrelated cross-frame drops serialize versions without extra coordinate PATCH');
|
||||
await reset('slowcap');await start();await wait(()=>!tree.memberJobs.length,'slow capability move');assert.equal(saves.length,0,'A slow capability response must not trigger legacy PATCH fallback');
|
||||
await reset('cap-failure');await start();await wait(()=>!tree.memberJobs.length,'capability retry');assert.equal(capCalls,2);assert.equal(saves.length,0,'A failed prefetch is retried rather than cached as unsupported');
|
||||
console.log('PASS member capabilities: responses slower than two seconds and transient prefetch errors retain atomic moves');
|
||||
capability=false;await reset();await start();await wait(()=>!tree.memberJobs.length,'legacy move');assert.equal(saves.length,1,'Old backend retains the coordinate save');assert.equal(JSON.parse(posts[0].body).positions,undefined);
|
||||
console.log('PASS member compatibility: capability-gated positions and legacy two-request fallback');
|
||||
capability=true;await reset('delayed');
|
||||
|
||||
@@ -216,6 +216,8 @@ try {
|
||||
}
|
||||
const { canvasMemberScenario } = await import("./canvas-member-scenario.mjs");
|
||||
await canvasMemberScenario({ root, act, h, useCanvasTree, GraphCanvas, event, window, makeCanvasNode, emptyCanvas, tick, mock: (handler) => { apiMock = handler; } });
|
||||
const { canvasUploadScenario } = await import("./canvas-upload-scenario.mjs");
|
||||
await canvasUploadScenario({ root, act, h, GraphCanvas, window, emptyCanvas, event, tick, mock: (handler) => { apiMock = handler; } });
|
||||
await act(async () => { root.unmount(); await tick(); });
|
||||
} finally {
|
||||
await rm(folder, { recursive: true, force: true }); window.close(); stop();
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import assert from 'node:assert/strict';
|
||||
export async function canvasUploadScenario({root,act,h,GraphCanvas,window,emptyCanvas,event,tick,mock}) {
|
||||
const parent='cccccccc-cccc-4ccc-8ccc-cccccccccccc',assetID='dddddddd-dddd-4ddd-8ddd-dddddddddddd';
|
||||
const asset={id:assetID,url:`https://api.foundry.entroia.com/projects/endoleap/workspaces/w/assets/${assetID}`,width:640,height:1280,bytes:4,mime_type:'image/png'};
|
||||
let snapshot,uploads,saves,release,mode;
|
||||
const json=(v,status=200)=>new Response(JSON.stringify(v),{status,headers:{'content-type':'application/json'}});
|
||||
const revoked=[],originalRevoke=URL.revokeObjectURL;URL.revokeObjectURL=(url)=>{revoked.push(url);originalRevoke(url);};
|
||||
const NativeImage=window.Image;
|
||||
const wait=async(check,label)=>{for(let i=0;i<100;i++){if(check())return;await act(async()=>{await new Promise(r=>setTimeout(r,30));});}throw new Error('Timeout '+label);};
|
||||
async function reset(nextMode='delayed'){
|
||||
await act(async()=>{root.render(null);await tick();});localStorage.clear();snapshot={version:1,document:{...emptyCanvas(),schema_version:2}};uploads=[];saves=[];release=null;mode=nextMode;
|
||||
mock(async(url,options={})=>{
|
||||
const parts=new URL(url,'http://localhost').pathname.split('/'),suffix=parts.slice(8).join('/'),method=options.method||'GET';
|
||||
if(parts.at(-1)==='assets'&&method==='POST'){
|
||||
const file=options.body.get('image');uploads.push({key:options.headers['Idempotency-Key'],bytes:Buffer.from(await file.arrayBuffer()),signal:options.signal});
|
||||
if(mode==='failed')return json({error:'forbidden'},403);
|
||||
if(mode==='delayed')await new Promise(resolve=>{release=resolve;});
|
||||
return json(asset,201);
|
||||
}
|
||||
if(suffix==='capabilities')return json({subgraphs:{member_positions:true}});
|
||||
if(suffix==='ai/runs')return json({runs:[]});
|
||||
if(!suffix&&method==='PATCH'){
|
||||
assert.ok(!options.body.includes('blob:'),'Local object URLs must never be saved');assert.equal(options.headers['If-Match'],`"${snapshot.version}"`);
|
||||
snapshot.document=JSON.parse(options.body).document;snapshot.version++;saves.push(structuredClone(snapshot.document));return json({version:snapshot.version});
|
||||
}
|
||||
if(!suffix)return json(snapshot);
|
||||
throw new Error('Unhandled upload request '+url);
|
||||
});
|
||||
await act(async()=>{root.render(h(GraphCanvas,{board:{id:parent,workspace_id:'w',kind:'board',title:'Upload test',version:1},snapshot:structuredClone(snapshot)}));await tick();});
|
||||
}
|
||||
async function choose(label='添加图片'){
|
||||
await event(document.querySelector(`[aria-label="${label}"]`),'click');
|
||||
const input=document.querySelector('input[type="file"][accept^="image/"]');
|
||||
Object.defineProperty(input,'files',{configurable:true,value:[new File(['test'],'local.png',{type:'image/png'})]});
|
||||
await act(async()=>{input.dispatchEvent(new window.Event('change',{bubbles:true}));await tick();});
|
||||
await wait(()=>uploads.length,'upload started');
|
||||
}
|
||||
try {
|
||||
await reset();await choose();
|
||||
const local=document.querySelector('.react-flow__node img[src^="blob:"]');assert.ok(local,'Selected file immediately appears on the canvas before upload acknowledgement');const localURL=local.getAttribute('src');
|
||||
assert.ok(document.querySelector('[aria-label="图片上传状态"]'));assert.equal(snapshot.document.nodes.length,0);assert.equal(saves.length,0);assert.deepEqual(uploads[0].bytes,Buffer.from('test'));
|
||||
await event(document.querySelector('[aria-label="添加文本卡片"]'),'click');assert.equal(document.querySelectorAll('.react-flow__node').length,2,'Other content can be added during upload');
|
||||
await act(async()=>{release();await tick();});await wait(()=>document.querySelector('.react-flow__node img[src$="?variant=preview"]'),'managed image rendered');
|
||||
assert.ok(document.querySelector(`img[src="${localURL}"]`),'Local image remains visible while remote preview loads');
|
||||
const remote=document.querySelector('.react-flow__node img[src$="?variant=preview"]');await act(async()=>{remote.dispatchEvent(new window.Event('load'));await tick();});
|
||||
assert.ok(!document.querySelector(`img[src="${localURL}"]`));assert.ok(revoked.includes(localURL));await wait(()=>snapshot.document.nodes.some(n=>n.data.src===asset.url),'original reference saved');
|
||||
assert.equal(snapshot.document.nodes.filter(n=>n.data.src===asset.url).length,1);assert.equal(snapshot.document.nodes.find(n=>n.data.src===asset.url).data.assetId,assetID);
|
||||
console.log('PASS uploads: immediate local preview, unrelated editing, original-byte attachment and no blob URL persistence');
|
||||
await reset('failed');await choose();await wait(()=>document.querySelector('[aria-label="图片上传状态"]')?.textContent.includes('上传未完成'),'visible upload failure');
|
||||
assert.ok(document.querySelector('img[src^="blob:"]'));assert.equal(saves.length,0);const key=uploads[0].key;mode='delayed';
|
||||
await event([...document.querySelectorAll('[aria-label="图片上传状态"] button')].find(n=>n.textContent==='重试'),'click');assert.equal(uploads.length,2);assert.equal(uploads[1].key,key,'Manual retry retains the original idempotency key');
|
||||
await act(async()=>{release();await tick();});await wait(()=>snapshot.document.nodes.length===1,'retry saves exactly one image');assert.equal(snapshot.document.nodes[0].data.src,asset.url);
|
||||
console.log('PASS upload retry: retained file/preview, stable idempotency key and exactly one persisted node');
|
||||
await reset('failed');await choose();await wait(()=>document.querySelector('[aria-label="图片上传状态"]')?.textContent.includes('上传未完成'),'failed cancellation');
|
||||
const cancelledURL=document.querySelector('img[src^="blob:"]').getAttribute('src');await event([...document.querySelectorAll('[aria-label="图片上传状态"] button')].find(n=>n.textContent==='取消'),'click');assert.equal(document.querySelector('img[src^="blob:"]'),null);assert.ok(revoked.includes(cancelledURL));assert.equal(saves.length,0);
|
||||
window.Image=class {naturalWidth=640;naturalHeight=1280;set src(_){setTimeout(()=>this.onload?.(),0);}};
|
||||
await reset();await choose('添加纯图片');assert.equal(document.querySelector('.react-flow__node').style.width,'240px');assert.equal(document.querySelector('.react-flow__node').style.height,'480px');
|
||||
const unmountedURL=document.querySelector('img[src^="blob:"]').getAttribute('src');await act(async()=>{root.render(null);await tick();});assert.ok(uploads[0].signal.aborted);assert.ok(revoked.includes(unmountedURL));release();await tick();assert.equal(saves.length,0);
|
||||
console.log('PASS upload cleanup: cancellation/unmount revoke previews, abort uploads and retain plain-image aspect ratio');
|
||||
} finally {window.Image=NativeImage;URL.revokeObjectURL=originalRevoke;await act(async()=>{root.render(null);await tick();});}
|
||||
}
|
||||
Reference in New Issue
Block a user