mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-06-06 15:54:45 +00:00
## Summary Simplifies the error overlay so it presents one clear title, one clear message, and one stable details action instead of rendering a list of per-error messages. ## Changes - **What**: Extracts the error overlay view model into `useErrorOverlayState`, adds focused unit coverage for the overlay copy resolution rules, and updates the overlay E2E coverage to match the new behavior. - **Breaking**: None. - **Dependencies**: None. ### Behavior changes - The overlay body no longer renders a `<ul>` of individual error messages. It now always renders a single paragraph message. - Single-error overlays now prefer toast-specific copy when it exists. For execution errors, the overlay resolves the message in this order: `toastMessage`, `displayMessage`, raw `message`, group `displayMessage`, then group `displayTitle`. The title resolves from `toastTitle`, then `displayTitle`, then the group title. - Single non-execution groups use group-level toast/display copy. This lets grouped error types supply overlay-friendly copy without the overlay needing to understand each card implementation. - Multiple-error overlays now ignore individual error item copy in the overlay itself. The header becomes the pluralized count title, for example `7 errors found`, and the body becomes the fixed guidance message: `Resolve them before running the workflow.` - The overlay is hidden if the store reports an error count but no resolved overlay message exists. This avoids rendering a visible shell with an empty body. - The action button no longer varies by error type in normal app mode. Missing nodes, missing models, missing media, swap nodes, validation errors, and runtime errors all use `View details` instead of labels like `Show missing nodes`, `Show missing models`, `Show missing inputs`, or `See Errors`. - App mode keeps its existing `Show errors in graph` action label. - The overlay width now keeps the previous width as its minimum and allows a wider maximum, reducing avoidable wrapping in longer error headers. - The live region was softened from an assertive alert-style announcement to `role="status"` with `aria-live="polite"` so updates such as count changes are less disruptive. ### Tests - Adds component coverage for the rendered overlay shape and app-mode action label. - Adds composable coverage for single execution errors, runtime errors, grouped missing media errors, multiple-error aggregate copy, hidden empty-message state, and display-copy fallback behavior. - Updates `errorOverlay.spec.ts` so the E2E suite checks the new single-message overlay, the stable `View details` action, and the fixed multiple-error body guidance. - Removes the old type-specific button-label E2E expectations because that branch no longer exists in product behavior. ### Follow-up PR A follow-up PR is stacked on top of this one: `jaeone/fe-816-missing-resource-error-messaging`. That follow-up will wire missing resource error resolvers into the copy model consumed here. It covers missing node packs, missing models, missing media, and swap-node groups, including the group-level `toastTitle`, `toastMessage`, `displayMessage`, `displayDetails`, and item label copy those cards need. This PR intentionally keeps the overlay behavior separate so it can merge first without depending on the missing-resource resolver copy. ## Review Focus - Please check the single-error versus multiple-error overlay behavior, especially the fallback order for execution error copy. - Please check that the `View details` action is now intentionally error-type agnostic in normal app mode while app mode keeps `Show errors in graph`. - Please check the empty-message guard and the requirement that a single-error overlay only resolves a single group when the total error count and group list agree. - Please check the E2E reduction: the old type-specific action-label assertions were removed because the UI branch they tested was removed. ## Screenshots (if applicable) N/A
214 lines
6.8 KiB
TypeScript
214 lines
6.8 KiB
TypeScript
import type { Page } from '@playwright/test'
|
|
|
|
import {
|
|
comfyPageFixture as test,
|
|
comfyExpect as expect
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
import { TestIds } from '@e2e/fixtures/selectors'
|
|
import { cleanupFakeModel } from '@e2e/fixtures/helpers/ErrorsTabHelper'
|
|
|
|
test.describe('Error overlay', { tag: '@ui' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.RightSidePanel.ShowErrorsTab',
|
|
true
|
|
)
|
|
})
|
|
|
|
function getOverlay(page: Page) {
|
|
return page.getByTestId(TestIds.dialogs.errorOverlay)
|
|
}
|
|
|
|
function getDetailsButton(page: Page) {
|
|
return getOverlay(page).getByTestId(TestIds.dialogs.errorOverlaySeeErrors)
|
|
}
|
|
|
|
test.describe('Labels', () => {
|
|
test('Should display single error copy and View details action', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
|
|
|
|
const overlay = getOverlay(comfyPage.page)
|
|
await expect(overlay).toBeVisible()
|
|
await expect(overlay).not.toContainText(/1 ERROR/i)
|
|
await expect(
|
|
overlay.getByTestId(TestIds.dialogs.errorOverlayMessages)
|
|
).toHaveText(/\S/)
|
|
await expect(getDetailsButton(comfyPage.page)).toContainText(
|
|
/View details/i
|
|
)
|
|
})
|
|
})
|
|
|
|
test.describe('Persistence', () => {
|
|
test('Does not resurface missing nodes on undo/redo', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
|
|
|
|
const errorOverlay = getOverlay(comfyPage.page)
|
|
await expect(errorOverlay).toBeVisible()
|
|
await errorOverlay
|
|
.getByTestId(TestIds.dialogs.errorOverlayDismiss)
|
|
.click()
|
|
await expect(errorOverlay).toBeHidden()
|
|
|
|
await comfyPage.canvas.click()
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.page.keyboard.press('Control+a')
|
|
await comfyPage.page.mouse.move(400, 300)
|
|
await comfyPage.page.mouse.down()
|
|
await comfyPage.page.mouse.move(450, 350, { steps: 5 })
|
|
await comfyPage.page.mouse.up()
|
|
await comfyPage.nextFrame()
|
|
|
|
await comfyPage.keyboard.undo()
|
|
await expect(errorOverlay).toBeHidden()
|
|
|
|
await comfyPage.keyboard.redo()
|
|
await expect(errorOverlay).toBeHidden()
|
|
})
|
|
|
|
test('Does not resurface error overlay when switching back to workflow with missing nodes', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.Workflow.WorkflowTabsPosition',
|
|
'Sidebar'
|
|
)
|
|
await comfyPage.menu.workflowsTab.open()
|
|
|
|
await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
|
|
|
|
const errorOverlay = getOverlay(comfyPage.page)
|
|
await expect(errorOverlay).toBeVisible()
|
|
|
|
await errorOverlay
|
|
.getByTestId(TestIds.dialogs.errorOverlayDismiss)
|
|
.click()
|
|
await expect(errorOverlay).toBeHidden()
|
|
|
|
await comfyPage.menu.workflowsTab.open()
|
|
await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
|
|
|
|
await comfyPage.menu.workflowsTab.switchToWorkflow('missing_nodes')
|
|
|
|
await expect(errorOverlay).toBeHidden()
|
|
})
|
|
})
|
|
|
|
test.describe('View details flow', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setup()
|
|
})
|
|
|
|
async function triggerExecutionError(comfyPage: {
|
|
canvasOps: { disconnectEdge: () => Promise<void> }
|
|
page: Page
|
|
command: { executeCommand: (cmd: string) => Promise<void> }
|
|
}) {
|
|
await comfyPage.canvasOps.disconnectEdge()
|
|
await comfyPage.page.keyboard.press('Escape')
|
|
await comfyPage.command.executeCommand('Comfy.QueuePrompt')
|
|
}
|
|
|
|
test('Error overlay appears on execution error', async ({ comfyPage }) => {
|
|
await triggerExecutionError(comfyPage)
|
|
|
|
await expect(getOverlay(comfyPage.page)).toBeVisible()
|
|
})
|
|
|
|
test('Error overlay shows error message', async ({ comfyPage }) => {
|
|
await triggerExecutionError(comfyPage)
|
|
|
|
const overlay = getOverlay(comfyPage.page)
|
|
await expect(overlay).toBeVisible()
|
|
await expect(overlay).toHaveText(/\S/)
|
|
})
|
|
|
|
test('"View details" opens right side panel', async ({ comfyPage }) => {
|
|
await triggerExecutionError(comfyPage)
|
|
|
|
const overlay = getOverlay(comfyPage.page)
|
|
await expect(overlay).toBeVisible()
|
|
|
|
await overlay.getByTestId(TestIds.dialogs.errorOverlaySeeErrors).click()
|
|
|
|
await expect(overlay).toBeHidden()
|
|
await expect(comfyPage.page.getByTestId('properties-panel')).toBeVisible()
|
|
})
|
|
|
|
test('"View details" dismisses the overlay', async ({ comfyPage }) => {
|
|
await triggerExecutionError(comfyPage)
|
|
|
|
const overlay = getOverlay(comfyPage.page)
|
|
await expect(overlay).toBeVisible()
|
|
|
|
await overlay.getByTestId(TestIds.dialogs.errorOverlaySeeErrors).click()
|
|
|
|
await expect(overlay).toBeHidden()
|
|
})
|
|
|
|
test('"Dismiss" closes overlay without opening panel', async ({
|
|
comfyPage
|
|
}) => {
|
|
await triggerExecutionError(comfyPage)
|
|
|
|
const overlay = getOverlay(comfyPage.page)
|
|
await expect(overlay).toBeVisible()
|
|
|
|
await overlay.getByTestId(TestIds.dialogs.errorOverlayDismiss).click()
|
|
|
|
await expect(overlay).toBeHidden()
|
|
await expect(comfyPage.page.getByTestId('properties-panel')).toBeHidden()
|
|
})
|
|
|
|
test('Close button (X) dismisses overlay', async ({ comfyPage }) => {
|
|
await triggerExecutionError(comfyPage)
|
|
|
|
const overlay = getOverlay(comfyPage.page)
|
|
await expect(overlay).toBeVisible()
|
|
|
|
await overlay.getByRole('button', { name: /close/i }).click()
|
|
|
|
await expect(overlay).toBeHidden()
|
|
})
|
|
})
|
|
|
|
test.describe('Count independence from node selection', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await cleanupFakeModel(comfyPage)
|
|
})
|
|
|
|
test.afterEach(async ({ comfyPage }) => {
|
|
await cleanupFakeModel(comfyPage)
|
|
})
|
|
|
|
test('missing model count stays constant when a node is selected', async ({
|
|
comfyPage
|
|
}) => {
|
|
// Regression: ErrorOverlay previously read the selection-filtered
|
|
// missingModelGroups from useErrorGroups, so selecting one of two
|
|
// missing-model nodes could shrink the overlay count. The overlay must
|
|
// show the workflow total regardless of canvas selection.
|
|
await comfyPage.workflow.loadWorkflow('missing/missing_models_distinct')
|
|
|
|
const overlay = getOverlay(comfyPage.page)
|
|
await expect(overlay).toBeVisible()
|
|
await expect(overlay).toContainText(/2 errors found/i)
|
|
await expect(
|
|
overlay.getByTestId(TestIds.dialogs.errorOverlayMessages)
|
|
).toHaveText(/Resolve them before running the workflow\./i)
|
|
|
|
const node = await comfyPage.nodeOps.getNodeRefById('1')
|
|
await node.click('title')
|
|
|
|
await expect(overlay).toContainText(/2 errors found/i)
|
|
await expect(
|
|
overlay.getByTestId(TestIds.dialogs.errorOverlayMessages)
|
|
).toHaveText(/Resolve them before running the workflow\./i)
|
|
})
|
|
})
|
|
})
|