fix: Restore correct interfaces from PR #3367

- Restore original useManagerQueue, useServerLogs, and comfyManagerService interfaces
- Restore original component implementations for ManagerProgressDialogContent and ManagerProgressHeader
- Fix all TypeScript interface compatibility issues by using original PR implementations
- Remove duplicate setting that was causing runtime errors

This fixes merge errors where interfaces were incorrectly mixed between old and new implementations.

tests-ui/tests/composables/useServerLogs.test.ts

@@ -24,22 +24,22 @@ describe('useServerLogs', () => {
   })
 
   it('should initialize with empty logs array', () => {
-    const { logs } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { logs } = useServerLogs()
     expect(logs.value).toEqual([])
   })
 
   it('should not subscribe to logs by default', () => {
-    useServerLogs({ ui_id: 'test-ui-id' })
+    useServerLogs()
     expect(api.subscribeLogs).not.toHaveBeenCalled()
   })
 
   it('should subscribe to logs when immediate is true', () => {
-    useServerLogs({ ui_id: 'test-ui-id', immediate: true })
+    useServerLogs({ immediate: true })
     expect(api.subscribeLogs).toHaveBeenCalledWith(true)
   })
 
   it('should start listening when startListening is called', async () => {
-    const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { startListening } = useServerLogs()
 
     await startListening()
 
@@ -47,21 +47,16 @@ describe('useServerLogs', () => {
   })
 
   it('should stop listening when stopListening is called', async () => {
-    const { startListening, stopListening } = useServerLogs({
-      ui_id: 'test-ui-id'
-    })
+    const { startListening, stopListening } = useServerLogs()
 
     await startListening()
     await stopListening()
 
-    // TODO: Update this test when subscribeLogs(false) is re-enabled
-    // Currently commented out in useServerLogs to prevent logs from stopping
-    // after 1st of multiple queue tasks
-    expect(api.subscribeLogs).toHaveBeenCalledWith(true)
+    expect(api.subscribeLogs).toHaveBeenCalledWith(false)
   })
 
   it('should register event listener when starting', async () => {
-    const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { startListening } = useServerLogs()
 
     await startListening()
 
@@ -73,30 +68,16 @@ describe('useServerLogs', () => {
   })
 
   it('should handle log messages correctly', async () => {
-    const { logs, startListening } = useServerLogs({ ui_id: 'test-ui-id' })
+    const { logs, startListening } = useServerLogs()
 
     await startListening()
 
-    // Get the callbacks that were registered with useEventListener
-    const mockCalls = vi.mocked(useEventListener).mock.calls
-    const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
+    // Get the callback that was registered with useEventListener
+    const eventCallback = vi.mocked(useEventListener).mock.calls[0][2] as (
       event: CustomEvent<LogsWsMessage>
     ) => void
-    const taskStartedCallback = mockCalls.find(
-      (call) => call[1] === 'cm-task-started'
-    )?.[2] as (event: CustomEvent<any>) => void
 
-    // First, simulate task started event
-    const taskStartedEvent = new CustomEvent('cm-task-started', {
-      detail: {
-        type: 'cm-task-started',
-        ui_id: 'test-ui-id'
-      }
-    })
-    taskStartedCallback(taskStartedEvent)
-    await nextTick()
-
-    // Now simulate receiving a log event
+    // Simulate receiving a log event
     const mockEvent = new CustomEvent('logs', {
       detail: {
         type: 'logs',
@@ -104,7 +85,7 @@ describe('useServerLogs', () => {
       } as unknown as LogsWsMessage
     }) as CustomEvent<LogsWsMessage>
 
-    logsCallback(mockEvent)
+    eventCallback(mockEvent)
     await nextTick()
 
     expect(logs.value).toEqual(['Log message 1', 'Log message 2'])
@@ -112,32 +93,15 @@ describe('useServerLogs', () => {
 
   it('should use the message filter if provided', async () => {
     const { logs, startListening } = useServerLogs({
-      ui_id: 'test-ui-id',
       messageFilter: (msg) => msg !== 'remove me'
     })
 
     await startListening()
 
-    // Get the callbacks that were registered with useEventListener
-    const mockCalls = vi.mocked(useEventListener).mock.calls
-    const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
+    const eventCallback = vi.mocked(useEventListener).mock.calls[0][2] as (
       event: CustomEvent<LogsWsMessage>
     ) => void
-    const taskStartedCallback = mockCalls.find(
-      (call) => call[1] === 'cm-task-started'
-    )?.[2] as (event: CustomEvent<any>) => void
 
-    // First, simulate task started event
-    const taskStartedEvent = new CustomEvent('cm-task-started', {
-      detail: {
-        type: 'cm-task-started',
-        ui_id: 'test-ui-id'
-      }
-    })
-    taskStartedCallback(taskStartedEvent)
-    await nextTick()
-
-    // Now simulate receiving a log event
     const mockEvent = new CustomEvent('logs', {
       detail: {
         type: 'logs',
@@ -149,7 +113,7 @@ describe('useServerLogs', () => {
       } as unknown as LogsWsMessage
     }) as CustomEvent<LogsWsMessage>
 
-    logsCallback(mockEvent)
+    eventCallback(mockEvent)
     await nextTick()
 
     expect(logs.value).toEqual(['Log message 1 dont remove me', ''])