diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlAdapterPreprocessor.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlAdapterPreprocessor.ts index 3dc8db93f9..33e3c4c087 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlAdapterPreprocessor.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlAdapterPreprocessor.ts @@ -133,8 +133,8 @@ export const addControlAdapterPreprocessor = (startAppListening: AppStartListeni const [invocationCompleteAction] = await take( (action): action is ReturnType => socketInvocationComplete.match(action) && - action.payload.data.queue_batch_id === enqueueResult.batch.batch_id && - action.payload.data.source_node_id === processorNode.id + action.payload.data.batch_id === enqueueResult.batch.batch_id && + action.payload.data.invocation_source_id === processorNode.id ); // We still have to check the output type diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketGeneratorProgress.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketGeneratorProgress.ts index e0c6d4f33d..d2d8b11d8d 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketGeneratorProgress.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketGeneratorProgress.ts @@ -12,8 +12,8 @@ export const addGeneratorProgressEventListener = (startAppListening: AppStartLis actionCreator: socketGeneratorProgress, effect: (action) => { log.trace(action.payload, `Generator progress`); - const { source_node_id, step, total_steps, progress_image } = action.payload.data; - const nes = deepClone($nodeExecutionStates.get()[source_node_id]); + const { invocation_source_id, step, total_steps, progress_image } = action.payload.data; + const nes = deepClone($nodeExecutionStates.get()[invocation_source_id]); if (nes) { nes.status = zNodeStatus.enum.IN_PROGRESS; nes.progress = (step + 1) / total_steps; diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketQueueItemStatusChanged.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketQueueItemStatusChanged.ts index 720abe4adb..5c92e81001 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketQueueItemStatusChanged.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketQueueItemStatusChanged.ts @@ -73,7 +73,7 @@ export const addSocketQueueItemStatusChangedEventListener = (startAppListening: queueApi.util.invalidateTags(['CurrentSessionQueueItem', 'NextSessionQueueItem', 'InvocationCacheStatus']) ); - if (['in_progress'].includes(action.payload.data.queue_item.status)) { + if (['in_progress'].includes(action.payload.data.status)) { forEach($nodeExecutionStates.get(), (nes) => { if (!nes) { return; diff --git a/invokeai/frontend/web/src/features/canvas/store/canvasSlice.ts b/invokeai/frontend/web/src/features/canvas/store/canvasSlice.ts index a22f23d9d3..fbb6378166 100644 --- a/invokeai/frontend/web/src/features/canvas/store/canvasSlice.ts +++ b/invokeai/frontend/web/src/features/canvas/store/canvasSlice.ts @@ -613,7 +613,7 @@ export const canvasSlice = createSlice({ state.batchIds = state.batchIds.filter((id) => id !== batch_status.batch_id); } - const queueItemStatus = action.payload.data.queue_item.status; + const queueItemStatus = action.payload.data.status; if (queueItemStatus === 'canceled' || queueItemStatus === 'failed') { resetStagingAreaIfEmpty(state); }