mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-03 12:10:11 +00:00
8549e17c37
Backport of #6677 to rh-test branch. ## Changes - Adds `preservedQueryTracker` to preserve template/source query params during login/signup flows - Resolves merge conflicts by keeping rh-test routing structure while adding the fix ## Conflict Resolution Kept rh-test branch structure: - Import path: `./onboardingCloudRoutes` (not nested path) - `PUBLIC_ROUTE_NAMES` and `isPublicRoute` at top level with `/cloud/code` check - Existing auth guard logic intact Added from PR #6677: - `installPreservedQueryTracker` with template/source keys - New navigation utility files ## Testing ✅ Typecheck passes ✅ All new tests pass (20/20) Fixes issue where template query params were being stripped during login flows. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-6711-Backport-6677-fix-template-query-param-stripped-during-login-views-2ac6d73d36508115ad5fe2776fd93c7c) by [Unito](https://www.unito.io)
74 lines
2.2 KiB
TypeScript
74 lines
2.2 KiB
TypeScript
import { beforeEach, describe, expect, it } from 'vitest'
|
|
|
|
import {
|
|
capturePreservedQuery,
|
|
clearPreservedQuery,
|
|
hydratePreservedQuery,
|
|
mergePreservedQueryIntoQuery
|
|
} from '@/platform/navigation/preservedQueryManager'
|
|
import { PRESERVED_QUERY_NAMESPACES } from '@/platform/navigation/preservedQueryNamespaces'
|
|
|
|
const NAMESPACE = PRESERVED_QUERY_NAMESPACES.TEMPLATE
|
|
|
|
describe('preservedQueryManager', () => {
|
|
beforeEach(() => {
|
|
sessionStorage.clear()
|
|
clearPreservedQuery(NAMESPACE)
|
|
})
|
|
|
|
it('captures specified keys from the route query', () => {
|
|
capturePreservedQuery(NAMESPACE, { template: 'flux', source: 'custom' }, [
|
|
'template',
|
|
'source'
|
|
])
|
|
|
|
hydratePreservedQuery(NAMESPACE)
|
|
const merged = mergePreservedQueryIntoQuery(NAMESPACE)
|
|
|
|
expect(merged).toEqual({ template: 'flux', source: 'custom' })
|
|
expect(sessionStorage.getItem('Comfy.PreservedQuery.template')).toBeTruthy()
|
|
})
|
|
|
|
it('hydrates cached payload from sessionStorage once', () => {
|
|
sessionStorage.setItem(
|
|
'Comfy.PreservedQuery.template',
|
|
JSON.stringify({ template: 'flux', source: 'default' })
|
|
)
|
|
|
|
hydratePreservedQuery(NAMESPACE)
|
|
const merged = mergePreservedQueryIntoQuery(NAMESPACE)
|
|
|
|
expect(merged).toEqual({ template: 'flux', source: 'default' })
|
|
})
|
|
|
|
it('merges stored payload only when query lacks the keys', () => {
|
|
capturePreservedQuery(NAMESPACE, { template: 'flux' }, ['template'])
|
|
|
|
const merged = mergePreservedQueryIntoQuery(NAMESPACE, {
|
|
foo: 'bar'
|
|
})
|
|
|
|
expect(merged).toEqual({ foo: 'bar', template: 'flux' })
|
|
})
|
|
|
|
it('returns undefined when merge does not change query', () => {
|
|
capturePreservedQuery(NAMESPACE, { template: 'flux' }, ['template'])
|
|
|
|
const merged = mergePreservedQueryIntoQuery(NAMESPACE, {
|
|
template: 'existing'
|
|
})
|
|
|
|
expect(merged).toBeUndefined()
|
|
})
|
|
|
|
it('clears cached payload', () => {
|
|
capturePreservedQuery(NAMESPACE, { template: 'flux' }, ['template'])
|
|
|
|
clearPreservedQuery(NAMESPACE)
|
|
|
|
const merged = mergePreservedQueryIntoQuery(NAMESPACE)
|
|
expect(merged).toBeUndefined()
|
|
expect(sessionStorage.getItem('Comfy.PreservedQuery.template')).toBeNull()
|
|
})
|
|
})
|