mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-27 03:19:56 +00:00
## Summary - Partially reverts commitc84218d6to restore group node functionality in context menus - Adds "(Deprecated)" label to indicate the feature is deprecated - Fixes TypeError when right-clicking on group nodes - Re-enables tests that were disabled when the feature was removed ## Changes 1. **Restored context menu options** - Added back "Convert to Group Node (Deprecated)" and "Manage Group Nodes" menu items 2. **Fixed null reference error** - Added null-safe operator to prevent errors when right-clicking group nodes 3. **Re-enabled tests** - Restored 7 tests that were disabled in commit586f8824## Test plan - [x] Right-click on canvas → verify "Convert to Group Node (Deprecated)" appears - [x] Right-click on nodes → verify the same menu option appears - [x] Select multiple nodes and use the menu option → verify conversion works - [x] Right-click on group nodes → verify no errors occur - [x] Run browser tests → verify all re-enabled tests pass ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-4967-feat-Restore-group-node-conversion-menu-with-deprecated-label-24e6d73d36508149a6f2dbef47223e94) by [Unito](https://www.unito.io) --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: github-actions <github-actions@github.com>
158 lines
6.0 KiB
TypeScript
158 lines
6.0 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { NodeBadgeMode } from '../../src/types/nodeSource'
|
|
import { comfyPageFixture as test } from '../fixtures/ComfyPage'
|
|
|
|
test.describe('Canvas Right Click Menu', () => {
|
|
test('Can add node', async ({ comfyPage }) => {
|
|
await comfyPage.rightClickCanvas()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
|
|
await comfyPage.page.getByText('Add Node').click()
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.getByText('loaders').click()
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.getByText('Load VAE').click()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('add-node-node-added.png')
|
|
})
|
|
|
|
test('Can add group', async ({ comfyPage }) => {
|
|
await comfyPage.rightClickCanvas()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
|
|
await comfyPage.page.getByText('Add Group', { exact: true }).click()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('add-group-group-added.png')
|
|
})
|
|
|
|
test('Can convert to group node', async ({ comfyPage }) => {
|
|
await comfyPage.select2Nodes()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('selected-2-nodes.png')
|
|
await comfyPage.rightClickCanvas()
|
|
await comfyPage.clickContextMenuItem('Convert to Group Node (Deprecated)')
|
|
await comfyPage.promptDialogInput.fill('GroupNode2CLIP')
|
|
await comfyPage.page.keyboard.press('Enter')
|
|
await comfyPage.promptDialogInput.waitFor({ state: 'hidden' })
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-group-node.png'
|
|
)
|
|
})
|
|
})
|
|
|
|
test.describe('Node Right Click Menu', () => {
|
|
test('Can open properties panel', async ({ comfyPage }) => {
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.getByText('Properties Panel').click()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-properties-panel.png'
|
|
)
|
|
})
|
|
|
|
test('Can collapse', async ({ comfyPage }) => {
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.getByText('Collapse').click()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-collapsed.png'
|
|
)
|
|
})
|
|
|
|
test('Can collapse (Node Badge)', async ({ comfyPage }) => {
|
|
await comfyPage.setSetting(
|
|
'Comfy.NodeBadge.NodeIdBadgeMode',
|
|
NodeBadgeMode.ShowAll
|
|
)
|
|
await comfyPage.setSetting(
|
|
'Comfy.NodeBadge.NodeSourceBadgeMode',
|
|
NodeBadgeMode.ShowAll
|
|
)
|
|
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await comfyPage.page.getByText('Collapse').click()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-collapsed-badge.png'
|
|
)
|
|
})
|
|
|
|
test('Can bypass', async ({ comfyPage }) => {
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.getByText('Bypass').click()
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-node-bypassed.png'
|
|
)
|
|
})
|
|
|
|
test('Can pin and unpin', async ({ comfyPage }) => {
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.dragAndDrop({ x: 621, y: 617 }, { x: 16, y: 16 })
|
|
await expect(comfyPage.canvas).toHaveScreenshot('node-pinned.png')
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-pinned-node.png'
|
|
)
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-unpinned-node.png'
|
|
)
|
|
})
|
|
|
|
test('Can move after unpin', async ({ comfyPage }) => {
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.waitForTimeout(256)
|
|
await comfyPage.dragAndDrop({ x: 496, y: 618 }, { x: 200, y: 590 })
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'right-click-unpinned-node-moved.png'
|
|
)
|
|
})
|
|
|
|
test('Can pin/unpin selected nodes', async ({ comfyPage }) => {
|
|
await comfyPage.select2Nodes()
|
|
await comfyPage.page.keyboard.down('Control')
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
|
|
await comfyPage.page.keyboard.up('Control')
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot('selected-nodes-pinned.png')
|
|
await comfyPage.rightClickEmptyLatentNode()
|
|
await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
|
|
await comfyPage.nextFrame()
|
|
await expect(comfyPage.canvas).toHaveScreenshot(
|
|
'selected-nodes-unpinned.png'
|
|
)
|
|
})
|
|
|
|
test('Can clone pinned nodes', async ({ comfyPage }) => {
|
|
const nodeCount = await comfyPage.getGraphNodesCount()
|
|
const node = (await comfyPage.getFirstNodeRef())!
|
|
await node.clickContextMenuOption('Pin')
|
|
await comfyPage.nextFrame()
|
|
await node.click('title', { button: 'right' })
|
|
await expect(
|
|
comfyPage.page.locator('.litemenu-entry:has-text("Unpin")')
|
|
).toBeAttached()
|
|
const cloneItem = comfyPage.page.locator(
|
|
'.litemenu-entry:has-text("Clone")'
|
|
)
|
|
await cloneItem.click()
|
|
await expect(cloneItem).toHaveCount(0)
|
|
await comfyPage.nextFrame()
|
|
expect(await comfyPage.getGraphNodesCount()).toBe(nodeCount + 1)
|
|
})
|
|
})
|