Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
71c6da2
Readd cancel button
benceruleanlu Dec 6, 2025
b790aaf
Add new N queued toggle
benceruleanlu Dec 6, 2025
e65fc56
Remove active state
benceruleanlu Dec 7, 2025
ca084c3
Fix text size
benceruleanlu Dec 7, 2025
5c106bd
Add progress bar embedded into top menu section
benceruleanlu Dec 7, 2025
da4b241
Remove unused QueueOverlayActive files
benceruleanlu Dec 7, 2025
5e1dc91
Extract to own component file
benceruleanlu Dec 7, 2025
d965fb0
Add progress bars and progress text
benceruleanlu Dec 7, 2025
05d2cae
Add close button back to queue progress overlay
benceruleanlu Dec 7, 2025
99019cf
Align expanded QPO to new design
benceruleanlu Dec 7, 2025
0a5fc8b
Delete unused file
benceruleanlu Dec 7, 2025
c4b53c1
Make job list button visual seperation change
benceruleanlu Dec 8, 2025
48aa3d9
Remove unused event
benceruleanlu Dec 8, 2025
87abea9
Merge remote-tracking branch 'origin/main' into bl-semantic-jellyfish
benceruleanlu Dec 9, 2025
ad44241
[automated] Update test expectations
invalid-email-address Dec 9, 2025
73741df
fix: lint issues and unused exports
benceruleanlu Dec 9, 2025
8b4f174
refactor(actionbar): move cancel and queue buttons into draggable con…
benceruleanlu Dec 9, 2025
f0b9d28
fix(queue): rename clearQueued translation key to clearQueue
benceruleanlu Dec 9, 2025
b428892
Add tests
benceruleanlu Dec 9, 2025
ab820bf
Readd missing DTID
benceruleanlu Dec 9, 2025
f6ffb1f
Fix actionbar digit shifting
benceruleanlu Dec 9, 2025
db80292
Fix text expectation after digit shift change
benceruleanlu Dec 9, 2025
a5b5fe8
Merge remote-tracking branch 'origin/main' into bl-semantic-jellyfish
benceruleanlu Dec 9, 2025
a48360d
nit
benceruleanlu Dec 9, 2025
96893f7
nit
benceruleanlu Dec 9, 2025
cbbf3eb
[automated] Update test expectations
invalid-email-address Dec 9, 2025
f7d3a8c
nit
benceruleanlu Dec 9, 2025
8fdf355
nit
benceruleanlu Dec 9, 2025
38b589c
nit
benceruleanlu Dec 9, 2025
3ce8cca
nit
benceruleanlu Dec 9, 2025
3fe2d39
nit
benceruleanlu Dec 9, 2025
ae1d6f9
nit
benceruleanlu Dec 9, 2025
b277cbf
nit
benceruleanlu Dec 9, 2025
b21cf86
Merge branch 'bl-semantic-jellyfish' of https://github.com/Comfy-Org/…
benceruleanlu Dec 9, 2025
8bec2df
nit
benceruleanlu Dec 9, 2025
268ab1d
Implement progress bar on actionbar
benceruleanlu Dec 10, 2025
36fda56
Implement progress text on actionbar
benceruleanlu Dec 10, 2025
33626a5
Fix menu position docked issue
benceruleanlu Dec 10, 2025
d963b8e
Widen drop zone
benceruleanlu Dec 10, 2025
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
Prev Previous commit
Next Next commit
Add close button back to queue progress overlay
  • Loading branch information
benceruleanlu committed Dec 7, 2025
commit 05d2cae61c5004b5eaee4320e34d9203865ffeff
15 changes: 15 additions & 0 deletions src/components/queue/QueueOverlayHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@
</IconTextButton>
</div>
</Popover>
<IconButton
v-tooltip.top="closeTooltipConfig"
type="transparent"
size="sm"
class="size-6 bg-transparent hover:bg-secondary-background hover:opacity-100"
:aria-label="t('g.close')"
@click="onCloseClick"
>
<i
class="icon-[lucide--x] block size-4 leading-none text-text-secondary"
/>
</IconButton>
</div>
</div>
</template>
Expand All @@ -84,16 +96,19 @@ defineProps<{

const emit = defineEmits<{
(e: 'clearHistory'): void
(e: 'close'): void
}>()

const { t } = useI18n()

const morePopoverRef = ref<PopoverMethods | null>(null)
const closeTooltipConfig = computed(() => buildTooltipConfig(t('g.close')))
const moreTooltipConfig = computed(() => buildTooltipConfig(t('g.more')))

const onMoreClick = (event: MouseEvent) => {
morePopoverRef.value?.toggle(event)
}
const onCloseClick = () => emit('close')
const onClearHistoryFromMenu = () => {
morePopoverRef.value?.hide()
emit('clearHistory')
Expand Down
20 changes: 7 additions & 13 deletions src/components/queue/QueueProgressOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,16 @@
<!-- 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"
:active-jobs-count="activeJobsCount"
:queued-count="queuedCount"
:displayed-job-groups="displayedJobGroups"
:has-failed-jobs="hasFailedJobs"
@show-assets="openAssetsSidebar"
@clear-history="onClearHistoryFromMenu"
@clear-queued="cancelQueuedWorkflows"
@close="closeOverlay"
@cancel-item="onCancelItem"
@delete-item="onDeleteItem"
@view-item="inspectJobAsset"
Expand Down Expand Up @@ -139,14 +136,7 @@ const showConcurrentIndicator = computed(
() => concurrentWorkflowCount.value > 1
)

const {
selectedJobTab,
selectedWorkflowFilter,
selectedSortMode,
hasFailedJobs,
filteredTasks,
groupedJobItems
} = useJobList()
const { filteredTasks, groupedJobItems } = useJobList()

const displayedJobGroups = computed(() => groupedJobItems.value)

Expand All @@ -171,6 +161,10 @@ const setExpanded = (expanded: boolean) => {
isExpanded.value = expanded
}

const closeOverlay = () => {
setExpanded(false)
}

const openExpandedFromEmpty = () => {
setExpanded(true)
}
Expand Down