diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index 7f8a3e1a0a0..2e8bd10fa72 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -1101,6 +1101,90 @@ describe('useWidgetSelectItems', () => { }) }) + describe('option preview URLs', () => { + it.for([ + { value: 'x.png', query: { filename: 'x.png', type: 'input' } }, + { + value: 'sub/x.png', + query: { filename: 'x.png', type: 'input', subfolder: 'sub' } + }, + { + value: 'a\\b\\x.png', + query: { filename: 'x.png', type: 'input', subfolder: 'a/b' } + } + ])( + 'previews the input option $value from its subfolder and filename', + ({ value, query }) => { + const { dropdownItems } = useWidgetSelectItems( + createDefaultOptions({ + values: () => [value], + modelValue: ref(value) + }) + ) + + const previewUrl = dropdownItems.value[0].preview_url + assert(previewUrl) + const [path, search] = previewUrl.split('?') + expect(path).toBe('/api/view') + expect(Object.fromEntries(new URLSearchParams(search))).toEqual(query) + } + ) + + it.for(['../x.png', 'folder/./photo.png', '/abs/x.png', 'C:photo.png'])( + 'shows no preview for the input option %s, which is not a plain relative path', + (value) => { + const { dropdownItems } = useWidgetSelectItems( + createDefaultOptions({ + values: () => [value], + modelValue: ref(value) + }) + ) + + expect(dropdownItems.value[0].preview_url).toBe('') + } + ) + + it.for([ + { + title: 'an output in a subfolder', + tags: ['output'], + subfolder: 'sub', + query: { filename: 'photo.png', type: 'output', subfolder: 'sub' } + }, + { + title: 'a generated temp output', + tags: ['output', 'temp'], + subfolder: 'previews', + query: { filename: 'photo.png', type: 'temp', subfolder: 'previews' } + } + ])( + 'falls back to a preview of $title from its root and subfolder', + async ({ tags, subfolder, query }) => { + mockMediaAssets.items.value = [ + fromPartial({ + id: 'asset-no-preview', + name: 'photo.png', + preview_url: '', + tags, + user_metadata: { subfolder } + }) + ] + + const { dropdownItems, filterSelected } = useWidgetSelectItems( + createDefaultOptions({ values: () => [], modelValue: ref(undefined) }) + ) + filterSelected.value = 'outputs' + await nextTick() + + const previewUrl = dropdownItems.value[0].preview_url + assert(previewUrl) + const [path, search] = previewUrl.split('?') + expect(path).toBe('/api/view') + expect(Object.fromEntries(new URLSearchParams(search))).toEqual(query) + } + ) + }) + describe('FE-228: output dropdown label uses human-readable filename', () => { it('renders metadata.filename in label when asset.name is a hash', async () => { mockMediaAssets.items.value = [ diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts index ff233c2874b..6a1a250ac71 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.ts @@ -215,7 +215,7 @@ export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) { .filter((value) => !missing.has(String(value))) .map((value, index) => ({ id: `input-${index}`, - preview_url: getMediaUrl(String(value), 'input', kind), + preview_url: getAnnotatedValueMediaUrl(String(value), kind), name: String(value), label: getDisplayLabel(String(value), labelFn) })) @@ -259,7 +259,8 @@ export function useWidgetSelectItems(options: UseWidgetSelectItemsOptions) { preview_url: kind === 'mesh' ? '' - : asset.preview_url || getMediaUrl(filenameForUrl, 'output', kind), + : asset.preview_url || + getMediaUrl(filenameForUrl, rootFolder, kind, subfolder), name: annotatedPath, label: getDisplayLabel(displayLabel, labelFn) })