mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-26 07:57:36 +00:00
## Summary This PR fixes the remaining FE-367 workflow persistence gap by moving the workflow draft lifecycle callers from the legacy V1 draft store to `workflowDraftStoreV2`, following the core design from #10367 while omitting unrelated changes. It keeps the change focused on saved workflow tab restore and V2 draft lifecycle behavior: - save active workflow drafts through V2 before loading a new graph - load, save, save-as, close, rename, and delete workflows against V2 draft storage - prefer a fresh V2 draft when loading a saved workflow, and discard stale drafts when the remote workflow is newer - restore saved open tabs from persisted tab state instead of letting stale active-path state win - preserve V2 draft payload timestamps when moving or refreshing draft recency - remove the now-unused V1 draft store/cache implementation instead of suppressing knip; the raw V1 on-disk migration path remains for existing users Co-authored-by: xmarre <xmarre@users.noreply.github.com> ## Test coverage Added unit coverage for V2 draft load, stale draft discard, rename/close lifecycle cleanup, tab restore ordering, metadata-load waiting/fallback, draft recency updates, quota eviction retry, and persistence-disabled reset behavior. Updated the workflow persistence composable tests to use a real `vue-i18n` plugin host instead of mocking `vue-i18n`. Added an E2E regression test that saves two workflows, edits an inactive saved tab draft, makes the active-path pointer stale, reloads, and verifies the saved tab order, active tab, and inactive draft restoration. ## Validation - `pnpm format` - `pnpm lint` - `pnpm typecheck` - `pnpm test:unit` - pre-push `pnpm knip` (passes with the existing flac tag hint) ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-12269-Fix-V2-draft-lifecycle-persistence-3606d73d365081b4a84feb1696ed88bb) by [Unito](https://www.unito.io) --------- Co-authored-by: xmarre <xmarre@users.noreply.github.com>
246 lines
7.4 KiB
TypeScript
246 lines
7.4 KiB
TypeScript
import { readFileSync } from 'fs'
|
|
|
|
import { test } from '@playwright/test'
|
|
|
|
import type { AppMode } from '@/composables/useAppMode'
|
|
import type {
|
|
ComfyApiWorkflow,
|
|
ComfyWorkflowJSON
|
|
} from '@/platform/workflow/validation/schemas/workflowSchema'
|
|
import type { WorkspaceStore } from '@e2e/types/globals'
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import { assetPath } from '@e2e/fixtures/utils/paths'
|
|
|
|
type FolderStructure = {
|
|
[key: string]: FolderStructure | string
|
|
}
|
|
|
|
export class WorkflowHelper {
|
|
constructor(private readonly comfyPage: ComfyPage) {}
|
|
|
|
convertLeafToContent(structure: FolderStructure): FolderStructure {
|
|
const result: FolderStructure = {}
|
|
|
|
for (const [key, value] of Object.entries(structure)) {
|
|
if (typeof value === 'string') {
|
|
const filePath = assetPath(value)
|
|
result[key] = readFileSync(filePath, 'utf-8')
|
|
} else {
|
|
result[key] = this.convertLeafToContent(value)
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
async setupWorkflowsDirectory(structure: FolderStructure) {
|
|
const resp = await this.comfyPage.request.post(
|
|
`${this.comfyPage.url}/api/devtools/setup_folder_structure`,
|
|
{
|
|
data: {
|
|
tree_structure: this.convertLeafToContent(structure),
|
|
base_path: `user/${this.comfyPage.id}/workflows`
|
|
}
|
|
}
|
|
)
|
|
|
|
if (resp.status() !== 200) {
|
|
throw new Error(
|
|
`Failed to setup workflows directory: ${await resp.text()}`
|
|
)
|
|
}
|
|
|
|
await this.comfyPage.page.evaluate(async () => {
|
|
await (
|
|
window.app!.extensionManager as WorkspaceStore
|
|
).workflow.syncWorkflows()
|
|
})
|
|
|
|
// Wait for Vue to re-render the workflow list
|
|
await this.comfyPage.nextFrame()
|
|
}
|
|
|
|
async waitForDraftPersisted() {
|
|
await this.comfyPage.page.waitForFunction(() =>
|
|
Object.keys(localStorage).some((key) =>
|
|
key.startsWith('Comfy.Workflow.Draft.v2:')
|
|
)
|
|
)
|
|
}
|
|
|
|
/** Waits for V2 draft index recency, not payload content freshness. */
|
|
async waitForDraftIndexUpdatedSince(updatedSince: number) {
|
|
await this.comfyPage.page.waitForFunction((indexUpdatedSince) => {
|
|
for (let i = 0; i < window.localStorage.length; i++) {
|
|
const key = window.localStorage.key(i)
|
|
if (!key?.startsWith('Comfy.Workflow.DraftIndex.v2:')) continue
|
|
|
|
const json = window.localStorage.getItem(key)
|
|
if (!json) continue
|
|
|
|
try {
|
|
const index = JSON.parse(json)
|
|
if (
|
|
typeof index.updatedAt === 'number' &&
|
|
index.updatedAt >= indexUpdatedSince
|
|
) {
|
|
return true
|
|
}
|
|
} catch {
|
|
// Ignore malformed storage while waiting for persistence.
|
|
}
|
|
}
|
|
|
|
return false
|
|
}, updatedSince)
|
|
}
|
|
|
|
/**
|
|
* Reloads the current page and waits for the app to initialize.
|
|
* Unlike ComfyPage.setup(), this preserves localStorage (drafts) and
|
|
* the URL hash (subgraph navigation state), so the app restores
|
|
* exactly where the user left off.
|
|
*/
|
|
async reloadAndWaitForApp() {
|
|
await this.comfyPage.page.reload({ waitUntil: 'domcontentloaded' })
|
|
await this.comfyPage.waitForAppReady()
|
|
}
|
|
|
|
async loadGraphData(workflow: ComfyWorkflowJSON): Promise<void> {
|
|
await this.comfyPage.page.evaluate(
|
|
(wf) => window.app!.loadGraphData(wf),
|
|
workflow
|
|
)
|
|
await this.comfyPage.nextFrame()
|
|
}
|
|
|
|
async loadWorkflow(workflowName: string) {
|
|
await this.comfyPage.workflowUploadInput.setInputFiles(
|
|
assetPath(`${workflowName}.json`)
|
|
)
|
|
await this.waitForWorkflowIdle()
|
|
await this.comfyPage.nextFrame()
|
|
if (test.info().tags.includes('@vue-nodes')) {
|
|
await this.comfyPage.vueNodes.waitForNodes()
|
|
}
|
|
}
|
|
|
|
async deleteWorkflow(
|
|
workflowName: string,
|
|
whenMissing: 'ignoreMissing' | 'throwIfMissing' = 'ignoreMissing'
|
|
) {
|
|
// Open workflows tab
|
|
const { workflowsTab } = this.comfyPage.menu
|
|
await workflowsTab.open()
|
|
|
|
// Action to take if workflow missing
|
|
if (whenMissing === 'ignoreMissing') {
|
|
const workflows = await workflowsTab.getTopLevelSavedWorkflowNames()
|
|
if (!workflows.includes(workflowName)) return
|
|
}
|
|
|
|
// Delete workflow
|
|
await workflowsTab.getPersistedItem(workflowName).click({ button: 'right' })
|
|
await this.comfyPage.contextMenu.clickMenuItem('Delete')
|
|
await this.comfyPage.nextFrame()
|
|
await this.comfyPage.confirmDialog.delete.click()
|
|
|
|
// Clear toast & close tab
|
|
await this.comfyPage.toast.closeToasts(1)
|
|
await workflowsTab.close()
|
|
}
|
|
|
|
async getUndoQueueSize(): Promise<number | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow
|
|
return workflow?.changeTracker.undoQueue.length
|
|
})
|
|
}
|
|
|
|
async getRedoQueueSize(): Promise<number | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow
|
|
return workflow?.changeTracker.redoQueue.length
|
|
})
|
|
}
|
|
|
|
async waitForActiveWorkflow(): Promise<void> {
|
|
await this.comfyPage.page.waitForFunction(
|
|
() =>
|
|
(window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow !== null
|
|
)
|
|
}
|
|
|
|
async getActiveWorkflowPath(): Promise<string | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.path
|
|
})
|
|
}
|
|
|
|
async getActiveWorkflowActiveAppMode(): Promise<AppMode | null | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.activeMode
|
|
})
|
|
}
|
|
|
|
async getActiveWorkflowInitialMode(): Promise<AppMode | null | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.initialMode
|
|
})
|
|
}
|
|
|
|
async getLinearModeFromGraph(): Promise<boolean | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return window.app!.rootGraph.extra?.linearMode as boolean | undefined
|
|
})
|
|
}
|
|
|
|
async getOpenWorkflowCount(): Promise<number> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow.workflows
|
|
.length
|
|
})
|
|
}
|
|
|
|
async isCurrentWorkflowModified(): Promise<boolean | undefined> {
|
|
return this.comfyPage.page.evaluate(() => {
|
|
return (window.app!.extensionManager as WorkspaceStore).workflow
|
|
.activeWorkflow?.isModified
|
|
})
|
|
}
|
|
|
|
async waitForWorkflowIdle(timeout = 5000): Promise<void> {
|
|
await this.comfyPage.page.waitForFunction(
|
|
() =>
|
|
!(window.app?.extensionManager as WorkspaceStore | undefined)?.workflow
|
|
?.isBusy,
|
|
undefined,
|
|
{ timeout }
|
|
)
|
|
}
|
|
|
|
async switchToTab(tabName: string): Promise<void> {
|
|
await this.comfyPage.menu.topbar.getWorkflowTab(tabName).click()
|
|
await this.waitForWorkflowIdle()
|
|
}
|
|
|
|
async getExportedWorkflow(options: { api: true }): Promise<ComfyApiWorkflow>
|
|
async getExportedWorkflow(options?: {
|
|
api?: false
|
|
}): Promise<ComfyWorkflowJSON>
|
|
async getExportedWorkflow(options?: {
|
|
api?: boolean
|
|
}): Promise<ComfyWorkflowJSON | ComfyApiWorkflow> {
|
|
const api = options?.api ?? false
|
|
return this.comfyPage.page.evaluate(async (api) => {
|
|
return (await window.app!.graphToPrompt())[api ? 'output' : 'workflow']
|
|
}, api)
|
|
}
|
|
}
|