From 2f4af9257667c3e58e37f27b007ddcddbded5bef Mon Sep 17 00:00:00 2001 From: Austin Mroz Date: Thu, 12 Nov 2026 16:49:49 -0800 Subject: [PATCH 1/2] minimal changeset --- .../sidebar/tabs/AssetsSidebarListView.vue | 8 +++---- .../queue/useQueueNotificationBanners.test.ts | 4 ++-- .../queue/useQueueNotificationBanners.ts | 8 +++---- .../assets/components/MediaImageTop.vue | 8 ++++++- .../assets/utils/mediaIconUtil.test.ts | 14 ++++++++++- src/platform/assets/utils/mediaIconUtil.ts | 8 +++++++ .../dropdown/FormDropdownMenuItem.test.ts | 15 ++++++++++++ .../form/dropdown/FormDropdownMenuItem.vue | 24 +++++++++++++++---- .../composables/useWidgetSelectItems.test.ts | 10 ++++++++ .../composables/useWidgetSelectItems.ts | 1 + src/utils/resultItemUrl.ts | 4 ---- 11 files changed, 84 insertions(+), 20 deletions(-) diff --git a/src/components/sidebar/tabs/AssetsSidebarListView.vue b/src/components/sidebar/tabs/AssetsSidebarListView.vue index 52a945d397a..a37208eacdb 100644 --- a/src/components/sidebar/tabs/AssetsSidebarListView.vue +++ b/src/components/sidebar/tabs/AssetsSidebarListView.vue @@ -34,7 +34,7 @@ " :preview-url="getAssetPreviewUrl(item.asset)" :preview-alt="getAssetDisplayName(item.asset)" - :icon-name="iconForMediaType(getAssetMediaType(item.asset))" + :icon-name="iconForFilename(item.asset.name)" :is-video-preview="isVideoAsset(item.asset)" :primary-text="getAssetPrimaryText(item.asset)" :secondary-text="getAssetSecondaryText(item.asset)" @@ -82,7 +82,7 @@ import type { AssetItem } from '@/platform/assets/schemas/assetSchema' import { startAssetDrag } from '@/platform/assets/utils/assetDragUtil' import { getAssetDisplayName } from '@/platform/assets/utils/assetMetadataUtils' import { resolveMediaSrc } from '@/platform/assets/utils/assetUrlUtil' -import { iconForMediaType } from '@/platform/assets/utils/mediaIconUtil' +import { iconForFilename } from '@/platform/assets/utils/mediaIconUtil' import { useAssetsStore } from '@/stores/assetsStore' import { formatDuration, @@ -145,8 +145,8 @@ function isVideoAsset(asset: AssetItem): boolean { function getAssetPreviewUrl(asset: AssetItem): string { const mediaType = getAssetMediaType(asset) - if (asset.preview_id && isHdrImageFilename(asset.name)) - return hdrPreviewAssetUrl(asset.preview_id) + if (isHdrImageFilename(asset.name)) + return asset.preview_id ? hdrPreviewAssetUrl(asset.preview_id) : '' if (mediaType === 'image' || mediaType === 'video') return resolveMediaSrc(asset.preview_url) return '' diff --git a/src/composables/queue/useQueueNotificationBanners.test.ts b/src/composables/queue/useQueueNotificationBanners.test.ts index bf29f353b4c..8fcac6101f1 100644 --- a/src/composables/queue/useQueueNotificationBanners.test.ts +++ b/src/composables/queue/useQueueNotificationBanners.test.ts @@ -19,7 +19,7 @@ type MockTask = { executionEndTimestamp?: number previewOutput?: { filename: string - url: string + previewUrl: string } } @@ -66,7 +66,7 @@ describe(useQueueNotificationBanners, () => { if (previewUrl) { task.previewOutput = { filename: isImage ? 'preview.png' : 'preview.txt', - url: previewUrl + previewUrl } } diff --git a/src/composables/queue/useQueueNotificationBanners.ts b/src/composables/queue/useQueueNotificationBanners.ts index 55207bbe0da..500b257f895 100644 --- a/src/composables/queue/useQueueNotificationBanners.ts +++ b/src/composables/queue/useQueueNotificationBanners.ts @@ -7,7 +7,7 @@ import type { } from '@comfyorg/api-client/ComfyApi' import { useExecutionStore } from '@/stores/executionStore' import { useQueueStore } from '@/stores/queueStore' -import { resultItemUrlWithTimestamp } from '@/utils/resultItemUrl' +import { resultItemPreviewUrl } from '@/utils/resultItemUrl' import { isImageResult } from '@/utils/resultItem' import { jobStateFromTask } from '@/utils/queueUtil' @@ -261,9 +261,9 @@ export const useQueueNotificationBanners = () => { if (state === 'completed') { completedCount++ const preview = task.previewOutput - if (preview && isImageResult(preview)) { - imagePreviews.push(resultItemUrlWithTimestamp(preview)) - } + const previewUrl = + preview && isImageResult(preview) && resultItemPreviewUrl(preview) + if (previewUrl) imagePreviews.push(previewUrl) } else if (state === 'failed') { failedCount++ } diff --git a/src/platform/assets/components/MediaImageTop.vue b/src/platform/assets/components/MediaImageTop.vue index 95c2d3625b4..edecdade5d5 100644 --- a/src/platform/assets/components/MediaImageTop.vue +++ b/src/platform/assets/components/MediaImageTop.vue @@ -13,7 +13,11 @@ :aria-label="$t('g.imageFailedToLoad')" class="flex size-full items-center justify-center bg-muted" > - + @@ -24,6 +28,8 @@ import { whenever } from '@vueuse/core' import { useImageQuiet } from '@/composables/useImageQuiet' import type { AssetMeta } from '@/platform/assets/schemas/mediaAssetSchema' import { getAssetDisplayName } from '@/platform/assets/utils/assetMetadataUtils' +import { iconForFilename } from '@/platform/assets/utils/mediaIconUtil' +import { cn } from '@comfyorg/tailwind-utils' const { asset } = defineProps<{ asset: AssetMeta diff --git a/src/platform/assets/utils/mediaIconUtil.test.ts b/src/platform/assets/utils/mediaIconUtil.test.ts index b7dfdc0fa08..48e240c05b1 100644 --- a/src/platform/assets/utils/mediaIconUtil.test.ts +++ b/src/platform/assets/utils/mediaIconUtil.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { iconForMediaType } from './mediaIconUtil' +import { iconForFilename, iconForMediaType } from './mediaIconUtil' describe('iconForMediaType', () => { it('maps text and misc fallbacks correctly', () => { @@ -15,3 +15,15 @@ describe('iconForMediaType', () => { expect(iconForMediaType('3D')).toBe('icon-[lucide--box]') }) }) + +describe('iconForFilename', () => { + it('uses the HDR icon for HDR images regardless of case', () => { + expect(iconForFilename('render.exr')).toBe('icon-[lucide--sun]') + expect(iconForFilename('SKY.HDR')).toBe('icon-[lucide--sun]') + }) + + it('falls back to the media type icon', () => { + expect(iconForFilename('clip.mp4')).toBe('icon-[lucide--video]') + expect(iconForFilename('photo.png')).toBe('icon-[lucide--image]') + }) +}) diff --git a/src/platform/assets/utils/mediaIconUtil.ts b/src/platform/assets/utils/mediaIconUtil.ts index 587bc4a7996..831cedf5840 100644 --- a/src/platform/assets/utils/mediaIconUtil.ts +++ b/src/platform/assets/utils/mediaIconUtil.ts @@ -1,4 +1,6 @@ import type { MediaKind } from '@/platform/assets/schemas/mediaAssetSchema' +import { getMediaTypeFromFilename } from '@/utils/formatUtil' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' export function iconForMediaType(mediaType: MediaKind): string { switch (mediaType) { @@ -16,3 +18,9 @@ export function iconForMediaType(mediaType: MediaKind): string { return 'icon-[lucide--image]' } } + +export function iconForFilename(filename: string): string { + return isHdrImageFilename(filename) + ? 'icon-[lucide--sun]' + : iconForMediaType(getMediaTypeFromFilename(filename)) +} diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.test.ts b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.test.ts index fb14d53f183..b1e53c376dc 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.test.ts @@ -117,6 +117,21 @@ describe('FormDropdownMenuItem', () => { expect(screen.queryByLabelText('item_name')).toBeNull() }) + it('renders an HDR placeholder for HDR items without a preview', () => { + renderItem({ name: 'render.exr [output]' }, { assetKind: 'image' }) + expect(screen.getByTestId('dropdown-item-hdr-placeholder')).toBeTruthy() + }) + + it('falls back to the placeholder when the preview fails to load', async () => { + renderItem( + { name: 'render.exr', previewUrl: '/broken.png' }, + { assetKind: 'image' } + ) + await fireEvent.error(screen.getByRole('img', { name: 'render.exr' })) + expect(screen.queryByRole('img', { name: 'render.exr' })).toBeNull() + expect(screen.getByTestId('dropdown-item-hdr-placeholder')).toBeTruthy() + }) + it('omits media area entirely for list-small layout', () => { renderItem( { previewUrl: '/p.png', layout: 'list-small' }, diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue index 1aab239c177..90c495db14f 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue +++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue @@ -12,6 +12,8 @@ import { findServerPreviewUrl, isAssetPreviewSupported } from '@/platform/assets/utils/assetPreviewUtil' +import { parseAnnotatedPath } from '@/utils/createAnnotatedPath' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' import { AssetKindKey } from './types' import type { FormDropdownMenuItemProps } from './types' @@ -63,8 +65,13 @@ watch( } ) -const displayedPreviewUrl = computed(() => - isMesh.value ? resolvedMeshPreview.value : props.previewUrl +const failedPreviewUrl = ref() +const displayedPreviewUrl = computed(() => { + const url = isMesh.value ? resolvedMeshPreview.value : props.previewUrl + return url && url !== failedPreviewUrl.value ? url : undefined +}) +const isHdr = computed(() => + isHdrImageFilename(parseAnnotatedPath(props.name).filepath) ) function handleClick() { @@ -143,13 +150,14 @@ function handleVideoLoad(event: Event) { />