mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-23 06:10:32 +00:00
## Summary Replaces #12164. Right-clicking a Vue node, using the selection toolbox More Options menu, or clicking the selection toolbox Node Info button now opens the right-side Info tab only when the new-menu UI makes that panel available. Legacy-menu contexts hide the no-op action even when the legacy node library design is selected; node-library help remains isolated to the node library itself. The existing `selection_toolbox_node_info_opened` telemetry fires only after the toolbox button successfully opens node info. No new context-menu telemetry event is added in this PR. ## Changes - **What**: Share the node-info availability/action path across the context menu and selection toolbox, keep legacy-menu state out of the right-side panel public store API, tighten node-info settings tests, and add unit plus E2E regression coverage for new-menu and legacy-menu modes. - **Dependencies**: None ## Review Focus Confirm the node context menu, selection toolbox direct Info button, and selection toolbox More Options entry all respect right-side panel availability, including legacy menu + legacy node library mode, while node-library help behavior remains isolated to the node library. ## Validation - Self-review: checked production path, unit mocks, and Playwright coverage; only gap found was weak E2E coverage for the toolbox direct Info path, now strengthened. - `pnpm test:unit -- src/composables/graph/useSelectionState.test.ts src/components/graph/SelectionToolbox.test.ts src/components/graph/selectionToolbox/InfoButton.test.ts` - `pnpm test:browser:local -- --project=chromium browser_tests/tests/selectionToolboxActions.spec.ts browser_tests/tests/selectionToolboxSubmenus.spec.ts browser_tests/tests/vueNodes/interactions/node/contextMenu.spec.ts --grep "info button opens the right-side info tab|info button is hidden|hides Node Info|should open node info"` - `pnpm typecheck:browser` - `pnpm exec oxlint --type-aware browser_tests/tests/selectionToolboxActions.spec.ts` - `pnpm exec eslint --cache --no-warn-ignored browser_tests/tests/selectionToolboxActions.spec.ts` - `pnpm exec oxfmt --check browser_tests/tests/selectionToolboxActions.spec.ts` - `git diff --check` - Commit hooks: lint-staged + `pnpm typecheck` + `pnpm typecheck:browser` - Push hook: `knip --cache` (existing tag hint only) ## Screenshots (if applicable) Before https://github.com/user-attachments/assets/4b1f6ddb-a01c-4958-81ab-36167f434e59 https://github.com/user-attachments/assets/83433f0d-24f1-46b7-a81d-f0f065812496 After https://github.com/user-attachments/assets/30bd61e5-f8d4-48b7-97e0-26c93e3cb362 https://github.com/user-attachments/assets/afce9f51-a43d-434f-a006-6b357a61ac8f --------- Co-authored-by: github-actions <github-actions@github.com>
282 lines
8.9 KiB
TypeScript
282 lines
8.9 KiB
TypeScript
import type { Locator } from '@playwright/test'
|
|
|
|
import {
|
|
comfyExpect as expect,
|
|
comfyPageFixture as test
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import type { NodeReference } from '@e2e/fixtures/utils/litegraphUtils'
|
|
|
|
const BYPASS_CLASS = /before:bg-bypass\/60/
|
|
|
|
function getNodeWrapper(comfyPage: ComfyPage, nodeTitle: string): Locator {
|
|
return comfyPage.page
|
|
.locator('[data-node-id]')
|
|
.filter({ hasText: nodeTitle })
|
|
.getByTestId('node-inner-wrapper')
|
|
}
|
|
|
|
async function selectNodeWithPan(comfyPage: ComfyPage, nodeRef: NodeReference) {
|
|
const nodePos = await nodeRef.getPosition()
|
|
await comfyPage.page.evaluate((pos) => {
|
|
const canvas = window.app!.canvas
|
|
canvas.ds.offset[0] = -pos.x + canvas.canvas.width / 2
|
|
canvas.ds.offset[1] = -pos.y + canvas.canvas.height / 2 + 100
|
|
canvas.setDirty(true, true)
|
|
}, nodePos)
|
|
await comfyPage.nextFrame()
|
|
await nodeRef.click('title')
|
|
}
|
|
|
|
test.describe('Selection Toolbox - Button Actions', { tag: '@ui' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
|
|
await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
|
|
})
|
|
|
|
test('delete button removes selected node', async ({ comfyPage }) => {
|
|
const nodeRef = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
|
|
await selectNodeWithPan(comfyPage, nodeRef)
|
|
|
|
const initialCount = await comfyPage.page.evaluate(
|
|
() => window.app!.graph!._nodes.length
|
|
)
|
|
|
|
const deleteButton = comfyPage.page.getByTestId('delete-button')
|
|
await expect(deleteButton).toBeVisible()
|
|
await deleteButton.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() =>
|
|
comfyPage.page.evaluate(() => window.app!.graph!._nodes.length)
|
|
)
|
|
.toBe(initialCount - 1)
|
|
})
|
|
|
|
test('info button opens the right-side info tab in new menu mode', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
|
|
await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', true)
|
|
await comfyPage.settings.setSetting('Comfy.RightSidePanel.IsOpen', false)
|
|
|
|
const nodeRef = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
|
|
await selectNodeWithPan(comfyPage, nodeRef)
|
|
await expect(comfyPage.menu.propertiesPanel.root).toBeHidden()
|
|
|
|
const infoButton = comfyPage.page.getByTestId('info-button')
|
|
await expect(infoButton).toBeVisible()
|
|
await infoButton.click()
|
|
|
|
const panel = comfyPage.menu.propertiesPanel.root
|
|
await expect(panel).toBeVisible()
|
|
await expect(panel.getByTestId('panel-tab-info')).toHaveAttribute(
|
|
'aria-selected',
|
|
'true'
|
|
)
|
|
await expect(panel).toContainText('KSampler')
|
|
await expect(comfyPage.menu.nodeLibraryTab.selectedTabButton).toBeHidden()
|
|
})
|
|
|
|
test('info button is hidden when the new menu is disabled', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
|
|
|
|
const nodeRef = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
|
|
await selectNodeWithPan(comfyPage, nodeRef)
|
|
|
|
await expect(comfyPage.selectionToolbox).toBeVisible()
|
|
await expect(
|
|
comfyPage.selectionToolbox.getByTestId('info-button')
|
|
).toBeHidden()
|
|
})
|
|
|
|
test('convert-to-subgraph button visible with multi-select', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('default')
|
|
|
|
await comfyPage.nodeOps.selectNodes(['KSampler', 'Empty Latent Image'])
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(
|
|
comfyPage.page.getByTestId('convert-to-subgraph-button')
|
|
).toBeVisible()
|
|
})
|
|
|
|
test('delete button removes multiple selected nodes', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('default')
|
|
|
|
await comfyPage.nodeOps.selectNodes(['KSampler', 'Empty Latent Image'])
|
|
await comfyPage.nextFrame()
|
|
|
|
const initialCount = await comfyPage.page.evaluate(
|
|
() => window.app!.graph!._nodes.length
|
|
)
|
|
|
|
const deleteButton = comfyPage.page.getByTestId('delete-button')
|
|
await expect(deleteButton).toBeVisible()
|
|
await deleteButton.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() =>
|
|
comfyPage.page.evaluate(() => window.app!.graph!._nodes.length)
|
|
)
|
|
.toBe(initialCount - 2)
|
|
})
|
|
|
|
test('bypass button toggles bypass on single node', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
|
|
await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
|
|
await comfyPage.vueNodes.waitForNodes()
|
|
|
|
const nodeRef = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
|
|
await selectNodeWithPan(comfyPage, nodeRef)
|
|
|
|
await expect.poll(() => nodeRef.isBypassed()).toBe(false)
|
|
|
|
const bypassButton = comfyPage.page.getByTestId('bypass-button')
|
|
await expect(bypassButton).toBeVisible()
|
|
await bypassButton.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect.poll(() => nodeRef.isBypassed()).toBe(true)
|
|
await expect(getNodeWrapper(comfyPage, 'KSampler')).toHaveClass(
|
|
BYPASS_CLASS
|
|
)
|
|
|
|
await bypassButton.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect.poll(() => nodeRef.isBypassed()).toBe(false)
|
|
await expect(getNodeWrapper(comfyPage, 'KSampler')).not.toHaveClass(
|
|
BYPASS_CLASS
|
|
)
|
|
})
|
|
|
|
test('convert-to-subgraph button converts node to subgraph', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeRef = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
|
|
await selectNodeWithPan(comfyPage, nodeRef)
|
|
|
|
const convertButton = comfyPage.page.getByTestId(
|
|
'convert-to-subgraph-button'
|
|
)
|
|
await expect(convertButton).toBeVisible()
|
|
await convertButton.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
// KSampler should be gone, replaced by a subgraph node
|
|
await expect
|
|
.poll(() => comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))
|
|
.toHaveLength(0)
|
|
|
|
await expect
|
|
.poll(() => comfyPage.nodeOps.getNodeRefsByTitle('New Subgraph'))
|
|
.toHaveLength(1)
|
|
})
|
|
|
|
test('convert-to-subgraph button converts multiple nodes', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('default')
|
|
|
|
const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
|
|
|
|
await comfyPage.nodeOps.selectNodes(['KSampler', 'Empty Latent Image'])
|
|
await comfyPage.nextFrame()
|
|
|
|
const convertButton = comfyPage.page.getByTestId(
|
|
'convert-to-subgraph-button'
|
|
)
|
|
await expect(convertButton).toBeVisible()
|
|
await convertButton.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() => comfyPage.nodeOps.getNodeRefsByTitle('New Subgraph'))
|
|
.toHaveLength(1)
|
|
|
|
await expect
|
|
.poll(() => comfyPage.nodeOps.getGraphNodesCount())
|
|
.toBe(initialCount - 1)
|
|
})
|
|
|
|
test('frame nodes button creates group from multiple selected nodes', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('default')
|
|
|
|
const initialGroupCount = await comfyPage.page.evaluate(
|
|
() => window.app!.graph.groups.length
|
|
)
|
|
|
|
await comfyPage.nodeOps.selectNodes(['KSampler', 'Empty Latent Image'])
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(
|
|
comfyPage.selectionToolbox.getByRole('button', {
|
|
name: /Frame Nodes/i
|
|
})
|
|
).toBeVisible()
|
|
await comfyPage.selectionToolbox
|
|
.getByRole('button', { name: /Frame Nodes/i })
|
|
.click()
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect
|
|
.poll(() =>
|
|
comfyPage.page.evaluate(() => window.app!.graph.groups.length)
|
|
)
|
|
.toBe(initialGroupCount + 1)
|
|
})
|
|
|
|
test('frame nodes button is not visible for single selection', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeRef = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
|
|
await selectNodeWithPan(comfyPage, nodeRef)
|
|
|
|
const frameButton = comfyPage.page.getByRole('button', {
|
|
name: /Frame Nodes/i
|
|
})
|
|
await expect(frameButton).toBeHidden()
|
|
})
|
|
|
|
test('execute button visible when output node selected', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('default')
|
|
|
|
// Select the SaveImage node by panning to it
|
|
const saveImageRef = (
|
|
await comfyPage.nodeOps.getNodeRefsByTitle('Save Image')
|
|
)[0]
|
|
await selectNodeWithPan(comfyPage, saveImageRef)
|
|
|
|
const executeButton = comfyPage.page.getByRole('button', {
|
|
name: /Execute to selected output nodes/i
|
|
})
|
|
await expect(executeButton).toBeVisible()
|
|
})
|
|
|
|
test('execute button not visible when non-output node selected', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeRef = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
|
|
await selectNodeWithPan(comfyPage, nodeRef)
|
|
|
|
const executeButton = comfyPage.page.getByRole('button', {
|
|
name: /Execute to selected output nodes/i
|
|
})
|
|
await expect(executeButton).toBeHidden()
|
|
})
|
|
})
|