diff --git a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts index 6df2e7142..50252ca11 100644 --- a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts +++ b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts @@ -31,7 +31,7 @@ const mockNodePack = { } const mockIsPackEnabled = vi.fn() -const mockEnablePack = { call: vi.fn().mockResolvedValue(undefined) } +const mockEnablePack = vi.fn().mockResolvedValue(undefined) const mockDisablePack = vi.fn().mockResolvedValue(undefined) vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore', () => ({ useComfyManagerStore: vi.fn(() => ({ @@ -46,7 +46,7 @@ describe('PackEnableToggle', () => { beforeEach(() => { vi.clearAllMocks() mockIsPackEnabled.mockReset() - mockEnablePack.call.mockReset().mockResolvedValue(undefined) + mockEnablePack.mockReset().mockResolvedValue(undefined) mockDisablePack.mockReset().mockResolvedValue(undefined) }) @@ -116,7 +116,7 @@ describe('PackEnableToggle', () => { const toggleSwitch = wrapper.findComponent(ToggleSwitch) await toggleSwitch.vm.$emit('update:modelValue', true) - expect(mockEnablePack.call).toHaveBeenCalledWith( + expect(mockEnablePack).toHaveBeenCalledWith( expect.objectContaining({ id: mockNodePack.id, version: mockNodePack.latest_version.version @@ -143,7 +143,7 @@ describe('PackEnableToggle', () => { const pendingPromise = new Promise((resolve) => { setTimeout(() => resolve(), 1000) }) - mockEnablePack.call.mockReturnValue(pendingPromise) + mockEnablePack.mockReturnValue(pendingPromise) mockIsPackEnabled.mockReturnValue(false) const wrapper = mountComponent() diff --git a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue index 756e5a607..be162c571 100644 --- a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue +++ b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue @@ -106,18 +106,11 @@ const handleEnable = () => { if (!nodePack.id) { throw new Error('Node ID is required for enabling') } - return enablePack.call({ + return enablePack({ id: nodePack.id, version: version.value ?? - ('latest' as ManagerComponents['schemas']['SelectedVersion']), - selected_version: - version.value ?? - ('latest' as ManagerComponents['schemas']['SelectedVersion']), - repository: nodePack.repository ?? '', - channel: 'default' as ManagerComponents['schemas']['ManagerChannel'], - mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'], - skip_post_install: false + ('latest' as ManagerComponents['schemas']['SelectedVersion']) }) } diff --git a/src/workbench/extensions/manager/services/comfyManagerService.ts b/src/workbench/extensions/manager/services/comfyManagerService.ts index 6e8f91ecd..9358f2918 100644 --- a/src/workbench/extensions/manager/services/comfyManagerService.ts +++ b/src/workbench/extensions/manager/services/comfyManagerService.ts @@ -228,6 +228,14 @@ export const useComfyManagerService = () => { return queueTask('disable', params, ui_id, signal) } + const enablePack = async ( + params: components['schemas']['EnablePackParams'], + ui_id?: string, + signal?: AbortSignal + ): Promise => { + return queueTask('enable', params, ui_id, signal) + } + const updatePack = async ( params: components['schemas']['UpdatePackParams'], ui_id?: string, @@ -321,7 +329,7 @@ export const useComfyManagerService = () => { getImportFailInfoBulk, installPack, uninstallPack, - enablePack: installPack, // enable is done via install + enablePack, disablePack, updatePack, updateAllPacks, diff --git a/src/workbench/extensions/manager/stores/comfyManagerStore.ts b/src/workbench/extensions/manager/stores/comfyManagerStore.ts index f3391d1bb..06097cbe7 100644 --- a/src/workbench/extensions/manager/stores/comfyManagerStore.ts +++ b/src/workbench/extensions/manager/stores/comfyManagerStore.ts @@ -317,6 +317,15 @@ export const useComfyManagerStore = defineStore('comfyManager', () => { await enqueueTaskWithLogs(task, t('g.disabling', { id: params.id })) } + const enablePack = async (params: ManagerPackInfo, signal?: AbortSignal) => { + const enableParams: components['schemas']['EnablePackParams'] = { + cnr_id: params.id + } + const task = (taskId: string) => + managerService.enablePack(enableParams, taskId, signal) + await enqueueTaskWithLogs(task, t('g.enabling', { id: params.id })) + } + const getInstalledPackVersion = (packId: string) => { const pack = installedPacks.value[packId] return pack?.ver @@ -380,7 +389,7 @@ export const useComfyManagerStore = defineStore('comfyManager', () => { updatePack, updateAllPacks, disablePack, - enablePack: installPack // Enable is done via install endpoint with a disabled pack + enablePack } })