mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-30 11:11:53 +00:00
[backport core/1.38] fix: update reactive ref after merge in imagePreviewStore (#8502)
Backport of #8479 to `core/1.38` Automatically created by backport workflow. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-8502-backport-core-1-38-fix-update-reactive-ref-after-merge-in-imagePreviewStore-2f96d73d3650815f944cc401a8c2d264) by [Unito](https://www.unito.io) --------- Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: Austin Mroz <austin@comfy.org>
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
import { createTestingPinia } from '@pinia/testing'
|
||||||
import { createPinia, setActivePinia } from 'pinia'
|
import { createPinia, setActivePinia } from 'pinia'
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
@@ -13,7 +14,9 @@ vi.mock('@/utils/litegraphUtil', () => ({
|
|||||||
|
|
||||||
vi.mock('@/scripts/app', () => ({
|
vi.mock('@/scripts/app', () => ({
|
||||||
app: {
|
app: {
|
||||||
getPreviewFormatParam: vi.fn(() => '&format=test_webp')
|
getPreviewFormatParam: vi.fn(() => '&format=test_webp'),
|
||||||
|
nodeOutputs: {} as Record<string, unknown>,
|
||||||
|
nodePreviewImages: {} as Record<string, string[]>
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -28,6 +31,62 @@ const createMockOutputs = (
|
|||||||
images?: ExecutedWsMessage['output']['images']
|
images?: ExecutedWsMessage['output']['images']
|
||||||
): ExecutedWsMessage['output'] => ({ images })
|
): ExecutedWsMessage['output'] => ({ images })
|
||||||
|
|
||||||
|
vi.mock('@/stores/executionStore', () => ({
|
||||||
|
useExecutionStore: vi.fn(() => ({
|
||||||
|
executionIdToNodeLocatorId: vi.fn((id: string) => id)
|
||||||
|
}))
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
|
||||||
|
useWorkflowStore: vi.fn(() => ({
|
||||||
|
nodeIdToNodeLocatorId: vi.fn((id: string | number) => String(id)),
|
||||||
|
nodeToNodeLocatorId: vi.fn((node: { id: number }) => String(node.id))
|
||||||
|
}))
|
||||||
|
}))
|
||||||
|
|
||||||
|
describe('imagePreviewStore setNodeOutputsByExecutionId with merge', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
setActivePinia(createTestingPinia({ stubActions: false }))
|
||||||
|
vi.clearAllMocks()
|
||||||
|
app.nodeOutputs = {}
|
||||||
|
app.nodePreviewImages = {}
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should update reactive nodeOutputs.value when merging outputs', () => {
|
||||||
|
const store = useNodeOutputStore()
|
||||||
|
const executionId = '1'
|
||||||
|
|
||||||
|
const initialOutput = createMockOutputs([{ filename: 'a.png' }])
|
||||||
|
store.setNodeOutputsByExecutionId(executionId, initialOutput)
|
||||||
|
|
||||||
|
expect(app.nodeOutputs[executionId]?.images).toHaveLength(1)
|
||||||
|
expect(store.nodeOutputs[executionId]?.images).toHaveLength(1)
|
||||||
|
|
||||||
|
const newOutput = createMockOutputs([{ filename: 'b.png' }])
|
||||||
|
store.setNodeOutputsByExecutionId(executionId, newOutput, { merge: true })
|
||||||
|
|
||||||
|
expect(app.nodeOutputs[executionId]?.images).toHaveLength(2)
|
||||||
|
expect(store.nodeOutputs[executionId]?.images).toHaveLength(2)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should assign to reactive ref after merge for Vue reactivity', () => {
|
||||||
|
const store = useNodeOutputStore()
|
||||||
|
const executionId = '1'
|
||||||
|
|
||||||
|
const initialOutput = createMockOutputs([{ filename: 'a.png' }])
|
||||||
|
store.setNodeOutputsByExecutionId(executionId, initialOutput)
|
||||||
|
|
||||||
|
const newOutput = createMockOutputs([{ filename: 'b.png' }])
|
||||||
|
|
||||||
|
store.setNodeOutputsByExecutionId(executionId, newOutput, { merge: true })
|
||||||
|
|
||||||
|
expect(store.nodeOutputs[executionId]).toStrictEqual(
|
||||||
|
app.nodeOutputs[executionId]
|
||||||
|
)
|
||||||
|
expect(store.nodeOutputs[executionId]?.images).toHaveLength(2)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
describe('imagePreviewStore getPreviewParam', () => {
|
describe('imagePreviewStore getPreviewParam', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
setActivePinia(createPinia())
|
setActivePinia(createPinia())
|
||||||
|
|||||||
@@ -148,6 +148,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
|
|||||||
existingOutput[k] = newValue
|
existingOutput[k] = newValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
nodeOutputs.value[nodeLocatorId] = existingOutput
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user