Skip to content
114 changes: 112 additions & 2 deletions src/components/queue/QueueProgressOverlay.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { createTestingPinia } from '@pinia/testing'
import { render, screen } from '@testing-library/vue'
import { render, screen, waitFor } from '@testing-library/vue'
import userEvent from '@testing-library/user-event'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { defineComponent } from 'vue'

import QueueProgressOverlay from '@/components/queue/QueueProgressOverlay.vue'
import type { JobListItem as JobListViewItem } from '@/composables/queue/useJobList'
import { i18n } from '@/i18n'
import { useAssetSelectionStore } from '@/platform/assets/composables/useAssetSelectionStore'
import type { JobStatus } from '@/platform/remote/comfyui/jobs/jobTypes'
import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
Expand All @@ -14,6 +16,18 @@ vi.mock('@/platform/distribution/types', () => ({
isCloud: false
}))

const { outputAssetsMock } = vi.hoisted(() => ({
outputAssetsMock: {
loadOutputAsset: vi.fn<(id: string) => Promise<boolean>>()
}
}))

vi.mock('@/stores/assetsStore', () => ({
useAssetsStore: () => outputAssetsMock
}))

let itemToView: JobListViewItem | undefined

const QueueOverlayExpandedStub = defineComponent({
name: 'QueueOverlayExpanded',
props: {
Expand All @@ -22,10 +36,17 @@ const QueueOverlayExpandedStub = defineComponent({
required: true
}
},
emits: ['viewItem'],
setup(_, { emit }) {
return {
viewItem: () => itemToView && emit('viewItem', itemToView)
}
},
template: `
<div>
<div data-testid="expanded-title">{{ headerTitle }}</div>
<button data-testid="show-assets-button" @click="$emit('show-assets')" />
<button data-testid="view-item-button" @click="viewItem" />
</div>
`
})
Expand All @@ -39,6 +60,30 @@ function createTask(id: string, status: JobStatus): TaskItemImpl {
})
}

function createCompletedJobView(id: string): JobListViewItem {
const task = new TaskItemImpl({
id,
status: 'completed',
create_time: 0,
priority: 0,
preview_output: {
filename: `${id}.png`,
mediaType: 'images',
nodeId: '1',
subfolder: '',
type: 'output'
}
})
return {
id,
meta: '',
showClear: false,
state: 'completed',
taskRef: task,
title: id
}
}

function renderComponent(
runningTasks: TaskItemImpl[],
pendingTasks: TaskItemImpl[]
Expand All @@ -48,6 +93,7 @@ function renderComponent(
stubActions: false
})
const queueStore = useQueueStore(pinia)
const assetSelectionStore = useAssetSelectionStore(pinia)
const sidebarTabStore = useSidebarTabStore(pinia)
queueStore.runningTasks = runningTasks
queueStore.pendingTasks = pendingTasks
Expand All @@ -71,12 +117,14 @@ function renderComponent(
}
})

return { sidebarTabStore, user }
return { assetSelectionStore, sidebarTabStore, user }
}

describe('QueueProgressOverlay', () => {
beforeEach(() => {
i18n.global.locale.value = 'en'
itemToView = undefined
outputAssetsMock.loadOutputAsset.mockReset()
})

it('shows expanded header with running and queued labels', () => {
Expand Down Expand Up @@ -116,4 +164,66 @@ describe('QueueProgressOverlay', () => {
await user.click(screen.getByTestId('show-assets-button'))
expect(sidebarTabStore.activeSidebarTabId).toBe(null)
})

it('loads older pages before selecting a job asset', async () => {
itemToView = createCompletedJobView('target-job')
outputAssetsMock.loadOutputAsset.mockResolvedValue(true)
const { assetSelectionStore, sidebarTabStore, user } = renderComponent(
[],
[]
)

await user.click(screen.getByTestId('view-item-button'))

await waitFor(() => {
expect(outputAssetsMock.loadOutputAsset).toHaveBeenCalledWith(
'target-job'
)
expect(assetSelectionStore.selectedIdsArray).toEqual(['target-job'])
})
expect(sidebarTabStore.activeSidebarTabId).toBe('assets')
})

it('does not select a missing job asset when pagination cannot advance', async () => {
itemToView = createCompletedJobView('missing-job')
outputAssetsMock.loadOutputAsset.mockResolvedValue(false)
const { assetSelectionStore, sidebarTabStore, user } = renderComponent(
[],
[]
)

await user.click(screen.getByTestId('view-item-button'))

await waitFor(() =>
expect(outputAssetsMock.loadOutputAsset).toHaveBeenCalledWith(
'missing-job'
)
)
expect(assetSelectionStore.selectedIdsArray).toEqual([])
expect(sidebarTabStore.activeSidebarTabId).toBe('assets')
})

it('only selects the latest asset when focus requests overlap', async () => {
let resolveFirst!: (found: boolean) => void
outputAssetsMock.loadOutputAsset
.mockImplementationOnce(
() => new Promise<boolean>((resolve) => (resolveFirst = resolve))
)
.mockResolvedValueOnce(true)
const { assetSelectionStore, user } = renderComponent([], [])

itemToView = createCompletedJobView('older-request')
await user.click(screen.getByTestId('view-item-button'))
itemToView = createCompletedJobView('latest-request')
await user.click(screen.getByTestId('view-item-button'))

await waitFor(() =>
expect(assetSelectionStore.selectedIdsArray).toEqual(['latest-request'])
)
resolveFirst(true)
await waitFor(() =>
expect(outputAssetsMock.loadOutputAsset).toHaveBeenCalledTimes(2)
)
expect(assetSelectionStore.selectedIdsArray).toEqual(['latest-request'])
})
})
8 changes: 8 additions & 0 deletions src/components/queue/QueueProgressOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ import { api } from '@/scripts/api'
import { useCommandStore } from '@/stores/commandStore'
import { useExecutionStore } from '@/stores/executionStore'
import { useQueueStore } from '@/stores/queueStore'
import { useAssetsStore } from '@/stores/assetsStore'
import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'

type OverlayState = 'hidden' | 'active' | 'expanded'
Expand All @@ -88,6 +89,7 @@ const { t, n } = useI18n()
const queueStore = useQueueStore()
const commandStore = useCommandStore()
const executionStore = useExecutionStore()
const assetsStore = useAssetsStore()
const sidebarTabStore = useSidebarTabStore()
const assetSelectionStore = useAssetSelectionStore()
const { showQueueClearHistoryDialog } = useQueueClearHistoryDialog()
Expand Down Expand Up @@ -234,7 +236,9 @@ const openAssetsSidebar = () => {
sidebarTabStore.activeSidebarTabId = 'assets'
}

let focusRequest = 0
const focusAssetInSidebar = async (item: JobListItem) => {
const request = ++focusRequest
const task = item.taskRef
const jobId = task?.jobId
const preview = task?.previewOutput
Expand All @@ -243,6 +247,10 @@ const focusAssetInSidebar = async (item: JobListItem) => {
const assetId = String(jobId)
openAssetsSidebar()
await nextTick()

if (!(await assetsStore.loadOutputAsset(assetId)) || request !== focusRequest)
return

assetSelectionStore.setSelection([assetId])
Comment thread
christian-byrne marked this conversation as resolved.
Resolved
assetSelectionStore.setLastSelectedAssetId(assetId)
}
Expand Down
Loading
Loading