Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 47 additions & 37 deletions src/platform/workflow/core/services/workflowService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1625,9 +1625,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] }
Expand All @@ -1652,36 +1650,42 @@ 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)
Reflect.set(app, 'canvas', {
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)
Expand All @@ -1696,32 +1700,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)
}
Expand Down
19 changes: 17 additions & 2 deletions src/platform/workflow/core/services/workflowService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,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
}
Expand Down
Loading