diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue index b34949602..061f92a2c 100644 --- a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue +++ b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue @@ -154,6 +154,7 @@ import { render } from 'vue' +import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames' import SearchBox from '@/components/common/SearchBox.vue' import type { SearchFilter } from '@/components/common/SearchFilterChip.vue' import TreeExplorer from '@/components/common/TreeExplorer.vue' @@ -276,7 +277,9 @@ const renderedRoot = computed>(() => { return { key: node.key, - label: node.leaf ? node.data.display_name : node.label, + label: node.leaf + ? (resolveEssentialsDisplayName(node.data) ?? node.data.display_name) + : node.label, leaf: node.leaf, data: node.data, getIcon() { diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue index a86947df6..91556fac0 100644 --- a/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue +++ b/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue @@ -114,6 +114,7 @@ import { import { computed, nextTick, onMounted, ref, watchEffect } from 'vue' import { useI18n } from 'vue-i18n' +import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames' import SearchBox from '@/components/common/SearchBoxV2.vue' import { useFeatureFlags } from '@/composables/useFeatureFlags' import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas' @@ -230,16 +231,23 @@ function findFirstLeaf(node: TreeNode): TreeNode | undefined { } function fillNodeInfo( - node: TreeNode + node: TreeNode, + { useEssentialsLabels = false }: { useEssentialsLabels?: boolean } = {} ): RenderedTreeExplorerNode { - const children = node.children?.map(fillNodeInfo) + const children = node.children?.map((child) => + fillNodeInfo(child, { useEssentialsLabels }) + ) const totalLeaves = node.leaf ? 1 : (children?.reduce((acc, child) => acc + child.totalLeaves, 0) ?? 0) return { key: node.key, - label: node.leaf ? node.data?.display_name : node.label, + label: node.leaf + ? useEssentialsLabels + ? (resolveEssentialsDisplayName(node.data) ?? node.data?.display_name) + : node.data?.display_name + : node.label, leaf: node.leaf, data: node.data, icon: node.leaf ? 'icon-[comfy--node]' : getFolderIcon(node), @@ -274,7 +282,7 @@ const essentialSections = computed(() => { const renderedEssentialRoot = computed(() => { const section = essentialSections.value[0] return section - ? fillNodeInfo(applySorting(section.tree)) + ? fillNodeInfo(applySorting(section.tree), { useEssentialsLabels: true }) : fillNodeInfo({ key: 'root', label: '', children: [] }) }) diff --git a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts index 4497ef59f..f34d84a4b 100644 --- a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts +++ b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts @@ -44,7 +44,7 @@ describe('EssentialNodeCard', () => { return { key: 'test-key', - label: 'Test Node', + label: data.display_name, icon: 'icon-[comfy--node]', type: 'node', totalLeaves: 1, diff --git a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue index 9a5b7edd6..c2003ef15 100644 --- a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue +++ b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue @@ -1,7 +1,7 @@