mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-27 11:29:53 +00:00
* refactor: move settingStore to platform/settings Move src/stores/settingStore.ts to src/platform/settings/settingStore.ts to separate platform infrastructure from domain logic following DDD principles. Updates all import references across ~70 files to maintain compatibility. * fix: update remaining settingStore imports after rebase * fix: complete remaining settingStore import updates * fix: update vi.mock paths for settingStore in tests Update all test files to mock the new settingStore location at @/platform/settings/settingStore instead of @/stores/settingStore * fix: resolve remaining settingStore imports and unused imports after rebase * fix: update settingStore mock path in SelectionToolbox test Fix vi.mock path from @/stores/settingStore to @/platform/settings/settingStore to resolve failing Load3D viewer button test. * refactor: complete comprehensive settings migration to platform layer This commit completes the migration of all settings-related code to the platform layer as part of the Domain-Driven Design (DDD) architecture refactoring. - constants/coreSettings.ts → platform/settings/constants/coreSettings.ts - types/settingTypes.ts → platform/settings/types.ts - stores/settingStore.ts → platform/settings/settingStore.ts (already moved) - composables/setting/useSettingUI.ts → platform/settings/composables/useSettingUI.ts - composables/setting/useSettingSearch.ts → platform/settings/composables/useSettingSearch.ts - composables/useLitegraphSettings.ts → platform/settings/composables/useLitegraphSettings.ts - components/dialog/content/SettingDialogContent.vue → platform/settings/components/SettingDialogContent.vue - components/dialog/content/setting/SettingItem.vue → platform/settings/components/SettingItem.vue - components/dialog/content/setting/SettingGroup.vue → platform/settings/components/SettingGroup.vue - components/dialog/content/setting/SettingsPanel.vue → platform/settings/components/SettingsPanel.vue - components/dialog/content/setting/ColorPaletteMessage.vue → platform/settings/components/ColorPaletteMessage.vue - components/dialog/content/setting/ExtensionPanel.vue → platform/settings/components/ExtensionPanel.vue - components/dialog/content/setting/ServerConfigPanel.vue → platform/settings/components/ServerConfigPanel.vue - ~100+ import statements updated across the codebase - Test file imports corrected - Component imports fixed in dialog service and command menubar - Composable imports updated in GraphCanvas.vue ``` src/platform/settings/ ├── components/ # All settings UI components ├── composables/ # Settings-related composables ├── constants/ # Core settings definitions ├── types.ts # Settings type definitions └── settingStore.ts # Central settings state management ``` ✅ TypeScript compilation successful ✅ All tests passing (settings store, search functionality, UI components) ✅ Production build successful ✅ Domain boundaries properly established This migration consolidates all settings functionality into a cohesive platform domain, improving maintainability and following DDD principles for better code organization. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: format and lint after rebase conflict resolution * fix: update remaining import paths to platform settings - Fix browser test import: extensionAPI.spec.ts - Fix script import: collect-i18n-general.ts - Complete settings migration import path updates 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
177 lines
5.2 KiB
TypeScript
177 lines
5.2 KiB
TypeScript
import { createPinia, setActivePinia } from 'pinia'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { app } from '@/scripts/app'
|
|
import { useKeybindingService } from '@/services/keybindingService'
|
|
import { useCommandStore } from '@/stores/commandStore'
|
|
import { useDialogStore } from '@/stores/dialogStore'
|
|
|
|
// Mock the app and canvas using factory functions
|
|
vi.mock('@/scripts/app', () => {
|
|
return {
|
|
app: {
|
|
canvas: {
|
|
processKey: vi.fn()
|
|
}
|
|
}
|
|
}
|
|
})
|
|
|
|
// Mock stores
|
|
vi.mock('@/platform/settings/settingStore', () => ({
|
|
useSettingStore: vi.fn(() => ({
|
|
get: vi.fn(() => [])
|
|
}))
|
|
}))
|
|
|
|
vi.mock('@/stores/dialogStore', () => ({
|
|
useDialogStore: vi.fn(() => ({
|
|
dialogStack: []
|
|
}))
|
|
}))
|
|
|
|
// Test utility for creating keyboard events with mocked methods
|
|
function createTestKeyboardEvent(
|
|
key: string,
|
|
options: {
|
|
target?: Element
|
|
ctrlKey?: boolean
|
|
altKey?: boolean
|
|
metaKey?: boolean
|
|
} = {}
|
|
): KeyboardEvent {
|
|
const {
|
|
target = document.body,
|
|
ctrlKey = false,
|
|
altKey = false,
|
|
metaKey = false
|
|
} = options
|
|
|
|
const event = new KeyboardEvent('keydown', {
|
|
key,
|
|
ctrlKey,
|
|
altKey,
|
|
metaKey,
|
|
bubbles: true,
|
|
cancelable: true
|
|
})
|
|
|
|
// Mock event methods
|
|
event.preventDefault = vi.fn()
|
|
event.composedPath = vi.fn(() => [target])
|
|
|
|
return event
|
|
}
|
|
|
|
describe('keybindingService - Event Forwarding', () => {
|
|
let keybindingService: ReturnType<typeof useKeybindingService>
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
setActivePinia(createPinia())
|
|
|
|
// Mock command store execute
|
|
const commandStore = useCommandStore()
|
|
commandStore.execute = vi.fn()
|
|
|
|
// Reset dialog store mock to empty
|
|
vi.mocked(useDialogStore).mockReturnValue({
|
|
dialogStack: []
|
|
} as any)
|
|
|
|
keybindingService = useKeybindingService()
|
|
keybindingService.registerCoreKeybindings()
|
|
})
|
|
|
|
it('should forward Delete key to canvas when no keybinding exists', async () => {
|
|
const event = createTestKeyboardEvent('Delete')
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
// Should forward to canvas processKey
|
|
expect(vi.mocked(app.canvas.processKey)).toHaveBeenCalledWith(event)
|
|
// Should not execute any command
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should forward Backspace key to canvas when no keybinding exists', async () => {
|
|
const event = createTestKeyboardEvent('Backspace')
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(vi.mocked(app.canvas.processKey)).toHaveBeenCalledWith(event)
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should not forward Delete key when typing in input field', async () => {
|
|
const inputElement = document.createElement('input')
|
|
const event = createTestKeyboardEvent('Delete', { target: inputElement })
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
// Should not forward to canvas when in input field
|
|
expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should not forward Delete key when typing in textarea', async () => {
|
|
const textareaElement = document.createElement('textarea')
|
|
const event = createTestKeyboardEvent('Delete', { target: textareaElement })
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should not forward Delete key when canvas processKey is not available', async () => {
|
|
// Temporarily replace processKey with undefined
|
|
const originalProcessKey = vi.mocked(app.canvas).processKey
|
|
vi.mocked(app.canvas).processKey = undefined as any
|
|
|
|
const event = createTestKeyboardEvent('Delete')
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
|
|
// Restore processKey for other tests
|
|
vi.mocked(app.canvas).processKey = originalProcessKey
|
|
})
|
|
|
|
it('should not forward Delete key when canvas is not available', async () => {
|
|
// Temporarily set canvas to null
|
|
const originalCanvas = vi.mocked(app).canvas
|
|
vi.mocked(app).canvas = null as any
|
|
|
|
const event = createTestKeyboardEvent('Delete')
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
|
|
// Restore canvas for other tests
|
|
vi.mocked(app).canvas = originalCanvas
|
|
})
|
|
|
|
it('should not forward non-canvas keys', async () => {
|
|
const event = createTestKeyboardEvent('Enter')
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
// Should not forward Enter key
|
|
expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should not forward when modifier keys are pressed', async () => {
|
|
const event = createTestKeyboardEvent('Delete', { ctrlKey: true })
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
// Should not forward when modifiers are pressed
|
|
expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
|
|
expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
|
|
})
|
|
})
|