mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-14 17:37:46 +00:00
refactor: centralize display_name || name into getAssetDisplayName (#9641)
## Summary Centralize the inline `display_name || name` pattern into `getAssetDisplayName`, adding `display_name` to the existing metadata fallback chain. ## Changes - **What**: Update `getAssetDisplayName` fallback chain to `user_metadata.name → metadata.name → display_name → name`. Replace all 6 inline `asset.display_name || asset.name` call sites with the shared utility. Remove duplicate local function in `AssetsSidebarListView.vue`. ## Review Focus The fallback order preserves user_metadata overrides while incorporating the `display_name` field added in #9626. All callers now go through a single code path. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9641-refactor-centralize-display_name-name-into-getAssetDisplayName-31e6d73d365081e09e5de85486583443) by [Unito](https://www.unito.io) --------- Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: GitHub Action <action@github.com>
This commit is contained in:
@@ -186,7 +186,7 @@ const tooltipDelay = computed<number>(() =>
|
||||
|
||||
const { isLoading, error } = useImage({
|
||||
src: asset.preview_url ?? '',
|
||||
alt: asset.display_name || asset.name
|
||||
alt: displayName.value
|
||||
})
|
||||
|
||||
function handleSelect() {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
:aria-label="
|
||||
asset
|
||||
? $t('assetBrowser.ariaLabel.assetCard', {
|
||||
name: asset.display_name || asset.name,
|
||||
name: getAssetDisplayName(asset),
|
||||
type: fileKind
|
||||
})
|
||||
: $t('assetBrowser.ariaLabel.loadingAsset')
|
||||
@@ -152,6 +152,7 @@ import { cn } from '@/utils/tailwindUtil'
|
||||
import { getAssetType } from '../composables/media/assetMappers'
|
||||
import { useMediaAssetActions } from '../composables/useMediaAssetActions'
|
||||
import type { AssetItem } from '../schemas/assetSchema'
|
||||
import { getAssetDisplayName } from '../utils/assetMetadataUtils'
|
||||
import type { MediaKind } from '../schemas/mediaAssetSchema'
|
||||
import { MediaAssetKey } from '../schemas/mediaAssetSchema'
|
||||
import MediaTitle from './MediaTitle.vue'
|
||||
@@ -225,7 +226,7 @@ const canInspect = computed(() => isPreviewableMediaType(fileKind.value))
|
||||
|
||||
// Get filename without extension
|
||||
const fileName = computed(() => {
|
||||
return getFilenameDetails(asset?.display_name || asset?.name || '').filename
|
||||
return getFilenameDetails(asset ? getAssetDisplayName(asset) : '').filename
|
||||
})
|
||||
|
||||
// Adapt AssetItem to legacy AssetMeta format for existing components
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<img
|
||||
v-if="!error"
|
||||
:src="asset.src"
|
||||
:alt="asset.display_name || asset.name"
|
||||
:alt="getAssetDisplayName(asset)"
|
||||
class="size-full object-contain transition-transform duration-300 group-hover:scale-105 group-data-[selected=true]:scale-105"
|
||||
/>
|
||||
<div
|
||||
@@ -22,6 +22,7 @@
|
||||
import { useImage, whenever } from '@vueuse/core'
|
||||
|
||||
import type { AssetMeta } from '../schemas/mediaAssetSchema'
|
||||
import { getAssetDisplayName } from '../utils/assetMetadataUtils'
|
||||
|
||||
const { asset } = defineProps<{
|
||||
asset: AssetMeta
|
||||
@@ -34,7 +35,7 @@ const emit = defineEmits<{
|
||||
|
||||
const { state, error, isReady } = useImage({
|
||||
src: asset.src ?? '',
|
||||
alt: asset.display_name || asset.name
|
||||
alt: getAssetDisplayName(asset)
|
||||
})
|
||||
|
||||
whenever(
|
||||
|
||||
Reference in New Issue
Block a user