From 7542a39487da250032b882f2d783b8234c41187e Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Tue, 10 Nov 2026 22:44:56 +0100 Subject: [PATCH 1/4] feat(ui): move Performance Tests and Benchmarks back to the title menu The platform redesign put both tools in a Tools group in the dashboard sidebar and dropped them from the title-bar menu. Put them back in the menu (same items and handler as before the redesign) and drop the Tools group, so the sidebar keeps Home, Apps and Builds. Co-Authored-By: Claude Opus 5.5 --- e2e/whats-new-keeps-page.test.ts | 2 +- locales/en.json | 1 - locales/zh.json | 1 - src/main/popups/titlePopup.test.ts | 7 +++- src/main/popups/titlePopup.ts | 7 ++++ src/renderer/src/panel/AppSidebar.test.ts | 43 ++++++++++++----------- src/renderer/src/panel/AppSidebar.vue | 11 ++---- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/e2e/whats-new-keeps-page.test.ts b/e2e/whats-new-keeps-page.test.ts index 97801cdd1..de0340f66 100644 --- a/e2e/whats-new-keeps-page.test.ts +++ b/e2e/whats-new-keeps-page.test.ts @@ -30,7 +30,7 @@ async function settleClose(): Promise { } test("closing What's New stays on the Performance Tests page @windows @macos @linux", async () => { - expect(await ctx.panel.click('[data-testid="app-sidebar-performance-test"]')).toBe(true) + await ctx.panel.evaluate(`window.api.navigatePanel('performance-test')`) await ctx.panel.waitForVisible(PERFORMANCE_TEST) await openWhatsNew() diff --git a/locales/en.json b/locales/en.json index 5ea93efdf..2118bfc80 100644 --- a/locales/en.json +++ b/locales/en.json @@ -21,7 +21,6 @@ "home": "Home", "apps": "Apps", "comingSoon": "Coming soon", - "tools": "Tools", "collapse": "Collapse sidebar", "expand": "Expand sidebar", "signInTitle": "Log in to Comfy", diff --git a/locales/zh.json b/locales/zh.json index 0efa4e807..c4196eef8 100644 --- a/locales/zh.json +++ b/locales/zh.json @@ -21,7 +21,6 @@ "home": "主页", "apps": "应用", "comingSoon": "即将推出", - "tools": "工具", "collapse": "收起侧边栏", "expand": "展开侧边栏", "signInTitle": "登录 Comfy", diff --git a/src/main/popups/titlePopup.test.ts b/src/main/popups/titlePopup.test.ts index fc891b2f3..6421f5b3e 100644 --- a/src/main/popups/titlePopup.test.ts +++ b/src/main/popups/titlePopup.test.ts @@ -134,12 +134,15 @@ describe('buildTitlePopupMenuItems', () => { }) it.each([null, 'inst-1'] as const)( - 'keeps settings and window actions without duplicate dashboard shortcuts on host %s', + 'lists the tools, settings and window actions on host %s', (installationId) => { const items = buildTitlePopupMenuItems(makeEntry({ installationId })) expect(items.map((item) => item.id ?? 'separator')).toEqual([ 'new-window', 'separator', + 'performance-test', + 'benchmarks', + 'separator', 'settings', 'separator', 'exit-window', @@ -153,6 +156,8 @@ describe('buildTitlePopupMenuItems', () => { const ids = items.map((i) => i.id ?? null).filter((id) => id !== null) expect(ids).toEqual([ 'new-window', + 'performance-test', + 'benchmarks', 'settings', 'reset-zoom', 'exit-window', diff --git a/src/main/popups/titlePopup.ts b/src/main/popups/titlePopup.ts index 3a6db8b2d..38334bf23 100644 --- a/src/main/popups/titlePopup.ts +++ b/src/main/popups/titlePopup.ts @@ -477,6 +477,13 @@ export function buildTitlePopupMenuItems(entry: ComfyWindowEntry): TitlePopupMen const items: TitlePopupMenuItem[] = [ { id: 'new-window', label: 'Open Dashboard', labelKey: 'fileMenu.newWindow' }, { kind: 'separator' }, + { + id: 'performance-test', + label: 'Performance Tests', + labelKey: 'fileMenu.performanceTest' + }, + { id: 'benchmarks', label: 'Benchmarks', labelKey: 'fileMenu.benchmarks' }, + { kind: 'separator' }, { id: 'settings', label: 'Desktop Settings', diff --git a/src/renderer/src/panel/AppSidebar.test.ts b/src/renderer/src/panel/AppSidebar.test.ts index cece09cab..3be318622 100644 --- a/src/renderer/src/panel/AppSidebar.test.ts +++ b/src/renderer/src/panel/AppSidebar.test.ts @@ -33,37 +33,38 @@ async function mountSidebar(activePage: SidebarPage = 'chooser') { } describe('AppSidebar', () => { - it('lists Home, Apps, Builds, Performance Tests, then Benchmarks', async () => { + it('lists Home, Apps, then Builds, with the tools left to the menu', async () => { const wrapper = await mountSidebar() expect(wrapper.findAll('nav button').map((row) => row.text())).toEqual([ 'Home', 'Apps', - 'Builds', - 'Performance Tests', - 'Benchmarks' + 'Builds' ]) }) it('marks only the current page', async () => { + const wrapper = await mountSidebar('chooser') + + expect(wrapper.findAll('[aria-current="page"]').map((row) => row.text())).toEqual(['Builds']) + }) + + it('marks no row while a tool page from the menu is open', async () => { const wrapper = await mountSidebar('benchmarks') - expect(wrapper.findAll('[aria-current="page"]').map((row) => row.text())).toEqual([ - 'Benchmarks' - ]) + expect(wrapper.findAll('[aria-current="page"]')).toHaveLength(0) }) - it.each<[string, DashboardPage]>([ - ['app-sidebar-chooser', 'chooser'], - ['app-sidebar-benchmarks', 'benchmarks'], - ['app-sidebar-performance-test', 'performance-test'] - ])('navigates from %s', async (testId, page) => { - const wrapper = await mountSidebar() + it.each<[string, DashboardPage]>([['app-sidebar-chooser', 'chooser']])( + 'navigates from %s', + async (testId, page) => { + const wrapper = await mountSidebar() - await wrapper.get(`[data-testid="${testId}"]`).trigger('click') + await wrapper.get(`[data-testid="${testId}"]`).trigger('click') - expect(navigatePanel).toHaveBeenCalledExactlyOnceWith(page) - }) + expect(navigatePanel).toHaveBeenCalledExactlyOnceWith(page) + } + ) it.each(['home', 'apps'])( 'opens the %s section inside the dashboard', @@ -93,15 +94,15 @@ describe('AppSidebar', () => { it('collapses to icons with tooltips and stays collapsed when reopened', async () => { const wrapper = await mountSidebar() - const benchmarks = wrapper.get('[data-testid="app-sidebar-benchmarks"]') - expect(benchmarks.text()).toBe('Benchmarks') - expect(benchmarks.attributes('title')).toBeUndefined() + const builds = wrapper.get('[data-testid="app-sidebar-chooser"]') + expect(builds.text()).toBe('Builds') + expect(builds.attributes('title')).toBeUndefined() await wrapper.get('[data-testid="app-sidebar-toggle"]').trigger('click') await flushPromises() - expect(benchmarks.text()).toBe('') - expect(benchmarks.attributes('title')).toBe('Benchmarks') + expect(builds.text()).toBe('') + expect(builds.attributes('title')).toBe('Builds') expect(wrapper.get('[data-testid="app-sidebar-toggle"]').attributes('aria-expanded')).toBe( 'false' ) diff --git a/src/renderer/src/panel/AppSidebar.vue b/src/renderer/src/panel/AppSidebar.vue index c70a65be1..d8ed00674 100644 --- a/src/renderer/src/panel/AppSidebar.vue +++ b/src/renderer/src/panel/AppSidebar.vue @@ -2,7 +2,7 @@ import { computed } from 'vue' import { useI18n } from 'vue-i18n' import { useLocalStorage } from '@vueuse/core' -import { AppWindow, ChartColumn, Gauge, House, Server } from 'lucide-vue-next' +import { AppWindow, House, Server } from 'lucide-vue-next' import type { Component } from 'vue' import Button from '@comfyorg/design-system/button/Button' import ComfyCLogo from '../components/icons/ComfyCLogo.vue' @@ -37,13 +37,8 @@ const mainRows = computed(() => [ { page: 'apps', label: t('sidebar.apps'), icon: AppWindow }, { page: 'chooser', label: t('sidebar.builds'), icon: Server } ]) -const toolRows = computed(() => [ - { page: 'performance-test', label: t('fileMenu.performanceTest'), icon: Gauge }, - { page: 'benchmarks', label: t('fileMenu.benchmarks'), icon: ChartColumn } -]) -const groups = computed(() => [ - { key: 'main', rows: mainRows.value }, - { key: 'tools', title: t('sidebar.tools'), rows: toolRows.value } +const groups = computed<{ key: string; title?: string; rows: SidebarRow[] }[]>(() => [ + { key: 'main', rows: mainRows.value } ]) function navigate(page: SidebarPage): void { From 9071c208889b7f51962ad07d4c460588c31234f6 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 11 Nov 2026 05:05:09 +0100 Subject: [PATCH 2/4] feat(ui): move the title-bar menu button to the right Co-Authored-By: Claude Opus 5.5 --- e2e/lifecycle-first-use-skip.test.ts | 6 ++--- e2e/support/chooserHelpers.ts | 4 ++-- .../src/comfyTitleBar/TitleBarApp.test.ts | 16 ++++++------- .../src/comfyTitleBar/TitleBarApp.vue | 24 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/e2e/lifecycle-first-use-skip.test.ts b/e2e/lifecycle-first-use-skip.test.ts index 9fa7edcc4..d739c7a16 100644 --- a/e2e/lifecycle-first-use-skip.test.ts +++ b/e2e/lifecycle-first-use-skip.test.ts @@ -19,7 +19,7 @@ test('cold start lands on first-use start screen with the waffle menu hidden @li await ctx.panel.waitForVisible('.start-hero', { timeout: 15_000 }) await ctx.panel.waitForVisible('[data-testid="first-use-continue"]') - expect(await ctx.titleBar.exists('.title-menu-button')).toBe(false) + expect(await ctx.titleBar.exists('.title-menu-button[aria-haspopup="menu"]')).toBe(false) }) test('ToS + Local + Continue surfaces the waffle menu; Skip Onboarding reveals the chooser @lifecycle', async () => { @@ -45,10 +45,10 @@ test('ToS + Local + Continue surfaces the waffle menu; Skip Onboarding reveals t expect(await ctx.panel.click('[data-testid="first-use-continue"]')).toBe(true) - await ctx.titleBar.waitForVisible('.title-menu-button', { timeout: 15_000 }) + await ctx.titleBar.waitForVisible('.title-menu-button[aria-haspopup="menu"]', { timeout: 15_000 }) await resetIpcInvocations(ctx.app, 'comfy-window:set-first-use-mode') - expect(await ctx.titleBar.click('.title-menu-button')).toBe(true) + expect(await ctx.titleBar.click('.title-menu-button[aria-haspopup="menu"]')).toBe(true) await waitForWebContents(ctx.app, 'comfyTitlePopup.html') const popup = titlePopupPage(ctx.app) await popup.waitForVisible('li.item', { timeout: 10_000 }) diff --git a/e2e/support/chooserHelpers.ts b/e2e/support/chooserHelpers.ts index 595e44ba8..fb63e7f6b 100644 --- a/e2e/support/chooserHelpers.ts +++ b/e2e/support/chooserHelpers.ts @@ -48,8 +48,8 @@ export async function clickInstallTile( } export async function openTitleMenu(titleBar: WebContentsPage): Promise { - await titleBar.waitForVisible('.title-menu-button--icon') - const ok = await titleBar.click('.title-menu-button--icon') + await titleBar.waitForVisible('.title-menu-button--icon[aria-haspopup="menu"]') + const ok = await titleBar.click('.title-menu-button--icon[aria-haspopup="menu"]') expect(ok, 'Title menu button click dispatched').toBe(true) } diff --git a/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts b/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts index c256af797..cd90aa7ee 100644 --- a/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts +++ b/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts @@ -270,7 +270,7 @@ describe('TitleBarApp', () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp) await flushPromises() - const fileBtn = wrapper.find('.title-menu-button') + const fileBtn = wrapper.find('.title-menu-button[aria-haspopup="menu"]') expect(fileBtn.exists()).toBe(true) expect(fileBtn.attributes('aria-label')).toBe('Menu') expect(fileBtn.classes()).toContain('title-menu-button--icon') @@ -307,7 +307,7 @@ describe('TitleBarApp', () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp, { attachTo: document.body }) await flushPromises() - await wrapper.find('.title-menu-button').trigger('click') + await wrapper.find('.title-menu-button[aria-haspopup="menu"]').trigger('click') expect(bridgeState.fileMenuAnchors.length).toBe(1) const anchor = bridgeState.fileMenuAnchors[0]! expect(typeof anchor.x).toBe('number') @@ -393,13 +393,13 @@ describe('TitleBarApp', () => { const wrapper = mount(TitleBarApp, { attachTo: document.body }) await flushPromises() - await wrapper.find('.title-menu-button').trigger('click') + await wrapper.find('.title-menu-button[aria-haspopup="menu"]').trigger('click') expect(bridgeState.fileMenuAnchors.length).toBe(1) bridgeState.menuClosedCallbacks.forEach((cb) => cb({ menu: 'menu' })) await flushPromises() - await wrapper.find('.title-menu-button').trigger('click') + await wrapper.find('.title-menu-button[aria-haspopup="menu"]').trigger('click') expect(bridgeState.fileMenuAnchors.length).toBe(1) wrapper.unmount() @@ -1005,7 +1005,7 @@ describe('TitleBarApp', () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp, { attachTo: document.body }) await flushPromises() - const btn = wrapper.find('.title-menu-button').element as HTMLElement + const btn = wrapper.find('.title-menu-button[aria-haspopup="menu"]').element as HTMLElement btn.dispatchEvent(new PointerEvent('pointermove', { bubbles: true })) vi.advanceTimersByTime(1000) await flushPromises() @@ -1023,7 +1023,7 @@ describe('TitleBarApp', () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp) await flushPromises() - const btn = wrapper.find('.title-menu-button') + const btn = wrapper.find('.title-menu-button[aria-haspopup="menu"]') expect(btn.attributes('aria-label')).toBe('Menu') expect(btn.attributes('data-title-tooltip')).toBe('Menu') expect(btn.attributes('title')).toBeUndefined() @@ -1035,7 +1035,7 @@ describe('TitleBarApp', () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp) await flushPromises() - const btn = wrapper.find('.title-menu-button') + const btn = wrapper.find('.title-menu-button[aria-haspopup="menu"]') expect(btn.attributes('aria-label')).toBe('Menu') expect(btn.attributes('title')).toBe('Menu') expect(btn.attributes('data-title-tooltip')).toBeUndefined() @@ -1051,7 +1051,7 @@ describe('TitleBarApp', () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp, { attachTo: document.body }) await flushPromises() - const btn = wrapper.find('.title-menu-button').element as HTMLElement + const btn = wrapper.find('.title-menu-button[aria-haspopup="menu"]').element as HTMLElement btn.getBoundingClientRect = () => ({ left: 20, top: 6, right: 50, bottom: 30, width: 30, height: 24, x: 20, y: 6 }) as DOMRect btn.dispatchEvent(new PointerEvent('pointermove', { bubbles: true })) diff --git a/src/renderer/src/comfyTitleBar/TitleBarApp.vue b/src/renderer/src/comfyTitleBar/TitleBarApp.vue index 2deec2a31..f56d2229e 100644 --- a/src/renderer/src/comfyTitleBar/TitleBarApp.vue +++ b/src/renderer/src/comfyTitleBar/TitleBarApp.vue @@ -579,18 +579,6 @@ onUnmounted(() => {
- +
From 3d7e4bd66bddc4a9be415a0ddf9ffe343a87520a Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 11 Nov 2026 05:16:43 +0100 Subject: [PATCH 3/4] test(e2e): expect the tools in the title menu Co-Authored-By: Claude Opus 5.5 --- e2e/chooser.test.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/e2e/chooser.test.ts b/e2e/chooser.test.ts index 5f5bb36a5..bf90377d3 100644 --- a/e2e/chooser.test.ts +++ b/e2e/chooser.test.ts @@ -110,7 +110,14 @@ test('title popup opens, renders menu items, and closes via bridge @windows @mac .toBe(true) const popupItems = await readPopupMenuItems(ctx.app, 'comfyTitlePopup.html') - expect(popupItems).toEqual(['Open Dashboard', 'Desktop Settings', 'Close Window', 'Quit Desktop']) + expect(popupItems).toEqual([ + 'Open Dashboard', + 'Performance Tests', + 'Benchmarks', + 'Desktop Settings', + 'Close Window', + 'Quit Desktop' + ]) await evalWithRetry(() => ctx.app.evaluate(({ webContents }) => { From 4a44ce296e70b9648c84e494deaa07cbff120dfa Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 11 Nov 2026 18:28:16 +0100 Subject: [PATCH 4/4] style(ui): title menu items match the filter menus Items use the design system menu item spacing and hover, and the check sits on the right only when an item is checked, so labels no longer indent behind an empty icon column. Co-Authored-By: Claude Opus 5.5 --- src/renderer/src/comfyTitlePopup/MenuView.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/comfyTitlePopup/MenuView.vue b/src/renderer/src/comfyTitlePopup/MenuView.vue index 2f1bb0542..7a3936095 100644 --- a/src/renderer/src/comfyTitlePopup/MenuView.vue +++ b/src/renderer/src/comfyTitlePopup/MenuView.vue @@ -37,20 +37,18 @@ function handleClick(item: MenuItem): void {