@teamscala/service-boot 0.23.417 → 0.23.419

package/src/register-registry-page-route/public-shell-page-data.ts

@@ -0,0 +1,169 @@
+/**
+ * @system ui-service-boot
+ * @status handwritten
+ * @edit edit directly
+ *
+ * Branch 2 of the resolved-graph → pageData conversion: the public shell
+ * (header/body/footer regions from header/footer sources).
+ *
+ * Split out of resolve-page-data.ts (547 lines) — byte-identical body; only
+ * the closure variables became explicit parameters.
+ */
+
+import { resolveThemeMode } from "../resolve-theme-mode.ts";
+import { composePageTitle } from "../compose-page-title.ts";
+import { resolveEntityTitle } from "./meta-title.ts";
+import {
+	applyLayoutDefaults,
+	EMPTY_PUCK_DATA,
+	extractPuckData,
+	pickRootProp,
+	readBrandTokens,
+	type PuckData,
+	type RegionEntry,
+} from "./page-data-shared.ts";
+
+export function publicShellPageData(
+	resolved: Record<string, unknown>,
+	meta: Record<string, unknown>,
+	themeOverride: "light" | "dark" | undefined,
+	orgPrefix: boolean | undefined,
+): Record<string, unknown> {
+	const { brand, primaryColor, headingFont, bodyFont, logo, brandTheme } =
+		readBrandTokens(resolved);
+	const headerSource = resolved.header as Record<string, unknown> | undefined;
+	const footerSource = resolved.footer as Record<string, unknown> | undefined;
+
+	const page = (resolved.page as Record<string, unknown>) ?? {};
+	const website =
+		(resolved.website_by_host as Record<string, unknown>) ??
+		(resolved.website as Record<string, unknown>) ??
+		{};
+	const layoutDefaults =
+		(website.layout_defaults as Record<string, string>) ??
+		(website.layout_settings as Record<string, string>) ??
+		{};
+	const layoutSettings = website.layout_settings as
+		| { theme?: unknown }
+		| null
+		| undefined;
+	const websiteTheme =
+		layoutSettings && typeof layoutSettings.theme === "string"
+			? layoutSettings.theme
+			: undefined;
+
+	const regions: RegionEntry[] = [];
+
+	if (headerSource) {
+		const headerPuck = extractPuckData(headerSource) ?? EMPTY_PUCK_DATA;
+		applyLayoutDefaults(headerPuck, layoutDefaults);
+		regions.push({
+			slot: "header",
+			puckData: headerPuck,
+			pageId: (headerSource.id as string) ?? "",
+		});
+	}
+
+	const bodyPuck = extractPuckData(page) ?? EMPTY_PUCK_DATA;
+	applyLayoutDefaults(bodyPuck, layoutDefaults);
+	regions.push({
+		slot: "body",
+		puckData: bodyPuck,
+		pageId: (page.id as string) ?? "",
+		metaTitle: (page.meta_title as string) ?? null,
+		metaDescription: (page.meta_description as string) ?? null,
+	});
+
+	if (footerSource) {
+		const footerPuck = extractPuckData(footerSource) ?? EMPTY_PUCK_DATA;
+		applyLayoutDefaults(footerPuck, layoutDefaults);
+		regions.push({
+			slot: "footer",
+			puckData: footerPuck,
+			pageId: (footerSource.id as string) ?? "",
+		});
+	}
+
+	const rootTheme = pickRootProp<string>(regions, "theme");
+	const { theme } = resolveThemeMode({
+		override: themeOverride,
+		candidates: [rootTheme, brandTheme, websiteTheme],
+	});
+
+	const overrideColor = pickRootProp<string>(regions, "primaryColor");
+	const overrideBg = pickRootProp<string>(regions, "backgroundColor");
+	const overrideHeading = pickRootProp<string>(regions, "headingFont");
+	const overrideBody = pickRootProp<string>(regions, "bodyFont");
+
+	const pageName = (page.name as string) || null;
+	const entityTitle = resolveEntityTitle(resolved);
+	const bodyMetaTitle = regions.find((r) => r.slot === "body")?.metaTitle;
+	const pageRootTitle = pickRootProp<string>(regions, "title");
+	const pageDescription =
+		regions.find((r) => r.slot === "body")?.metaDescription ??
+		pickRootProp<string>(regions, "description") ??
+		null;
+
+	return {
+		puckData: { root: { props: {} }, content: [] } as PuckData,
+		regions,
+		// Region-shell blocks (e.g. the header Navigation deriving the body's
+		// document sections) read the resolved entity graph from
+		// pageData.loaderData — the same surface Branch 1 exposes. Without it a
+		// header/footer block serverLoader gets ctx.loaderData=undefined and
+		// cannot see the body page, so a server-derived nav produced no items
+		// and the menu was client-only (vanished on stale tabs / narrow views).
+		loaderData: resolved,
+		website: {
+			slug: website.slug as string,
+			name: website.name as string,
+			organisation_id: website.organisation_id as string | null,
+			// header_settings carries the DB-driven header config (e.g.
+			// backdropBlur) the public shell applies — PublicTemplate reads
+			// pageData.website.header_settings.backdropBlur. Dropping it here
+			// silently kills the header blur even though the DB switch is set
+			// (the 2026-06-17 regression). Pass it through verbatim.
+			header_settings:
+				(website.header_settings as Record<string, unknown> | null) ?? null,
+		},
+		orgId:
+			(page.organisation_id as string) ??
+			null,
+		brand: {
+			primaryColor: overrideColor ?? primaryColor,
+			// Thread the org brand's dark surface (brand_background_color /
+			// brand_dark_color) when the page sets no explicit override — so
+			// dark-mode pages use the brand's real dark colour, not a
+			// primary-derived tint. Uses the org brand's real dark colour.
+			backgroundColor:
+				overrideBg ?? (brand.backgroundColor as string | null) ?? null,
+			lightSurface: (brand.lightSurface as string | null) ?? null,
+			darkSurface: (brand.darkSurface as string | null) ?? null,
+			accentColor: (brand.accentColor as string | null) ?? null,
+			secondaryColor: (brand.secondaryColor as string | null) ?? null,
+			mutedColor: (brand.mutedColor as string | null) ?? null,
+			headingFont: overrideHeading ?? headingFont,
+			bodyFont: overrideBody ?? bodyFont,
+			logo,
+			companyName: (brand.companyName as string) ?? null,
+			companyFriendlyName: (brand.companyFriendlyName as string) ?? null,
+			contactEmail: (brand.contactEmail as string) ?? null,
+			favicon: (brand.favicon as string) ?? null,
+		},
+		theme,
+		meta: {
+		title: composePageTitle(
+			{
+					pageMetaTitle: bodyMetaTitle,
+					templateTitle: (meta.title as string) || undefined,
+					websiteName: (website.name as string) || undefined,
+					organisationName: (brand.companyName as string) || undefined,
+					pageName: pageName ?? pageRootTitle,
+					entityTitle: entityTitle || undefined,
+				},
+				{ orgPrefix },
+			),
+			...(pageDescription ? { description: pageDescription } : {}),
+		},
+	};
+}

