mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-27 18:24:11 +00:00
This commit integrates the previously recovered ComfyUI Manager functionality with significant enhancements from PR #3367, including: ## Core Manager System Recovery - **v2 API Integration**: All manager endpoints now use `/v2/manager/queue/*` - **Task Queue System**: Complete client-side task queuing with WebSocket status - **Service Layer**: Comprehensive manager service with all CRUD operations - **Store Integration**: Full manager store with progress dialog support ## New Features & Enhancements - **Reactive Feature Flags**: Foundation for dynamic feature toggling - **Enhanced UI Components**: Improved loading states, progress tracking - **Package Management**: Install, update, enable/disable functionality - **Version Selection**: Support for latest/nightly package versions - **Progress Dialogs**: Real-time installation progress with logs - **Missing Node Detection**: Automated detection and installation prompts ## Technical Improvements - **TypeScript Definitions**: Complete type system for manager operations - **WebSocket Integration**: Real-time status updates via `cm-queue-status` - **Error Handling**: Comprehensive error handling with user feedback - **Testing**: Updated test suites for new functionality - **Documentation**: Complete backup documentation for recovery process ## API Endpoints Restored - `manager/queue/start` - Start task queue - `manager/queue/status` - Get queue status - `manager/queue/task` - Queue individual tasks - `manager/queue/install` - Install packages - `manager/queue/update` - Update packages - `manager/queue/disable` - Disable packages ## Breaking Changes - Manager API base URL changed to `/v2/` - Updated TypeScript interfaces for manager operations - New WebSocket message format for queue status This restores all critical manager functionality lost during the previous rebase while integrating the latest enhancements and maintaining compatibility with the current main branch. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
333 lines
10 KiB
TypeScript
333 lines
10 KiB
TypeScript
import { VueWrapper, mount } from '@vue/test-utils'
|
|
import { createPinia } from 'pinia'
|
|
import Button from 'primevue/button'
|
|
import PrimeVue from 'primevue/config'
|
|
import Listbox from 'primevue/listbox'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { nextTick } from 'vue'
|
|
import { createI18n } from 'vue-i18n'
|
|
|
|
import enMessages from '@/locales/en/main.json'
|
|
|
|
// SelectedVersion is now using direct strings instead of enum
|
|
|
|
import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'
|
|
|
|
// Default mock versions for reference
|
|
const defaultMockVersions = [
|
|
{ version: '1.0.0', createdAt: '2023-01-01' },
|
|
{ version: '0.9.0', createdAt: '2022-12-01' },
|
|
{ version: '0.8.0', createdAt: '2022-11-01' }
|
|
]
|
|
|
|
const mockNodePack = {
|
|
id: 'test-pack',
|
|
name: 'Test Pack',
|
|
latest_version: { version: '1.0.0' },
|
|
repository: 'https://github.com/user/repo'
|
|
}
|
|
|
|
// Create mock functions
|
|
const mockGetPackVersions = vi.fn()
|
|
const mockInstallPack = vi.fn().mockResolvedValue(undefined)
|
|
|
|
// Mock the registry service
|
|
vi.mock('@/services/comfyRegistryService', () => ({
|
|
useComfyRegistryService: vi.fn(() => ({
|
|
getPackVersions: mockGetPackVersions
|
|
}))
|
|
}))
|
|
|
|
// Mock the manager store
|
|
vi.mock('@/stores/comfyManagerStore', () => ({
|
|
useComfyManagerStore: vi.fn(() => ({
|
|
installPack: {
|
|
call: mockInstallPack,
|
|
clear: vi.fn()
|
|
},
|
|
isPackInstalled: vi.fn(() => false),
|
|
getInstalledPackVersion: vi.fn(() => undefined)
|
|
}))
|
|
}))
|
|
|
|
const waitForPromises = async () => {
|
|
await new Promise((resolve) => setTimeout(resolve, 16))
|
|
await nextTick()
|
|
}
|
|
|
|
describe('PackVersionSelectorPopover', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
mockGetPackVersions.mockReset()
|
|
mockInstallPack.mockReset().mockResolvedValue(undefined)
|
|
})
|
|
|
|
const mountComponent = ({
|
|
props = {}
|
|
}: Record<string, any> = {}): VueWrapper => {
|
|
const i18n = createI18n({
|
|
legacy: false,
|
|
locale: 'en',
|
|
messages: { en: enMessages }
|
|
})
|
|
|
|
return mount(PackVersionSelectorPopover, {
|
|
props: {
|
|
nodePack: mockNodePack,
|
|
...props
|
|
},
|
|
global: {
|
|
plugins: [PrimeVue, createPinia(), i18n],
|
|
components: {
|
|
Listbox
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
it('fetches versions on mount', async () => {
|
|
// Set up the mock for this specific test
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
mountComponent()
|
|
await waitForPromises()
|
|
|
|
expect(mockGetPackVersions).toHaveBeenCalledWith(mockNodePack.id)
|
|
})
|
|
|
|
it('shows loading state while fetching versions', async () => {
|
|
// Delay the promise resolution
|
|
mockGetPackVersions.mockImplementationOnce(
|
|
() =>
|
|
new Promise((resolve) =>
|
|
setTimeout(() => resolve(defaultMockVersions), 1000)
|
|
)
|
|
)
|
|
|
|
const wrapper = mountComponent()
|
|
|
|
expect(wrapper.text()).toContain('Loading versions...')
|
|
})
|
|
|
|
it('displays special options and version options in the listbox', async () => {
|
|
// Set up the mock for this specific test
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const wrapper = mountComponent()
|
|
await waitForPromises()
|
|
|
|
const listbox = wrapper.findComponent(Listbox)
|
|
expect(listbox.exists()).toBe(true)
|
|
|
|
const options = listbox.props('options')!
|
|
// Check that we have both special options and version options
|
|
expect(options.length).toBe(defaultMockVersions.length + 2) // 2 special options + version options
|
|
|
|
// Check that special options exist
|
|
expect(options.some((o) => o.value === 'nightly')).toBe(true)
|
|
expect(options.some((o) => o.value === 'latest')).toBe(true)
|
|
|
|
// Check that version options exist
|
|
expect(options.some((o) => o.value === '1.0.0')).toBe(true)
|
|
expect(options.some((o) => o.value === '0.9.0')).toBe(true)
|
|
expect(options.some((o) => o.value === '0.8.0')).toBe(true)
|
|
})
|
|
|
|
it('emits cancel event when cancel button is clicked', async () => {
|
|
// Set up the mock for this specific test
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const wrapper = mountComponent()
|
|
await waitForPromises()
|
|
|
|
const cancelButton = wrapper.findAllComponents(Button)[0]
|
|
await cancelButton.trigger('click')
|
|
|
|
expect(wrapper.emitted('cancel')).toBeTruthy()
|
|
})
|
|
|
|
it('calls installPack and emits submit when install button is clicked', async () => {
|
|
// Set up the mock for this specific test
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const wrapper = mountComponent()
|
|
await waitForPromises()
|
|
|
|
// Set the selected version
|
|
await wrapper.findComponent(Listbox).setValue('0.9.0')
|
|
|
|
const installButton = wrapper.findAllComponents(Button)[1]
|
|
await installButton.trigger('click')
|
|
|
|
// Check that installPack was called with the correct parameters
|
|
expect(mockInstallPack).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
id: mockNodePack.id,
|
|
repository: mockNodePack.repository,
|
|
version: '0.9.0',
|
|
selected_version: '0.9.0'
|
|
})
|
|
)
|
|
|
|
// Check that submit was emitted
|
|
expect(wrapper.emitted('submit')).toBeTruthy()
|
|
})
|
|
|
|
it('is reactive to nodePack prop changes', async () => {
|
|
// Set up the mock for the initial fetch
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const wrapper = mountComponent()
|
|
await waitForPromises()
|
|
|
|
// Set up the mock for the second fetch after prop change
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
// Update the nodePack prop
|
|
const newNodePack = { ...mockNodePack, id: 'new-test-pack' }
|
|
await wrapper.setProps({ nodePack: newNodePack })
|
|
await waitForPromises()
|
|
|
|
// Should fetch versions for the new nodePack
|
|
expect(mockGetPackVersions).toHaveBeenCalledWith(newNodePack.id)
|
|
})
|
|
|
|
describe('nodePack.id changes', () => {
|
|
it('re-fetches versions when nodePack.id changes', async () => {
|
|
// Set up the mock for the initial fetch
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const wrapper = mountComponent()
|
|
await waitForPromises()
|
|
|
|
// Verify initial fetch
|
|
expect(mockGetPackVersions).toHaveBeenCalledTimes(1)
|
|
expect(mockGetPackVersions).toHaveBeenCalledWith(mockNodePack.id)
|
|
|
|
// Set up the mock for the second fetch
|
|
const newVersions = [
|
|
{ version: '2.0.0', createdAt: '2023-06-01' },
|
|
{ version: '1.9.0', createdAt: '2023-05-01' }
|
|
]
|
|
mockGetPackVersions.mockResolvedValueOnce(newVersions)
|
|
|
|
// Update the nodePack with a new ID
|
|
const newNodePack = {
|
|
...mockNodePack,
|
|
id: 'different-pack',
|
|
name: 'Different Pack'
|
|
}
|
|
await wrapper.setProps({ nodePack: newNodePack })
|
|
await waitForPromises()
|
|
|
|
// Should fetch versions for the new nodePack
|
|
expect(mockGetPackVersions).toHaveBeenCalledTimes(2)
|
|
expect(mockGetPackVersions).toHaveBeenLastCalledWith(newNodePack.id)
|
|
|
|
// Check that new versions are displayed
|
|
const listbox = wrapper.findComponent(Listbox)
|
|
const options = listbox.props('options')!
|
|
expect(options.some((o) => o.value === '2.0.0')).toBe(true)
|
|
expect(options.some((o) => o.value === '1.9.0')).toBe(true)
|
|
})
|
|
|
|
it('does not re-fetch when nodePack changes but id remains the same', async () => {
|
|
// Set up the mock for the initial fetch
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const wrapper = mountComponent()
|
|
await waitForPromises()
|
|
|
|
// Verify initial fetch
|
|
expect(mockGetPackVersions).toHaveBeenCalledTimes(1)
|
|
|
|
// Update the nodePack with same ID but different properties
|
|
const updatedNodePack = {
|
|
...mockNodePack,
|
|
name: 'Updated Test Pack',
|
|
description: 'New description'
|
|
}
|
|
await wrapper.setProps({ nodePack: updatedNodePack })
|
|
await waitForPromises()
|
|
|
|
// Should NOT fetch versions again
|
|
expect(mockGetPackVersions).toHaveBeenCalledTimes(1)
|
|
})
|
|
|
|
it('maintains selected version when switching to a new pack', async () => {
|
|
// Set up the mock for the initial fetch
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const wrapper = mountComponent()
|
|
await waitForPromises()
|
|
|
|
// Select a specific version
|
|
const listbox = wrapper.findComponent(Listbox)
|
|
await listbox.setValue('0.9.0')
|
|
expect(listbox.props('modelValue')).toBe('0.9.0')
|
|
|
|
// Set up the mock for the second fetch
|
|
mockGetPackVersions.mockResolvedValueOnce([
|
|
{ version: '3.0.0', createdAt: '2023-07-01' },
|
|
{ version: '0.9.0', createdAt: '2023-04-01' }
|
|
])
|
|
|
|
// Update to a new pack that also has version 0.9.0
|
|
const newNodePack = {
|
|
id: 'another-pack',
|
|
name: 'Another Pack',
|
|
latest_version: { version: '3.0.0' }
|
|
}
|
|
await wrapper.setProps({ nodePack: newNodePack })
|
|
await waitForPromises()
|
|
|
|
// Selected version should remain the same if available
|
|
expect(listbox.props('modelValue')).toBe('0.9.0')
|
|
})
|
|
})
|
|
|
|
describe('Unclaimed GitHub packs handling', () => {
|
|
it('falls back to nightly when no versions exist', async () => {
|
|
// Set up the mock to return versions
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const packWithRepo = {
|
|
...mockNodePack,
|
|
latest_version: undefined
|
|
}
|
|
|
|
const wrapper = mountComponent({
|
|
props: {
|
|
nodePack: packWithRepo
|
|
}
|
|
})
|
|
|
|
await waitForPromises()
|
|
const listbox = wrapper.findComponent(Listbox)
|
|
expect(listbox.exists()).toBe(true)
|
|
expect(listbox.props('modelValue')).toBe('nightly')
|
|
})
|
|
|
|
it('defaults to nightly when publisher name is "Unclaimed"', async () => {
|
|
// Set up the mock to return versions
|
|
mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
|
|
|
|
const unclaimedNodePack = {
|
|
...mockNodePack,
|
|
publisher: { name: 'Unclaimed' }
|
|
}
|
|
|
|
const wrapper = mountComponent({
|
|
props: {
|
|
nodePack: unclaimedNodePack
|
|
}
|
|
})
|
|
|
|
await waitForPromises()
|
|
const listbox = wrapper.findComponent(Listbox)
|
|
expect(listbox.exists()).toBe(true)
|
|
expect(listbox.props('modelValue')).toBe('nightly')
|
|
})
|
|
})
|
|
})
|