Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/queue/job/JobDetailsPopover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@ const queuedAtValue = computed(() =>
: ''
)

const currentQueueIndex = computed<number | null>(() => {
const currentJobPriority = computed<number | null>(() => {
const task = taskForJob.value
return task ? Number(task.job.priority) : null
})

const jobsAhead = computed<number | null>(() => {
const idx = currentQueueIndex.value
const idx = currentJobPriority.value
if (idx == null) return null
const ahead = queueStore.pendingTasks.filter(
(t: TaskItemImpl) => Number(t.job.priority) < idx
Expand Down
10 changes: 5 additions & 5 deletions src/stores/queueStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ describe('useQueueStore', () => {
expect(store.tasks).toEqual([])
expect(store.flatTasks).toEqual([])
expect(store.hasPendingTasks).toBe(false)
expect(store.lastHistoryQueueIndex).toBe(-1)
expect(store.lastJobHistoryPriority).toBe(-1)
})
})

Expand Down Expand Up @@ -686,7 +686,7 @@ describe('useQueueStore', () => {
expect(store.hasPendingTasks).toBe(false)
})

it('lastHistoryQueueIndex should return highest queue index', async () => {
it('lastJobHistoryPriority should return highest job priority', async () => {
const hist1 = createHistoryJob(10, 'hist-1')
const hist2 = createHistoryJob(25, 'hist-2')
const hist3 = createHistoryJob(15, 'hist-3')
Expand All @@ -695,15 +695,15 @@ describe('useQueueStore', () => {
mockGetHistory.mockResolvedValue([hist1, hist2, hist3])

await store.update()
expect(store.lastHistoryQueueIndex).toBe(25)
expect(store.lastJobHistoryPriority).toBe(25)
})

it('lastHistoryQueueIndex should be -1 when no history', async () => {
it('lastJobHistoryPriority should be -1 when no history', async () => {
mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
mockGetHistory.mockResolvedValue([])

await store.update()
expect(store.lastHistoryQueueIndex).toBe(-1)
expect(store.lastJobHistoryPriority).toBe(-1)
})
})

Expand Down
4 changes: 2 additions & 2 deletions src/stores/queueStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ export const useQueueStore = defineStore('queue', () => {
tasks.value.flatMap((task: TaskItemImpl) => task.flatten())
)

const lastHistoryQueueIndex = computed<number>(() =>
const lastJobHistoryPriority = computed<number>(() =>
historyTasks.value.length ? historyTasks.value[0].job.priority : -1
)

Expand Down Expand Up @@ -607,7 +607,7 @@ export const useQueueStore = defineStore('queue', () => {

tasks,
flatTasks,
lastHistoryQueueIndex,
lastJobHistoryPriority,
hasPendingTasks,
activeJobsCount,

Expand Down
Loading