@questpie/admin 3.3.0 → 3.4.0

package/dist/client/views/collection/outline.mjs

@@ -0,0 +1,363 @@
+//#region src/client/views/collection/outline.ts
+const DEFAULT_MAX_DEPTH = 12;
+const NO_VALUE = "No value";
+function getId(value) {
+	if (typeof value === "string" || typeof value === "number") return String(value);
+	if (value && typeof value === "object") {
+		const id = value.id;
+		if (typeof id === "string" || typeof id === "number") return String(id);
+	}
+	return null;
+}
+function getPathValue(source, path) {
+	if (!path) return source;
+	const parts = path.split(".").filter(Boolean);
+	let current = source;
+	for (const part of parts) {
+		if (!current || typeof current !== "object") return void 0;
+		current = current[part];
+	}
+	return current;
+}
+function defaultLabelForValue(value) {
+	if (value === null || value === void 0 || value === "") return NO_VALUE;
+	if (Array.isArray(value)) return value.length ? value.map((item) => defaultLabelForValue(item)).join(", ") : NO_VALUE;
+	if (typeof value === "object") {
+		const record = value;
+		return String(record.title ?? record.name ?? record.label ?? record.id ?? NO_VALUE);
+	}
+	return String(value);
+}
+function stableGroupKey(value) {
+	if (value === null || value === void 0 || value === "") return "__empty__";
+	if (Array.isArray(value)) return value.map(stableGroupKey).join(",");
+	if (typeof value === "object") return getId(value) ?? JSON.stringify(value);
+	return String(value);
+}
+function shouldExpand(key, depth, outline, collapsedKeys) {
+	if (collapsedKeys.has(key)) return false;
+	const defaultExpanded = outline?.defaultExpanded ?? true;
+	if (defaultExpanded === true) return true;
+	if (defaultExpanded === false) return false;
+	return depth === 0;
+}
+function compareByOrder(a, b, order) {
+	if (Array.isArray(order)) {
+		const ai = order.indexOf(a.key);
+		const bi = order.indexOf(b.key);
+		if (ai !== -1 || bi !== -1) {
+			if (ai === -1) return 1;
+			if (bi === -1) return -1;
+			return ai - bi;
+		}
+	}
+	const result = a.label.localeCompare(b.label);
+	return order === "desc" ? -result : result;
+}
+function matchesWhere(edge, where) {
+	if (!where) return true;
+	return Object.entries(where).every(([key, expected]) => {
+		const actual = getPathValue(edge, key);
+		if (expected && typeof expected === "object" && !Array.isArray(expected)) {
+			if ("in" in expected) return (expected.in ?? []).map(String).includes(String(actual));
+		}
+		return String(actual) === String(expected);
+	});
+}
+function isRecord(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function buildFieldRows(level, docs, depth, levelIndex, ctx, scopeKey) {
+	const groups = /* @__PURE__ */ new Map();
+	for (const doc of docs) {
+		const value = getPathValue(doc, level.field);
+		const key = stableGroupKey(value);
+		const group = groups.get(key);
+		if (group) {
+			group.docs.push(doc);
+			continue;
+		}
+		groups.set(key, {
+			key,
+			label: ctx.labelForValue(value, level.labelField ?? level.field),
+			value,
+			docs: [doc]
+		});
+	}
+	return Array.from(groups.values()).sort((a, b) => compareByOrder(a, b, level.order)).flatMap((group) => {
+		const rowKey = `${scopeKey}/field:${level.field}:${group.key}`;
+		const expanded = shouldExpand(rowKey, depth, ctx.outline, ctx.collapsedKeys);
+		return [{
+			kind: "group",
+			key: rowKey,
+			label: group.label,
+			depth,
+			count: group.docs.length,
+			expandable: true,
+			collapsed: !expanded
+		}, ...expanded ? buildLevelRows(group.docs, depth + 1, levelIndex + 1, ctx, rowKey) : []];
+	});
+}
+function buildRelationFieldRows(level, docs, depth, levelIndex, ctx, scopeKey) {
+	const fieldPath = level.field ? `${level.relation}.${level.field}` : level.relation;
+	const groups = /* @__PURE__ */ new Map();
+	for (const doc of docs) {
+		const relationValue = getPathValue(doc, level.relation);
+		const value = level.field ? getPathValue(relationValue, level.field) : relationValue;
+		const key = stableGroupKey(value);
+		const group = groups.get(key);
+		if (group) {
+			group.docs.push(doc);
+			continue;
+		}
+		groups.set(key, {
+			key,
+			label: ctx.labelForValue(value, level.labelField ?? fieldPath),
+			docs: [doc]
+		});
+	}
+	return Array.from(groups.values()).sort((a, b) => compareByOrder(a, b, level.order)).flatMap((group) => {
+		const rowKey = `${scopeKey}/relation-field:${fieldPath}:${group.key}`;
+		const expanded = shouldExpand(rowKey, depth, ctx.outline, ctx.collapsedKeys);
+		return [{
+			kind: "group",
+			key: rowKey,
+			label: group.label,
+			depth,
+			count: group.docs.length,
+			expandable: true,
+			collapsed: !expanded
+		}, ...expanded ? buildLevelRows(group.docs, depth + 1, levelIndex + 1, ctx, rowKey) : []];
+	});
+}
+function getRepeatMaxDepth(repeat, fallback) {
+	if (!repeat) return 1;
+	if (typeof repeat === "object") return repeat.maxDepth ?? fallback;
+	return fallback;
+}
+function buildEdgeRows(level, docs, depth, levelIndex, ctx, scopeKey) {
+	const docsById = /* @__PURE__ */ new Map();
+	for (const doc of docs) {
+		const id = getId(doc);
+		if (id) docsById.set(id, doc);
+	}
+	const edgeDocs = (ctx.edgesByCollection[level.collection] ?? []).filter((edge) => matchesWhere(edge, level.where));
+	if (ctx.outline?.preserveMatchingBranches !== false) for (let pass = 0; pass < ctx.maxDepth; pass++) {
+		let changed = false;
+		for (const edge of edgeDocs) {
+			const parentValue = getPathValue(edge, level.parentField);
+			const childValue = getPathValue(edge, level.childField);
+			const parentId = getId(parentValue);
+			const childId = getId(childValue);
+			if (!parentId || !childId || !docsById.has(childId)) continue;
+			if (docsById.has(parentId) || !isRecord(parentValue)) continue;
+			docsById.set(parentId, parentValue);
+			changed = true;
+		}
+		if (!changed) break;
+	}
+	const outlineDocs = Array.from(docsById.values());
+	const childrenByParent = /* @__PURE__ */ new Map();
+	const childIds = /* @__PURE__ */ new Set();
+	const edgeSeen = /* @__PURE__ */ new Set();
+	for (const edge of edgeDocs) {
+		const parentId = getId(getPathValue(edge, level.parentField));
+		const childId = getId(getPathValue(edge, level.childField));
+		if (!parentId || !childId || parentId === childId) continue;
+		if (!docsById.has(childId)) continue;
+		const dedupeKey = `${parentId}:${childId}:${JSON.stringify(level.where ?? {})}`;
+		if (edgeSeen.has(dedupeKey)) continue;
+		edgeSeen.add(dedupeKey);
+		childIds.add(childId);
+		const children = childrenByParent.get(parentId) ?? [];
+		children.push({
+			childId,
+			edge
+		});
+		childrenByParent.set(parentId, children);
+	}
+	const roots = outlineDocs.filter((doc) => {
+		const id = getId(doc);
+		return !id || !childIds.has(id) || !docsById.has(id);
+	});
+	const maxRepeatDepth = getRepeatMaxDepth(level.repeat, ctx.maxDepth);
+	const rows = [];
+	const visited = /* @__PURE__ */ new Set();
+	function pushChildRows(parentId, nextDepth, branchDepth, ancestorIds) {
+		const children = childrenByParent.get(parentId) ?? [];
+		if (children.length === 0) return;
+		if (branchDepth >= maxRepeatDepth) return;
+		if (level.groupByEdgeField) {
+			const groups = /* @__PURE__ */ new Map();
+			for (const child of children) {
+				const value = getPathValue(child.edge, level.groupByEdgeField);
+				const key = stableGroupKey(value);
+				const group = groups.get(key);
+				if (group) group.children.push(child);
+				else groups.set(key, {
+					label: ctx.labelForValue(value, level.groupByEdgeField),
+					children: [child]
+				});
+			}
+			for (const [key, group] of groups) {
+				const rowKey = `${scopeKey}/edge-group:${level.collection}:${parentId}:${key}`;
+				const expanded = shouldExpand(rowKey, nextDepth, ctx.outline, ctx.collapsedKeys);
+				rows.push({
+					kind: "group",
+					key: rowKey,
+					label: group.label,
+					depth: nextDepth,
+					count: group.children.length,
+					expandable: true,
+					collapsed: !expanded
+				});
+				if (!expanded) continue;
+				for (const child of group.children) pushEdgeRecord(child.childId, nextDepth + 1, branchDepth + 1, ancestorIds);
+			}
+			return;
+		}
+		for (const child of children) pushEdgeRecord(child.childId, nextDepth, branchDepth + 1, ancestorIds);
+	}
+	function pushEdgeRecord(id, rowDepth, branchDepth, ancestorIds) {
+		const doc = docsById.get(id);
+		if (!doc || ancestorIds.has(id)) return;
+		const rowKey = `${scopeKey}/record:${id}`;
+		const hasChildren = (childrenByParent.get(id) ?? []).some((child) => docsById.has(child.childId));
+		const expanded = hasChildren && shouldExpand(rowKey, rowDepth, ctx.outline, ctx.collapsedKeys);
+		rows.push({
+			kind: "record",
+			key: rowKey,
+			id,
+			doc,
+			depth: rowDepth,
+			expandable: hasChildren,
+			collapsed: hasChildren ? !expanded : void 0
+		});
+		visited.add(id);
+		if (hasChildren && expanded) {
+			const nextAncestors = new Set(ancestorIds);
+			nextAncestors.add(id);
+			pushChildRows(id, rowDepth + 1, branchDepth, nextAncestors);
+		}
+	}
+	for (const doc of roots) {
+		const id = getId(doc);
+		if (!id) {
+			rows.push({
+				kind: "record",
+				key: `${scopeKey}/record:${rows.length}`,
+				id: String(rows.length),
+				doc,
+				depth
+			});
+			continue;
+		}
+		pushEdgeRecord(id, depth, 0, /* @__PURE__ */ new Set());
+	}
+	for (const doc of outlineDocs) {
+		const id = getId(doc);
+		if (id && !visited.has(id)) pushEdgeRecord(id, depth, 0, /* @__PURE__ */ new Set());
+	}
+	if (levelIndex + 1 >= ctx.levels.length) return rows;
+	return rows.flatMap((row) => row.kind === "record" ? [row, ...buildLevelRows([row.doc], row.depth + 1, levelIndex + 1, ctx, row.key)] : [row]);
+}
+function createPathNode(key, label) {
+	return {
+		key,
+		label,
+		children: /* @__PURE__ */ new Map(),
+		docs: []
+	};
+}
+function countPathNode(node) {
+	let count = node.docs.length;
+	for (const child of node.children.values()) count += countPathNode(child);
+	return count;
+}
+function buildPathRows(level, docs, depth, levelIndex, ctx, scopeKey) {
+	const root = createPathNode("path:root", "Root");
+	const separator = level.separator ?? "/";
+	const maxPathDepth = getRepeatMaxDepth(level.repeat, ctx.maxDepth);
+	for (const doc of docs) {
+		const segments = String(getPathValue(doc, level.field) ?? "").trim().split(separator).filter(Boolean).slice(0, maxPathDepth);
+		const folderSegments = level.syntheticFolders && segments.length > 0 ? segments.slice(0, Math.max(segments.length - 1, 0)) : segments;
+		let node = root;
+		let currentPath = "";
+		for (const segment of folderSegments) {
+			currentPath = currentPath ? `${currentPath}${separator}${segment}` : segment;
+			let child = node.children.get(segment);
+			if (!child) {
+				child = createPathNode(`${scopeKey}/path:${level.field}:${currentPath}`, segment);
+				node.children.set(segment, child);
+			}
+			node = child;
+		}
+		node.docs.push(doc);
+	}
+	function walk(node, rowDepth) {
+		const rows = [];
+		for (const child of Array.from(node.children.values()).sort((a, b) => a.label.localeCompare(b.label))) {
+			const expanded = shouldExpand(child.key, rowDepth, ctx.outline, ctx.collapsedKeys);
+			rows.push({
+				kind: "synthetic",
+				key: child.key,
+				label: child.label,
+				depth: rowDepth,
+				count: countPathNode(child),
+				expandable: true,
+				collapsed: !expanded
+			});
+			if (expanded) rows.push(...walk(child, rowDepth + 1));
+		}
+		for (const doc of node.docs) {
+			const id = getId(doc) ?? `${node.key}:${rows.length}`;
+			rows.push({
+				kind: "record",
+				key: `${scopeKey}/record:${id}`,
+				id,
+				doc,
+				depth: rowDepth
+			});
+			if (levelIndex + 1 < ctx.levels.length) rows.push(...buildLevelRows([doc], rowDepth + 1, levelIndex + 1, ctx, `${scopeKey}/record:${id}`));
+		}
+		return rows;
+	}
+	return walk(root, depth);
+}
+function buildLevelRows(docs, depth, levelIndex, ctx, scopeKey = "root") {
+	if (docs.length === 0) return [];
+	if (depth > ctx.maxDepth || levelIndex >= ctx.levels.length) return docs.map((doc, index) => {
+		const id = getId(doc) ?? `${depth}:${index}`;
+		return {
+			kind: "record",
+			key: `${scopeKey}/record:${id}`,
+			id,
+			doc,
+			depth
+		};
+	});
+	const level = ctx.levels[levelIndex];
+	if (level.kind === "field") return buildFieldRows(level, docs, depth, levelIndex, ctx, scopeKey);
+	if (level.kind === "relation-field") return buildRelationFieldRows(level, docs, depth, levelIndex, ctx, scopeKey);
+	if (level.kind === "edge") return buildEdgeRows(level, docs, depth, levelIndex, ctx, scopeKey);
+	return buildPathRows(level, docs, depth, levelIndex, ctx, scopeKey);
+}
+function buildOutlineRows({ docs, outline, edgesByCollection = {}, collapsedKeys, labelForValue = defaultLabelForValue, maxDepth }) {
+	const levels = outline?.levels?.filter(Boolean) ?? [];
+	const ctx = {
+		levels,
+		outline,
+		edgesByCollection,
+		collapsedKeys: new Set(collapsedKeys ?? []),
+		labelForValue,
+		maxDepth: maxDepth ?? outline?.maxDepth ?? DEFAULT_MAX_DEPTH
+	};
+	if (levels.length === 0) return buildLevelRows(docs, 0, 0, {
+		...ctx,
+		levels: []
+	});
+	return buildLevelRows(docs, 0, 0, ctx);
+}
+
+//#endregion
+export { buildOutlineRows };

package/dist/client/views/collection/table-view.mjs

@@ -252,11 +252,14 @@ function mapListSchemaToConfig(list) {
 	if (list.columns?.length) config.columns = list.columns;
 	if (list.defaultSort) config.defaultSort = list.defaultSort;
 	if (list.orderable) config.orderable = list.orderable;
-	if (list.searchable?.length) {
+	if (Array.isArray(list.searchable) && list.searchable.length) {
 		config.searchFields = list.searchable;
 		config.searchable = true;
-	}
+	} else if (typeof list.searchable === "boolean") config.searchable = list.searchable;
+	if (list.filterable?.length) config.filterable = list.filterable;
 	if (list.grouping?.fields?.length) config.grouping = list.grouping;
+	if (list.layout) config.layout = list.layout;
+	if (list.outline?.levels?.length) config.outline = list.outline;
 	config.actions = mapListActionsToDefinitions(list.actions);
 	return config;
 }
@@ -1543,4 +1546,4 @@ function TableViewInner({ collection, config, viewConfig, navigate, basePath = "
 }
 
 //#endregion
-export { TableView as default };
+export { UploadCollectionButton, TableView as default, mapListSchemaToConfig, stringifyGroupValue };

package/dist/client/views/layout/admin-layout.d.mts

@@ -1,3 +1,5 @@
+import { ServerAdminShellRailConfig } from "../../../server/augmentation/shell.mjs";
+import "../../../server/augmentation.mjs";
 import { AdminToasterProps } from "../../components/ui/sonner.mjs";
 import { AdminSidebarProps } from "./admin-sidebar.mjs";
 import { AdminTheme } from "./admin-theme.mjs";
@@ -73,6 +75,18 @@ interface AdminLayoutSharedProps {
    */
   layoutMode?: LayoutMode;
 }
+interface AdminShellRailProps {
+  /** Current route path, usually the browser pathname. */
+  activeRoute?: string;
+  /** Admin base path, usually "/admin". */
+  basePath: string;
+  /** Resolved rail placement. */
+  placement: "left" | "right";
+  /** Raw rail config from server admin config. */
+  config: ServerAdminShellRailConfig;
+  /** Navigate function from the admin runtime. */
+  navigate: (path: string) => void;
+}
 interface AdminLayoutProps extends AdminLayoutSharedProps {
   /**
    * Brand name for sidebar.
@@ -127,4 +141,4 @@ declare function AdminLayout({
   layoutMode
 }: AdminLayoutProps): React.ReactElement;
 //#endregion
-export { AdminLayout, AdminLayoutSharedProps };
+export { AdminLayout, AdminLayoutSharedProps, AdminShellRailProps };

package/dist/client/views/layout/admin-layout.mjs

@@ -1,6 +1,8 @@
 import { useSafeI18n } from "../../i18n/hooks.mjs";
 import { cn } from "../../lib/utils.mjs";
 import { useAdminStore } from "../../runtime/provider.mjs";
+import { ComponentRenderer } from "../../components/component-renderer.mjs";
+import { useAdminConfig } from "../../hooks/use-admin-config.mjs";
 import { shouldHandleAdminShortcut } from "../../utils/keyboard-shortcuts.mjs";
 import { SidebarInset, SidebarProvider } from "../../components/ui/sidebar.mjs";
 import { Toaster } from "../../components/ui/sonner.mjs";
@@ -29,6 +31,54 @@ function useLayoutProps(props) {
 		navigate: props.navigate ?? storeNavigate
 	};
 }
+function normalizeRoute(route) {
+	return route.replace(/\/+$/, "") || "/";
+}
+function resolveRouteRule(rule, basePath) {
+	if (rule.startsWith("/")) return normalizeRoute(rule);
+	return normalizeRoute(`${basePath}/${rule.replace(/^\/+/, "")}`);
+}
+function routeMatchesRule(activeRoute, rule, basePath, match) {
+	if (!activeRoute) return false;
+	const active = normalizeRoute(activeRoute);
+	const target = resolveRouteRule(rule, basePath);
+	if (match === "exact") return active === target;
+	return active === target || active.startsWith(`${target}/`);
+}
+function shouldRenderShellRail(config, activeRoute, basePath) {
+	const routes = config.routes;
+	if (!routes) return true;
+	const match = routes.match ?? "prefix";
+	if (!(!routes.include?.length || routes.include.some((rule) => routeMatchesRule(activeRoute, rule, basePath, match)))) return false;
+	return !routes.exclude?.some((rule) => routeMatchesRule(activeRoute, rule, basePath, match));
+}
+function toCssLength(value) {
+	if (value === void 0) return void 0;
+	return typeof value === "number" ? `${value}px` : value;
+}
+function AdminShellRail({ config, activeRoute, basePath, navigate }) {
+	const placement = config.placement ?? "left";
+	const style = {
+		width: toCssLength(config.width ?? 320),
+		minWidth: toCssLength(config.minWidth ?? config.width ?? 280),
+		maxWidth: toCssLength(config.maxWidth)
+	};
+	return /* @__PURE__ */ jsx("aside", {
+		className: cn("qa-admin-layout__secondary-rail bg-background h-svh min-h-0 shrink-0 flex-col overflow-hidden", config.hiddenOnMobile === false ? "flex" : "hidden md:flex", placement === "left" ? "border-border-subtle border-r" : "border-border-subtle border-l", config.className),
+		"data-placement": placement,
+		style,
+		children: /* @__PURE__ */ jsx(ComponentRenderer, {
+			reference: config.component,
+			additionalProps: {
+				activeRoute,
+				basePath,
+				placement,
+				config,
+				navigate
+			}
+		})
+	});
+}
 /**
 * AdminLayout Component
 *
@@ -61,6 +111,15 @@ function AdminLayout({ LinkComponent, activeRoute, basePath = "/admin", brandNam
 	const [isSearchOpen, setIsSearchOpen] = React.useState(false);
 	const openSearch = React.useCallback(() => setIsSearchOpen(true), []);
 	const closeSearch = React.useCallback(() => setIsSearchOpen(false), []);
+	const { data: serverConfig } = useAdminConfig();
+	const currentActiveRoute = activeRoute ?? (typeof window !== "undefined" ? window.location.pathname : void 0);
+	const secondaryRailConfig = serverConfig?.shell?.secondaryRail;
+	const secondaryRail = !!secondaryRailConfig && shouldRenderShellRail(secondaryRailConfig, currentActiveRoute, basePath) && secondaryRailConfig ? /* @__PURE__ */ jsx(AdminShellRail, {
+		config: secondaryRailConfig,
+		activeRoute: currentActiveRoute,
+		basePath,
+		navigate
+	}) : null;
 	React.useEffect(() => {
 		const down = (e) => {
 			if (shouldHandleAdminShortcut(e, { key: "k" })) {
@@ -90,38 +149,43 @@ function AdminLayout({ LinkComponent, activeRoute, basePath = "/admin", brandNam
 				/* @__PURE__ */ jsxs(SidebarProvider, {
 					defaultOpen: !sidebarCollapsedProp,
 					className: "qa-admin-layout__sidebar-wrapper bg-sidebar mx-auto h-svh max-w-[1920px] overflow-hidden",
-					children: [/* @__PURE__ */ jsx(AdminSidebar, {
-						LinkComponent,
-						activeRoute,
-						basePath,
-						brandName,
-						theme,
-						setTheme,
-						showThemeToggle,
-						onSearchOpen: openSearch,
-						...sidebarProps
-					}), /* @__PURE__ */ jsxs(SidebarInset, {
-						className: "qa-admin-layout__content bg-background flex h-svh flex-col overflow-hidden md:rounded-tl-2xl",
-						children: [
-							shouldShowHeader && header && /* @__PURE__ */ jsx("header", {
-								className: "qa-admin-layout__header border-border-subtle border-b",
-								children: header
-							}),
-							/* @__PURE__ */ jsx("main", {
-								id: "main-content",
-								className: "qa-admin-layout__main min-w-0 flex-1 overflow-y-auto",
-								tabIndex: -1,
-								children: /* @__PURE__ */ jsx("div", {
-									className: cn("qa-admin-layout__main-content min-w-0", layoutMode === "default" && "mx-auto max-w-5xl px-3 pt-1 pb-6 md:px-4 md:pt-2 md:pb-8", layoutMode === "wide" && "px-3 pt-1 pb-6 md:px-4 md:pt-2 md:pb-8", layoutMode === "full" && "px-2 pt-1 pb-6 md:px-3 md:pb-8", layoutMode === "immersive" && "p-0"),
-									children
+					children: [
+						/* @__PURE__ */ jsx(AdminSidebar, {
+							LinkComponent,
+							activeRoute: currentActiveRoute,
+							basePath,
+							brandName,
+							theme,
+							setTheme,
+							showThemeToggle,
+							onSearchOpen: openSearch,
+							...sidebarProps
+						}),
+						secondaryRailConfig?.placement !== "right" && secondaryRail,
+						/* @__PURE__ */ jsxs(SidebarInset, {
+							className: "qa-admin-layout__content bg-background flex h-svh flex-col overflow-hidden md:rounded-tl-2xl",
+							children: [
+								shouldShowHeader && header && /* @__PURE__ */ jsx("header", {
+									className: "qa-admin-layout__header border-border-subtle border-b",
+									children: header
+								}),
+								/* @__PURE__ */ jsx("main", {
+									id: "main-content",
+									className: "qa-admin-layout__main min-w-0 flex-1 overflow-y-auto",
+									tabIndex: -1,
+									children: /* @__PURE__ */ jsx("div", {
+										className: cn("qa-admin-layout__main-content min-w-0", layoutMode === "default" && "mx-auto max-w-5xl px-3 pt-1 pb-6 md:px-4 md:pt-2 md:pb-8", layoutMode === "wide" && "px-3 pt-1 pb-6 md:px-4 md:pt-2 md:pb-8", layoutMode === "full" && "px-2 pt-1 pb-6 md:px-3 md:pb-8", layoutMode === "immersive" && "p-0"),
+										children
+									})
+								}),
+								shouldShowFooter && footer && /* @__PURE__ */ jsx("footer", {
+									className: "qa-admin-layout__footer border-border-subtle border-t",
+									children: footer
 								})
-							}),
-							shouldShowFooter && footer && /* @__PURE__ */ jsx("footer", {
-								className: "qa-admin-layout__footer border-border-subtle border-t",
-								children: footer
-							})
-						]
-					})]
+							]
+						}),
+						secondaryRailConfig?.placement === "right" && secondaryRail
+					]
 				}),
 				/* @__PURE__ */ jsx(Toaster, {
 					theme,

package/dist/client.d.mts

@@ -1,11 +1,11 @@
-import { BaseWidgetAdminMeta, WidgetTypeRegistry } from "./augmentation.mjs";
 import { I18nContext, I18nText } from "./client/i18n/types.mjs";
 import { BaseFieldProps, IconComponent, MaybeLazyComponent } from "./client/builder/types/common.mjs";
+import { FormViewDefinition, ListViewDefinition, ViewDefinition, ViewKind, view } from "./client/builder/view/view.mjs";
+import { Badge, BadgeProps, ComponentRenderer, ComponentRendererProps, ComponentRendererRegistry, IconifyIcon, IconifyIconProps, createIconRenderer, isComponentReference, resolveIconElement } from "./client/components/component-renderer.mjs";
 import { FieldDefinition, FieldInstance, configureField, field } from "./client/builder/field/field.mjs";
 import { PageDefinition, page } from "./client/builder/page/page.mjs";
-import { AnyWidgetConfig, BaseWidgetConfig, ChartWidgetConfig, CustomWidgetConfig, ProgressWidgetConfig, QuickActionsWidgetConfig, RecentItemsWidgetConfig, StatsWidgetConfig, TableWidgetConfig, TimelineWidgetConfig, ValueWidgetConfig, WidgetComponentProps, WidgetConfig } from "./client/builder/types/widget-types.mjs";
-import { FormViewDefinition, ListViewDefinition, ViewDefinition, ViewKind, view } from "./client/builder/view/view.mjs";
 import { WidgetDefinition, widget } from "./client/builder/widget/widget.mjs";
+import { AnyWidgetConfig, BaseWidgetConfig, ChartWidgetConfig, CustomWidgetConfig, ProgressWidgetConfig, QuickActionsWidgetConfig, RecentItemsWidgetConfig, StatsWidgetConfig, TableWidgetConfig, TimelineWidgetConfig, ValueWidgetConfig, WidgetComponentProps, WidgetConfig } from "./client/builder/types/widget-types.mjs";
 import { Admin, AppAdmin, InferAdminCMS } from "./client/builder/admin.mjs";
 import { createAdminClient } from "./client/create-admin-client.mjs";
 import { TypedHooks, createTypedHooks } from "./client/hooks/typed-hooks.mjs";
@@ -15,7 +15,7 @@ import { BrandLogoConfig, BrandingConfig } from "./client/types/admin-config.mjs
 import { AdminProvider, AdminProviderProps, AdminState, AdminStore, selectAdmin, selectBasePath, selectClient, selectNavigate, useAdminStore } from "./client/runtime/provider.mjs";
 import { useShallow } from "./client/runtime/index.mjs";
 import { AdminSidebarBrandProps, AdminSidebarNavItemProps } from "./client/views/layout/admin-sidebar.mjs";
-import { AdminLayout } from "./client/views/layout/admin-layout.mjs";
+import { AdminLayout, AdminShellRailProps } from "./client/views/layout/admin-layout.mjs";
 import { AdminLayoutProvider } from "./client/views/layout/admin-layout-provider.mjs";
 import { AdminRouter, AdminRouterProps } from "./client/views/layout/admin-router.mjs";
 import { BlockCategory, BlockContent, BlockNode, BlockRendererProps as BlockRendererProps$1, EMPTY_BLOCK_CONTENT, isBlockContent } from "./client/blocks/types.mjs";
@@ -33,7 +33,6 @@ import { UseCollectionPreviewOptions, UseCollectionPreviewResult, useCollectionP
 import "./client/preview/index.mjs";
 import { AuthGuard } from "./client/components/auth/auth-guard.mjs";
 import { AuthLoading } from "./client/components/auth/auth-loading.mjs";
-import { Badge, BadgeProps, ComponentRenderer, ComponentRendererProps, ComponentRendererRegistry, IconifyIcon, IconifyIconProps, createIconRenderer, isComponentReference, resolveIconElement } from "./client/components/component-renderer.mjs";
 import { AcceptInviteForm } from "./client/views/auth/accept-invite-form.mjs";
 import { AuthDefaultLogo, AuthLayout, AuthLayoutProps } from "./client/views/auth/auth-layout.mjs";
 import { BrandLogoMark, BrandLogoMarkProps } from "./client/components/brand-logo.mjs";
@@ -61,6 +60,7 @@ import { SetupStatus, useSetupStatus } from "./client/hooks/use-setup-status.mjs
 import { useSidebarSearchParam } from "./client/hooks/use-sidebar-search-param.mjs";
 import { AdminLink } from "./client/components/admin-link.mjs";
 import { FlagConfig, getCountryCode, getFlagConfig, getFlagUrl } from "./client/utils/locale-to-flag.mjs";
+import { BaseWidgetAdminMeta, WidgetTypeRegistry } from "./augmentation.mjs";
 import { CollectionFormViewProps, CollectionListViewProps, GlobalFormViewProps } from "./client/builder/types/views.mjs";
 import { buildValidationSchema, buildZodFromIntrospection, createFormSchema } from "./client/builder/validation.mjs";
 import { FocusContextValue, FocusProvider, FocusProviderProps, FocusState, parsePreviewFieldPath, scrollFieldIntoView, useFocus, useFocusOptional, useIsBlockFocused, useIsFieldFocused } from "./client/contexts/focus-context.mjs";
@@ -105,4 +105,4 @@ type CollectionFieldKeys<TApp extends QuestpieApp, TCollectionName extends strin
   select: infer TSelect;
 } ? keyof TSelect : never : never : never;
 //#endregion
-export { AcceptInviteForm, AcceptInvitePage, Admin, AdminLayout, AdminLayoutProvider, AdminLink, AdminProvider, type AdminProviderProps, AdminRouter, type AdminRouterProps, type AdminSidebarBrandProps, type AdminSidebarNavItemProps, type AdminState, type AdminStore, type AdminToPreviewMessage, AnyQuestpieClient, type AnyWidgetConfig, type AppAdmin, AuthDefaultLogo, AuthGuard, AuthLayout, type AuthLayoutProps, AuthLoading, Badge, type BadgeProps, type BaseFieldProps, type BaseWidgetAdminMeta, type BaseWidgetConfig, type BlockCategory, type BlockClickedMessage, type BlockContent, type BlockNode, BlockRenderer, type BlockRendererProps as BlockRendererComponentProps, type BlockRendererProps$1 as BlockRendererProps, type BlockScopeContextValue, BlockScopeProvider, type BlockScopeProviderProps, type BrandLogoConfig, BrandLogoMark, type BrandLogoMarkProps, type BrandSnapshot, type BrandingConfig, type ChartWidgetConfig, CollectionFieldKeys, type CollectionFormViewProps, CollectionItem, type CollectionListViewProps, CollectionNames, type CommitMessage, type ComponentRegistry, ComponentRenderer, type ComponentRendererProps, type ComponentRendererRegistry, type CustomWidgetConfig, DashboardPage, EMPTY_BLOCK_CONTENT, type FieldClickedMessage, type FieldComponentProps, type FieldDefinition, type FieldInstance, type FieldValueEditedMessage, type FlagConfig, type FocusContextValue, type FocusFieldMessage, FocusProvider, type FocusProviderProps, type FocusState, ForgotPasswordForm, ForgotPasswordPage, type FormViewConfig, type FormViewDefinition, type FullResyncMessage, type GlobalFormViewProps, GlobalNames, type I18nContext, type I18nText, type IconComponent, IconifyIcon, type IconifyIconProps, type InferAdminCMS, type InitSnapshotMessage, InvitePage, type ListViewDefinition, LoginForm, LoginPage, type MaybeLazyComponent, type OptionItem, type PageDefinition, type PatchAppliedMessage, type PatchBatchMessage, PreviewBanner, type PreviewBannerProps, type PreviewConfig, PreviewField, type PreviewFieldProps, type PreviewPatchOp, PreviewProvider, type PreviewReadyMessage, type PreviewRefreshMessage, type PreviewToAdminMessage, type ProgressWidgetConfig, type QuickActionsWidgetConfig, type ReactiveFieldResult, type ReactiveFieldState, type RecentItemsWidgetConfig, type RefreshCompleteMessage, ResetPasswordForm, ResetPasswordPage, type ResyncRequestMessage, RichTextEditor, type RichTextEditorProps, RichTextRenderer, type RichTextStyles, type ScopeContextValue, type ScopeOption, ScopePicker, type ScopePickerProps, ScopeProvider, type ScopeProviderProps, type SelectBlockMessage, SetupForm, type SetupFormValues, SetupPage, type SetupPageProps, type SetupStatus, StandalonePreviewField, type StatsWidgetConfig, type TableWidgetConfig, type TimelineWidgetConfig, type TipTapDoc, type TipTapNode, type TypedHooks, type UseCollectionPreviewOptions, type UseCollectionPreviewResult, type UseFieldOptionsOptions, type UseFieldOptionsResult, type UseReactiveFieldsOptions, type UseReactiveFieldsResult, type ValueWidgetConfig, type ViewDefinition, type ViewKind, type WidgetComponentProps, type WidgetConfig, type WidgetDefinition, type WidgetTypeRegistry, buildValidationSchema, buildZodFromIntrospection, configureField, createAdminAuthClient, createAdminClient, createFormSchema, createIconRenderer, createScopedFetch, createTypedHooks, field, getCountryCode, getFlagConfig, getFlagUrl, isAdminToPreviewMessage, isBlockContent, isComponentReference, isPreviewToAdminMessage, page, parsePreviewFieldPath, resolveIconElement, scrollFieldIntoView, selectAdmin, selectBasePath, selectClient, selectNavigate, useAdminStore, useAuthClient, useBlockScope, useBrand, useBrandSnapshotRef, useCollectionCreate, useCollectionDelete, useCollectionItem, useCollectionList, useCollectionPreview, useCollectionRestore, useCollectionRevertVersion, useCollectionUpdate, useCollectionVersions, useCurrentUser, useFieldOptions, useFocus, useFocusOptional, useGlobal, useGlobalRevertVersion, useGlobalUpdate, useGlobalVersions, useIsBlockFocused, useIsDesktop, useIsFieldFocused, useIsMobile, useMediaQuery, usePreviewContext, useReactiveFields, useResolveFieldPath, useScope, useScopeSafe, useScopedFetch, useSearchParamToggle, useServerWidgetData, useSetupStatus, useShallow, useSidebarSearchParam, view, widget };
+export { AcceptInviteForm, AcceptInvitePage, Admin, AdminLayout, AdminLayoutProvider, AdminLink, AdminProvider, type AdminProviderProps, AdminRouter, type AdminRouterProps, type AdminShellRailProps, type AdminSidebarBrandProps, type AdminSidebarNavItemProps, type AdminState, type AdminStore, type AdminToPreviewMessage, AnyQuestpieClient, type AnyWidgetConfig, type AppAdmin, AuthDefaultLogo, AuthGuard, AuthLayout, type AuthLayoutProps, AuthLoading, Badge, type BadgeProps, type BaseFieldProps, type BaseWidgetAdminMeta, type BaseWidgetConfig, type BlockCategory, type BlockClickedMessage, type BlockContent, type BlockNode, BlockRenderer, type BlockRendererProps as BlockRendererComponentProps, type BlockRendererProps$1 as BlockRendererProps, type BlockScopeContextValue, BlockScopeProvider, type BlockScopeProviderProps, type BrandLogoConfig, BrandLogoMark, type BrandLogoMarkProps, type BrandSnapshot, type BrandingConfig, type ChartWidgetConfig, CollectionFieldKeys, type CollectionFormViewProps, CollectionItem, type CollectionListViewProps, CollectionNames, type CommitMessage, type ComponentRegistry, ComponentRenderer, type ComponentRendererProps, type ComponentRendererRegistry, type CustomWidgetConfig, DashboardPage, EMPTY_BLOCK_CONTENT, type FieldClickedMessage, type FieldComponentProps, type FieldDefinition, type FieldInstance, type FieldValueEditedMessage, type FlagConfig, type FocusContextValue, type FocusFieldMessage, FocusProvider, type FocusProviderProps, type FocusState, ForgotPasswordForm, ForgotPasswordPage, type FormViewConfig, type FormViewDefinition, type FullResyncMessage, type GlobalFormViewProps, GlobalNames, type I18nContext, type I18nText, type IconComponent, IconifyIcon, type IconifyIconProps, type InferAdminCMS, type InitSnapshotMessage, InvitePage, type ListViewDefinition, LoginForm, LoginPage, type MaybeLazyComponent, type OptionItem, type PageDefinition, type PatchAppliedMessage, type PatchBatchMessage, PreviewBanner, type PreviewBannerProps, type PreviewConfig, PreviewField, type PreviewFieldProps, type PreviewPatchOp, PreviewProvider, type PreviewReadyMessage, type PreviewRefreshMessage, type PreviewToAdminMessage, type ProgressWidgetConfig, type QuickActionsWidgetConfig, type ReactiveFieldResult, type ReactiveFieldState, type RecentItemsWidgetConfig, type RefreshCompleteMessage, ResetPasswordForm, ResetPasswordPage, type ResyncRequestMessage, RichTextEditor, type RichTextEditorProps, RichTextRenderer, type RichTextStyles, type ScopeContextValue, type ScopeOption, ScopePicker, type ScopePickerProps, ScopeProvider, type ScopeProviderProps, type SelectBlockMessage, SetupForm, type SetupFormValues, SetupPage, type SetupPageProps, type SetupStatus, StandalonePreviewField, type StatsWidgetConfig, type TableWidgetConfig, type TimelineWidgetConfig, type TipTapDoc, type TipTapNode, type TypedHooks, type UseCollectionPreviewOptions, type UseCollectionPreviewResult, type UseFieldOptionsOptions, type UseFieldOptionsResult, type UseReactiveFieldsOptions, type UseReactiveFieldsResult, type ValueWidgetConfig, type ViewDefinition, type ViewKind, type WidgetComponentProps, type WidgetConfig, type WidgetDefinition, type WidgetTypeRegistry, buildValidationSchema, buildZodFromIntrospection, configureField, createAdminAuthClient, createAdminClient, createFormSchema, createIconRenderer, createScopedFetch, createTypedHooks, field, getCountryCode, getFlagConfig, getFlagUrl, isAdminToPreviewMessage, isBlockContent, isComponentReference, isPreviewToAdminMessage, page, parsePreviewFieldPath, resolveIconElement, scrollFieldIntoView, selectAdmin, selectBasePath, selectClient, selectNavigate, useAdminStore, useAuthClient, useBlockScope, useBrand, useBrandSnapshotRef, useCollectionCreate, useCollectionDelete, useCollectionItem, useCollectionList, useCollectionPreview, useCollectionRestore, useCollectionRevertVersion, useCollectionUpdate, useCollectionVersions, useCurrentUser, useFieldOptions, useFocus, useFocusOptional, useGlobal, useGlobalRevertVersion, useGlobalUpdate, useGlobalVersions, useIsBlockFocused, useIsDesktop, useIsFieldFocused, useIsMobile, useMediaQuery, usePreviewContext, useReactiveFields, useResolveFieldPath, useScope, useScopeSafe, useScopedFetch, useSearchParamToggle, useServerWidgetData, useSetupStatus, useShallow, useSidebarSearchParam, view, widget };

package/dist/components/rich-text/rich-text-renderer.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime20 from "react/jsx-runtime";
+import * as react_jsx_runtime19 from "react/jsx-runtime";
 
 //#region src/components/rich-text/rich-text-renderer.d.ts
 /**
@@ -98,6 +98,6 @@ declare function RichTextRenderer({
   content,
   styles: customStyles,
   className
-}: RichTextRendererProps): react_jsx_runtime20.JSX.Element | null;
+}: RichTextRendererProps): react_jsx_runtime19.JSX.Element | null;
 //#endregion
 export { RichTextRenderer, RichTextStyles, TipTapDoc, TipTapNode };