diff --git a/src/platform/workflow/core/services/workflowService.test.ts b/src/platform/workflow/core/services/workflowService.test.ts index 22390f87612..d24f78c9fa0 100644 --- a/src/platform/workflow/core/services/workflowService.test.ts +++ b/src/platform/workflow/core/services/workflowService.test.ts @@ -1649,9 +1649,7 @@ describe('useWorkflowService', () => { 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 + const workflow = createModeTestWorkflow() try { const options = { position: [120, 240] as [number, number] } @@ -1676,17 +1674,16 @@ describe('useWorkflowService', () => { 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 workflow = createModeTestWorkflow() + let finishLoad: (value: LoadedComfyWorkflow) => void = () => {} + vi.spyOn(workflow, 'load').mockImplementation( + () => + new Promise((resolve) => { + finishLoad = resolve + }) + ) - const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + reportErrorMock.mockClear() try { const pending = useWorkflowService().insertWorkflow(workflow) @@ -1694,18 +1691,25 @@ describe('useWorkflowService', () => { graph: originalGraph, _deserializeItems: vi.fn() }) - finishLoad({ initialState: { nodes: [], links: [] } }) + finishLoad(workflow) await pending expect(deserialize).not.toHaveBeenCalled() expect(app.canvas._deserializeItems).not.toHaveBeenCalled() - expect(warnSpy).toHaveBeenCalledWith( - expect.stringContaining( - 'insertWorkflow aborted: canvas or graph was replaced' - ) - ) + expect(reportErrorMock).toHaveBeenCalledTimes(1) + expect(reportErrorMock).toHaveBeenCalledWith(expect.any(Error), { + errorType: 'workflow_insert_aborted_canvas_changed', + level: 'warning', + tags: { + failure_kind: 'degraded', + feature_area: 'workflow', + operation: 'insert', + outcome: 'degraded', + assert_mode: 'soft' + }, + context: { replacement_kind: 'canvas' } + }) } finally { - warnSpy.mockRestore() Reflect.set(app, 'canvas', originalCanvas) Reflect.set(originalCanvas, 'graph', priorGraph) Reflect.set(originalCanvas, '_deserializeItems', priorDeserialize) @@ -1720,32 +1724,38 @@ describe('useWorkflowService', () => { 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 workflow = createModeTestWorkflow() + let finishLoad: (value: LoadedComfyWorkflow) => void = () => {} + vi.spyOn(workflow, 'load').mockImplementation( + () => + new Promise((resolve) => { + finishLoad = resolve + }) + ) - const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) + reportErrorMock.mockClear() try { const pending = useWorkflowService().insertWorkflow(workflow) Reflect.set(canvas, 'graph', {}) - finishLoad({ initialState: { nodes: [], links: [] } }) + finishLoad(workflow) await pending expect(deserialize).not.toHaveBeenCalled() - expect(warnSpy).toHaveBeenCalledWith( - expect.stringContaining( - 'insertWorkflow aborted: canvas or graph was replaced' - ) - ) + expect(reportErrorMock).toHaveBeenCalledTimes(1) + expect(reportErrorMock).toHaveBeenCalledWith(expect.any(Error), { + errorType: 'workflow_insert_aborted_canvas_changed', + level: 'warning', + tags: { + failure_kind: 'degraded', + feature_area: 'workflow', + operation: 'insert', + outcome: 'degraded', + assert_mode: 'soft' + }, + context: { replacement_kind: 'graph' } + }) } finally { - warnSpy.mockRestore() Reflect.set(canvas, 'graph', priorGraph) Reflect.set(canvas, '_deserializeItems', priorDeserialize) } diff --git a/src/platform/workflow/core/services/workflowService.ts b/src/platform/workflow/core/services/workflowService.ts index 1cb65bfe750..2257a1d650f 100644 --- a/src/platform/workflow/core/services/workflowService.ts +++ b/src/platform/workflow/core/services/workflowService.ts @@ -783,8 +783,23 @@ export const useWorkflowService = () => { 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' + const replacementKind = app.canvas !== canvas ? 'canvas' : 'graph' + reportError( + new Error( + 'insertWorkflow aborted: canvas or graph was replaced while the workflow loaded' + ), + { + errorType: 'workflow_insert_aborted_canvas_changed', + level: 'warning', + tags: { + failure_kind: 'degraded', + feature_area: 'workflow', + operation: 'insert', + outcome: 'degraded', + assert_mode: 'soft' + }, + context: { replacement_kind: replacementKind } + } ) return }