mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-26 19:09:52 +00:00
* fix: normalize pack IDs to fix version detection for disabled packs When a pack is disabled, ComfyUI-Manager returns it with a version suffix (e.g., "ComfyUI-GGUF@1_1_4") while enabled packs don't have this suffix. This inconsistency caused disabled packs to incorrectly show as having updates available even when they were on the latest version. Changes: - Add normalizePackId utility to consistently remove version suffixes - Apply normalization in refreshInstalledList and WebSocket updates - Use the utility across conflict detection and node help modules - Ensure pack version info is preserved in the object's ver field This fixes the "Update Available" indicator incorrectly showing for disabled packs that are already on the latest version. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * feature: test code added * test: packUtils test code added * test: address PR review feedback for test improvements - Remove unnecessary .not.toThrow() assertion in useManagerQueue test - Add clarifying comments for version normalization test logic - Replace 'as any' with vi.mocked() for better type safety --------- Co-authored-by: Claude <noreply@anthropic.com>
223 lines
5.7 KiB
TypeScript
223 lines
5.7 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { ref } from 'vue'
|
|
|
|
import { useManagerQueue } from '@/composables/useManagerQueue'
|
|
import { components } from '@/types/generatedManagerTypes'
|
|
|
|
// Mock dialog service
|
|
vi.mock('@/services/dialogService', () => ({
|
|
useDialogService: () => ({
|
|
showManagerProgressDialog: vi.fn()
|
|
})
|
|
}))
|
|
|
|
// Mock the app API
|
|
vi.mock('@/scripts/app', () => ({
|
|
app: {
|
|
api: {
|
|
addEventListener: vi.fn(),
|
|
removeEventListener: vi.fn(),
|
|
clientId: 'test-client-id'
|
|
}
|
|
}
|
|
}))
|
|
|
|
type ManagerTaskHistory = Record<
|
|
string,
|
|
components['schemas']['TaskHistoryItem']
|
|
>
|
|
type ManagerTaskQueue = components['schemas']['TaskStateMessage']
|
|
|
|
describe('useManagerQueue', () => {
|
|
let taskHistory: any
|
|
let taskQueue: any
|
|
let installedPacks: any
|
|
|
|
const createManagerQueue = () => {
|
|
taskHistory = ref<ManagerTaskHistory>({})
|
|
taskQueue = ref<ManagerTaskQueue>({
|
|
history: {},
|
|
running_queue: [],
|
|
pending_queue: [],
|
|
installed_packs: {}
|
|
})
|
|
installedPacks = ref({})
|
|
|
|
return useManagerQueue(taskHistory, taskQueue, installedPacks)
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
})
|
|
|
|
afterEach(() => {
|
|
vi.clearAllMocks()
|
|
})
|
|
|
|
describe('initialization', () => {
|
|
it('should initialize with empty state', () => {
|
|
const queue = createManagerQueue()
|
|
|
|
expect(queue.currentQueueLength.value).toBe(0)
|
|
expect(queue.allTasksDone.value).toBe(true)
|
|
expect(queue.isProcessing.value).toBe(false)
|
|
expect(queue.historyCount.value).toBe(0)
|
|
})
|
|
})
|
|
|
|
describe('task state management', () => {
|
|
it('should track task queue length', () => {
|
|
const queue = createManagerQueue()
|
|
|
|
// Add tasks to queue
|
|
taskQueue.value.running_queue = [
|
|
{
|
|
ui_id: 'task1',
|
|
client_id: 'test-client-id',
|
|
task_name: 'Installing pack1'
|
|
}
|
|
]
|
|
taskQueue.value.pending_queue = [
|
|
{
|
|
ui_id: 'task2',
|
|
client_id: 'test-client-id',
|
|
task_name: 'Installing pack2'
|
|
}
|
|
]
|
|
|
|
expect(queue.currentQueueLength.value).toBe(2)
|
|
expect(queue.allTasksDone.value).toBe(false)
|
|
})
|
|
|
|
it('should handle empty queues', () => {
|
|
const queue = createManagerQueue()
|
|
|
|
taskQueue.value.running_queue = []
|
|
taskQueue.value.pending_queue = []
|
|
|
|
expect(queue.currentQueueLength.value).toBe(0)
|
|
expect(queue.allTasksDone.value).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe('task history management', () => {
|
|
it('should track task history count', () => {
|
|
const queue = createManagerQueue()
|
|
|
|
taskHistory.value = {
|
|
task1: {
|
|
ui_id: 'task1',
|
|
client_id: 'test-client-id',
|
|
status: { status_str: 'success', completed: true }
|
|
},
|
|
task2: {
|
|
ui_id: 'task2',
|
|
client_id: 'test-client-id',
|
|
status: { status_str: 'success', completed: true }
|
|
}
|
|
}
|
|
|
|
expect(queue.historyCount.value).toBe(2)
|
|
})
|
|
|
|
it('should filter tasks by client ID', () => {
|
|
const queue = createManagerQueue()
|
|
|
|
const mockState = {
|
|
history: {
|
|
task1: {
|
|
ui_id: 'task1',
|
|
client_id: 'test-client-id', // This client
|
|
kind: 'install',
|
|
timestamp: '2024-01-01T00:00:00Z',
|
|
result: 'success',
|
|
status: {
|
|
status_str: 'success' as const,
|
|
completed: true,
|
|
messages: []
|
|
}
|
|
},
|
|
task2: {
|
|
ui_id: 'task2',
|
|
client_id: 'other-client-id', // Different client
|
|
kind: 'install',
|
|
timestamp: '2024-01-01T00:00:00Z',
|
|
result: 'success',
|
|
status: {
|
|
status_str: 'success' as const,
|
|
completed: true,
|
|
messages: []
|
|
}
|
|
}
|
|
},
|
|
running_queue: [],
|
|
pending_queue: [],
|
|
installed_packs: {}
|
|
}
|
|
|
|
queue.updateTaskState(mockState)
|
|
|
|
// Should only include task from this client
|
|
expect(taskHistory.value).toHaveProperty('task1')
|
|
expect(taskHistory.value).not.toHaveProperty('task2')
|
|
})
|
|
|
|
it('normalizes pack IDs when updating installed packs', () => {
|
|
const queue = createManagerQueue()
|
|
|
|
const mockState = {
|
|
history: {},
|
|
running_queue: [],
|
|
pending_queue: [],
|
|
installed_packs: {
|
|
'ComfyUI-GGUF@1_1_4': {
|
|
enabled: false,
|
|
cnr_id: 'ComfyUI-GGUF',
|
|
ver: '1.1.4'
|
|
},
|
|
'test-pack': {
|
|
enabled: true,
|
|
cnr_id: 'test-pack',
|
|
ver: '2.0.0'
|
|
}
|
|
}
|
|
}
|
|
|
|
queue.updateTaskState(mockState)
|
|
|
|
// Packs should be accessible by normalized keys
|
|
expect(installedPacks.value['ComfyUI-GGUF']).toEqual({
|
|
enabled: false,
|
|
cnr_id: 'ComfyUI-GGUF',
|
|
ver: '1.1.4'
|
|
})
|
|
expect(installedPacks.value['test-pack']).toEqual({
|
|
enabled: true,
|
|
cnr_id: 'test-pack',
|
|
ver: '2.0.0'
|
|
})
|
|
|
|
// Version suffixed keys should not exist after normalization
|
|
// The pack should be accessible by its base name only (without @version)
|
|
expect(installedPacks.value['ComfyUI-GGUF@1_1_4']).toBeUndefined()
|
|
})
|
|
|
|
it('handles empty installed_packs gracefully', () => {
|
|
const queue = createManagerQueue()
|
|
|
|
const mockState: any = {
|
|
history: {},
|
|
running_queue: [],
|
|
pending_queue: [],
|
|
installed_packs: undefined
|
|
}
|
|
|
|
// Just call the function - if it throws, the test will fail automatically
|
|
queue.updateTaskState(mockState)
|
|
|
|
// installedPacks should remain unchanged
|
|
expect(installedPacks.value).toEqual({})
|
|
})
|
|
})
|
|
})
|