mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-08 09:00:05 +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>
123 lines
4.1 KiB
TypeScript
123 lines
4.1 KiB
TypeScript
import { createPinia, setActivePinia } from 'pinia'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
import { useMinimapSettings } from '@/renderer/extensions/minimap/composables/useMinimapSettings'
|
|
import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
|
|
|
|
vi.mock('@/platform/settings/settingStore')
|
|
vi.mock('@/stores/workspace/colorPaletteStore')
|
|
|
|
describe('useMinimapSettings', () => {
|
|
beforeEach(() => {
|
|
setActivePinia(createPinia())
|
|
vi.clearAllMocks()
|
|
})
|
|
|
|
it('should return all minimap settings as computed refs', () => {
|
|
const mockSettingStore = {
|
|
get: vi.fn((key: string) => {
|
|
const settings: Record<string, any> = {
|
|
'Comfy.Minimap.NodeColors': true,
|
|
'Comfy.Minimap.ShowLinks': false,
|
|
'Comfy.Minimap.ShowGroups': true,
|
|
'Comfy.Minimap.RenderBypassState': false,
|
|
'Comfy.Minimap.RenderErrorState': true
|
|
}
|
|
return settings[key]
|
|
})
|
|
}
|
|
|
|
vi.mocked(useSettingStore).mockReturnValue(mockSettingStore as any)
|
|
vi.mocked(useColorPaletteStore).mockReturnValue({
|
|
completedActivePalette: { light_theme: false }
|
|
} as any)
|
|
|
|
const settings = useMinimapSettings()
|
|
|
|
expect(settings.nodeColors.value).toBe(true)
|
|
expect(settings.showLinks.value).toBe(false)
|
|
expect(settings.showGroups.value).toBe(true)
|
|
expect(settings.renderBypass.value).toBe(false)
|
|
expect(settings.renderError.value).toBe(true)
|
|
})
|
|
|
|
it('should generate container styles based on theme', () => {
|
|
const mockColorPaletteStore = {
|
|
completedActivePalette: { light_theme: false }
|
|
}
|
|
|
|
vi.mocked(useSettingStore).mockReturnValue({ get: vi.fn() } as any)
|
|
vi.mocked(useColorPaletteStore).mockReturnValue(
|
|
mockColorPaletteStore as any
|
|
)
|
|
|
|
const settings = useMinimapSettings()
|
|
const styles = settings.containerStyles.value
|
|
|
|
expect(styles.width).toBe('250px')
|
|
expect(styles.height).toBe('200px')
|
|
expect(styles.backgroundColor).toBe('#15161C') // dark theme color
|
|
expect(styles.border).toBe('1px solid #333')
|
|
})
|
|
|
|
it('should generate light theme container styles', () => {
|
|
const mockColorPaletteStore = {
|
|
completedActivePalette: { light_theme: true }
|
|
}
|
|
|
|
vi.mocked(useSettingStore).mockReturnValue({ get: vi.fn() } as any)
|
|
vi.mocked(useColorPaletteStore).mockReturnValue(
|
|
mockColorPaletteStore as any
|
|
)
|
|
|
|
const settings = useMinimapSettings()
|
|
const styles = settings.containerStyles.value
|
|
|
|
expect(styles.backgroundColor).toBe('#FAF9F5') // light theme color
|
|
expect(styles.border).toBe('1px solid #ccc')
|
|
})
|
|
|
|
it('should generate panel styles based on theme', () => {
|
|
const mockColorPaletteStore = {
|
|
completedActivePalette: { light_theme: false }
|
|
}
|
|
|
|
vi.mocked(useSettingStore).mockReturnValue({ get: vi.fn() } as any)
|
|
vi.mocked(useColorPaletteStore).mockReturnValue(
|
|
mockColorPaletteStore as any
|
|
)
|
|
|
|
const settings = useMinimapSettings()
|
|
const styles = settings.panelStyles.value
|
|
|
|
expect(styles.backgroundColor).toBe('#15161C')
|
|
expect(styles.border).toBe('1px solid #333')
|
|
expect(styles.borderRadius).toBe('8px')
|
|
})
|
|
|
|
it('should create computed properties that call the store getter', () => {
|
|
const mockGet = vi.fn((key: string) => {
|
|
if (key === 'Comfy.Minimap.NodeColors') return true
|
|
if (key === 'Comfy.Minimap.ShowLinks') return false
|
|
return true
|
|
})
|
|
const mockSettingStore = { get: mockGet }
|
|
|
|
vi.mocked(useSettingStore).mockReturnValue(mockSettingStore as any)
|
|
vi.mocked(useColorPaletteStore).mockReturnValue({
|
|
completedActivePalette: { light_theme: false }
|
|
} as any)
|
|
|
|
const settings = useMinimapSettings()
|
|
|
|
// Access the computed properties
|
|
expect(settings.nodeColors.value).toBe(true)
|
|
expect(settings.showLinks.value).toBe(false)
|
|
|
|
// Verify the store getter was called with the correct keys
|
|
expect(mockGet).toHaveBeenCalledWith('Comfy.Minimap.NodeColors')
|
|
expect(mockGet).toHaveBeenCalledWith('Comfy.Minimap.ShowLinks')
|
|
})
|
|
})
|