diff --git a/src/composables/useCoreCommands.ts b/src/composables/useCoreCommands.ts index b385efbb29..2134ccdaac 100644 --- a/src/composables/useCoreCommands.ts +++ b/src/composables/useCoreCommands.ts @@ -16,7 +16,6 @@ import { import { Point } from '@/lib/litegraph/src/litegraph' import { api } from '@/scripts/api' import { app } from '@/scripts/app' -import { useComfyManagerService } from '@/services/comfyManagerService' import { useDialogService } from '@/services/dialogService' import { useLitegraphService } from '@/services/litegraphService' import { useWorkflowService } from '@/services/workflowService' @@ -744,26 +743,33 @@ export function useCoreCommands(): ComfyCommand[] { label: 'Custom Nodes Manager', versionAdded: '1.12.10', function: async () => { - const { is_legacy_manager_ui } = - (await useComfyManagerService().isLegacyManagerUI()) ?? {} + const managerState = useManagerStateStore().managerUIState - if (is_legacy_manager_ui === true) { - try { - await useCommandStore().execute( - 'Comfy.Manager.Menu.ToggleVisibility' // This command is registered by legacy manager FE extension - ) - } catch (error) { - console.error('error', error) - useToastStore().add({ - severity: 'error', - summary: t('g.error'), - detail: t('manager.legacyMenuNotAvailable'), - life: 3000 - }) + switch (managerState) { + case ManagerUIState.DISABLED: + dialogService.showSettingsDialog('extension') + break + + case ManagerUIState.LEGACY_UI: + try { + await useCommandStore().execute( + 'Comfy.Manager.Menu.ToggleVisibility' // This command is registered by legacy manager FE extension + ) + } catch (error) { + console.error('error', error) + useToastStore().add({ + severity: 'error', + summary: t('g.error'), + detail: t('manager.legacyMenuNotAvailable'), + life: 3000 + }) + dialogService.showManagerDialog() + } + break + + case ManagerUIState.NEW_UI: dialogService.showManagerDialog() - } - } else { - dialogService.showManagerDialog() + break } } },