Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
cleanup: More consistent asset name
  • Loading branch information
DrJKL committed Dec 1, 2025
commit ff988cd6f1f3390d852d48a5f859ecc6526f21e7
6 changes: 3 additions & 3 deletions src/locales/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -2155,9 +2155,9 @@
"deletion": {
"header": "Delete this model?",
"body": "This model will be permanently removed from your library.",
"inProgress": "Deleting {asset}...",
"complete": "{asset} has been deleted.",
"failed": "{asset} could not be deleted."
"inProgress": "Deleting {assetName}...",
"complete": "{assetName} has been deleted.",
"failed": "{assetName} could not be deleted."
}
},
"mediaAsset": {
Expand Down
17 changes: 10 additions & 7 deletions src/platform/assets/components/AssetCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<img
v-else
:src="asset.preview_url"
:alt="asset.name"
:alt="displayName"
class="size-full object-contain cursor-pointer"
role="button"
@click.self="interactive && $emit('select', asset)"
Expand Down Expand Up @@ -73,7 +73,7 @@
<div class="max-h-32 flex flex-col gap-2 justify-between flex-auto">
<h3
:id="titleId"
v-tooltip.top="{ value: asset.name, showDelay: tooltipDelay }"
v-tooltip.top="{ value: displayName, showDelay: tooltipDelay }"
:class="
cn(
'mb-2 m-0 text-base font-semibold line-clamp-2 wrap-anywhere',
Expand All @@ -82,7 +82,7 @@
"
>
<EditableText
:model-value="newNameRef ?? asset.name"
:model-value="displayName"
:is-editing="isEditing"
:input-attrs="{ 'data-testid': 'asset-name-input' }"
@edit="assetRename"
Expand Down Expand Up @@ -120,7 +120,7 @@

<script setup lang="ts">
import { useImage } from '@vueuse/core'
import { computed, ref, useId, useTemplateRef } from 'vue'
import { computed, ref, toValue, useId, useTemplateRef } from 'vue'
import { useI18n } from 'vue-i18n'

import IconButton from '@/components/button/IconButton.vue'
Expand Down Expand Up @@ -162,6 +162,8 @@ const isEditing = ref(false)
const newNameRef = ref<string>()
const deletedLocal = ref(false)

const displayName = computed(() => newNameRef.value ?? asset.name)

const tooltipDelay = computed<number>(() =>
settingStore.get('LiteGraph.Node.TooltipDelay')
)
Expand All @@ -173,6 +175,7 @@ const { isLoading, error } = useImage({

function confirmDeletion() {
dropdownMenuButton.value?.hide()
const assetName = toValue(displayName)
const promptText = ref<string>(t('assetBrowser.deletion.body'))
const optionsDisabled = ref(false)
const confirmDialog = showConfirmDialog({
Expand All @@ -195,19 +198,19 @@ function confirmDeletion() {
onConfirm: async () => {
try {
promptText.value = t('assetBrowser.deletion.inProgress', {
asset: asset.name
assetName
})
await assetService.deleteAsset(asset.id)
promptText.value = t('assetBrowser.deletion.complete', {
asset: asset.name
assetName
})
// Give a second for the completion message
await new Promise((resolve) => setTimeout(resolve, 1_000))
deletedLocal.value = true
} catch (err: unknown) {
console.error(err)
promptText.value = t('assetBrowser.deletion.failed', {
asset: asset.name
assetName
})
// Give a second for the completion message
await new Promise((resolve) => setTimeout(resolve, 3_000))
Expand Down
Loading