diff --git a/src/composables/node/badgeRendererParity.test.ts b/src/composables/node/badgeRendererParity.test.ts index 1e2758ea90a..d312e805852 100644 --- a/src/composables/node/badgeRendererParity.test.ts +++ b/src/composables/node/badgeRendererParity.test.ts @@ -117,7 +117,7 @@ describe('badge renderer parity (I2)', () => { expect(legacyBadgeText(node)).toBe('#1 BETA my_pack') }) - it.fails('renders Vue badges in the same display order', () => { + it('renders Vue badges in the same display order', () => { const node = setup( NodeBadgeMode.ShowAll, 'CustomNode', @@ -139,7 +139,7 @@ describe('badge renderer parity (I2)', () => { expect(legacyBadgeText(node)).toBe('#1 BETA my_pack') }) - it.fails('renders Vue badges in the same display order', () => { + it('renders Vue badges in the same display order', () => { const node = setup( NodeBadgeMode.HideBuiltIn, 'CustomNode', @@ -164,7 +164,7 @@ describe('badge renderer parity (I2)', () => { expect(legacyBadgeText(node)).toBe(`#1 BETA ${CORE_SOURCE_BADGE}`) }) - it.fails('renders Vue badges in the same display order', () => { + it('renders Vue badges in the same display order', () => { const node = setup(NodeBadgeMode.ShowAll, 'CoreNode', 'nodes') expect(vueBadgeText(node)).toBe(`#1 BETA ${CORE_SOURCE_BADGE}`) diff --git a/src/renderer/extensions/vueNodes/components/NodeBadges.test.ts b/src/renderer/extensions/vueNodes/components/NodeBadges.test.ts new file mode 100644 index 00000000000..5170003cde2 --- /dev/null +++ b/src/renderer/extensions/vueNodes/components/NodeBadges.test.ts @@ -0,0 +1,23 @@ +import { render, screen } from '@testing-library/vue' +import { describe, expect, it } from 'vitest' + +import NodeBadges from '@/renderer/extensions/vueNodes/components/NodeBadges.vue' + +describe('NodeBadges', () => { + it('renders the Comfy badge after the core badges', () => { + render(NodeBadges, { + props: { + hasComfyBadge: true, + core: [{ text: '#1' }, { text: 'BETA' }], + extension: [] + } + }) + + const coreBadge = screen.getByText('BETA') + const comfyBadge = screen.getByTestId('comfy-badge') + expect( + coreBadge.compareDocumentPosition(comfyBadge) & + Node.DOCUMENT_POSITION_FOLLOWING + ).toBeTruthy() + }) +}) diff --git a/src/renderer/extensions/vueNodes/components/NodeBadges.vue b/src/renderer/extensions/vueNodes/components/NodeBadges.vue index 79598519f38..1e8db11a7cc 100644 --- a/src/renderer/extensions/vueNodes/components/NodeBadges.vue +++ b/src/renderer/extensions/vueNodes/components/NodeBadges.vue @@ -13,12 +13,6 @@ defineProps<{ v-if="hasComfyBadge || core.length || extension.length" class="flex h-5 w-full gap-2 px-2 text-muted-foreground" > -
- -
+
+ +
{ expect(partitioned.value).toEqual({ hasComfyBadge: false, - core: [{ text: 'BETA' }, { text: '#5' }, { text: 'testpack' }], + core: [{ text: '#5' }, { text: 'BETA' }, { text: 'testpack' }], extension: [], pricing: [{ required: '$0.05', rest: 'x 3 Runs' }] }) @@ -157,8 +157,8 @@ describe('usePartitionedBadges', () => { addNodeDef('CustomNode', 'custom_nodes.testpack') expect(partitioned.value.core).toEqual([ - { text: 'BETA' }, { text: '#5' }, + { text: 'BETA' }, { text: 'testpack' } ]) }) diff --git a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts index 5cdc40b7935..28c95c5be48 100644 --- a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts +++ b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts @@ -7,6 +7,8 @@ import type { NodeBadgeProps } from '@/renderer/extensions/vueNodes/components/N import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useNodeDefStore } from '@/stores/nodeDefStore' import { nodeBadges } from '@/systems/badgeSystem' +import { CORE_JOIN_ORDER } from '@/types/badgeData' +import type { CoreBadgePart } from '@/types/badgeData' import { NodeBadgeMode } from '@/types/nodeSource' import { resolveNode } from '@/utils/litegraphUtil' @@ -33,7 +35,7 @@ export function usePartitionedBadges(nodeData: NodeState) { settingStore.get('Comfy.NodeBadge.NodeSourceBadgeMode') === NodeBadgeMode.ShowAll - const core: NodeBadgeProps[] = [] + const coreByPart = new Map() const extension: NodeBadgeProps[] = [] const pricing: { required: string; rest?: string }[] = [] @@ -46,7 +48,7 @@ export function usePartitionedBadges(nodeData: NodeState) { continue } if (nodeDef?.isCoreNode && row.part === 'source') continue - core.push({ + coreByPart.set(row.part, { text: row.part === 'lifecycle' ? trim(row.text, ['[', ']']) : row.text }) } @@ -58,7 +60,10 @@ export function usePartitionedBadges(nodeData: NodeState) { return { hasComfyBadge: showComfyLogo && pricing.length === 0, - core, + core: CORE_JOIN_ORDER.flatMap((part) => { + const badge = coreByPart.get(part) + return badge ? [badge] : [] + }), extension, pricing }