From 5a44016f9268415d4e7fabf4615c95d28a269dc3 Mon Sep 17 00:00:00 2001 From: Simon Pinfold Date: Sun, 11 Oct 2026 16:00:31 -0700 Subject: [PATCH 1/3] test: tests for the EXR/HDR preview fixes The unit and e2e tests for the stacked HDR viewer, preview and drop fixes, kept separate so the fixes read as product code alone. --- .../tests/sidebar/hdrOutputViewer.spec.ts | 107 ++++++++++++ src/components/hdr/HdrViewerContent.test.ts | 23 +++ .../queue/job/JobAssetsList.test.ts | 24 +++ .../sidebar/tabs/AssetsSidebarTab.test.ts | 65 +++++++ .../node/useNodeDragAndDrop.test.ts | 22 +++ .../queue/useResultGallery.test.ts | 63 +++++++ src/composables/useHdrViewer.test.ts | 43 +++++ .../assets/components/MediaAssetCard.test.ts | 13 ++ .../NodeOutputsExportDialog.test.ts | 16 +- .../composables/media/assetMappers.test.ts | 25 +++ .../assets/composables/useAssetsQuery.test.ts | 12 ++ .../useGeneratedPreviewLookup.test.ts | 64 +++++++ .../composables/useNodeOutputsExport.test.ts | 66 ++++++++ .../assets/utils/attachPreview.test.ts | 49 ++++++ .../assets/utils/hdrPreviewGeneration.test.ts | 159 ++++++++++++++++++ .../assets/utils/outputAssetUtil.test.ts | 24 +++ .../vueNodes/components/ImagePreview.test.ts | 55 ++++++ src/services/hdrViewerService.test.ts | 11 ++ src/utils/eventUtils.test.ts | 37 +++- src/utils/loaderNodeUtil.test.ts | 19 +++ 20 files changed, 894 insertions(+), 3 deletions(-) create mode 100644 browser_tests/tests/sidebar/hdrOutputViewer.spec.ts create mode 100644 src/composables/useHdrViewer.test.ts create mode 100644 src/platform/assets/composables/useGeneratedPreviewLookup.test.ts create mode 100644 src/platform/assets/utils/attachPreview.test.ts create mode 100644 src/platform/assets/utils/hdrPreviewGeneration.test.ts create mode 100644 src/utils/loaderNodeUtil.test.ts diff --git a/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts new file mode 100644 index 00000000000..9bfab691de2 --- /dev/null +++ b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts @@ -0,0 +1,107 @@ +import { expect, mergeTests } from '@playwright/test' + +import { comfyPageFixture } from '@e2e/fixtures/ComfyPage' +import type { ComfyPage } from '@e2e/fixtures/ComfyPage' +import { + createRouteMockJob, + jobsRouteFixture, + routeMockJobTimestamp +} from '@e2e/fixtures/jobsRouteFixture' +import { TestIds } from '@e2e/fixtures/selectors' +import { mockViewFiles } from '@e2e/fixtures/utils/viewFileMocks' + +const hdrJob = createRouteMockJob({ + id: 'hdr-job', + create_time: routeMockJobTimestamp - 1_000, + execution_start_time: routeMockJobTimestamp - 1_000, + execution_end_time: routeMockJobTimestamp, + preview_output: { + filename: 'sky.exr', + subfolder: 'renders', + type: 'output', + nodeId: '1', + mediaType: 'images' + } +}) + +const test = mergeTests(comfyPageFixture, jobsRouteFixture).extend<{ + mockHdrJob: void +}>({ + mockHdrJob: [ + async ({ jobsRoutes, page }, use) => { + // Job history and the assets sidebar page jobs with different limits. + await jobsRoutes.mockJobsScenario({ history: [hdrJob], queue: [] }) + await jobsRoutes.mockJobsHistory([hdrJob]) + await mockViewFiles(page, { + 'sky.exr': { + path: 'browser_tests/assets/test_upload_image.exr', + contentType: 'image/x-exr' + } + }) + // Only the subfolder URL serves the EXR, so a decoded viewer proves the URL. + await page.route('**/api/view**', async (route) => { + const url = new URL(route.request().url()) + const wrongFolder = + url.searchParams.get('filename') === 'sky.exr' && + url.searchParams.get('subfolder') !== 'renders' + await (wrongFolder ? route.fulfill({ status: 404 }) : route.fallback()) + }) + await use() + }, + { auto: true } + ] +}) + +function hdrViewer(comfyPage: ComfyPage) { + return comfyPage.page.getByRole('dialog').filter({ hasText: 'sky.exr' }) +} + +async function expectHdrViewerLoaded(comfyPage: ComfyPage) { + const viewer = hdrViewer(comfyPage) + // Statistics only render once the texture has decoded. + await expect(viewer.getByText('Resolution', { exact: true })).toBeVisible() + await expect(viewer.getByRole('alert')).toBeHidden() + // The image lightbox would be a second dialog. + await expect(comfyPage.page.getByRole('dialog')).toHaveCount(1) +} + +// History-mode routing to the viewer; the assets-mode by-id URL is pinned in +// AssetsSidebarTab.test.ts. +test.describe('HDR outputs open in the HDR viewer', { tag: '@ui' }, () => { + test.describe('from job history', () => { + test.use({ initialSettings: { 'Comfy.Queue.QPOV2': true } }) + + test('opens the job output instead of the image lightbox', async ({ + comfyPage + }) => { + await comfyPage.page + .getByTestId(TestIds.sidebar.toolbar) + .getByRole('button', { name: 'Job History', exact: true }) + .click() + const row = comfyPage.queuePanel.jobRow('hdr-job') + await row.dblclick() + await expectHdrViewerLoaded(comfyPage) + }) + }) + + test.describe('from the assets sidebar', () => { + test('opens a generated HDR card on double click', async ({ + comfyPage + }) => { + const tab = comfyPage.menu.assetsTab + await tab.open() + await tab.getAssetCardByName('sky').dblclick() + await expectHdrViewerLoaded(comfyPage) + }) + + test('opens a generated HDR card from Inspect asset', async ({ + comfyPage + }) => { + const tab = comfyPage.menu.assetsTab + await tab.open() + await tab.rightClickAsset('sky') + await comfyPage.contextMenu.clickMenuItemExact('Inspect asset') + await expectHdrViewerLoaded(comfyPage) + }) + }) +}) diff --git a/src/components/hdr/HdrViewerContent.test.ts b/src/components/hdr/HdrViewerContent.test.ts index a3a3acc3446..596b40dd84d 100644 --- a/src/components/hdr/HdrViewerContent.test.ts +++ b/src/components/hdr/HdrViewerContent.test.ts @@ -5,6 +5,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { ref } from 'vue' import { createI18n } from 'vue-i18n' +import { downloadFile } from '@/base/common/downloadUtil' + import HdrViewerContent from './HdrViewerContent.vue' vi.mock(import('@/base/common/downloadUtil'), () => ({ downloadFile: vi.fn() })) @@ -138,4 +140,25 @@ describe('HdrViewerContent', () => { expect(viewer.checkerboard.value).toBe(false) }) + + it('loads and downloads a by-id URL under the given filename', async () => { + const user = userEvent.setup() + render(HdrViewerContent, { + props: { imageUrl: '/api/assets/abc/content', filename: 'sky.hdr' }, + global: { plugins: [i18n] } + }) + + const { mount } = holder.viewer as { mount: ReturnType } + expect(mount).toHaveBeenCalledWith( + expect.any(HTMLElement), + '/api/assets/abc/content', + 'sky.hdr' + ) + + await user.click(screen.getByRole('button', { name: 'Download' })) + expect(downloadFile).toHaveBeenCalledWith( + '/api/assets/abc/content', + 'sky.hdr' + ) + }) }) diff --git a/src/components/queue/job/JobAssetsList.test.ts b/src/components/queue/job/JobAssetsList.test.ts index b6245c97673..48bffe8f833 100644 --- a/src/components/queue/job/JobAssetsList.test.ts +++ b/src/components/queue/job/JobAssetsList.test.ts @@ -32,6 +32,16 @@ vi.mock( }) ) +vi.mock( + import('@/platform/assets/composables/useGeneratedPreviewLookup'), + () => ({ + useGeneratedPreviewLookup: () => (filename, assetId) => + assetId + ? `/api/assets/${assetId}-preview/content` + : `/by-name/${filename}` + }) +) + const AssetsListItemStub = defineComponent({ name: 'AssetsListItem', props: { @@ -67,6 +77,7 @@ const i18n = createI18n({ }) type TestPreviewOutput = { + id?: string filename: string mediaType: string url: string @@ -255,6 +266,19 @@ describe('JobAssetsList', () => { expect(stubRoot.getAttribute('data-preview-url')).not.toBe(preview.url) }) + it("uses an HDR job's own generated preview by asset id", () => { + const preview = { ...createPreviewOutput('img.exr'), id: 'exr-asset' } + const { container } = renderJobAssetsList({ + jobs: [buildJob({ taskRef: createTaskRef(preview) })] + }) + + expect( + container + .querySelector('.assets-list-item-stub')! + .getAttribute('data-preview-url') + ).toBe('/api/assets/exr-asset-preview/content') + }) + it('emits viewItem on double-click for completed jobs with preview', async () => { const job = buildJob() const onViewItem = vi.fn() diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts index 3575f577528..0ef270a17b3 100644 --- a/src/components/sidebar/tabs/AssetsSidebarTab.test.ts +++ b/src/components/sidebar/tabs/AssetsSidebarTab.test.ts @@ -7,10 +7,14 @@ import { within } from '@testing-library/vue' import { beforeEach, describe, expect, it, vi } from 'vitest' +import { nextTick } from 'vue' import { createI18n } from 'vue-i18n' +import { useFeatureFlags } from '@/composables/useFeatureFlags' + import { useMediaAssetActions } from '@/platform/assets/composables/useMediaAssetActions' import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil' +import { openHdrViewer } from '@/services/hdrViewerService' import { useAssetsStore } from '@/stores/assetsStore' import AssetsSidebarTab from './AssetsSidebarTab.vue' @@ -82,6 +86,10 @@ vi.mock(import('@/platform/assets/composables/useMediaAssetActions')) vi.mock(import('@/platform/assets/utils/outputAssetUtil')) +vi.mock(import('@/services/hdrViewerService')) + +vi.mock(import('@/composables/useFeatureFlags')) + vi.mock( import('primevue/usetoast'), // oxlint-disable-line comfy/no-primevue-imports () => ({ @@ -221,6 +229,63 @@ describe('AssetsSidebarTab context menu', () => { expect(useMediaAssetActions().addWorkflow).toHaveBeenCalledWith(asset) }) + it('inspects an HDR output in the HDR viewer and offers it as a node', async () => { + const asset = { ...folderAsset, name: 'sky.exr' } + useAssetsStore().outputAssets.items = [asset] + renderTab() + + await fireEvent.contextMenu( + screen.getByRole('button', { name: 'Enter output folder' }) + ) + expect( + await screen.findByRole('menuitem', { + name: 'mediaAsset.actions.insertAsNodeInWorkflow' + }) + ).toBeInTheDocument() + await userEvent.click( + screen.getByRole('menuitem', { name: 'mediaAsset.actions.inspect' }) + ) + + expect(openHdrViewer).toHaveBeenCalledWith( + expect.stringMatching(/\/view\?filename=sky\.exr&type=output$/), + 'sky.exr' + ) + }) + + it('opens a grouped HDR output by its own asset id when assets are enabled', async () => { + vi.mocked(useFeatureFlags().flags).assetsEnabled = true + await nextTick() + const asset = { + ...folderAsset, + name: 'sky.exr', + preview_url: '/api/view?filename=sky_preview.jpg&type=output', + user_metadata: { ...folderAsset.user_metadata, assetId: 'sky-asset' } + } + useAssetsStore().outputAssets = { + items: [asset], + hasMore: false, + isLoading: false, + loadMore: vi.fn(async () => false), + loadNew: vi.fn(async () => {}), + invalidate: vi.fn(async () => {}) + } + renderTab() + + await fireEvent.contextMenu( + screen.getByRole('button', { name: 'Enter output folder' }) + ) + await userEvent.click( + await screen.findByRole('menuitem', { + name: 'mediaAsset.actions.inspect' + }) + ) + + expect(openHdrViewer).toHaveBeenCalledWith( + expect.stringMatching(/\/assets\/sky-asset\/content$/), + 'sky.exr' + ) + }) + it('does not offer insertion for an unloadable file', async () => { useAssetsStore().outputAssets.items = [ { ...folderAsset, name: 'result.txt' } diff --git a/src/composables/node/useNodeDragAndDrop.test.ts b/src/composables/node/useNodeDragAndDrop.test.ts index 621fae75171..34a17c00d3d 100644 --- a/src/composables/node/useNodeDragAndDrop.test.ts +++ b/src/composables/node/useNodeDragAndDrop.test.ts @@ -111,6 +111,28 @@ describe('useNodeDragAndDrop', () => { expect(onDrop).toHaveBeenCalledWith([keep]) }) + it('onDragDrop passes an untyped HDR file to an image filter as an image', async () => { + const onDrop = vi.fn().mockResolvedValue([]) + const node = createNode() + + useNodeDragAndDrop(node, { + onDrop, + fileFilter: (file) => file.type.startsWith('image/') + }) + + const result = await node.onDragDrop?.( + createDragEvent({ + files: [createFile('sky.exr', '')], + items: [{ kind: 'file' }] + }) + ) + + expect(result).toBe(true) + expect(onDrop).toHaveBeenCalledWith([ + expect.objectContaining({ name: 'sky.exr', type: 'image/x-exr' }) + ]) + }) + it('onDragDrop returns false for invalid drops', async () => { const onDrop = vi.fn().mockResolvedValue([]) const node = createNode() diff --git a/src/composables/queue/useResultGallery.test.ts b/src/composables/queue/useResultGallery.test.ts index d02e6c09f01..272a0188ba9 100644 --- a/src/composables/queue/useResultGallery.test.ts +++ b/src/composables/queue/useResultGallery.test.ts @@ -1,8 +1,10 @@ import { describe, expect, it, vi } from 'vitest' vi.mock(import('@/platform/assets/composables/media/assetMappers')) +vi.mock(import('@/services/hdrViewerService')) import { useResultGallery } from '@/composables/queue/useResultGallery' +import { openHdrViewer } from '@/services/hdrViewerService' import type { JobListItem as JobListViewItem } from '@/composables/queue/useJobList' import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes' import { TaskItemImpl } from '@/stores/queueStore' @@ -160,4 +162,65 @@ describe('useResultGallery', () => { expect(galleryItems.value).toEqual(fullOutputs) expect(galleryActiveIndex.value).toBe(0) }) + + it('opens an HDR preview output in the HDR viewer instead of the gallery', async () => { + const exr = createResultItem('/api/view?filename=out.exr&subfolder=qa') + exr.filename = 'out.exr' + const task = createTask(exr) + + const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery( + () => [task] + ) + + await onViewItem(createJobViewItem('job-hdr', task)) + + expect(openHdrViewer).toHaveBeenCalledWith( + '/api/view?filename=out.exr&subfolder=qa', + 'out.exr' + ) + expect(galleryItems.value).toEqual([]) + expect(galleryActiveIndex.value).toBe(-1) + }) + + it('opens a job with HDR and image outputs in the gallery on its images', async () => { + const image = createResultItem('image.png') + const exr = createResultItem('/api/view?filename=out.exr') + exr.filename = 'out.exr' + const task = createTask(exr, [image, exr]) + + const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery( + () => [task] + ) + + await onViewItem(createJobViewItem('job-mixed', task)) + + expect(galleryItems.value).toEqual([image]) + expect(galleryActiveIndex.value).toBe(0) + expect(openHdrViewer).not.toHaveBeenCalled() + }) + + it('does not open a slower gallery request over a later HDR selection', async () => { + const image = createResultItem('image.png') + const exr = createResultItem('/api/view?filename=out.exr') + exr.filename = 'out.exr' + const imageJob = createMockJob('slow-image-job', 2) + const imageTask = new TaskItemImpl(imageJob, {}, [image]) + let resolveFullOutputs!: (task: TaskItemImpl) => void + imageTask.loadFullOutputs = () => + new Promise((resolve) => (resolveFullOutputs = resolve)) + const hdrTask = createTask(exr) + + const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery( + () => [imageTask, hdrTask] + ) + + const imageView = onViewItem(createJobViewItem('job-image', imageTask)) + await onViewItem(createJobViewItem('job-hdr', hdrTask)) + resolveFullOutputs(new TaskItemImpl(imageJob, {}, [image, image])) + await imageView + + expect(openHdrViewer).toHaveBeenCalledOnce() + expect(galleryItems.value).toEqual([]) + expect(galleryActiveIndex.value).toBe(-1) + }) }) diff --git a/src/composables/useHdrViewer.test.ts b/src/composables/useHdrViewer.test.ts new file mode 100644 index 00000000000..29008c20415 --- /dev/null +++ b/src/composables/useHdrViewer.test.ts @@ -0,0 +1,43 @@ +import { describe, expect, it, vi } from 'vitest' +import * as THREE from 'three' + +import { loadHdrTexture } from '@/platform/hdr/hdrTextureLoader' + +import { useHdrViewer } from './useHdrViewer' + +vi.mock(import('three'), { spy: true }) +vi.mock(import('@/renderer/three/WebGLViewport')) +vi.mock(import('@/platform/hdr/hdrTextureLoader')) + +/** happy-dom has no WebGL; any renderer method is a no-op returning 1. */ +function fakeRenderer() { + const target: Record = { + domElement: document.createElement('canvas') + } + return new Proxy(target, { + get: (object, key) => + key === 'then' ? undefined : (object[key] ??= vi.fn(() => 1)) + }) +} + +describe('useHdrViewer', () => { + it('loads the texture under the filename it was given', async () => { + vi.mocked(THREE.WebGLRenderer).mockImplementation(function () { + return fakeRenderer() as unknown as THREE.WebGLRenderer + }) + vi.mocked(loadHdrTexture).mockRejectedValue(new Error('stop')) + + const viewer = useHdrViewer() + await viewer.mount( + document.createElement('div'), + '/api/assets/abc/content', + 'sky.hdr' + ) + + expect(viewer.error.value).toBe('stop') + expect(loadHdrTexture).toHaveBeenCalledWith( + '/api/assets/abc/content', + 'sky.hdr' + ) + }) +}) diff --git a/src/platform/assets/components/MediaAssetCard.test.ts b/src/platform/assets/components/MediaAssetCard.test.ts index 7202d85c8dd..3ed3d22f34a 100644 --- a/src/platform/assets/components/MediaAssetCard.test.ts +++ b/src/platform/assets/components/MediaAssetCard.test.ts @@ -248,6 +248,19 @@ describe('MediaAssetCard', () => { expect(emitted().zoom).toEqual([[asset]]) }) + it('inspects an HDR asset from a double click and the HDR viewer button', async () => { + const user = userEvent.setup() + const hdrAsset = { ...asset, name: 'sky.exr' } + const { emitted } = renderCard({ loading: false, asset: hdrAsset }) + + await user.dblClick(await screen.findByText('hdrViewer.hdrImage')) + await user.click( + screen.getByRole('button', { name: 'hdrViewer.openInHdrViewer' }) + ) + + expect(emitted().zoom).toEqual([[hdrAsset], [hdrAsset]]) + }) + it('selects non-video assets from the preview', async () => { const user = userEvent.setup() const { container, emitted } = renderCard({ diff --git a/src/platform/assets/components/NodeOutputsExportDialog.test.ts b/src/platform/assets/components/NodeOutputsExportDialog.test.ts index cef90df9127..583699dad0e 100644 --- a/src/platform/assets/components/NodeOutputsExportDialog.test.ts +++ b/src/platform/assets/components/NodeOutputsExportDialog.test.ts @@ -12,11 +12,11 @@ const items = [ { name: 'shot_003.exr', thumbnailUrl: '/api/view?filename=shot_003.exr' } ] -function renderDialog() { +function renderDialog(dialogItems = items) { const onExport = vi.fn<(selectedIndices: number[]) => void>() const onCancel = vi.fn<() => void>() render(NodeOutputsExportDialog, { - props: { items, onExport, onCancel }, + props: { items: dialogItems, onExport, onCancel }, global: { plugins: [i18n] } }) return { onExport, onCancel, user: userEvent.setup() } @@ -77,6 +77,18 @@ describe('NodeOutputsExportDialog', () => { ) }) + it('shows a placeholder for an output with no thumbnail', () => { + renderDialog([ + { name: 'shot_001.exr', thumbnailUrl: '' }, + { name: 'shot_002.png', thumbnailUrl: '/api/view?filename=shot_002.png' } + ]) + + expect(screen.getAllByTestId('output-thumbnail')).toHaveLength(1) + expect(screen.getAllByTestId('output-thumbnail-placeholder')).toHaveLength( + 1 + ) + }) + it('cancels without exporting', async () => { const { onExport, onCancel, user } = renderDialog() diff --git a/src/platform/assets/composables/media/assetMappers.test.ts b/src/platform/assets/composables/media/assetMappers.test.ts index 79fd17b9b2c..7de760c90c9 100644 --- a/src/platform/assets/composables/media/assetMappers.test.ts +++ b/src/platform/assets/composables/media/assetMappers.test.ts @@ -116,4 +116,29 @@ describe('unflattenOutputAssets', () => { 'later-id' ]) }) + + it('carries each output asset preview id into the grouped outputs', () => { + const assets = [ + { + id: 'exr-id', + job_id: 'job-id', + name: 'out.exr', + size: 1, + tags: ['output'], + preview_id: 'preview-id', + preview_url: '/api/assets/preview-id/content', + created_at: '2026-01-01T00:00:00Z', + updated_at: '2026-01-01T00:00:00Z' + } + ] satisfies AssetItem[] + + const [grouped] = unflattenOutputAssets(assets) + const metadata = getOutputAssetMetadata(grouped.user_metadata) + + expect(metadata?.allOutputs?.[0]).toMatchObject({ + assetId: 'exr-id', + previewId: 'preview-id', + url: '/api/assets/preview-id/content' + }) + }) }) diff --git a/src/platform/assets/composables/useAssetsQuery.test.ts b/src/platform/assets/composables/useAssetsQuery.test.ts index 57902105f34..036d55dde80 100644 --- a/src/platform/assets/composables/useAssetsQuery.test.ts +++ b/src/platform/assets/composables/useAssetsQuery.test.ts @@ -383,3 +383,15 @@ describe('useAssetsQuery loadMore pagination', () => { expect(fetchApiMock).toHaveBeenCalledTimes(3) }) }) + +describe('useAssetsQuery hidden assets', () => { + it('excludes missing assets and client-uploaded previews from every list', async () => { + await createList('hidden', ['a']) + + const [url] = fetchApiMock.mock.calls[0] + const tagsNone = new URL(url, 'http://localhost').searchParams.get( + 'tags_none' + ) + expect(tagsNone?.split(',').sort()).toEqual(['fe-preview', 'missing']) + }) +}) diff --git a/src/platform/assets/composables/useGeneratedPreviewLookup.test.ts b/src/platform/assets/composables/useGeneratedPreviewLookup.test.ts new file mode 100644 index 00000000000..ebdb51eeb85 --- /dev/null +++ b/src/platform/assets/composables/useGeneratedPreviewLookup.test.ts @@ -0,0 +1,64 @@ +import { fromPartial } from '@total-typescript/shoehorn' +import { describe, expect, it, vi } from 'vitest' +import { ref } from 'vue' + +import type { AssetItem } from '@/platform/assets/schemas/assetSchema' +import { useAssetsQuery } from '@/platform/assets/composables/useAssetsQuery' +import { isAssetPreviewSupported } from '@/platform/assets/utils/assetPreviewUtil' + +import { useGeneratedPreviewLookup } from './useGeneratedPreviewLookup' + +vi.mock(import('@/platform/assets/composables/useAssetsQuery')) +vi.mock(import('@/platform/assets/utils/assetPreviewUtil')) + +function exr(id: string, name: string, previewUrl: string): AssetItem { + return fromPartial({ + id, + name, + preview_id: `${id}-preview`, + preview_url: previewUrl + }) +} + +function withAssets(inputs: AssetItem[], outputs: AssetItem[]) { + vi.mocked(isAssetPreviewSupported).mockReturnValue(true) + vi.mocked(useAssetsQuery).mockImplementation((params) => + fromPartial({ + items: ref(params?.tags_any?.includes('input') ? inputs : outputs) + }) + ) + return useGeneratedPreviewLookup() +} + +describe('useGeneratedPreviewLookup', () => { + it('finds the asset with the given id when filenames collide', () => { + const find = withAssets( + [exr('input-sky', 'sky.exr', '/input-preview.jpg')], + [ + exr('run-a', 'sky.exr', '/run-a-preview.jpg'), + exr('run-b', 'sky.exr', '/run-b-preview.jpg') + ] + ) + + expect(find('sky.exr', 'run-b')).toBe('/run-b-preview.jpg') + }) + + it('finds nothing for an id that is not loaded, even if the filename is', () => { + const find = withAssets([], [exr('run-a', 'sky.exr', '/run-a-preview.jpg')]) + + expect(find('sky.exr', 'not-loaded')).toBe('') + }) + + it('falls back to the filename without an id', () => { + const find = withAssets([], [exr('run-a', 'sky.exr', '/run-a-preview.jpg')]) + + expect(find('sky.exr')).toBe('/run-a-preview.jpg') + }) + + it('finds nothing where asset previews are unsupported', () => { + vi.mocked(isAssetPreviewSupported).mockReturnValue(false) + + expect(useGeneratedPreviewLookup()('sky.exr')).toBe('') + expect(useAssetsQuery).not.toHaveBeenCalled() + }) +}) diff --git a/src/platform/assets/composables/useNodeOutputsExport.test.ts b/src/platform/assets/composables/useNodeOutputsExport.test.ts index 8981587167c..fca740e5287 100644 --- a/src/platform/assets/composables/useNodeOutputsExport.test.ts +++ b/src/platform/assets/composables/useNodeOutputsExport.test.ts @@ -13,6 +13,7 @@ import type { ResultItem } from '@/platform/remote/comfyui/execution/types' import { reportError } from '@/platform/telemetry/reportError' import { useToastStore } from '@/platform/updates/common/toastStore' import { useAssetExportStore } from '@/stores/assetExportStore' +import { useGeneratedPreviewLookup } from '@/platform/assets/composables/useGeneratedPreviewLookup' import { useNodeOutputStore } from '@/stores/nodeOutputStore' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' @@ -21,6 +22,19 @@ import { useNodeOutputsExport } from './useNodeOutputsExport' vi.mock(import('@/composables/useFeatureFlags')) vi.mock(import('@/platform/assets/services/assetService')) vi.mock(import('@/platform/telemetry/reportError')) +vi.mock( + import('@/platform/assets/composables/useGeneratedPreviewLookup'), + () => ({ + useGeneratedPreviewLookup: vi.fn( + () => (_filename: string | undefined, assetId?: string) => + assetId === 'sky-asset' + ? '/api/assets/sky-preview/content' + : assetId + ? '' + : '/api/assets/filename-match/content' + ) + }) +) vi.mock(import('@/base/common/downloadUtil'), () => ({ downloadFile: vi.fn(), downloadFileAsBlob: vi.fn() @@ -234,4 +248,56 @@ describe('useNodeOutputsExport', () => { ]) expect(useAssetExportStore().exportList).toEqual([]) }) + + it('shows HDR outputs by their own generated preview, or a placeholder without one', async () => { + const node = nodeWithOutputs([ + { + filename: 'sky.exr', + subfolder: 'renders', + type: 'output', + id: 'sky-asset' + }, + { + filename: 'sky.exr', + subfolder: 'other', + type: 'output', + id: 'other-sky' + }, + { filename: 'sky.exr', subfolder: 'third', type: 'output' }, + { filename: 'a.png', type: 'output' } + ]) + + const { dialog } = await openExportDialog(node) + + const thumbnails = within(dialog).getAllByTestId('output-thumbnail') + expect(thumbnails.map((img) => img.getAttribute('src'))).toEqual([ + '/api/assets/sky-preview/content', + expect.stringContaining('filename=a.png') + ]) + expect( + within(dialog).getAllByTestId('output-thumbnail-placeholder') + ).toHaveLength(2) + }) + + it('creates the preview lookup once, not on every dialog open', async () => { + const node = nodeWithOutputs([ + { filename: 'a.png', type: 'output' }, + { filename: 'b.png', type: 'output' } + ]) + const { showOutputsExportDialog } = mountComposable() + const user = userEvent.setup() + + for (let open = 0; open < 2; open++) { + showOutputsExportDialog(node) + const dialog = await screen.findByRole('dialog', { + name: 'Download Assets' + }) + await user.click(within(dialog).getByRole('button', { name: 'Cancel' })) + await waitFor(() => { + expect(screen.queryByRole('dialog')).not.toBeInTheDocument() + }) + } + + expect(useGeneratedPreviewLookup).toHaveBeenCalledOnce() + }) }) diff --git a/src/platform/assets/utils/attachPreview.test.ts b/src/platform/assets/utils/attachPreview.test.ts new file mode 100644 index 00000000000..83010b44176 --- /dev/null +++ b/src/platform/assets/utils/attachPreview.test.ts @@ -0,0 +1,49 @@ +import { fromPartial } from '@total-typescript/shoehorn' +import { describe, expect, it, vi } from 'vitest' + +import { assetService } from '@/platform/assets/services/assetService' + +import { attachPreview } from './attachPreview' + +const mocks = vi.hoisted(() => ({ isCloud: false })) + +vi.mock(import('@/platform/distribution/types'), () => ({ + get isCloud() { + return mocks.isCloud + } +})) +vi.mock(import('@/platform/assets/services/assetService'), () => + fromPartial({ + assetService: { + uploadAssetFromBase64: vi.fn(), + updateAsset: vi.fn() + } + }) +) + +describe('attachPreview', () => { + it.for([ + { isCloud: false, tags: ['output', 'fe-preview'] }, + { isCloud: true, tags: ['preview'] } + ])( + 'uploads with tags $tags when isCloud=$isCloud and links it', + async ({ isCloud, tags }) => { + mocks.isCloud = isCloud + vi.mocked(assetService.uploadAssetFromBase64).mockResolvedValue( + fromPartial({ id: 'preview-id' }) + ) + + await attachPreview( + { id: 'exr-id', name: 'sky.exr' }, + new Blob(['jpeg'], { type: 'image/jpeg' }) + ) + + expect(assetService.uploadAssetFromBase64).toHaveBeenCalledWith( + expect.objectContaining({ name: 'sky.exr_preview.jpg', tags }) + ) + expect(assetService.updateAsset).toHaveBeenCalledWith('exr-id', { + preview_id: 'preview-id' + }) + } + ) +}) diff --git a/src/platform/assets/utils/hdrPreviewGeneration.test.ts b/src/platform/assets/utils/hdrPreviewGeneration.test.ts new file mode 100644 index 00000000000..5e0786b62b8 --- /dev/null +++ b/src/platform/assets/utils/hdrPreviewGeneration.test.ts @@ -0,0 +1,159 @@ +import { fromPartial } from '@total-typescript/shoehorn' +import { beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest' +import { effectScope, ref } from 'vue' + +import type { AssetItem } from '@/platform/assets/schemas/assetSchema' +import { assetService } from '@/platform/assets/services/assetService' +import { attachPreview } from '@/platform/assets/utils/attachPreview' +import type { PagedList } from '@/utils/pagedList' + +import { generatePreviewsForNewAssets } from './hdrPreviewGeneration' + +vi.mock(import('@/platform/assets/services/assetService'), () => + fromPartial({ assetService: { getAssetDetails: vi.fn() } }) +) +vi.mock(import('@/platform/assets/utils/attachPreview')) +vi.mock(import('@/platform/telemetry/reportError'), () => ({ + reportError: vi.fn() +})) +vi.mock(import('@/composables/useFeatureFlags'), () => + fromPartial({ useFeatureFlags: () => ({ flags: { assetsEnabled: true } }) }) +) + +const thumbnail = new Blob(['jpeg'], { type: 'image/jpeg' }) + +let workersStarted = 0 + +class FakeWorker { + onmessage: ((event: { data: unknown }) => void) | null = null + onerror = null + constructor() { + workersStarted++ + } + postMessage() { + queueMicrotask(() => this.onmessage?.({ data: thumbnail })) + } + terminate() {} +} + +/** Web Locks that grant one holder at a time, as a secure-context browser does. */ +function stubGrantingLocks() { + let held: Promise = Promise.resolve() + const request = vi.fn((_name: string, task: (lock: object) => unknown) => { + const run = held.then(() => task({})) + held = run.catch(() => undefined) + return run + }) + vi.stubGlobal('navigator', { locks: { request } }) + return request +} + +function exrAsset(overrides: Partial = {}): AssetItem { + return fromPartial({ + id: 'exr-id', + name: 'sky.exr', + tags: ['input'], + created_at: new Date().toISOString(), + ...overrides + }) +} + +function watchNewAssets() { + const items = ref([]) + const invalidate = vi.fn().mockResolvedValue(undefined) + const list = fromPartial>({ + items, + hasMore: ref(false), + invalidate + }) + const scope = effectScope() + scope.run(() => generatePreviewsForNewAssets(list)) + onTestFinished(() => scope.stop()) + return { items, invalidate } +} + +async function addAndSettle(asset: AssetItem) { + const { items, invalidate } = watchNewAssets() + items.value = [asset] + await vi.waitFor(() => expect(invalidate).toHaveBeenCalled()) +} + +describe('generatePreviewsForNewAssets', () => { + beforeEach(() => { + workersStarted = 0 + vi.stubGlobal('Worker', FakeWorker) + }) + + it.for([ + { locks: 'granted', stub: stubGrantingLocks }, + { locks: 'unavailable', stub: () => vi.stubGlobal('navigator', {}) } + ])( + 'attaches a rendered preview to a new HDR asset when locks are $locks', + async ({ stub }) => { + stub() + vi.mocked(assetService.getAssetDetails).mockResolvedValue(exrAsset()) + + await addAndSettle(exrAsset()) + + expect(attachPreview).toHaveBeenCalledWith( + expect.objectContaining({ id: 'exr-id' }), + thumbnail + ) + } + ) + + it('does not attach when another client attached a preview while rendering', async () => { + stubGrantingLocks() + vi.mocked(assetService.getAssetDetails) + .mockResolvedValueOnce(exrAsset()) + .mockResolvedValue( + exrAsset({ preview_id: 'other-preview', preview_url: '/p.jpg' }) + ) + + await addAndSettle(exrAsset()) + + expect(workersStarted).toBe(1) + expect(attachPreview).not.toHaveBeenCalled() + }) + + it('still generates a preview when the asset lookup fails', async () => { + stubGrantingLocks() + vi.mocked(assetService.getAssetDetails).mockRejectedValue( + new Error('asset lookup failed') + ) + + await addAndSettle(exrAsset()) + + expect(workersStarted).toBe(1) + expect(attachPreview).toHaveBeenCalledOnce() + }) + + it('lets one tab render while another waits and then reuses its preview', async () => { + const request = stubGrantingLocks() + let attached = false + vi.mocked(attachPreview).mockImplementation(async () => { + attached = true + }) + vi.mocked(assetService.getAssetDetails).mockImplementation(async () => + attached + ? exrAsset({ preview_id: 'tab-preview', preview_url: '/p.jpg' }) + : exrAsset() + ) + const firstTab = watchNewAssets() + const secondTab = watchNewAssets() + + firstTab.items.value = [exrAsset()] + secondTab.items.value = [exrAsset()] + await vi.waitFor(() => { + expect(firstTab.invalidate).toHaveBeenCalled() + expect(secondTab.invalidate).toHaveBeenCalled() + }) + + expect(request).toHaveBeenCalledWith( + 'hdr-preview:exr-id', + expect.any(Function) + ) + expect(workersStarted).toBe(1) + expect(attachPreview).toHaveBeenCalledOnce() + }) +}) diff --git a/src/platform/assets/utils/outputAssetUtil.test.ts b/src/platform/assets/utils/outputAssetUtil.test.ts index 615f48af7f2..2e4c70cbf3e 100644 --- a/src/platform/assets/utils/outputAssetUtil.test.ts +++ b/src/platform/assets/utils/outputAssetUtil.test.ts @@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { OutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema' import type { AssetItem } from '@/platform/assets/schemas/assetSchema' +import { getGeneratedPreviewUrl } from '@/platform/assets/utils/assetUrlUtil' import { getOutputKey } from '@/platform/assets/utils/outputKeyUtil' import type { AugmentedResultItem } from '@/utils/resultItem' import type { SerializedNodeId } from '@/types/nodeId' @@ -190,6 +191,29 @@ describe('resolveOutputAssetItems', () => { expect(results[0].id).toBe('asset-a') }) + it('keeps the linked preview of an output so an HDR child shows it', async () => { + const output = { + ...createOutput({ + filename: 'out.exr', + assetId: 'exr-id', + url: '/api/assets/preview-id/content' + }), + previewId: 'preview-id' + } + const metadata: OutputAssetMetadata = { + jobId: 'job-1', + nodeId: '1', + subfolder: 'sub', + outputCount: 1, + allOutputs: [output] + } + + const [child] = await resolveOutputAssetItems(metadata) + + expect(child.preview_id).toBe('preview-id') + expect(getGeneratedPreviewUrl(child)).toBe('/api/assets/preview-id/content') + }) + it('synthesizes an item id when the output carries an empty asset id', async () => { const output = createOutput({ filename: 'a.png', diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts index 4793037f0f9..11044bb8c34 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts @@ -27,6 +27,14 @@ vi.mock(import('@/services/hdrViewerService'), () => ({ vi.mock(import('@/platform/telemetry')) +vi.mock( + import('@/platform/assets/composables/useGeneratedPreviewLookup'), + () => ({ + useGeneratedPreviewLookup: () => (_filename, assetId) => + assetId ? `/api/assets/${assetId}-preview/content` : '' + }) +) + vi.mock(import('@/utils/litegraphUtil'), { spy: true }) const i18n = createI18n({ @@ -159,6 +167,53 @@ describe('ImagePreview', () => { ).not.toBeInTheDocument() }) + it("shows an HDR output's own preview when another folder has the same filename", () => { + vi.mocked(resolveNode).mockReturnValue(createMockLGraphNode({ id: 1 })) + vi.spyOn(useNodeOutputStore(), 'getNodeOutputs').mockReturnValue({ + images: [ + { filename: 'img.exr', subfolder: 'qa8/b', type: 'output', id: 'b' }, + { filename: 'img.exr', subfolder: 'qa8/a', type: 'output', id: 'a' } + ] + }) + + renderImagePreview({ + nodeId: '1', + imageUrls: ['/api/view?filename=img.exr&subfolder=qa8%2Fa&type=output'] + }) + + expect(screen.getByRole('img', { name: 'img.exr' })).toHaveAttribute( + 'src', + '/api/assets/a-preview/content' + ) + }) + + it('shows each grid HDR output its own preview when filenames collide', () => { + vi.mocked(resolveNode).mockReturnValue(createMockLGraphNode({ id: 1 })) + vi.spyOn(useNodeOutputStore(), 'getNodeOutputs').mockReturnValue({ + images: [ + { filename: 'img.exr', subfolder: 'qa8/a', type: 'output', id: 'a' }, + { filename: 'img.exr', subfolder: 'qa8/b', type: 'output', id: 'b' } + ] + }) + + renderImagePreview({ + nodeId: '1', + imageUrls: [ + '/api/view?filename=img.exr&subfolder=qa8%2Fa&type=output', + '/api/view?filename=img.exr&subfolder=qa8%2Fb&type=output' + ] + }) + + expect( + screen + .getAllByRole('img', { name: 'img.exr' }) + .map((img) => img.getAttribute('src')) + ).toEqual([ + '/api/assets/a-preview/content', + '/api/assets/b-preview/content' + ]) + }) + it('offers the HDR viewer instead of an for exr outputs', () => { renderImagePreview({ imageUrls: ['/api/view?filename=out.exr&type=output'] diff --git a/src/services/hdrViewerService.test.ts b/src/services/hdrViewerService.test.ts index f3babdba928..743261dcbca 100644 --- a/src/services/hdrViewerService.test.ts +++ b/src/services/hdrViewerService.test.ts @@ -19,4 +19,15 @@ describe('openHdrViewer', () => { }) expect(options.dialogComponentProps?.size).toBe('full') }) + + it('titles and labels a by-id URL with the given filename', () => { + openHdrViewer('/api/assets/abc/content', 'sky.hdr') + + const options = vi.mocked(useDialogStore().showDialog).mock.calls.at(-1)![0] + expect(options.title).toBe('sky.hdr') + expect(options.props).toMatchObject({ + imageUrl: '/api/assets/abc/content', + filename: 'sky.hdr' + }) + }) }) diff --git a/src/utils/eventUtils.test.ts b/src/utils/eventUtils.test.ts index 01ecbf0db9c..8b72d427108 100644 --- a/src/utils/eventUtils.test.ts +++ b/src/utils/eventUtils.test.ts @@ -1,9 +1,12 @@ +import { fromAny } from '@total-typescript/shoehorn' import { describe, expect, it } from 'vitest' import { + extractFilesFromDragEvent, hasAudioType, hasImageType, hasVideoType, - isMediaFile + isMediaFile, + withHdrImageType } from './eventUtils' describe('hasImageType', () => { @@ -54,3 +57,35 @@ describe('isMediaFile', () => { expect(isMediaFile({ type: 'application/json' } as File)).toBe(false) }) }) + +describe('withHdrImageType', () => { + it.for([ + ['sky.exr', 'image/x-exr'], + ['SKY.HDR', 'image/vnd.radiance'] + ])('types an untyped %s as %s', ([name, type]) => { + const typed = withHdrImageType(new File(['data'], name)) + + expect(typed.type).toBe(type) + expect(typed.name).toBe(name) + }) + + it('leaves typed and non-HDR files alone', () => { + const typed = new File(['data'], 'sky.exr', { type: 'image/x-exr' }) + const other = new File(['data'], 'notes.txt') + + expect(withHdrImageType(typed)).toBe(typed) + expect(withHdrImageType(other)).toBe(other) + }) +}) + +describe('extractFilesFromDragEvent', () => { + it('returns an untyped .exr drop as an image', async () => { + const event = fromAny({ + dataTransfer: { files: [new File(['data'], 'sky.exr')] } + }) + + const [file] = await extractFilesFromDragEvent(event) + + expect(hasImageType(file)).toBe(true) + }) +}) diff --git a/src/utils/loaderNodeUtil.test.ts b/src/utils/loaderNodeUtil.test.ts new file mode 100644 index 00000000000..4d5ac71377a --- /dev/null +++ b/src/utils/loaderNodeUtil.test.ts @@ -0,0 +1,19 @@ +import { describe, expect, it } from 'vitest' + +import { detectNodeTypeFromFilename } from './loaderNodeUtil' + +describe('detectNodeTypeFromFilename', () => { + it.for(['image.png', 'sky.exr', 'sky.HDR'])( + 'loads %s with LoadImage', + (filename) => { + expect(detectNodeTypeFromFilename(filename)).toEqual({ + nodeType: 'LoadImage', + widgetName: 'image' + }) + } + ) + + it('has no loader for 3D files', () => { + expect(detectNodeTypeFromFilename('mesh.glb').nodeType).toBeNull() + }) +}) From 2acc6643bd41fd61bbb72cb5968b24a54eb25f7c Mon Sep 17 00:00:00 2001 From: Simon Pinfold Date: Sun, 11 Oct 2026 16:53:41 -0700 Subject: [PATCH 2/3] test: move the HDR viewer dialog wiring into a page object --- .../fixtures/components/HdrViewerDialog.ts | 24 +++++++++++++++++++ .../tests/sidebar/hdrOutputViewer.spec.ts | 23 ++++-------------- 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 browser_tests/fixtures/components/HdrViewerDialog.ts diff --git a/browser_tests/fixtures/components/HdrViewerDialog.ts b/browser_tests/fixtures/components/HdrViewerDialog.ts new file mode 100644 index 00000000000..3c55e55051a --- /dev/null +++ b/browser_tests/fixtures/components/HdrViewerDialog.ts @@ -0,0 +1,24 @@ +import { expect } from '@playwright/test' +import type { Locator, Page } from '@playwright/test' + +/** The HDR viewer dialog showing one file. */ +export class HdrViewerDialog { + public readonly root: Locator + + constructor( + public readonly page: Page, + filename: string + ) { + this.root = page.getByRole('dialog').filter({ hasText: filename }) + } + + /** Waits for the file to decode: statistics only render after that. */ + async expectLoaded() { + await expect( + this.root.getByText('Resolution', { exact: true }) + ).toBeVisible() + await expect(this.root.getByRole('alert')).toBeHidden() + // The image lightbox would be a second dialog. + await expect(this.page.getByRole('dialog')).toHaveCount(1) + } +} diff --git a/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts index 9bfab691de2..8b8d3edba9b 100644 --- a/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts +++ b/browser_tests/tests/sidebar/hdrOutputViewer.spec.ts @@ -1,12 +1,12 @@ -import { expect, mergeTests } from '@playwright/test' +import { mergeTests } from '@playwright/test' import { comfyPageFixture } from '@e2e/fixtures/ComfyPage' -import type { ComfyPage } from '@e2e/fixtures/ComfyPage' import { createRouteMockJob, jobsRouteFixture, routeMockJobTimestamp } from '@e2e/fixtures/jobsRouteFixture' +import { HdrViewerDialog } from '@e2e/fixtures/components/HdrViewerDialog' import { TestIds } from '@e2e/fixtures/selectors' import { mockViewFiles } from '@e2e/fixtures/utils/viewFileMocks' @@ -52,19 +52,6 @@ const test = mergeTests(comfyPageFixture, jobsRouteFixture).extend<{ ] }) -function hdrViewer(comfyPage: ComfyPage) { - return comfyPage.page.getByRole('dialog').filter({ hasText: 'sky.exr' }) -} - -async function expectHdrViewerLoaded(comfyPage: ComfyPage) { - const viewer = hdrViewer(comfyPage) - // Statistics only render once the texture has decoded. - await expect(viewer.getByText('Resolution', { exact: true })).toBeVisible() - await expect(viewer.getByRole('alert')).toBeHidden() - // The image lightbox would be a second dialog. - await expect(comfyPage.page.getByRole('dialog')).toHaveCount(1) -} - // History-mode routing to the viewer; the assets-mode by-id URL is pinned in // AssetsSidebarTab.test.ts. test.describe('HDR outputs open in the HDR viewer', { tag: '@ui' }, () => { @@ -80,7 +67,7 @@ test.describe('HDR outputs open in the HDR viewer', { tag: '@ui' }, () => { .click() const row = comfyPage.queuePanel.jobRow('hdr-job') await row.dblclick() - await expectHdrViewerLoaded(comfyPage) + await new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded() }) }) @@ -91,7 +78,7 @@ test.describe('HDR outputs open in the HDR viewer', { tag: '@ui' }, () => { const tab = comfyPage.menu.assetsTab await tab.open() await tab.getAssetCardByName('sky').dblclick() - await expectHdrViewerLoaded(comfyPage) + await new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded() }) test('opens a generated HDR card from Inspect asset', async ({ @@ -101,7 +88,7 @@ test.describe('HDR outputs open in the HDR viewer', { tag: '@ui' }, () => { await tab.open() await tab.rightClickAsset('sky') await comfyPage.contextMenu.clickMenuItemExact('Inspect asset') - await expectHdrViewerLoaded(comfyPage) + await new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded() }) }) }) From 0c64e0865a9e2f252ba20dcc6a9486c4543ef66d Mon Sep 17 00:00:00 2001 From: Simon Pinfold Date: Sun, 11 Oct 2026 17:09:38 -0700 Subject: [PATCH 3/3] test: a temp and an output HDR image with the same name keep their own previews --- .../vueNodes/components/ImagePreview.test.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts index 11044bb8c34..3beeeb68c3c 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts @@ -214,6 +214,26 @@ describe('ImagePreview', () => { ]) }) + it('tells apart a temp and an output HDR image with the same name and folder', () => { + vi.mocked(resolveNode).mockReturnValue(createMockLGraphNode({ id: 1 })) + vi.spyOn(useNodeOutputStore(), 'getNodeOutputs').mockReturnValue({ + images: [ + { filename: 'img.exr', subfolder: 'qa', type: 'temp', id: 'temp' }, + { filename: 'img.exr', subfolder: 'qa', type: 'output', id: 'out' } + ] + }) + + renderImagePreview({ + nodeId: '1', + imageUrls: ['/api/view?filename=img.exr&subfolder=qa&type=output'] + }) + + expect(screen.getByRole('img', { name: 'img.exr' })).toHaveAttribute( + 'src', + '/api/assets/out-preview/content' + ) + }) + it('offers the HDR viewer instead of an for exr outputs', () => { renderImagePreview({ imageUrls: ['/api/view?filename=out.exr&type=output']