refactor: move queue files under domain

This commit is contained in:
Benjamin Lu
2026-01-08 20:00:49 -08:00
parent 5561efcfd3
commit 003e72406d
70 changed files with 124 additions and 126 deletions

View File

@@ -2,8 +2,8 @@ import { mount } from '@vue/test-utils'
import { afterEach, describe, expect, it, vi } from 'vitest'
import { defineComponent, nextTick } from 'vue'
import JobGroupsList from '@/components/queue/job/JobGroupsList.vue'
import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
import JobGroupsList from '@/queue/components/job/JobGroupsList.vue'
import type { JobGroup, JobListItem } from '@/queue/composables/useJobList'
const QueueJobItemStub = defineComponent({
name: 'QueueJobItemStub',
@@ -22,7 +22,6 @@ const QueueJobItemStub = defineComponent({
runningNodeName: { type: String, default: undefined },
activeDetailsId: { type: String, default: null }
},
emits: ['cancel', 'delete', 'menu', 'view', 'details-enter', 'details-leave'],
template: '<div class="queue-job-item-stub"></div>'
})

View File

@@ -3,12 +3,12 @@ import { computed, ref } from 'vue'
import type { ComputedRef } from 'vue'
import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
import type { TaskItemImpl } from '@/stores/queueStore'
import type { TaskItemImpl } from '@/queue/stores/queueStore'
import type {
JobErrorDialogService,
UseJobErrorReportingOptions
} from '@/components/queue/job/useJobErrorReporting'
import * as jobErrorReporting from '@/components/queue/job/useJobErrorReporting'
} from '@/queue/components/job/useJobErrorReporting'
import * as jobErrorReporting from '@/queue/components/job/useJobErrorReporting'
const createExecutionErrorMessage = (
overrides: Partial<ExecutionErrorWsMessage> = {}

View File

@@ -1,9 +1,9 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { nextTick, reactive } from 'vue'
import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
import { useCompletionSummary } from '@/queue/composables/useCompletionSummary'
import { useExecutionStore } from '@/stores/executionStore'
import { useQueueStore } from '@/stores/queueStore'
import { useQueueStore } from '@/queue/stores/queueStore'
type MockTask = {
displayStatus: 'Completed' | 'Failed' | 'Cancelled' | 'Running' | 'Pending'
@@ -14,7 +14,7 @@ type MockTask = {
}
}
vi.mock('@/stores/queueStore', () => {
vi.mock('@/queue/stores/queueStore', () => {
const state = reactive({
runningTasks: [] as MockTask[],
historyTasks: [] as MockTask[]

View File

@@ -3,11 +3,11 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
import { nextTick, reactive, ref } from 'vue'
import type { Ref } from 'vue'
import { useJobList } from '@/composables/queue/useJobList'
import type { JobState } from '@/types/queue'
import { buildJobDisplay } from '@/utils/queueDisplay'
import type { BuildJobDisplayCtx } from '@/utils/queueDisplay'
import type { TaskItemImpl } from '@/stores/queueStore'
import { useJobList } from '@/queue/composables/useJobList'
import type { JobState } from '@/queue/types/queue'
import { buildJobDisplay } from '@/queue/utils/queueDisplay'
import type { BuildJobDisplayCtx } from '@/queue/utils/queueDisplay'
import type { TaskItemImpl } from '@/queue/stores/queueStore'
type TestTask = {
promptId: string
@@ -57,7 +57,7 @@ const ensureProgressRefs = () => {
if (!currentNodePercent) currentNodePercent = ref(0) as Ref<number>
return { totalPercent, currentNodePercent }
}
vi.mock('@/composables/queue/useQueueProgress', () => ({
vi.mock('@/queue/composables/useQueueProgress', () => ({
useQueueProgress: () => {
ensureProgressRefs()
return {
@@ -67,7 +67,7 @@ vi.mock('@/composables/queue/useQueueProgress', () => ({
}
}))
vi.mock('@/utils/queueDisplay', () => ({
vi.mock('@/queue/utils/queueDisplay', () => ({
buildJobDisplay: vi.fn(
(task: TaskItemImpl, state: JobState, options: BuildJobDisplayCtx) => ({
primary: `Job ${task.promptId}`,
@@ -80,7 +80,7 @@ vi.mock('@/utils/queueDisplay', () => ({
)
}))
vi.mock('@/utils/queueUtil', () => ({
vi.mock('@/queue/utils/queueUtil', () => ({
jobStateFromTask: vi.fn(
(task: TestTask, isInitializing?: boolean): JobState =>
task.mockState ?? (isInitializing ? 'running' : 'completed')
@@ -102,7 +102,7 @@ const ensureQueueStore = () => {
}
return queueStoreMock
}
vi.mock('@/stores/queueStore', () => ({
vi.mock('@/queue/stores/queueStore', () => ({
useQueueStore: () => {
return ensureQueueStore()
}

View File

@@ -2,8 +2,8 @@ import { describe, it, expect, beforeEach, vi } from 'vitest'
import { nextTick, ref } from 'vue'
import type { Ref } from 'vue'
import type { JobListItem } from '@/composables/queue/useJobList'
import type { MenuEntry } from '@/composables/queue/useJobMenu'
import type { JobListItem } from '@/queue/composables/useJobList'
import type { MenuEntry } from '@/queue/composables/useJobMenu'
const downloadFileMock = vi.fn()
vi.mock('@/base/common/downloadUtil', () => ({
@@ -99,7 +99,7 @@ const queueStoreMock = {
update: vi.fn(),
delete: vi.fn()
}
vi.mock('@/stores/queueStore', () => ({
vi.mock('@/queue/stores/queueStore', () => ({
useQueueStore: () => queueStoreMock
}))
@@ -116,7 +116,7 @@ vi.mock('@/utils/formatUtil', () => ({
appendJsonExtMock(...args)
}))
import { useJobMenu } from '@/composables/queue/useJobMenu'
import { useJobMenu } from '@/queue/composables/useJobMenu'
const createJobItem = (overrides: Partial<JobListItem> = {}): JobListItem => ({
id: overrides.id ?? 'job-1',

View File

@@ -4,7 +4,7 @@ import { nextTick, ref } from 'vue'
import type { Ref } from 'vue'
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
import { useQueueProgress } from '@/composables/queue/useQueueProgress'
import { useQueueProgress } from '@/queue/composables/useQueueProgress'
import { formatPercent0 } from '@/utils/numberUtil'
type ProgressValue = number | null

View File

@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { useResultGallery } from '@/composables/queue/useResultGallery'
import type { JobListItem } from '@/composables/queue/useJobList'
import { useResultGallery } from '@/queue/composables/useResultGallery'
import type { JobListItem } from '@/queue/composables/useJobList'
type PreviewLike = { url: string; supportsPreview: boolean }

View File

@@ -22,7 +22,7 @@ const {
WidgetToggleSwitch
} = FOR_TESTING
vi.mock('@/stores/queueStore', () => ({
vi.mock('@/queue/stores/queueStore', () => ({
useQueueStore: vi.fn(() => ({
historyTasks: []
}))

View File

@@ -32,7 +32,7 @@ vi.mock('@/platform/distribution/types', () => ({
}))
// Mock TaskItemImpl
vi.mock('@/stores/queueStore', () => ({
vi.mock('@/queue/stores/queueStore', () => ({
TaskItemImpl: class {
public flatOutputs: Array<{
supportsPreview: boolean

View File

@@ -10,7 +10,7 @@ import type {
TaskStatus
} from '@/schemas/apiSchema'
import { api } from '@/scripts/api'
import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
import { TaskItemImpl, useQueueStore } from '@/queue/stores/queueStore'
// Fixture factories
const createTaskPrompt = (

View File

@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
import type { ComfyApp } from '@/scripts/app'
import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
import { TaskItemImpl } from '@/stores/queueStore'
import { TaskItemImpl } from '@/queue/stores/queueStore'
import * as getWorkflowModule from '@/platform/workflow/cloud'
vi.mock('@/platform/distribution/types', () => ({