mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-28 02:34:10 +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>
186 lines
5.2 KiB
TypeScript
186 lines
5.2 KiB
TypeScript
import { VueWrapper, mount } from '@vue/test-utils'
|
|
import { createPinia } from 'pinia'
|
|
import Button from 'primevue/button'
|
|
import PrimeVue from 'primevue/config'
|
|
import Panel from 'primevue/panel'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { nextTick } from 'vue'
|
|
import { createI18n } from 'vue-i18n'
|
|
|
|
import enMessages from '@/locales/en/main.json'
|
|
|
|
import ManagerProgressDialogContent from './ManagerProgressDialogContent.vue'
|
|
|
|
type ComponentInstance = InstanceType<typeof ManagerProgressDialogContent> & {
|
|
lastPanelRef: HTMLElement | null
|
|
onLogsAdded: () => void
|
|
handleScroll: (e: { target: HTMLElement }) => void
|
|
isUserScrolling: boolean
|
|
resetUserScrolling: () => void
|
|
collapsedPanels: Record<number, boolean>
|
|
togglePanel: (index: number) => void
|
|
}
|
|
|
|
const mockCollapse = vi.fn()
|
|
|
|
const defaultMockTaskLogs = [
|
|
{ taskName: 'Task 1', logs: ['Log 1', 'Log 2'] },
|
|
{ taskName: 'Task 2', logs: ['Log 3', 'Log 4'] }
|
|
]
|
|
|
|
vi.mock('@/stores/comfyManagerStore', () => ({
|
|
useComfyManagerStore: vi.fn(() => ({
|
|
taskLogs: [...defaultMockTaskLogs],
|
|
succeededTasksLogs: [...defaultMockTaskLogs],
|
|
failedTasksLogs: [...defaultMockTaskLogs],
|
|
managerQueue: { historyCount: 2 },
|
|
isLoading: false
|
|
})),
|
|
useManagerProgressDialogStore: vi.fn(() => ({
|
|
isExpanded: true,
|
|
activeTabIndex: 0,
|
|
getActiveTabIndex: vi.fn(() => 0),
|
|
setActiveTabIndex: vi.fn(),
|
|
toggle: vi.fn(),
|
|
collapse: mockCollapse,
|
|
expand: vi.fn()
|
|
}))
|
|
}))
|
|
|
|
describe('ManagerProgressDialogContent', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
mockCollapse.mockReset()
|
|
})
|
|
|
|
const mountComponent = ({
|
|
props = {}
|
|
}: Record<string, any> = {}): VueWrapper<ComponentInstance> => {
|
|
const i18n = createI18n({
|
|
legacy: false,
|
|
locale: 'en',
|
|
messages: { en: enMessages }
|
|
})
|
|
|
|
return mount(ManagerProgressDialogContent, {
|
|
props: {
|
|
...props
|
|
},
|
|
global: {
|
|
plugins: [PrimeVue, createPinia(), i18n],
|
|
components: {
|
|
Panel,
|
|
Button
|
|
}
|
|
}
|
|
}) as VueWrapper<ComponentInstance>
|
|
}
|
|
|
|
it('renders the correct number of panels', async () => {
|
|
const wrapper = mountComponent()
|
|
await nextTick()
|
|
expect(wrapper.findAllComponents(Panel).length).toBe(2)
|
|
})
|
|
|
|
it('expands the last panel by default', async () => {
|
|
const wrapper = mountComponent()
|
|
await nextTick()
|
|
expect(wrapper.vm.collapsedPanels[1]).toBeFalsy()
|
|
})
|
|
|
|
it('toggles panel expansion when toggle method is called', async () => {
|
|
const wrapper = mountComponent()
|
|
await nextTick()
|
|
|
|
// Initial state - first panel should be collapsed
|
|
expect(wrapper.vm.collapsedPanels[0]).toBeFalsy()
|
|
|
|
wrapper.vm.togglePanel(0)
|
|
await nextTick()
|
|
|
|
// After toggle - first panel should be expanded
|
|
expect(wrapper.vm.collapsedPanels[0]).toBe(true)
|
|
|
|
wrapper.vm.togglePanel(0)
|
|
await nextTick()
|
|
|
|
expect(wrapper.vm.collapsedPanels[0]).toBeFalsy()
|
|
})
|
|
|
|
it('displays the correct status for each panel', async () => {
|
|
const wrapper = mountComponent()
|
|
await nextTick()
|
|
|
|
// Expand all panels to see status text
|
|
const panels = wrapper.findAllComponents(Panel)
|
|
for (let i = 0; i < panels.length; i++) {
|
|
if (!wrapper.vm.collapsedPanels[i]) {
|
|
wrapper.vm.togglePanel(i)
|
|
await nextTick()
|
|
}
|
|
}
|
|
|
|
const panelsText = wrapper
|
|
.findAllComponents(Panel)
|
|
.map((panel) => panel.text())
|
|
|
|
expect(panelsText[0]).toContain('Completed ✓')
|
|
expect(panelsText[1]).toContain('Completed ✓')
|
|
})
|
|
|
|
it('auto-scrolls to bottom when new logs are added', async () => {
|
|
const wrapper = mountComponent()
|
|
await nextTick()
|
|
|
|
const mockScrollElement = document.createElement('div')
|
|
Object.defineProperty(mockScrollElement, 'scrollHeight', { value: 200 })
|
|
Object.defineProperty(mockScrollElement, 'clientHeight', { value: 100 })
|
|
Object.defineProperty(mockScrollElement, 'scrollTop', {
|
|
value: 0,
|
|
writable: true
|
|
})
|
|
|
|
wrapper.vm.lastPanelRef = mockScrollElement
|
|
|
|
wrapper.vm.onLogsAdded()
|
|
await nextTick()
|
|
|
|
// Check if scrollTop is set to scrollHeight (scrolled to bottom)
|
|
expect(mockScrollElement.scrollTop).toBe(200)
|
|
})
|
|
|
|
it('does not auto-scroll when user is manually scrolling', async () => {
|
|
const wrapper = mountComponent()
|
|
await nextTick()
|
|
|
|
const mockScrollElement = document.createElement('div')
|
|
Object.defineProperty(mockScrollElement, 'scrollHeight', { value: 200 })
|
|
Object.defineProperty(mockScrollElement, 'clientHeight', { value: 100 })
|
|
Object.defineProperty(mockScrollElement, 'scrollTop', {
|
|
value: 50,
|
|
writable: true
|
|
})
|
|
|
|
wrapper.vm.lastPanelRef = mockScrollElement
|
|
|
|
wrapper.vm.handleScroll({ target: mockScrollElement })
|
|
await nextTick()
|
|
|
|
expect(wrapper.vm.isUserScrolling).toBe(true)
|
|
|
|
// Now trigger the log update
|
|
wrapper.vm.onLogsAdded()
|
|
await nextTick()
|
|
|
|
// Check that scrollTop is not changed (should still be 50)
|
|
expect(mockScrollElement.scrollTop).toBe(50)
|
|
})
|
|
|
|
it('calls collapse method when component is unmounted', async () => {
|
|
const wrapper = mountComponent()
|
|
await nextTick()
|
|
wrapper.unmount()
|
|
expect(mockCollapse).toHaveBeenCalled()
|
|
})
|
|
})
|