mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-23 14:16:00 +00:00
*PR Created by the Glary-Bot Agent* --- ## Summary - Fixes app mode bug where custom combo inputs (and other widget inputs) unselect and show "Widget not visible" after refreshing or reopening a saved app workflow - Root cause: `resetSelectedToWorkflow()` loads from `changeTracker.activeState` which may not have linearData yet after refresh, and `pruneLinearData()` prunes valid entries during graph loading when nodes aren't yet in the graph - Two defensive guards: fallback to `initialState` for authoritative data, and skip pruning during graph loading ## Changes - `appModeStore.ts`: `resetSelectedToWorkflow()` now falls back to `initialState.extra.linearData` when `activeState` has none - `appModeStore.ts`: `pruneLinearData()` skips node-existence checks when `ChangeTracker.isLoadingGraph` is true - Unit tests: 4 new tests covering both fix paths (pruning during loading, fallback to initialState) - E2E test: Save-as → close → reopen → verify all inputs persist with no "Widget not visible" ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-11422-fix-preserve-app-builder-inputs-through-graph-reconfiguration-3476d73d36508166a563f7df3967665c) by [Unito](https://www.unito.io) --------- Co-authored-by: Glary-Bot <glary-bot@users.noreply.github.com> Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
192 lines
5.6 KiB
TypeScript
192 lines
5.6 KiB
TypeScript
import {
|
|
comfyPageFixture as test,
|
|
comfyExpect as expect
|
|
} from '@e2e/fixtures/ComfyPage'
|
|
import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import {
|
|
saveCloseAndReopenInBuilder,
|
|
setupBuilder
|
|
} from '@e2e/fixtures/utils/builderTestUtils'
|
|
|
|
const WIDGETS = ['seed', 'steps', 'cfg']
|
|
|
|
async function saveCloseAndReopenAsApp(
|
|
comfyPage: ComfyPage,
|
|
appMode: AppModeHelper,
|
|
workflowName: string
|
|
) {
|
|
await saveCloseAndReopenInBuilder(comfyPage, appMode, workflowName)
|
|
await appMode.toggleAppMode()
|
|
}
|
|
|
|
test.describe('Builder input reordering', { tag: '@ui' }, () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.appMode.enableLinearMode()
|
|
await comfyPage.settings.setSetting(
|
|
'Comfy.AppBuilder.VueNodeSwitchDismissed',
|
|
true
|
|
)
|
|
})
|
|
|
|
test('Drag first input to last position', async ({ comfyPage }) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(0, 2)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
})
|
|
|
|
test('Drag last input to first position', async ({ comfyPage }) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(2, 0)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'cfg',
|
|
'seed',
|
|
'steps'
|
|
])
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'cfg',
|
|
'seed',
|
|
'steps'
|
|
])
|
|
})
|
|
|
|
test('Drag input to middle position', async ({ comfyPage }) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(0, 1)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'steps',
|
|
'seed',
|
|
'cfg'
|
|
])
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'seed',
|
|
'cfg'
|
|
])
|
|
})
|
|
|
|
test('Reorder in preview step reflects in app mode after save', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToPreview()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragPreviewItem(0, 2)
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
|
|
const workflowName = `${Date.now()} reorder-preview`
|
|
await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
|
|
|
|
await expect(appMode.linearWidgets).toBeVisible()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
})
|
|
|
|
test('Reorder inputs persists after save and reload', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { appMode } = comfyPage
|
|
await setupBuilder(comfyPage, undefined, WIDGETS)
|
|
|
|
await appMode.steps.goToInputs()
|
|
await appMode.select.dragInputItem(0, 2)
|
|
await expect(appMode.select.inputItemTitles).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
|
|
const workflowName = `${Date.now()} reorder-persist`
|
|
await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
|
|
|
|
await expect(appMode.linearWidgets).toBeVisible()
|
|
await expect(appMode.select.previewWidgetLabels).toHaveText([
|
|
'steps',
|
|
'cfg',
|
|
'seed'
|
|
])
|
|
})
|
|
|
|
test('Reordering inputs in one app does not corrupt another app', async ({
|
|
comfyPage
|
|
}, testInfo) => {
|
|
// This test creates 2 apps, switches tabs 3 times, and enters builder 3
|
|
// times — the default 15s timeout is insufficient in CI.
|
|
testInfo.setTimeout(45_000)
|
|
const { appMode } = comfyPage
|
|
const app2Widgets = ['seed', 'steps']
|
|
const app1Reordered = ['steps', 'cfg', 'seed']
|
|
|
|
await test.step('Load both apps', async () => {
|
|
await comfyPage.workflow.loadWorkflow('linear-basic-app-1')
|
|
await comfyPage.workflow.loadWorkflow('linear-basic-app-2')
|
|
})
|
|
|
|
await test.step('Reorder app1 inputs', async () => {
|
|
await comfyPage.workflow.switchToTab('linear-basic-app-1')
|
|
await appMode.enterBuilder()
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
|
|
|
|
await appMode.select.dragInputItem(0, 2)
|
|
await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
|
|
})
|
|
|
|
await test.step('Verify app2 inputs are not corrupted', async () => {
|
|
await appMode.footer.exitBuilder()
|
|
await comfyPage.workflow.switchToTab('linear-basic-app-2')
|
|
await appMode.enterBuilder()
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(app2Widgets)
|
|
})
|
|
|
|
await test.step('Verify app1 reorder persisted', async () => {
|
|
await appMode.footer.exitBuilder()
|
|
await comfyPage.workflow.switchToTab('linear-basic-app-1')
|
|
await appMode.enterBuilder()
|
|
await appMode.steps.goToInputs()
|
|
await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
|
|
})
|
|
})
|
|
})
|