mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 13:59:28 +00:00
## Summary Follow-up to #9215 to keep Docked Job History toggle behavior deterministic even when settings persistence fails. ## Changes - Close the actions popover immediately when toggling Docked Job History. - Use settingStore.setMany(...) when switching from docked to floating mode. - Set sidebarTabStore.activeSidebarTabId = 'job-history' before persisting when switching from floating to docked mode. - Wrap persistence calls in try/catch without rollback so locally-applied UI state remains deterministic. - Expand QueueOverlayHeader tests to cover setMany, popover close behavior, and persistence-failure paths. ## Testing - pnpm test:unit -- src/components/queue/QueueOverlayHeader.test.ts - pnpm typecheck - pnpm exec eslint src/components/queue/JobHistoryActionsMenu.vue src/components/queue/QueueOverlayHeader.test.ts - pnpm lint (fails in this branch due pre-existing stylelint errors in generated apps/desktop-ui/dist/**/*.css files, unrelated to this change) ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9265-fix-make-docked-job-history-toggle-persistence-safe-3146d73d3650818f86c4dfdd57669abd) by [Unito](https://www.unito.io)
211 lines
6.2 KiB
TypeScript
211 lines
6.2 KiB
TypeScript
import { mount } from '@vue/test-utils'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { createI18n } from 'vue-i18n'
|
|
import { defineComponent, h } from 'vue'
|
|
|
|
const popoverCloseSpy = vi.fn()
|
|
|
|
vi.mock('@/components/ui/Popover.vue', () => {
|
|
const PopoverStub = defineComponent({
|
|
name: 'Popover',
|
|
setup(_, { slots }) {
|
|
return () =>
|
|
h('div', [
|
|
slots.button?.(),
|
|
slots.default?.({
|
|
close: () => {
|
|
popoverCloseSpy()
|
|
}
|
|
})
|
|
])
|
|
}
|
|
})
|
|
return { default: PopoverStub }
|
|
})
|
|
|
|
const mockGetSetting = vi.fn<(key: string) => boolean | undefined>((key) =>
|
|
key === 'Comfy.Queue.QPOV2' ? true : undefined
|
|
)
|
|
const mockSetSetting = vi.fn()
|
|
const mockSetMany = vi.fn()
|
|
const mockSidebarTabStore = {
|
|
activeSidebarTabId: null as string | null
|
|
}
|
|
|
|
vi.mock('@/platform/settings/settingStore', () => ({
|
|
useSettingStore: () => ({
|
|
get: mockGetSetting,
|
|
set: mockSetSetting,
|
|
setMany: mockSetMany
|
|
})
|
|
}))
|
|
|
|
vi.mock('@/stores/workspace/sidebarTabStore', () => ({
|
|
useSidebarTabStore: () => mockSidebarTabStore
|
|
}))
|
|
|
|
import QueueOverlayHeader from './QueueOverlayHeader.vue'
|
|
import * as tooltipConfig from '@/composables/useTooltipConfig'
|
|
|
|
const tooltipDirectiveStub = {
|
|
mounted: vi.fn(),
|
|
updated: vi.fn()
|
|
}
|
|
|
|
const i18n = createI18n({
|
|
legacy: false,
|
|
locale: 'en',
|
|
messages: {
|
|
en: {
|
|
g: { more: 'More' },
|
|
sideToolbar: {
|
|
queueProgressOverlay: {
|
|
queuedSuffix: 'queued',
|
|
clearQueued: 'Clear queued',
|
|
clearQueueTooltip: 'Clear queue',
|
|
clearAllJobsTooltip: 'Cancel all running jobs',
|
|
moreOptions: 'More options',
|
|
clearHistory: 'Clear history',
|
|
dockedJobHistory: 'Docked Job History'
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
|
|
const mountHeader = (props = {}) =>
|
|
mount(QueueOverlayHeader, {
|
|
props: {
|
|
headerTitle: 'Job queue',
|
|
queuedCount: 3,
|
|
...props
|
|
},
|
|
global: {
|
|
plugins: [i18n],
|
|
directives: { tooltip: tooltipDirectiveStub }
|
|
}
|
|
})
|
|
|
|
describe('QueueOverlayHeader', () => {
|
|
beforeEach(() => {
|
|
popoverCloseSpy.mockClear()
|
|
mockSetSetting.mockClear()
|
|
mockSetMany.mockClear()
|
|
mockSidebarTabStore.activeSidebarTabId = null
|
|
mockGetSetting.mockImplementation((key: string) =>
|
|
key === 'Comfy.Queue.QPOV2' ? true : undefined
|
|
)
|
|
})
|
|
|
|
it('renders header title', () => {
|
|
const wrapper = mountHeader()
|
|
expect(wrapper.text()).toContain('Job queue')
|
|
})
|
|
|
|
it('shows clear queue text and emits clear queued', async () => {
|
|
const wrapper = mountHeader({ queuedCount: 4 })
|
|
|
|
expect(wrapper.text()).toContain('Clear queue')
|
|
expect(wrapper.text()).not.toContain('4 queued')
|
|
|
|
const clearQueuedButton = wrapper.get('button[aria-label="Clear queued"]')
|
|
await clearQueuedButton.trigger('click')
|
|
expect(wrapper.emitted('clearQueued')).toHaveLength(1)
|
|
})
|
|
|
|
it('disables clear queued button when queued count is zero', () => {
|
|
const wrapper = mountHeader({ queuedCount: 0 })
|
|
const clearQueuedButton = wrapper.get('button[aria-label="Clear queued"]')
|
|
|
|
expect(clearQueuedButton.attributes('disabled')).toBeDefined()
|
|
expect(wrapper.text()).toContain('Clear queue')
|
|
})
|
|
|
|
it('emits clear history from the menu', async () => {
|
|
const spy = vi.spyOn(tooltipConfig, 'buildTooltipConfig')
|
|
|
|
const wrapper = mountHeader()
|
|
|
|
expect(wrapper.find('button[aria-label="More options"]').exists()).toBe(
|
|
true
|
|
)
|
|
expect(spy).toHaveBeenCalledWith('More')
|
|
|
|
const clearHistoryButton = wrapper.get(
|
|
'[data-testid="clear-history-action"]'
|
|
)
|
|
await clearHistoryButton.trigger('click')
|
|
expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
|
|
expect(wrapper.emitted('clearHistory')).toHaveLength(1)
|
|
})
|
|
|
|
it('opens floating queue progress overlay when disabling from the menu', async () => {
|
|
const wrapper = mountHeader()
|
|
|
|
const dockedJobHistoryButton = wrapper.get(
|
|
'[data-testid="docked-job-history-action"]'
|
|
)
|
|
await dockedJobHistoryButton.trigger('click')
|
|
|
|
expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
|
|
expect(mockSetMany).toHaveBeenCalledTimes(1)
|
|
expect(mockSetMany).toHaveBeenCalledWith({
|
|
'Comfy.Queue.QPOV2': false,
|
|
'Comfy.Queue.History.Expanded': true
|
|
})
|
|
expect(mockSetSetting).not.toHaveBeenCalled()
|
|
expect(mockSidebarTabStore.activeSidebarTabId).toBe(null)
|
|
})
|
|
|
|
it('opens docked job history sidebar when enabling from the menu', async () => {
|
|
mockGetSetting.mockImplementation((key: string) =>
|
|
key === 'Comfy.Queue.QPOV2' ? false : undefined
|
|
)
|
|
const wrapper = mountHeader()
|
|
|
|
const dockedJobHistoryButton = wrapper.get(
|
|
'[data-testid="docked-job-history-action"]'
|
|
)
|
|
await dockedJobHistoryButton.trigger('click')
|
|
|
|
expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
|
|
expect(mockSetSetting).toHaveBeenCalledTimes(1)
|
|
expect(mockSetSetting).toHaveBeenCalledWith('Comfy.Queue.QPOV2', true)
|
|
expect(mockSetMany).not.toHaveBeenCalled()
|
|
expect(mockSidebarTabStore.activeSidebarTabId).toBe('job-history')
|
|
})
|
|
|
|
it('keeps docked target open even when enabling persistence fails', async () => {
|
|
mockGetSetting.mockImplementation((key: string) =>
|
|
key === 'Comfy.Queue.QPOV2' ? false : undefined
|
|
)
|
|
mockSetSetting.mockRejectedValueOnce(new Error('persistence failed'))
|
|
const wrapper = mountHeader()
|
|
|
|
const dockedJobHistoryButton = wrapper.get(
|
|
'[data-testid="docked-job-history-action"]'
|
|
)
|
|
await dockedJobHistoryButton.trigger('click')
|
|
|
|
expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
|
|
expect(mockSetSetting).toHaveBeenCalledWith('Comfy.Queue.QPOV2', true)
|
|
expect(mockSidebarTabStore.activeSidebarTabId).toBe('job-history')
|
|
})
|
|
|
|
it('closes the menu when disabling persistence fails', async () => {
|
|
mockSetMany.mockRejectedValueOnce(new Error('persistence failed'))
|
|
const wrapper = mountHeader()
|
|
|
|
const dockedJobHistoryButton = wrapper.get(
|
|
'[data-testid="docked-job-history-action"]'
|
|
)
|
|
await dockedJobHistoryButton.trigger('click')
|
|
|
|
expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
|
|
expect(mockSetMany).toHaveBeenCalledWith({
|
|
'Comfy.Queue.QPOV2': false,
|
|
'Comfy.Queue.History.Expanded': true
|
|
})
|
|
})
|
|
})
|