Merge remote-tracking branch 'origin/main' into bl-inline-progress

src/components/TopMenuSection.vue

@@ -54,7 +54,7 @@
               :aria-pressed="
                 isQueuePanelV2Enabled
                   ? activeSidebarTabId === 'assets'
-                  : isQueueProgressOverlayVisible
+                  : isQueueProgressOverlayEnabled
                     ? isQueueOverlayExpanded
                     : undefined
               "
@@ -96,7 +96,7 @@
           </div>
         </div>
         <QueueProgressOverlay
-          v-if="isQueueProgressOverlayVisible"
+          v-if="isQueueProgressOverlayEnabled"
           v-model:expanded="isQueueOverlayExpanded"
           :menu-hovered="isTopMenuHovered"
         />
@@ -200,13 +200,12 @@ const isIntegratedTabBar = computed(
 const isQueuePanelV2Enabled = computed(() =>
   settingStore.get('Comfy.Queue.QPOV2')
 )
-const isQueueProgressOverlayVisible = computed(
+const isQueueProgressOverlayEnabled = computed(
   () => !isQueuePanelV2Enabled.value
 )
-const isInlineProgressVisible = computed(() => isQueuePanelV2Enabled.value)
 type PanelElementTarget = HTMLElement | { value?: HTMLElement | null } | null
 const shouldShowInlineProgressSummary = computed(
-  () => isInlineProgressVisible.value && isActionbarEnabled.value
+  () => isQueuePanelV2Enabled.value && isActionbarEnabled.value
 )
 const actionbarRef = ref<{ panelElement: PanelElementTarget } | null>(null)
 const resolvePanelElement = (target: PanelElementTarget) => {

src/components/sidebar/ComfyMenuButton.vue

@@ -219,7 +219,7 @@ const extraMenuItems = computed(() => [
   {
     key: 'settings',
     label: t('g.settings'),
-    icon: 'mdi mdi-cog-outline',
+    icon: 'icon-[lucide--settings]',
     command: () => {
       telemetry?.trackUiButtonClicked({
         button_id: 'sidebar_settings_menu_opened'
@@ -230,7 +230,7 @@ const extraMenuItems = computed(() => [
   {
     key: 'manage-extensions',
     label: t('menu.manageExtensions'),
-    icon: 'mdi mdi-puzzle-outline',
+    icon: 'icon-[lucide--puzzle]',
     command: showManageExtensions
   }
 ])

src/components/sidebar/ModeToggle.vue

@@ -5,6 +5,11 @@ import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCommandStore } from '@/stores/commandStore'
 
 const canvasStore = useCanvasStore()
+function toggleLinearMode() {
+  useCommandStore().execute('Comfy.ToggleLinear', {
+    metadata: { source: 'button' }
+  })
+}
 </script>
 <template>
   <div class="p-1 bg-secondary-background rounded-lg w-10">
@@ -12,7 +17,7 @@ const canvasStore = useCanvasStore()
       size="icon"
       :title="t('linearMode.linearMode')"
       :variant="canvasStore.linearMode ? 'inverted' : 'secondary'"
-      @click="useCommandStore().execute('Comfy.ToggleLinear')"
+      @click="toggleLinearMode"
     >
       <i class="icon-[lucide--panels-top-left]" />
     </Button>
@@ -20,7 +25,7 @@ const canvasStore = useCanvasStore()
       size="icon"
       :title="t('linearMode.graphMode')"
       :variant="canvasStore.linearMode ? 'secondary' : 'inverted'"
-      @click="useCommandStore().execute('Comfy.ToggleLinear')"
+      @click="toggleLinearMode"
     >
       <i class="icon-[comfy--workflow]" />
     </Button>

src/components/sidebar/tabs/AssetsSidebarGridView.vue

@@ -6,7 +6,11 @@
       class="grid max-h-[50%] scrollbar-custom overflow-y-auto"
       :style="gridStyle"
     >
-      <ActiveJobCard v-for="job in activeJobItems" :key="job.id" :job="job" />
+      <ActiveMediaAssetCard
+        v-for="job in activeJobItems"
+        :key="job.id"
+        :job="job"
+      />
     </div>
 
     <!-- Assets Header -->
@@ -55,7 +59,7 @@ import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import VirtualGrid from '@/components/common/VirtualGrid.vue'
-import ActiveJobCard from '@/components/sidebar/tabs/assets/ActiveJobCard.vue'
+import ActiveMediaAssetCard from '@/platform/assets/components/ActiveMediaAssetCard.vue'
 import { useJobList } from '@/composables/queue/useJobList'
 import MediaAssetCard from '@/platform/assets/components/MediaAssetCard.vue'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'

src/components/sidebar/tabs/assets/ActiveJobCard.test.ts

@@ -1,111 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { describe, expect, it, vi } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import ActiveJobCard from './ActiveJobCard.vue'
-
-import type { JobListItem } from '@/composables/queue/useJobList'
-
-vi.mock('@/composables/useProgressBarBackground', () => ({
-  useProgressBarBackground: () => ({
-    progressBarPrimaryClass: 'bg-blue-500',
-    hasProgressPercent: (val: number | undefined) => typeof val === 'number',
-    progressPercentStyle: (val: number) => ({ width: `${val}%` })
-  })
-}))
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      sideToolbar: {
-        activeJobStatus: 'Active job: {status}'
-      }
-    }
-  }
-})
-
-const createJob = (overrides: Partial<JobListItem> = {}): JobListItem => ({
-  id: 'test-job-1',
-  title: 'Running...',
-  meta: 'Step 5/10',
-  state: 'running',
-  progressTotalPercent: 50,
-  progressCurrentPercent: 75,
-  ...overrides
-})
-
-const mountComponent = (job: JobListItem) =>
-  mount(ActiveJobCard, {
-    props: { job },
-    global: {
-      plugins: [i18n]
-    }
-  })
-
-describe('ActiveJobCard', () => {
-  it('displays percentage and progress bar when job is running', () => {
-    const wrapper = mountComponent(
-      createJob({ state: 'running', progressTotalPercent: 65 })
-    )
-
-    expect(wrapper.text()).toContain('65%')
-    const progressBar = wrapper.find('.bg-blue-500')
-    expect(progressBar.exists()).toBe(true)
-    expect(progressBar.attributes('style')).toContain('width: 65%')
-  })
-
-  it('displays status text when job is pending', () => {
-    const wrapper = mountComponent(
-      createJob({
-        state: 'pending',
-        title: 'In queue...',
-        progressTotalPercent: undefined
-      })
-    )
-
-    expect(wrapper.text()).toContain('In queue...')
-    const progressBar = wrapper.find('.bg-blue-500')
-    expect(progressBar.exists()).toBe(false)
-  })
-
-  it('shows spinner for pending state', () => {
-    const wrapper = mountComponent(createJob({ state: 'pending' }))
-
-    const spinner = wrapper.find('.icon-\\[lucide--loader-circle\\]')
-    expect(spinner.exists()).toBe(true)
-    expect(spinner.classes()).toContain('animate-spin')
-  })
-
-  it('shows error icon for failed state', () => {
-    const wrapper = mountComponent(
-      createJob({ state: 'failed', title: 'Failed' })
-    )
-
-    const errorIcon = wrapper.find('.icon-\\[lucide--circle-alert\\]')
-    expect(errorIcon.exists()).toBe(true)
-    expect(wrapper.text()).toContain('Failed')
-  })
-
-  it('shows preview image when running with iconImageUrl', () => {
-    const wrapper = mountComponent(
-      createJob({
-        state: 'running',
-        iconImageUrl: 'https://example.com/preview.jpg'
-      })
-    )
-
-    const img = wrapper.find('img')
-    expect(img.exists()).toBe(true)
-    expect(img.attributes('src')).toBe('https://example.com/preview.jpg')
-  })
-
-  it('has proper accessibility attributes', () => {
-    const wrapper = mountComponent(createJob({ title: 'Generating...' }))
-
-    const container = wrapper.find('[role="status"]')
-    expect(container.exists()).toBe(true)
-    expect(container.attributes('aria-label')).toBe('Active job: Generating...')
-  })
-})

src/components/sidebar/tabs/assets/ActiveJobCard.vue

@@ -1,85 +0,0 @@
-<template>
-  <div
-    role="status"
-    :aria-label="t('sideToolbar.activeJobStatus', { status: statusText })"
-    class="flex flex-col gap-2 p-2 rounded-lg"
-  >
-    <!-- Thumbnail -->
-    <div class="relative aspect-square overflow-hidden rounded-lg">
-      <!-- Running state with preview image -->
-      <img
-        v-if="isRunning && job.iconImageUrl"
-        :src="job.iconImageUrl"
-        :alt="statusText"
-        class="size-full object-cover"
-      />
-      <!-- Placeholder for queued/failed states or running without preview -->
-      <div
-        v-else
-        class="absolute inset-0 flex items-center justify-center bg-modal-card-placeholder-background"
-      >
-        <!-- Spinner for queued/initialization states -->
-        <i
-          v-if="isQueued"
-          class="icon-[lucide--loader-circle] size-8 animate-spin text-muted-foreground"
-        />
-        <!-- Error icon for failed state -->
-        <i
-          v-else-if="isFailed"
-          class="icon-[lucide--circle-alert] size-8 text-red-500"
-        />
-        <!-- Spinner for running without preview -->
-        <i
-          v-else
-          class="icon-[lucide--loader-circle] size-8 animate-spin text-muted-foreground"
-        />
-      </div>
-    </div>
-
-    <!-- Footer: Progress bar or status text -->
-    <div class="flex gap-1.5 items-center h-5">
-      <!-- Running state: percentage + progress bar -->
-      <template v-if="isRunning && hasProgressPercent(progressPercent)">
-        <span class="shrink-0 text-sm text-muted-foreground">
-          {{ Math.round(progressPercent ?? 0) }}%
-        </span>
-        <div class="flex-1 relative h-1 rounded-sm bg-secondary-background">
-          <div
-            :class="progressBarPrimaryClass"
-            :style="progressPercentStyle(progressPercent)"
-          />
-        </div>
-      </template>
-      <!-- Non-running states: status text only -->
-      <template v-else>
-        <div class="w-full truncate text-center text-sm text-muted-foreground">
-          {{ statusText }}
-        </div>
-      </template>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import type { JobListItem } from '@/composables/queue/useJobList'
-import { useProgressBarBackground } from '@/composables/useProgressBarBackground'
-
-const { job } = defineProps<{ job: JobListItem }>()
-
-const { t } = useI18n()
-
-const { progressBarPrimaryClass, hasProgressPercent, progressPercentStyle } =
-  useProgressBarBackground()
-
-const statusText = computed(() => job.title)
-const progressPercent = computed(() => job.progressTotalPercent)
-
-const isQueued = computed(
-  () => job.state === 'pending' || job.state === 'initialization'
-)
-const isRunning = computed(() => job.state === 'running')
-const isFailed = computed(() => job.state === 'failed')
-</script>