Skip to content
Closed
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
24 changes: 24 additions & 0 deletions browser_tests/fixtures/components/HdrViewerDialog.ts
Original file line number Diff line number Diff line change
@@ -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)
}
}
94 changes: 94 additions & 0 deletions browser_tests/tests/sidebar/hdrOutputViewer.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import { mergeTests } from '@playwright/test'

import { comfyPageFixture } 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'

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 }
]
})

// 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 new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded()
})
})

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 new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded()
})

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 new HdrViewerDialog(comfyPage.page, 'sky.exr').expectLoaded()
})
})
})
23 changes: 23 additions & 0 deletions src/components/hdr/HdrViewerContent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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() }))
Expand Down Expand Up @@ -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<typeof vi.fn> }
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'
)
})
})
24 changes: 24 additions & 0 deletions src/components/queue/job/JobAssetsList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ vi.mock<unknown>(
})
)

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: {
Expand Down Expand Up @@ -67,6 +77,7 @@ const i18n = createI18n({
})

type TestPreviewOutput = {
id?: string
filename: string
mediaType: string
url: string
Expand Down Expand Up @@ -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()
Expand Down
65 changes: 65 additions & 0 deletions src/components/sidebar/tabs/AssetsSidebarTab.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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<unknown>(
import('primevue/usetoast'), // oxlint-disable-line comfy/no-primevue-imports
() => ({
Expand Down Expand Up @@ -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' }
Expand Down
22 changes: 22 additions & 0 deletions src/composables/node/useNodeDragAndDrop.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
63 changes: 63 additions & 0 deletions src/composables/queue/useResultGallery.test.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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)
})
})
Loading
Loading