@questpie/admin 2.0.0 → 3.0.1

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

@@ -1,16 +1,14 @@
 import { AdminInput } from "../../builder/admin.mjs";
+import { AnyQuestpieClient } from "../../builder/index.mjs";
 import { AdminLayoutSharedProps } from "./admin-layout.mjs";
+import * as React from "react";
 import { QueryClient } from "@tanstack/react-query";
-import { QuestpieClient } from "questpie/client";
-import * as React$1 from "react";
-import { Questpie } from "questpie";
 
 //#region src/client/views/layout/admin-layout-provider.d.ts
 
-interface AdminLayoutProviderProps<TApp extends Questpie<any> = Questpie<any>> extends AdminLayoutSharedProps {
+interface AdminLayoutProviderProps extends AdminLayoutSharedProps {
   /**
-   * Admin configuration - pass your AdminBuilder directly.
-   * Can also accept an Admin instance for backward compatibility.
+   * Admin configuration - pass plain AdminState or Admin instance.
    *
    * @example
    * ```tsx
@@ -25,7 +23,7 @@ interface AdminLayoutProviderProps<TApp extends Questpie<any> = Questpie<any>> e
   /**
    * API client for data fetching
    */
-  client: QuestpieClient<TApp>;
+  client: AnyQuestpieClient;
   /**
    * Auth client for authentication (created via createAdminAuthClient)
    */
@@ -54,26 +52,26 @@ interface AdminLayoutProviderProps<TApp extends Questpie<any> = Questpie<any>> e
   /**
    * Custom loading component while checking authentication.
    */
-  authLoadingFallback?: React$1.ReactNode;
+  authLoadingFallback?: React.ReactNode;
   /**
    * Custom unauthorized component (instead of redirecting to login).
    */
-  authUnauthorizedFallback?: React$1.ReactNode;
+  authUnauthorizedFallback?: React.ReactNode;
   /**
    * Use server-side translations (fetched via getAdminTranslations RPC).
    * When true, translations are fetched from the server configured via
-   * .adminLocale() and .messages() on QuestpieBuilder.
+   * .adminLocale() and config translations.
    *
    * @default false (for backwards compatibility)
    *
    * @example
    * ```tsx
    * // Server configures locales and messages
-   * const cms = q()
-   *   .use(adminModule)
-   *   .adminLocale({ locales: ["en", "sk"], defaultLocale: "en" })
-   *   .messages({ sk: { "common.save": "Ulozit" } })
-   *   .build();
+   * const app = runtimeConfig({
+   *   modules: [adminModule],
+   *   adminLocale: { locales: ["en", "sk"], defaultLocale: "en" },
+   *   messages: { sk: { "common.save": "Ulozit" } },
+   * });
    *
    * // Client fetches from server
    * <AdminLayoutProvider
@@ -90,7 +88,7 @@ interface AdminLayoutProviderProps<TApp extends Questpie<any> = Questpie<any>> e
    * Fallback element to show while loading server translations.
    * Only used when useServerTranslations is true.
    */
-  translationsFallback?: React$1.ReactNode;
+  translationsFallback?: React.ReactNode;
   /**
    * Initial UI locale (admin interface language)
    * If not provided, reads from cookie or uses default from admin config
@@ -101,7 +99,7 @@ interface AdminLayoutProviderProps<TApp extends Questpie<any> = Questpie<any>> e
    * - Next.js: {children} from layout props
    * - TanStack Router: <Outlet />
    */
-  children: React$1.ReactNode;
+  children: React.ReactNode;
 }
 /**
  * AdminLayoutProvider Component
@@ -109,7 +107,7 @@ interface AdminLayoutProviderProps<TApp extends Questpie<any> = Questpie<any>> e
  * Universal wrapper for admin layout that works with any router.
  * Handles all the provider setup and renders children inside the layout.
  */
-declare function AdminLayoutProvider<TApp extends Questpie<any>>({
+declare function AdminLayoutProvider({
   admin: adminInput,
   client,
   authClient,
@@ -134,7 +132,6 @@ declare function AdminLayoutProvider<TApp extends Questpie<any>>({
   translationsFallback,
   initialUiLocale,
   children
-}: AdminLayoutProviderProps<TApp>): React$1.ReactElement;
+}: AdminLayoutProviderProps): React.ReactElement;
 //#endregion
-export { AdminLayoutProvider, AdminLayoutProviderProps };
-//# sourceMappingURL=admin-layout-provider.d.mts.map
+export { AdminLayoutProvider };

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

@@ -1,14 +1,43 @@
 import { Admin } from "../../builder/admin.mjs";
+import { getAdminLocalesQueryOptions, getAdminTranslationsQueryOptions, getUiLocaleFromCookie } from "../../runtime/translations-provider.mjs";
 import { AdminProvider } from "../../runtime/provider.mjs";
+import { getAdminConfigQueryOptions } from "../../hooks/use-admin-config.mjs";
 import { AdminLayout } from "./admin-layout.mjs";
 import { AuthGuard } from "../../components/auth/auth-guard.mjs";
+import { c } from "react/compiler-runtime";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/client/views/layout/admin-layout-provider.tsx
+/** Debounced 401 redirect - prevents multiple redirects from concurrent failures */
+let sessionExpiredRedirectPending = false;
+function handleSessionExpiredError(error) {
+	if (sessionExpiredRedirectPending) return;
+	if ((error != null && typeof error === "object" && "status" in error ? error.status : void 0) !== 401) return;
+	if (typeof window !== "undefined") {
+		const path = window.location.pathname;
+		if (DEFAULT_PUBLIC_PATHS.some((p) => path.endsWith(p))) return;
+		sessionExpiredRedirectPending = true;
+		const returnUrl = encodeURIComponent(window.location.pathname + window.location.search);
+		window.location.href = `${path.replace(/\/[^/]*$/, "")}/login?returnUrl=${returnUrl}`;
+	}
+}
 let cachedQueryClient;
 function getDefaultQueryClient() {
-	if (!cachedQueryClient) cachedQueryClient = new QueryClient({ defaultOptions: { queries: { staleTime: 60 * 1e3 } } });
+	if (!cachedQueryClient) {
+		cachedQueryClient = new QueryClient({ defaultOptions: {
+			queries: {
+				staleTime: 60 * 1e3,
+				refetchOnWindowFocus: false,
+				retry: (failureCount, error) => {
+					if ((error != null && typeof error === "object" && "status" in error ? error.status : void 0) === 401) return false;
+					return failureCount < 3;
+				}
+			},
+			mutations: { onError: handleSessionExpiredError }
+		} });
+		cachedQueryClient.getQueryCache().config.onError = handleSessionExpiredError;
+	}
 	return cachedQueryClient;
 }
 /**
@@ -41,39 +70,94 @@ function isPublicPath(currentPath, basePath, publicPaths) {
 * Universal wrapper for admin layout that works with any router.
 * Handles all the provider setup and renders children inside the layout.
 */
-function AdminLayoutProvider({ admin: adminInput, client, authClient, queryClient, LinkComponent, activeRoute, basePath = "/admin", header, footer, sidebarProps, theme, setTheme, showThemeToggle, toasterProps, className, enableAuthGuard, publicPaths = DEFAULT_PUBLIC_PATHS, requiredRole = "admin", authLoadingFallback, authUnauthorizedFallback, useServerTranslations, translationsFallback, initialUiLocale, children }) {
-	const qc = queryClient ?? getDefaultQueryClient();
-	const admin = Admin.normalize(adminInput);
+function AdminLayoutProvider(t0) {
+	const $ = c(38);
+	const { admin: adminInput, client, authClient, queryClient, LinkComponent, activeRoute, basePath: t1, header, footer, sidebarProps, theme, setTheme, showThemeToggle, toasterProps, className, enableAuthGuard, publicPaths: t2, requiredRole: t3, authLoadingFallback, authUnauthorizedFallback, useServerTranslations, translationsFallback, initialUiLocale, children } = t0;
+	const basePath = t1 === void 0 ? "/admin" : t1;
+	const publicPaths = t2 === void 0 ? DEFAULT_PUBLIC_PATHS : t2;
+	const requiredRole = t3 === void 0 ? "admin" : t3;
+	let qc;
+	if ($[0] !== client || $[1] !== initialUiLocale || $[2] !== queryClient || $[3] !== useServerTranslations) {
+		qc = queryClient ?? getDefaultQueryClient();
+		if (client?.routes) {
+			qc.prefetchQuery(getAdminConfigQueryOptions(client));
+			if (useServerTranslations) {
+				const locale = initialUiLocale ?? getUiLocaleFromCookie() ?? "en";
+				qc.prefetchQuery(getAdminLocalesQueryOptions(client));
+				qc.prefetchQuery(getAdminTranslationsQueryOptions(client, locale));
+			}
+		}
+		$[0] = client;
+		$[1] = initialUiLocale;
+		$[2] = queryClient;
+		$[3] = useServerTranslations;
+		$[4] = qc;
+	} else qc = $[4];
+	let t4;
+	if ($[5] !== adminInput) {
+		t4 = Admin.normalize(adminInput);
+		$[5] = adminInput;
+		$[6] = t4;
+	} else t4 = $[6];
+	const admin = t4;
 	const shouldUseAuthGuard = enableAuthGuard ?? authClient != null;
 	const isCurrentPathPublic = isPublicPath(activeRoute ?? (typeof window !== "undefined" ? window.location.pathname : void 0), basePath, publicPaths);
 	let innerContent;
 	if (isCurrentPathPublic) innerContent = children;
 	else {
-		const layoutContent = /* @__PURE__ */ jsx(AdminLayout, {
-			LinkComponent,
-			activeRoute,
-			basePath,
-			header,
-			footer,
-			sidebarProps,
-			theme,
-			setTheme,
-			showThemeToggle,
-			toasterProps,
-			className,
-			children
-		});
-		innerContent = shouldUseAuthGuard ? /* @__PURE__ */ jsx(AuthGuard, {
-			loginPath: `${basePath}/login`,
-			requiredRole,
-			loadingFallback: authLoadingFallback,
-			unauthorizedFallback: authUnauthorizedFallback,
-			children: layoutContent
-		}) : layoutContent;
+		let t5$1;
+		if ($[7] !== LinkComponent || $[8] !== activeRoute || $[9] !== basePath || $[10] !== children || $[11] !== className || $[12] !== footer || $[13] !== header || $[14] !== setTheme || $[15] !== showThemeToggle || $[16] !== sidebarProps || $[17] !== theme || $[18] !== toasterProps) {
+			t5$1 = /* @__PURE__ */ jsx(AdminLayout, {
+				LinkComponent,
+				activeRoute,
+				basePath,
+				header,
+				footer,
+				sidebarProps,
+				theme,
+				setTheme,
+				showThemeToggle,
+				toasterProps,
+				className,
+				children
+			});
+			$[7] = LinkComponent;
+			$[8] = activeRoute;
+			$[9] = basePath;
+			$[10] = children;
+			$[11] = className;
+			$[12] = footer;
+			$[13] = header;
+			$[14] = setTheme;
+			$[15] = showThemeToggle;
+			$[16] = sidebarProps;
+			$[17] = theme;
+			$[18] = toasterProps;
+			$[19] = t5$1;
+		} else t5$1 = $[19];
+		const layoutContent = t5$1;
+		let t6$1;
+		if ($[20] !== authLoadingFallback || $[21] !== authUnauthorizedFallback || $[22] !== basePath || $[23] !== layoutContent || $[24] !== requiredRole || $[25] !== shouldUseAuthGuard) {
+			t6$1 = shouldUseAuthGuard ? /* @__PURE__ */ jsx(AuthGuard, {
+				loginPath: `${basePath}/login`,
+				requiredRole,
+				loadingFallback: authLoadingFallback,
+				unauthorizedFallback: authUnauthorizedFallback,
+				children: layoutContent
+			}) : layoutContent;
+			$[20] = authLoadingFallback;
+			$[21] = authUnauthorizedFallback;
+			$[22] = basePath;
+			$[23] = layoutContent;
+			$[24] = requiredRole;
+			$[25] = shouldUseAuthGuard;
+			$[26] = t6$1;
+		} else t6$1 = $[26];
+		innerContent = t6$1;
 	}
-	return /* @__PURE__ */ jsx(QueryClientProvider, {
-		client: qc,
-		children: /* @__PURE__ */ jsx(AdminProvider, {
+	let t5;
+	if ($[27] !== admin || $[28] !== authClient || $[29] !== client || $[30] !== initialUiLocale || $[31] !== innerContent || $[32] !== translationsFallback || $[33] !== useServerTranslations) {
+		t5 = /* @__PURE__ */ jsx(AdminProvider, {
 			admin,
 			client,
 			authClient,
@@ -81,10 +165,29 @@ function AdminLayoutProvider({ admin: adminInput, client, authClient, queryClien
 			translationsFallback,
 			initialUiLocale,
 			children: innerContent
-		})
-	});
+		});
+		$[27] = admin;
+		$[28] = authClient;
+		$[29] = client;
+		$[30] = initialUiLocale;
+		$[31] = innerContent;
+		$[32] = translationsFallback;
+		$[33] = useServerTranslations;
+		$[34] = t5;
+	} else t5 = $[34];
+	const content = t5;
+	let t6;
+	if ($[35] !== content || $[36] !== qc) {
+		t6 = /* @__PURE__ */ jsx(QueryClientProvider, {
+			client: qc,
+			children: content
+		});
+		$[35] = content;
+		$[36] = qc;
+		$[37] = t6;
+	} else t6 = $[37];
+	return t6;
 }
 
 //#endregion
-export { AdminLayoutProvider };
-//# sourceMappingURL=admin-layout-provider.mjs.map
+export { AdminLayoutProvider };

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

@@ -1,7 +1,6 @@
 import { AdminToasterProps } from "../../components/ui/sonner.mjs";
-import { NavigationGroup } from "../../runtime/routes.mjs";
 import { AdminSidebarProps } from "./admin-sidebar.mjs";
-import * as React$1 from "react";
+import * as React from "react";
 
 //#region src/client/views/layout/admin-layout.d.ts
 
@@ -11,10 +10,10 @@ import * as React$1 from "react";
 type AdminTheme = "light" | "dark" | "system";
 /**
  * Layout mode for content area width
- * - default: max-w-6xl (forms, settings)
- * - wide: max-w-7xl (tables, cards)
- * - full: 100% with padding (kanban, calendar)
- * - immersive: 100% no padding (puck editor)
+ * - default: max-w-5xl centered (settings, narrow forms)
+ * - wide: full width with padding (tables, forms, dashboards) — the default
+ * - full: full width reduced padding (kanban, calendar)
+ * - immersive: full width no padding (block editor, canvas)
  */
 type LayoutMode = "default" | "wide" | "full" | "immersive";
 /**
@@ -38,15 +37,15 @@ interface AdminLayoutSharedProps {
   /**
    * Header content
    */
-  header?: React$1.ReactNode;
+  header?: React.ReactNode;
   /**
    * Footer content
    */
-  footer?: React$1.ReactNode;
+  footer?: React.ReactNode;
   /**
    * Additional sidebar props
    */
-  sidebarProps?: Partial<Omit<AdminSidebarProps, "navigation" | "LinkComponent">>;
+  sidebarProps?: Partial<Omit<AdminSidebarProps, "LinkComponent">>;
   /**
    * Current theme.
    * Pass from your app's theme context.
@@ -73,16 +72,11 @@ interface AdminLayoutSharedProps {
   className?: string;
   /**
    * Layout mode for content area width
-   * @default "default"
+   * @default "wide"
    */
   layoutMode?: LayoutMode;
 }
 interface AdminLayoutProps extends AdminLayoutSharedProps {
-  /**
-   * Navigation groups for sidebar.
-   * If not provided, reads from AdminProvider context.
-   */
-  navigation?: NavigationGroup[];
   /**
    * Brand name for sidebar.
    * If not provided, reads from AdminProvider context.
@@ -95,7 +89,7 @@ interface AdminLayoutProps extends AdminLayoutSharedProps {
   /**
    * Main content to render
    */
-  children: React$1.ReactNode;
+  children: React.ReactNode;
   /**
    * Navigation function (for search/quick actions)
    */
@@ -104,31 +98,20 @@ interface AdminLayoutProps extends AdminLayoutSharedProps {
 /**
  * AdminLayout Component
  *
- * When used inside AdminProvider, navigation and brandName are automatically
+ * When used inside AdminProvider, brandName is automatically
  * read from context if not provided as props.
+ * Navigation is driven by server-side sidebar configuration.
  *
  * @example
  * ```tsx
- * // With AdminProvider (automatic)
  * <AdminProvider admin={admin} client={client}>
  *   <AdminLayout LinkComponent={Link} activeRoute="/admin/posts">
  *     <Outlet />
  *   </AdminLayout>
  * </AdminProvider>
- *
- * // Without AdminProvider (manual)
- * <AdminLayout
- *   navigation={buildNavigation(admin)}
- *   LinkComponent={Link}
- *   activeRoute="/admin/posts"
- *   brandName="My CMS"
- * >
- *   <Outlet />
- * </AdminLayout>
  * ```
  */
 declare function AdminLayout({
-  navigation: navigationProp,
   LinkComponent,
   activeRoute,
   basePath,
@@ -145,7 +128,6 @@ declare function AdminLayout({
   showThemeToggle,
   toasterProps,
   layoutMode
-}: AdminLayoutProps): React$1.ReactElement;
+}: AdminLayoutProps): React.ReactElement;
 //#endregion
-export { AdminLayout, AdminLayoutProps, AdminLayoutSharedProps };
-//# sourceMappingURL=admin-layout.d.mts.map
+export { AdminLayout, AdminLayoutSharedProps };