diff --git a/browser_tests/fixtures/data/assetFixtures.ts b/browser_tests/fixtures/data/assetFixtures.ts index 94f507f4354..39903fdd297 100644 --- a/browser_tests/fixtures/data/assetFixtures.ts +++ b/browser_tests/fixtures/data/assetFixtures.ts @@ -86,7 +86,7 @@ export const AGENT_AUDIO_ASSET: Asset = createOutputAsset({ last_access_time: '2026-09-18T00:00:00.000Z' }) -export const STALE_TEMP_FILENAME = 'ComfyUI_temp_thsmm_00001_.png' +const STALE_TEMP_FILENAME = 'ComfyUI_temp_thsmm_00001_.png' export const STALE_TEMP_CARD_TEXT = STALE_TEMP_FILENAME.replace(/\.[^.]+$/, '') export const STALE_TEMP_ASSET: Asset = createOutputAsset({ id: '55555555-5555-4555-a555-555555555555', diff --git a/browser_tests/tests/sidebar/assetPanelDragOntoLoadImageWidget.spec.ts b/browser_tests/tests/sidebar/assetPanelDragOntoLoadImageWidget.spec.ts index b9870b4c880..c94b4f2d3e0 100644 --- a/browser_tests/tests/sidebar/assetPanelDragOntoLoadImageWidget.spec.ts +++ b/browser_tests/tests/sidebar/assetPanelDragOntoLoadImageWidget.spec.ts @@ -4,8 +4,7 @@ import { } from '@e2e/fixtures/ComfyPage' import { STALE_TEMP_ASSET, - STALE_TEMP_CARD_TEXT, - STALE_TEMP_FILENAME + STALE_TEMP_CARD_TEXT } from '@e2e/fixtures/data/assetFixtures' import { TestIds } from '@e2e/fixtures/selectors' import { assetPath } from '@e2e/fixtures/utils/paths' @@ -50,9 +49,9 @@ test.describe( const url = new URL(route.request().url()) const filename = url.searchParams.get('filename') if ( - (filename === STALE_TEMP_FILENAME && + (filename === STALE_TEMP_ASSET.hash && (!tempAvailable || url.searchParams.get('type') !== 'temp')) || - filename === `${STALE_TEMP_FILENAME} [temp]` + filename === `${STALE_TEMP_ASSET.hash} [temp]` ) { return route.fulfill({ status: 404 }) } @@ -64,7 +63,7 @@ test.describe( const imageWidget = await loadImageNodeRef.getWidgetByName('image') await expect .poll(() => imageWidget.getValue()) - .toBe(`${STALE_TEMP_FILENAME} [temp]`) + .toBe(`${STALE_TEMP_ASSET.hash} [temp]`) }) await test.step('Show the dropped asset preview', async () => { diff --git a/browser_tests/tests/sidebar/tempAssetWorkflowRoutesThenDelete.spec.ts b/browser_tests/tests/sidebar/tempAssetWorkflowRoutesThenDelete.spec.ts index 1747f050a29..c48a01cd5ad 100644 --- a/browser_tests/tests/sidebar/tempAssetWorkflowRoutesThenDelete.spec.ts +++ b/browser_tests/tests/sidebar/tempAssetWorkflowRoutesThenDelete.spec.ts @@ -152,7 +152,7 @@ for (const route of [ shape: 'an expanded-stack child at the root folder', asset: TEMP_STACK_PREVIEW, reveal: inExpandedStack(1), - written: `${TEMP_STACK_PREVIEW.name} [temp]`, + written: `${TEMP_STACK_PREVIEW.hash} [temp]`, controls: rootControls(TEMP_STACK_PREVIEW) }, { @@ -242,28 +242,28 @@ for (const route of [ shape: 'an expanded-stack child at the root folder', asset: TEMP_STACK_PREVIEW, reveal: inExpandedStack(1), - written: `${TEMP_STACK_PREVIEW.name} [temp]`, + written: `${TEMP_STACK_PREVIEW.hash} [temp]`, controls: rootControls(TEMP_STACK_PREVIEW) }, { shape: 'an expanded-stack child whose metadata names only its subfolder', asset: TEMP_FOLDER_PREVIEW, reveal: inExpandedStack(0), - written: `previews/${TEMP_FOLDER_PREVIEW.name} [temp]`, + written: `previews/${TEMP_FOLDER_PREVIEW.hash} [temp]`, controls: folderControls(TEMP_FOLDER_PREVIEW) }, { shape: 'a card with no job at the root folder', asset: FLAT_TEMP_ASSET, reveal: asCard, - written: `${FLAT_TEMP_ASSET.name} [temp]`, + written: `${FLAT_TEMP_ASSET.hash} [temp]`, controls: rootControls(FLAT_TEMP_ASSET) }, { shape: 'a card with no job whose metadata names only its subfolder', asset: FLAT_FOLDER_TEMP_ASSET, reveal: asCard, - written: `previews/${FLAT_FOLDER_TEMP_ASSET.name} [temp]`, + written: `previews/${FLAT_FOLDER_TEMP_ASSET.hash} [temp]`, controls: folderControls(FLAT_FOLDER_TEMP_ASSET) } ]) { diff --git a/src/composables/node/useNodeDragAndDrop.test.ts b/src/composables/node/useNodeDragAndDrop.test.ts index 838b72ed09d..7d2bd036469 100644 --- a/src/composables/node/useNodeDragAndDrop.test.ts +++ b/src/composables/node/useNodeDragAndDrop.test.ts @@ -222,31 +222,65 @@ describe('useNodeDragAndDrop', () => { expect(onDrop.mock.calls[0][0][0].name).toBe('uri.png') }) - it('onDragDrop names a fetched asset-card file after its asset-info filename', async () => { - const onDrop = vi.fn().mockResolvedValue([]) - vi.mocked(fetch).mockResolvedValue( - fromAny({ - ok: true, - blob: vi - .fn() - .mockResolvedValue(new Blob(['uri'], { type: 'audio/wav' })) - }) - ) - - const node = createNode() - useNodeDragAndDrop(node, { onDrop }) - - const result = await node.onDragDrop?.( - createDragEvent({ - uri: `${location.origin}/api/assets/asset-1/content`, - types: ['text/uri-list', MIME_ASSET_INFO], - assetInfo: JSON.stringify({ filename: 'clip.wav' }) - }) - ) - - expect(result).toBe(true) - expect(onDrop.mock.calls[0][0][0].name).toBe('clip.wav') - }) + it.for([ + { assetInfo: { filename: 'clip.wav' }, name: 'clip.wav' }, + { + assetInfo: { filename: 'aa7ecf08.wav', display_name: 'clip.wav' }, + name: 'clip.wav' + }, + { + assetInfo: { filename: 'clip.wav', display_name: 'renders/clip.wav' }, + name: 'clip.wav' + }, + { + assetInfo: { filename: 'aa7ecf08.wav', display_name: 'My clip' }, + name: 'aa7ecf08.wav' + }, + { + assetInfo: { filename: 'aa7ecf08.wav', display_name: 'clip.mp3' }, + name: 'aa7ecf08.wav' + }, + { assetInfo: { filename: 'clip.wav', display_name: '' }, name: 'clip.wav' }, + { + assetInfo: { filename: 'aa7ecf08.wav', display_name: 'Take.WAV' }, + name: 'Take.WAV' + }, + { + assetInfo: { filename: 'aa7ecf08.wav', display_name: '..\\clip.wav' }, + name: 'aa7ecf08.wav' + }, + { + assetInfo: { filename: 'aa7ecf08.wav', display_name: 'Take 1: clip.wav' }, + name: 'aa7ecf08.wav' + } + ])( + 'onDragDrop names a fetched asset-card file $name from asset info $assetInfo', + async ({ assetInfo, name }) => { + const onDrop = vi.fn().mockResolvedValue([]) + vi.mocked(fetch).mockResolvedValue( + fromAny({ + ok: true, + blob: vi + .fn() + .mockResolvedValue(new Blob(['uri'], { type: 'audio/wav' })) + }) + ) + + const node = createNode() + useNodeDragAndDrop(node, { onDrop }) + + const result = await node.onDragDrop?.( + createDragEvent({ + uri: `${location.origin}/api/assets/asset-1/content`, + types: ['text/uri-list', MIME_ASSET_INFO], + assetInfo: JSON.stringify(assetInfo) + }) + ) + + expect(result).toBe(true) + expect(onDrop.mock.calls[0][0][0].name).toBe(name) + } + ) it('onDragDrop returns false for cross-origin uri drops', async () => { const node = createNode() diff --git a/src/composables/node/useNodeDragAndDrop.ts b/src/composables/node/useNodeDragAndDrop.ts index 7c95656203c..8526a939d60 100644 --- a/src/composables/node/useNodeDragAndDrop.ts +++ b/src/composables/node/useNodeDragAndDrop.ts @@ -4,8 +4,29 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { parseAssetInfo } from '@/platform/assets/schemas/mediaAssetSchema' import type { ResultItem } from '@comfyorg/api-client/executionTypes' import { withHdrImageType } from '@/utils/eventUtils' +import { getPathDetails } from '@/utils/formatUtil' import { parseUrl } from '@/utils/urlSafety' +const UNSAFE_FILENAME_CHARACTERS = /[\\:*?"<>|]/ + +function getLowercaseSuffix(filename: string): string | undefined { + return getPathDetails(filename).suffix?.toLowerCase() +} + +function getFetchedAssetFileName({ + filename, + display_name +}: ResultItem): string | undefined { + if (!filename || !display_name) return filename + const label = getPathDetails(display_name).fullFilename + const labelSuffix = getLowercaseSuffix(label) + return labelSuffix && + labelSuffix === getLowercaseSuffix(filename) && + !UNSAFE_FILENAME_CHARACTERS.test(label) + ? label + : filename +} + type DragHandler = (e: DragEvent) => boolean type DropHandler = (files: File[]) => Promise @@ -77,7 +98,7 @@ export const useNodeDragAndDrop = ( try { const resp = await fetch(uri) const fileName = - asset?.filename ?? + (asset && getFetchedAssetFileName(asset)) ?? uri.searchParams.get('filename') ?? baseUri.split('/').at(-1) if (!fileName || !resp.ok) return false diff --git a/src/platform/assets/components/MediaAssetCard.test.ts b/src/platform/assets/components/MediaAssetCard.test.ts index 42c386dd9e1..c623ffd8438 100644 --- a/src/platform/assets/components/MediaAssetCard.test.ts +++ b/src/platform/assets/components/MediaAssetCard.test.ts @@ -155,7 +155,9 @@ describe('MediaAssetCard', () => { }) it('includes the asset metadata with display_name in the drag payload', () => { - const { container } = renderCard() + const { container } = renderCard({ + asset: { ...asset, display_name: 'Display A', tags: ['output'] } + }) const { event, add } = dispatchDragStart(container) diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts index 206d953d7b0..d9d90ca8cda 100644 --- a/src/platform/assets/composables/useMediaAssetActions.test.ts +++ b/src/platform/assets/composables/useMediaAssetActions.test.ts @@ -2619,7 +2619,7 @@ describe('useMediaAssetActions', () => { 'tag temp', insertAsNode, () => tempAsset, - 'previews/ComfyUI_temp_00001_.png [temp]' + 'previews/aa7ecf08.png [temp]' ], [ 'inserted as a node', @@ -2633,7 +2633,7 @@ describe('useMediaAssetActions', () => { 'tag temp', dropOnLoadImage, () => atRoot(tempAsset), - 'ComfyUI_temp_00001_.png [temp]' + 'aa7ecf08.png [temp]' ], [ 'dropped on Load Image', @@ -2647,7 +2647,7 @@ describe('useMediaAssetActions', () => { 'tag temp in a subfolder', dropOnLoadImage, () => tempAsset, - 'previews/ComfyUI_temp_00001_.png [temp]' + 'previews/aa7ecf08.png [temp]' ], [ 'dropped on Load Image', @@ -2657,7 +2657,7 @@ describe('useMediaAssetActions', () => { 'previews/ComfyUI_temp_00003_.png [temp]' ] ] as const)( - 'writes the temp root for a child %s from an asset with %s, so deleting the child clears it', + 'writes the temp root and stored filename for a child %s from an asset with %s, so deleting the child clears it', async ([, , writeReference, source, written]) => { const child = await expandedChildOf(source()) const { actions, node } = await writeReference(child) @@ -2669,6 +2669,76 @@ describe('useMediaAssetActions', () => { expect(referenceState(node)).toEqual(cleared(written)) } ) + + describe('of a job with several outputs', () => { + const firstOutput = createMockAsset({ + job_id: 'job-3', + created_at: '2026-01-01T00:00:00Z', + id: 'first-output', + name: 'ComfyUI_00001_.png', + hash: '1a2b3c4d.png', + tags: ['output'], + user_metadata: { jobId: 'job-3', subfolder: '' } + }) + const coverOutput = createMockAsset({ + job_id: 'job-3', + created_at: '2026-01-01T00:00:01Z', + id: 'cover-output', + name: 'ComfyUI_00002_.png', + hash: '5e6f7a8b.png', + tags: ['output'], + user_metadata: { jobId: 'job-3', subfolder: '' } + }) + + async function expandedFirstOutput() { + mockResolveOutputAssetItems.mockRestore() + vi.mocked(api.getJobAssets).mockResolvedValue({ + assets: [firstOutput, coverOutput].map((output) => + fromPartial({ id: output.id, name: output.name }) + ), + complete: true + }) + const [group] = unflattenOutputAssets([firstOutput, coverOutput]) + const groupMetadata = getOutputAssetMetadata(group.user_metadata) + assert.exists(groupMetadata) + const children = await resolveOutputAssetItems(groupMetadata) + const child = children.find(({ id }) => id === firstOutput.id) + assert.exists(child) + return child + } + + it.for([ + ['inserted as a node', insertAsNode], + ['dropped on Load Image', dropOnLoadImage] + ] as const)( + 'writes a non-cover output %s by its own hash', + async ([, writeReference]) => { + const { node } = await writeReference(await expandedFirstOutput()) + + expect(serializedImageValue(node)).toBe('1a2b3c4d.png [output]') + } + ) + + it('drags a non-cover output with its hash as the attachment reference', async () => { + const dataTransfer = new DataTransfer() + const event = new DragEvent('dragstart') + Object.defineProperty(event, 'dataTransfer', { value: dataTransfer }) + + startAssetDrag(event, await expandedFirstOutput()) + + expect(parseAssetInfo(dataTransfer)?.attachment_ref).toBe( + '1a2b3c4d.png' + ) + }) + + it('drops the cover card as the cover output by its hash', async () => { + const [group] = unflattenOutputAssets([firstOutput, coverOutput]) + + const { node } = await dropOnLoadImage(group) + + expect(serializedImageValue(node)).toBe('5e6f7a8b.png [output]') + }) + }) }) it('ignores stored identity fields supplied in server metadata', async () => { diff --git a/src/platform/assets/composables/useMediaAssetActions.ts b/src/platform/assets/composables/useMediaAssetActions.ts index 7076150d939..fede513f38e 100644 --- a/src/platform/assets/composables/useMediaAssetActions.ts +++ b/src/platform/assets/composables/useMediaAssetActions.ts @@ -59,7 +59,10 @@ function createAssetWidgetPath(asset: AssetItem): string { : getAssetType(asset, 'input') return createAnnotatedPath({ - filename: getAssetStoredFilename(asset), + filename: getAssetStoredFilename( + asset, + asset.hash ?? getStoredOutputIdentity(asset)?.hash + ), subfolder: getOutputSubfolder(asset) ?? '', type: isResultItemType(assetType) ? assetType : undefined }) diff --git a/src/platform/assets/utils/assetDragUtil.ts b/src/platform/assets/utils/assetDragUtil.ts index bd343f36451..50da8a54100 100644 --- a/src/platform/assets/utils/assetDragUtil.ts +++ b/src/platform/assets/utils/assetDragUtil.ts @@ -15,10 +15,13 @@ import { getAssetType, isGeneratedTempOutput } from '@/platform/assets/composables/media/assetMappers' -import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema' import type { AssetItem } from '@/platform/assets/schemas/assetSchema' import { MIME_ASSET_INFO } from '@/platform/assets/schemas/mediaAssetSchema' -import { getAssetUrlFilename, getOutputSubfolder } from './assetMetadataUtils' +import { getStoredOutputIdentity } from '@/platform/assets/utils/outputAssetUtil' +import { + getAssetStoredFilename, + getOutputSubfolder +} from './assetMetadataUtils' import { resolvePreviewUrl } from './assetPreviewUtil' import { getAssetFileUrl } from './assetUrlUtil' import { parseUrl } from '@/utils/urlSafety' @@ -76,24 +79,13 @@ export function startAssetDrag( const { dataTransfer } = event if (!dataTransfer) return - const output = getOutputAssetMetadata(asset.user_metadata)?.allOutputs?.[0] + const storedHash = asset.hash ?? getStoredOutputIdentity(asset)?.hash const assetInfo = { - ...(output?.filename - ? { - filename: output.filename, - subfolder: output.subfolder, - type: output.type, - display_name: output.display_name - } - : { - filename: asset.name, - subfolder: getOutputSubfolder(asset), - type: isGeneratedTempOutput(asset) - ? 'temp' - : getAssetType(asset.tags), - display_name: asset.display_name ?? undefined - }), - attachment_ref: getAssetUrlFilename(asset), + filename: getAssetStoredFilename(asset, storedHash), + subfolder: getOutputSubfolder(asset), + type: isGeneratedTempOutput(asset) ? 'temp' : getAssetType(asset.tags), + display_name: asset.display_name || asset.name, + attachment_ref: storedHash ?? asset.name, ...assetMediaSources(asset) } dataTransfer.setData(MIME_ASSET_INFO, JSON.stringify(assetInfo)) diff --git a/src/platform/assets/utils/assetMetadataUtils.ts b/src/platform/assets/utils/assetMetadataUtils.ts index 651d2458a55..c40403ef5b4 100644 --- a/src/platform/assets/utils/assetMetadataUtils.ts +++ b/src/platform/assets/utils/assetMetadataUtils.ts @@ -452,8 +452,11 @@ export function getAssetFilename(asset: AssetItem): string { * * TODO(BE-933/934): collapse to `asset.file_path ?? asset.name`. */ -export function getAssetStoredFilename(asset: AssetItem): string { - return isCloud && asset.hash ? asset.hash : asset.name +export function getAssetStoredFilename( + asset: AssetItem, + hash = asset.hash +): string { + return isCloud && hash ? hash : asset.name } /**