package/src/register-registry-page-route/region-slots-page-data.ts

@@ -0,0 +1,175 @@
+/**
+ * @system ui-service-boot
+ * @status handwritten
+ * @edit edit directly
+ *
+ * Branch 1 of the resolved-graph → pageData conversion: arbitrary region-slots
+ * (portal/agents/docs) driven by resource_loader.region_slots.
+ *
+ * Split out of resolve-page-data.ts (547 lines) — byte-identical body; only
+ * the closure variables became explicit parameters.
+ */
+
+import { resolveThemeMode } from "../resolve-theme-mode.ts";
+import { composePageTitle } from "../compose-page-title.ts";
+import { resolveEntityTitle } from "./meta-title.ts";
+import {
+	applyLayoutDefaults,
+	EMPTY_PUCK_DATA,
+	extractPuckData,
+	pickRootProp,
+	readBrandTokens,
+	warnUnresolvedRegionSlot,
+	type PuckData,
+	type RegionEntry,
+} from "./page-data-shared.ts";
+
+export function regionSlotsPageData(
+	resolved: Record<string, unknown>,
+	meta: Record<string, unknown>,
+	regionSlots: string[],
+	themeOverride: "light" | "dark" | undefined,
+	orgPrefix: boolean | undefined,
+): Record<string, unknown> {
+	const { brand, primaryColor, headingFont, bodyFont, logo, brandTheme } =
+		readBrandTokens(resolved);
+	const website = (resolved.website as Record<string, unknown>) ?? {};
+	const layoutDefaults =
+		(website.layout_defaults as Record<string, string>) ??
+		(website.layout_settings as Record<string, string>) ??
+		{};
+	const layoutSettings = website.layout_settings as
+		| { theme?: unknown }
+		| null
+		| undefined;
+	const websiteTheme =
+		layoutSettings && typeof layoutSettings.theme === "string"
+			? layoutSettings.theme
+			: undefined;
+
+	// Title derives from the primary resolved entity (e.g. the GPT agent),
+	// matching the flat-page branch — so a utility-shell GPT shows the agent
+	// name in <title>/OG, not the generic "Portal". Falls back to the website
+	// name, then "Portal". Without this, the region-slots branch returned
+	// early with a hardcoded "Portal" title (gpt-test: SSR/DOM/OG title FAIL).
+	const entityTitle = resolveEntityTitle(resolved);
+
+	const regions: RegionEntry[] = [];
+	for (const slot of regionSlots) {
+		const source = resolved[slot] as Record<string, unknown> | undefined;
+		if (!source) {
+			warnUnresolvedRegionSlot(slot);
+			continue;
+		}
+		const puckData = extractPuckData(source) ?? EMPTY_PUCK_DATA;
+		applyLayoutDefaults(puckData, layoutDefaults);
+		regions.push({
+			slot,
+			puckData,
+			pageId: (source.id as string) ?? "",
+		});
+	}
+
+	if (regions.length === 0) {
+		return {
+			puckData: { root: { props: {} }, content: [] } as PuckData,
+			theme: "dark" as const,
+			brand: {
+				primaryColor,
+				backgroundColor: (brand.backgroundColor as string | null) ?? null,
+				lightSurface: (brand.lightSurface as string | null) ?? null,
+				darkSurface: (brand.darkSurface as string | null) ?? null,
+				headingFont,
+				bodyFont,
+				logo,
+				companyName: (brand.companyName as string) ?? null,
+				companyFriendlyName: (brand.companyFriendlyName as string) ?? null,
+				contactEmail: (brand.contactEmail as string) ?? null,
+				favicon: (brand.favicon as string) ?? null,
+			},
+			meta: {
+				title: composePageTitle(
+					{
+						templateTitle: (meta.title as string) || undefined,
+						websiteName: (website.name as string) || undefined,
+						organisationName: (brand.companyName as string) || undefined,
+						entityTitle: entityTitle || undefined,
+					},
+					{ orgPrefix },
+				),
+			},
+		};
+	}
+
+	const rootTheme = pickRootProp<string>(regions, "theme");
+	const { theme } = resolveThemeMode({
+		override: themeOverride,
+		candidates: [rootTheme, brandTheme, websiteTheme],
+	});
+
+	const overrideColor = pickRootProp<string>(regions, "primaryColor");
+	const overrideHeading = pickRootProp<string>(regions, "headingFont");
+	const overrideBody = pickRootProp<string>(regions, "bodyFont");
+	// The page the user is viewing is the main content region (center for
+	// portal, body for utility). Its name ("Dashboard") is the title subject.
+	const contentSlot = regionSlots.find((s) => s === "center" || s === "body");
+	const contentPageName = contentSlot
+		? ((resolved[contentSlot] as Record<string, unknown> | undefined)?.name as
+				| string
+				| undefined)
+		: undefined;
+
+	return {
+		puckData: { root: { props: {} }, content: [] } as PuckData,
+		regions,
+		// Region-shell blocks (e.g. the GPT chat in the center region) read
+		// their resolved entities from pageData.loaderData — same surface the
+		// flat single-page branch exposes. Without it the chat block has no
+		// agent and renders "Custom GPT not found".
+		loaderData: resolved,
+		website: {
+			slug: website.slug as string,
+			name: website.name as string,
+			organisation_id: website.organisation_id as string | null,
+			// header_settings carries the DB-driven header config (e.g.
+			// backdropBlur) the public shell applies — PublicTemplate reads
+			// pageData.website.header_settings.backdropBlur. Dropping it here
+			// silently kills the header blur even though the DB switch is set
+			// (the 2026-06-17 regression). Pass it through verbatim.
+			header_settings:
+				(website.header_settings as Record<string, unknown> | null) ?? null,
+		},
+		orgId:
+			((resolved.center as Record<string, unknown> | undefined)
+				?.organisation_id as string | null) ??
+			((resolved.agent as Record<string, unknown> | undefined)
+				?.organisation_id as string | null) ??
+			null,
+		brand: {
+			primaryColor: overrideColor ?? primaryColor,
+			backgroundColor: (brand.backgroundColor as string | null) ?? null,
+			lightSurface: (brand.lightSurface as string | null) ?? null,
+			darkSurface: (brand.darkSurface as string | null) ?? null,
+			headingFont: overrideHeading ?? headingFont,
+			bodyFont: overrideBody ?? bodyFont,
+			logo,
+			companyName: (brand.companyName as string) ?? null,
+			companyFriendlyName: (brand.companyFriendlyName as string) ?? null,
+			contactEmail: (brand.contactEmail as string) ?? null,
+			favicon: (brand.favicon as string) ?? null,
+		},
+		theme,
+		meta: {
+			title: composePageTitle(
+			{
+				templateTitle: (meta.title as string) || undefined,
+				websiteName: (website.name as string) || undefined,
+				organisationName: (brand.companyName as string) || undefined,
+					pageName: contentPageName,
+					entityTitle: entityTitle || undefined,
+				},
+				{ orgPrefix },
+			),
+		},
+	};
+}