paul/picpeak
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(create-event): re-apply Branding theme on stale→fresh settings (#323-B)

Browse Source 
CreateEventPage's branding-default effect used a boolean ref guard that
locked in whichever theme_config arrived first. React Query can hand the
observer a cached (stale) copy on initial render and then push fresh data
once the network call resolves — the boolean ref meant the form kept the
stale theme and ignored the fresh one.

Replace the ref with a stringified-hash check: re-apply when the source
actually changes (including stale → fresh) but skip when nothing has.
User edits via the customizer aren't disturbed because settings.theme_config
only refreshes on a real Branding save, not on form state.

This unblocks the local pre-push smoke gate's 07-branding-default test,
which was test.fixme'd against this exact React Query staleness.
This commit is contained in:
Paul Nothaft
2026-05-07 22:42:16 +02:00
parent 6b6191a426
commit 401abf7a27
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/admin/CreateEventPage.tsx
+12 -3
View File
@@ -245,12 +245,21 @@ export const CreateEventPage: React.FC = () => {
// This is the "always inherit colours from Branding" guarantee — every new // This is the "always inherit colours from Branding" guarantee — every new
// gallery starts with the site palette unless the admin then picks a preset // gallery starts with the site palette unless the admin then picks a preset
// or hits Sync from Branding inside the customizer to re-pull it later. // or hits Sync from Branding inside the customizer to re-pull it later.
const brandingThemeApplied = useRef(false); //
// Track the last theme_config we applied as a stringified hash rather than
// a boolean ref. React Query can hand us cached (stale) settings on first
// observer render and then push fresh data once the network call resolves;
// a boolean ref locks in the stale theme and ignores the fresh one (#323-B
// / smoke spec 07). With a hash, we re-apply when the source actually
// changes — including the stale → fresh transition — but skip when nothing
// new has arrived.
const lastAppliedThemeHashRef = useRef<string | null>(null);
useEffect(() => { useEffect(() => {
if (brandingThemeApplied.current) return;
const brandingTheme = settings?.theme_config as ThemeConfig | undefined; const brandingTheme = settings?.theme_config as ThemeConfig | undefined;
if (!brandingTheme || Object.keys(brandingTheme).length === 0) return; if (!brandingTheme || Object.keys(brandingTheme).length === 0) return;
brandingThemeApplied.current = true; const hash = JSON.stringify(brandingTheme);
if (lastAppliedThemeHashRef.current === hash) return;
lastAppliedThemeHashRef.current = hash;
// Identify which preset (if any) the Branding theme matches. Compare // Identify which preset (if any) the Branding theme matches. Compare
// only on the preset's own fields so saved themes carrying extras // only on the preset's own fields so saved themes carrying extras