mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-26 19:09:52 +00:00
## Summary Fixes the cancel button on queue job items to properly handle pending (queued) jobs. ## Problem The cancel button was calling `api.interrupt()` for all jobs, but interrupt only affects running/initializing jobs. For pending jobs, it silently fails with log message: `"Prompt ... is not currently running, skipping interrupt"`. The "Cancel job" option in the context menu worked correctly because it checks the job state first. Reported in #7758. ## Changes Update `onCancelItem` in `QueueProgressOverlay.vue` to mirror the behavior of `cancelJob()` in `useJobMenu.ts`: - Check `item.state` before deciding which API to call - Call `api.interrupt(promptId)` for `running` or `initialization` states - Call `api.deleteItem('queue', promptId)` for `pending` state - Refresh queue state after cancel action with `queueStore.update()` ## Testing - All 3816 unit tests pass - Type check passes - Lint passes (prettier, oxlint, eslint) ## Steps to Reproduce (before fix) 1. Queue more than 1 job 2. Open job history 3. Click "Cancel" button on any "in queue" job 4. Observe nothing happens (job remains in queue) After this fix, clicking Cancel on a pending job will remove it from the queue. Fixes #7758 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7788-fix-queue-Cancel-button-now-works-for-pending-jobs-2d86d73d365081b3957fdf1d5d677809) by [Unito](https://www.unito.io) --------- Co-authored-by: RUiNtheExtinct <deepkarma001@gmail.com>
318 lines
9.8 KiB
Vue
318 lines
9.8 KiB
Vue
<template>
|
|
<div
|
|
v-show="isVisible"
|
|
:class="['flex', 'justify-end', 'w-full', 'pointer-events-none']"
|
|
>
|
|
<div
|
|
class="pointer-events-auto flex w-[350px] min-w-[310px] max-h-[60vh] flex-col overflow-hidden rounded-lg border font-inter transition-colors duration-200 ease-in-out"
|
|
:class="containerClass"
|
|
@mouseenter="isHovered = true"
|
|
@mouseleave="isHovered = false"
|
|
>
|
|
<!-- Expanded state -->
|
|
<QueueOverlayExpanded
|
|
v-if="isExpanded"
|
|
v-model:selected-job-tab="selectedJobTab"
|
|
v-model:selected-workflow-filter="selectedWorkflowFilter"
|
|
v-model:selected-sort-mode="selectedSortMode"
|
|
class="flex-1 min-h-0"
|
|
:header-title="headerTitle"
|
|
:show-concurrent-indicator="showConcurrentIndicator"
|
|
:concurrent-workflow-count="concurrentWorkflowCount"
|
|
:queued-count="queuedCount"
|
|
:displayed-job-groups="displayedJobGroups"
|
|
:has-failed-jobs="hasFailedJobs"
|
|
@show-assets="openAssetsSidebar"
|
|
@clear-history="onClearHistoryFromMenu"
|
|
@clear-queued="cancelQueuedWorkflows"
|
|
@cancel-item="onCancelItem"
|
|
@delete-item="onDeleteItem"
|
|
@view-item="inspectJobAsset"
|
|
/>
|
|
|
|
<QueueOverlayActive
|
|
v-else-if="hasActiveJob"
|
|
:total-progress-style="totalProgressStyle"
|
|
:current-node-progress-style="currentNodeProgressStyle"
|
|
:total-percent-formatted="totalPercentFormatted"
|
|
:current-node-percent-formatted="currentNodePercentFormatted"
|
|
:current-node-name="currentNodeName"
|
|
:running-count="runningCount"
|
|
:queued-count="queuedCount"
|
|
:bottom-row-class="bottomRowClass"
|
|
@interrupt-all="interruptAll"
|
|
@clear-queued="cancelQueuedWorkflows"
|
|
@view-all-jobs="viewAllJobs"
|
|
/>
|
|
|
|
<QueueOverlayEmpty
|
|
v-else-if="completionSummary"
|
|
:summary="completionSummary"
|
|
@summary-click="onSummaryClick"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<ResultGallery
|
|
v-model:active-index="galleryActiveIndex"
|
|
:all-gallery-items="galleryItems"
|
|
/>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { computed, nextTick, ref } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import QueueOverlayActive from '@/components/queue/QueueOverlayActive.vue'
|
|
import QueueOverlayEmpty from '@/components/queue/QueueOverlayEmpty.vue'
|
|
import QueueOverlayExpanded from '@/components/queue/QueueOverlayExpanded.vue'
|
|
import QueueClearHistoryDialog from '@/components/queue/dialogs/QueueClearHistoryDialog.vue'
|
|
import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
|
|
import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
|
|
import { useJobList } from '@/composables/queue/useJobList'
|
|
import type { JobListItem } from '@/composables/queue/useJobList'
|
|
import { useQueueProgress } from '@/composables/queue/useQueueProgress'
|
|
import { useResultGallery } from '@/composables/queue/useResultGallery'
|
|
import { useErrorHandling } from '@/composables/useErrorHandling'
|
|
import { useAssetSelectionStore } from '@/platform/assets/composables/useAssetSelectionStore'
|
|
import { isCloud } from '@/platform/distribution/types'
|
|
import { api } from '@/scripts/api'
|
|
import { useAssetsStore } from '@/stores/assetsStore'
|
|
import { useCommandStore } from '@/stores/commandStore'
|
|
import { useDialogStore } from '@/stores/dialogStore'
|
|
import { useExecutionStore } from '@/stores/executionStore'
|
|
import { useQueueStore } from '@/stores/queueStore'
|
|
import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
|
|
|
|
type OverlayState = 'hidden' | 'empty' | 'active' | 'expanded'
|
|
|
|
const props = withDefaults(
|
|
defineProps<{
|
|
expanded?: boolean
|
|
menuHovered?: boolean
|
|
}>(),
|
|
{
|
|
menuHovered: false
|
|
}
|
|
)
|
|
|
|
const emit = defineEmits<{
|
|
(e: 'update:expanded', value: boolean): void
|
|
}>()
|
|
|
|
const { t } = useI18n()
|
|
const queueStore = useQueueStore()
|
|
const commandStore = useCommandStore()
|
|
const executionStore = useExecutionStore()
|
|
const sidebarTabStore = useSidebarTabStore()
|
|
const dialogStore = useDialogStore()
|
|
const assetsStore = useAssetsStore()
|
|
const assetSelectionStore = useAssetSelectionStore()
|
|
const { wrapWithErrorHandlingAsync } = useErrorHandling()
|
|
|
|
const {
|
|
totalPercentFormatted,
|
|
currentNodePercentFormatted,
|
|
totalProgressStyle,
|
|
currentNodeProgressStyle
|
|
} = useQueueProgress()
|
|
const isHovered = ref(false)
|
|
const isOverlayHovered = computed(() => isHovered.value || props.menuHovered)
|
|
const internalExpanded = ref(false)
|
|
const isExpanded = computed({
|
|
get: () =>
|
|
props.expanded === undefined ? internalExpanded.value : props.expanded,
|
|
set: (value) => {
|
|
if (props.expanded === undefined) {
|
|
internalExpanded.value = value
|
|
}
|
|
emit('update:expanded', value)
|
|
}
|
|
})
|
|
|
|
const { summary: completionSummary, clearSummary } = useCompletionSummary()
|
|
const hasCompletionSummary = computed(() => completionSummary.value !== null)
|
|
|
|
const runningCount = computed(() => queueStore.runningTasks.length)
|
|
const queuedCount = computed(() => queueStore.pendingTasks.length)
|
|
const isExecuting = computed(() => !executionStore.isIdle)
|
|
const hasActiveJob = computed(() => runningCount.value > 0 || isExecuting.value)
|
|
const activeJobsCount = computed(() => runningCount.value + queuedCount.value)
|
|
|
|
const overlayState = computed<OverlayState>(() => {
|
|
if (isExpanded.value) return 'expanded'
|
|
if (hasActiveJob.value) return 'active'
|
|
if (hasCompletionSummary.value) return 'empty'
|
|
return 'hidden'
|
|
})
|
|
|
|
const showBackground = computed(
|
|
() =>
|
|
overlayState.value === 'expanded' ||
|
|
overlayState.value === 'empty' ||
|
|
(overlayState.value === 'active' && isOverlayHovered.value)
|
|
)
|
|
|
|
const isVisible = computed(() => overlayState.value !== 'hidden')
|
|
|
|
const containerClass = computed(() =>
|
|
showBackground.value
|
|
? 'border-interface-stroke bg-interface-panel-surface shadow-interface'
|
|
: 'border-transparent bg-transparent shadow-none'
|
|
)
|
|
|
|
const bottomRowClass = computed(
|
|
() =>
|
|
`flex items-center justify-end gap-4 transition-opacity duration-200 ease-in-out ${
|
|
overlayState.value === 'active' && isOverlayHovered.value
|
|
? 'opacity-100 pointer-events-auto'
|
|
: 'opacity-0 pointer-events-none'
|
|
}`
|
|
)
|
|
const headerTitle = computed(() =>
|
|
hasActiveJob.value
|
|
? `${activeJobsCount.value} ${t('sideToolbar.queueProgressOverlay.activeJobsSuffix')}`
|
|
: t('sideToolbar.queueProgressOverlay.jobQueue')
|
|
)
|
|
|
|
const concurrentWorkflowCount = computed(
|
|
() => executionStore.runningWorkflowCount
|
|
)
|
|
const showConcurrentIndicator = computed(
|
|
() => concurrentWorkflowCount.value > 1
|
|
)
|
|
|
|
const {
|
|
selectedJobTab,
|
|
selectedWorkflowFilter,
|
|
selectedSortMode,
|
|
hasFailedJobs,
|
|
filteredTasks,
|
|
groupedJobItems,
|
|
currentNodeName
|
|
} = useJobList()
|
|
|
|
const displayedJobGroups = computed(() => groupedJobItems.value)
|
|
|
|
const onCancelItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => {
|
|
const promptId = item.taskRef?.promptId
|
|
if (!promptId) return
|
|
|
|
if (item.state === 'running' || item.state === 'initialization') {
|
|
// Running/initializing jobs: interrupt execution
|
|
await api.interrupt(promptId)
|
|
await queueStore.update()
|
|
} else if (item.state === 'pending') {
|
|
// Pending jobs: remove from queue
|
|
await api.deleteItem('queue', promptId)
|
|
await queueStore.update()
|
|
}
|
|
})
|
|
|
|
const onDeleteItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => {
|
|
if (!item.taskRef) return
|
|
await queueStore.delete(item.taskRef)
|
|
})
|
|
|
|
const {
|
|
galleryActiveIndex,
|
|
galleryItems,
|
|
onViewItem: openResultGallery
|
|
} = useResultGallery(() => filteredTasks.value)
|
|
|
|
const setExpanded = (expanded: boolean) => {
|
|
isExpanded.value = expanded
|
|
}
|
|
|
|
const openExpandedFromEmpty = () => {
|
|
setExpanded(true)
|
|
}
|
|
|
|
const viewAllJobs = () => {
|
|
setExpanded(true)
|
|
}
|
|
|
|
const onSummaryClick = () => {
|
|
openExpandedFromEmpty()
|
|
clearSummary()
|
|
}
|
|
|
|
const openAssetsSidebar = () => {
|
|
sidebarTabStore.activeSidebarTabId = 'assets'
|
|
}
|
|
|
|
const focusAssetInSidebar = async (item: JobListItem) => {
|
|
const task = item.taskRef
|
|
const promptId = task?.promptId
|
|
const preview = task?.previewOutput
|
|
if (!promptId || !preview) return
|
|
|
|
const assetId = String(promptId)
|
|
openAssetsSidebar()
|
|
await nextTick()
|
|
await assetsStore.updateHistory()
|
|
const asset = assetsStore.historyAssets.find(
|
|
(existingAsset) => existingAsset.id === assetId
|
|
)
|
|
if (!asset) {
|
|
throw new Error('Asset not found in media assets panel')
|
|
}
|
|
assetSelectionStore.setSelection([assetId])
|
|
}
|
|
|
|
const inspectJobAsset = wrapWithErrorHandlingAsync(
|
|
async (item: JobListItem) => {
|
|
openResultGallery(item)
|
|
await focusAssetInSidebar(item)
|
|
}
|
|
)
|
|
|
|
const cancelQueuedWorkflows = wrapWithErrorHandlingAsync(async () => {
|
|
await commandStore.execute('Comfy.ClearPendingTasks')
|
|
})
|
|
|
|
const interruptAll = wrapWithErrorHandlingAsync(async () => {
|
|
const tasks = queueStore.runningTasks
|
|
const promptIds = tasks
|
|
.map((task) => task.promptId)
|
|
.filter((id): id is string => typeof id === 'string' && id.length > 0)
|
|
|
|
if (!promptIds.length) return
|
|
|
|
// Cloud backend supports cancelling specific jobs via /queue delete,
|
|
// while /interrupt always targets the "first" job. Use the targeted API
|
|
// on cloud to ensure we cancel the workflow the user clicked.
|
|
if (isCloud) {
|
|
await Promise.all(promptIds.map((id) => api.deleteItem('queue', id)))
|
|
return
|
|
}
|
|
|
|
await Promise.all(promptIds.map((id) => api.interrupt(id)))
|
|
})
|
|
|
|
const showClearHistoryDialog = () => {
|
|
dialogStore.showDialog({
|
|
key: 'queue-clear-history',
|
|
component: QueueClearHistoryDialog,
|
|
dialogComponentProps: {
|
|
headless: true,
|
|
closable: false,
|
|
closeOnEscape: true,
|
|
dismissableMask: true,
|
|
pt: {
|
|
root: {
|
|
class: 'max-w-[360px] w-auto bg-transparent border-none shadow-none'
|
|
},
|
|
content: {
|
|
class: '!p-0 bg-transparent'
|
|
}
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
const onClearHistoryFromMenu = () => {
|
|
showClearHistoryDialog()
|
|
}
|
|
</script>
|