diff --git a/src/platform/workflow/core/services/workflowService.test.ts b/src/platform/workflow/core/services/workflowService.test.ts index 9c8de246496..22390f87612 100644 --- a/src/platform/workflow/core/services/workflowService.test.ts +++ b/src/platform/workflow/core/services/workflowService.test.ts @@ -1640,6 +1640,118 @@ describe('useWorkflowService', () => { }) }) + describe('insertWorkflow', () => { + it('inserts into the canvas with its requested position when nothing changes while loading', async () => { + const canvas = app.canvas + const priorGraph = canvas.graph + const priorDeserialize = canvas._deserializeItems + const originalGraph = {} + const deserialize = vi.fn() + Reflect.set(canvas, 'graph', originalGraph) + Reflect.set(canvas, '_deserializeItems', deserialize) + const workflow = { + load: vi.fn(async () => ({ initialState: { nodes: [], links: [] } })) + } as unknown as ComfyWorkflow + + try { + const options = { position: [120, 240] as [number, number] } + await useWorkflowService().insertWorkflow(workflow, options) + + expect(deserialize).toHaveBeenCalledOnce() + expect(deserialize).toHaveBeenCalledWith( + expect.objectContaining({ nodes: [], links: [] }), + options + ) + } finally { + Reflect.set(canvas, 'graph', priorGraph) + Reflect.set(canvas, '_deserializeItems', priorDeserialize) + } + }) + + it('does not insert after the canvas itself is replaced while loading', async () => { + const originalCanvas = app.canvas + const priorGraph = originalCanvas.graph + const priorDeserialize = originalCanvas._deserializeItems + const originalGraph = {} + const deserialize = vi.fn() + Reflect.set(originalCanvas, 'graph', originalGraph) + Reflect.set(originalCanvas, '_deserializeItems', deserialize) + let finishLoad: (value: unknown) => void = () => {} + const workflow = { + load: vi.fn( + () => + new Promise((resolve) => { + finishLoad = resolve + }) + ) + } as unknown as ComfyWorkflow + + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + + try { + const pending = useWorkflowService().insertWorkflow(workflow) + Reflect.set(app, 'canvas', { + graph: originalGraph, + _deserializeItems: vi.fn() + }) + finishLoad({ initialState: { nodes: [], links: [] } }) + await pending + + expect(deserialize).not.toHaveBeenCalled() + expect(app.canvas._deserializeItems).not.toHaveBeenCalled() + expect(warnSpy).toHaveBeenCalledWith( + expect.stringContaining( + 'insertWorkflow aborted: canvas or graph was replaced' + ) + ) + } finally { + warnSpy.mockRestore() + Reflect.set(app, 'canvas', originalCanvas) + Reflect.set(originalCanvas, 'graph', priorGraph) + Reflect.set(originalCanvas, '_deserializeItems', priorDeserialize) + } + }) + + it('does not insert after the canvas graph changes while loading', async () => { + const canvas = app.canvas + const priorGraph = canvas.graph + const priorDeserialize = canvas._deserializeItems + const originalGraph = {} + const deserialize = vi.fn() + Reflect.set(canvas, 'graph', originalGraph) + Reflect.set(canvas, '_deserializeItems', deserialize) + let finishLoad: (value: unknown) => void = () => {} + const workflow = { + load: vi.fn( + () => + new Promise((resolve) => { + finishLoad = resolve + }) + ) + } as unknown as ComfyWorkflow + + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + + try { + const pending = useWorkflowService().insertWorkflow(workflow) + Reflect.set(canvas, 'graph', {}) + finishLoad({ initialState: { nodes: [], links: [] } }) + await pending + + expect(deserialize).not.toHaveBeenCalled() + expect(warnSpy).toHaveBeenCalledWith( + expect.stringContaining( + 'insertWorkflow aborted: canvas or graph was replaced' + ) + ) + } finally { + warnSpy.mockRestore() + Reflect.set(canvas, 'graph', priorGraph) + Reflect.set(canvas, '_deserializeItems', priorDeserialize) + } + }) + }) + describe('saveWorkflow', () => { let workflowStore: ReturnType diff --git a/src/platform/workflow/core/services/workflowService.ts b/src/platform/workflow/core/services/workflowService.ts index b419f8ea87e..1cb65bfe750 100644 --- a/src/platform/workflow/core/services/workflowService.ts +++ b/src/platform/workflow/core/services/workflowService.ts @@ -779,14 +779,22 @@ export const useWorkflowService = () => { workflow: ComfyWorkflow, options: { position?: Point } = {} ) => { + const canvas = app.canvas + const graph = canvas.graph const loadedWorkflow = await workflow.load() + if (app.canvas !== canvas || canvas.graph !== graph) { + console.warn( + '[workflowService] insertWorkflow aborted: canvas or graph was replaced while the workflow loaded' + ) + return + } const workflowJSON = toRaw(loadedWorkflow.initialState) // unknown conversion: ComfyWorkflowJSON is stricter than LiteGraph's // serialisation schema. const items = workflowToClipboardItems( workflowJSON as unknown as SerialisableGraph ) - app.canvas._deserializeItems(items, options) + canvas._deserializeItems(items, options) } const loadNextOpenedWorkflow = async () => {