@dyrected/admin 2.5.61 → 2.5.62

package/dist/components/ui/button.d.ts

@@ -2,7 +2,7 @@ import { VariantProps } from 'class-variance-authority';
 import * as React from "react";
 declare const buttonVariants: (props?: {
     variant?: "link" | "default" | "destructive" | "outline" | "secondary" | "ghost";
-    size?: "default" | "sm" | "lg" | "icon";
+    size?: "icon" | "default" | "sm" | "lg";
 } & import('class-variance-authority/types').ClassProp) => string;
 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement>, VariantProps<typeof buttonVariants> {
     asChild?: boolean;

package/dist/components/ui/command.d.ts

@@ -48,7 +48,7 @@ declare const CommandGroup: React.ForwardRefExoticComponent<Omit<{
     ref?: React.Ref<HTMLDivElement>;
 } & {
     asChild?: boolean;
-}, "key" | keyof React.HTMLAttributes<HTMLDivElement> | "asChild">, "value" | "heading"> & {
+}, "key" | keyof React.HTMLAttributes<HTMLDivElement> | "asChild">, "heading" | "value"> & {
     heading?: React.ReactNode;
     value?: string;
     forceMount?: boolean;

package/dist/index.mjs

@@ -3,7 +3,7 @@ import React, { Component, StrictMode, createContext, createElement, useCallback
 import { createRoot } from "react-dom/client";
 import { HashRouter, Link, MemoryRouter, Route, Routes, useLocation, useNavigate, useParams, useSearchParams } from "react-router-dom";
 import { QueryClient, QueryClientProvider, keepPreviousData, useInfiniteQuery, useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
-import { PREVIEW_TOKEN_PARAM, createClient } from "@dyrected/sdk";
+import { DyrectedError, PREVIEW_TOKEN_PARAM, createClient } from "@dyrected/sdk";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { AlertCircle, AlertTriangle, AlignCenter, AlignLeft, AlignRight, Archive, ArrowDown, ArrowLeft, ArrowRight, ArrowUp, ArrowUpDown, ArrowUpRight, Bold, Braces, Calendar, Check, CheckCircle, CheckCircle2, ChevronDown, ChevronLeft, ChevronLeftIcon, ChevronRight, ChevronRightIcon, ChevronUp, ChevronsUpDown, Circle, Clock, Clock3, Code, Copy, Database, Download, ExternalLink, Eye, EyeOff, FileDown, FileIcon, FileText, FileUp, Filter, Globe, GripVertical, Heading1, Heading2, Heading3, Heading4, Heading5, Heading6, History, Home, Image as Image$1, Info, Italic, KeyRound, Layers, LayoutDashboard, LayoutGrid, Library, Link as Link$1, List, ListOrdered, Loader2, Lock, LogOut, Mail, Menu, Monitor, Moon, MoreHorizontal, MousePointer2, PanelLeftClose, PanelLeftOpen, Pencil, Play, Plus, Quote, RotateCcw, Save, Scissors, Search, Settings, Settings2, Share2, Shield, Smartphone, Sparkles, Star, Strikethrough, Sun, Table, Trash2, Underline, Undo2, Upload, UploadCloud, Users, Video, Volume2, Workflow, X, XCircle, icons } from "lucide-react";
 import { clsx } from "clsx";
@@ -67,6 +67,35 @@ function useDyrected() {
 }
 //#endregion
 //#region src/providers/dyrected-provider.tsx
+function resolveBlock(block, registry) {
+	return {
+		...block,
+		fields: block.fields.map((field) => resolveFieldBlocks(field, registry))
+	};
+}
+function resolveFieldBlocks(field, registry) {
+	const next = { ...field };
+	if (next.fields) next.fields = next.fields.map((child) => resolveFieldBlocks(child, registry));
+	if (next.type === "blocks" && next.blockReferences?.length) {
+		next.blocks = next.blockReferences.map((slug) => registry.get(slug)).filter((block) => !!block);
+		next.blocks = next.blocks.map((block) => resolveBlock(block, registry));
+	} else if (next.blocks) next.blocks = next.blocks.map((block) => resolveBlock(block, registry));
+	return next;
+}
+function resolveSchemas(schema) {
+	const registry = new Map((schema.blocks ?? []).map((block) => [block.slug, block]));
+	return {
+		...schema,
+		collections: schema.collections.map((collection) => ({
+			...collection,
+			fields: collection.fields.map((field) => resolveFieldBlocks(field, registry))
+		})),
+		globals: schema.globals.map((global) => ({
+			...global,
+			fields: global.fields.map((field) => resolveFieldBlocks(field, registry))
+		}))
+	};
+}
 function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBaseUrl, siteId: initialSiteId, initialToken, defaultTechStack, components }) {
 	const [baseUrl, setBaseUrl] = useState(() => initialBaseUrl || (typeof window !== "undefined" ? localStorage.getItem("dyrected_url") : null) || "");
 	const [apiKey, setApiKey] = useState(() => initialApiKey || (typeof window !== "undefined" ? localStorage.getItem("dyrected_key") : null) || void 0);
@@ -94,7 +123,8 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 		};
 		client.getSchemas().then((nextSchemas) => {
 			if (cancelled) return;
-			setSchemas((prev) => prev === nextSchemas ? prev : nextSchemas);
+			const resolved = resolveSchemas(nextSchemas);
+			setSchemas((prev) => prev === resolved ? prev : resolved);
 		}, (err) => {
 			if (cancelled) return;
 			console.error("Failed to fetch schemas:", err);
@@ -108,6 +138,16 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 	useEffect(() => {
 		if (initialToken && client) client.setToken(initialToken);
 	}, [initialToken, client]);
+	const clearPersistedAuthState = useCallback((nextClient) => {
+		localStorage.removeItem("dyrected_token");
+		localStorage.removeItem("dyrected_admin_auth_collection");
+		(nextClient ?? client)?.clearToken();
+		setAuthCollectionSlug(null);
+		setUser(null);
+	}, [client]);
+	const shouldClearStoredAuth = useCallback((error) => {
+		return error instanceof DyrectedError && (error.statusCode === 401 || error.statusCode === 404);
+	}, []);
 	const setAuth = useCallback((newUrl, newKey, newSiteId) => {
 		localStorage.setItem("dyrected_url", newUrl);
 		localStorage.setItem("dyrected_key", newKey);
@@ -119,11 +159,7 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 	}, []);
 	const setToken = useCallback((token, collectionSlug) => {
 		if (!token) {
-			localStorage.removeItem("dyrected_token");
-			localStorage.removeItem("dyrected_admin_auth_collection");
-			if (client) client.clearToken();
-			setAuthCollectionSlug(null);
-			setUser(null);
+			clearPersistedAuthState(client);
 			return;
 		}
 		const resolvedCollectionSlug = collectionSlug || authCollectionSlug || getAdminCollectionSlug(schemas);
@@ -134,12 +170,20 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 		}
 		if (client) {
 			client.setToken(token);
-			if (resolvedCollectionSlug) client.collection(resolvedCollectionSlug).me().then((nextUser) => setUser(nextUser), () => setUser(null));
+			if (resolvedCollectionSlug) client.collection(resolvedCollectionSlug).me().then((nextUser) => setUser(nextUser), (error) => {
+				if (shouldClearStoredAuth(error)) {
+					clearPersistedAuthState(client);
+					return;
+				}
+				setUser(null);
+			});
 		}
 	}, [
 		authCollectionSlug,
+		clearPersistedAuthState,
 		client,
-		schemas
+		schemas,
+		shouldClearStoredAuth
 	]);
 	useEffect(() => {
 		if (initialToken || !client || !schemas || activeUser) return;
@@ -147,21 +191,39 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 		const resolvedCollectionSlug = authCollectionSlug || getAdminCollectionSlug(schemas);
 		if (!token || !resolvedCollectionSlug) return;
 		client.setToken(token);
-		client.collection(resolvedCollectionSlug).me().then((nextUser) => setUser(nextUser), () => setUser(null));
+		client.collection(resolvedCollectionSlug).me().then((nextUser) => setUser(nextUser), (error) => {
+			if (shouldClearStoredAuth(error)) {
+				clearPersistedAuthState(client);
+				return;
+			}
+			setUser(null);
+		});
 	}, [
 		activeUser,
 		authCollectionSlug,
+		clearPersistedAuthState,
 		client,
 		initialToken,
-		schemas
+		schemas,
+		shouldClearStoredAuth
 	]);
 	const logout = useCallback(() => {
-		localStorage.removeItem("dyrected_token");
-		localStorage.removeItem("dyrected_admin_auth_collection");
-		if (client) client.clearToken();
-		setAuthCollectionSlug(null);
-		setUser(null);
-	}, [client]);
+		(async () => {
+			const resolvedCollectionSlug = authCollectionSlug || getAdminCollectionSlug(schemas);
+			try {
+				if (client && resolvedCollectionSlug) await client.collection(resolvedCollectionSlug).logout();
+			} catch (error) {
+				console.warn("Failed to revoke admin session during logout:", error);
+			} finally {
+				clearPersistedAuthState(client);
+			}
+		})();
+	}, [
+		authCollectionSlug,
+		clearPersistedAuthState,
+		client,
+		schemas
+	]);
 	return /* @__PURE__ */ jsx(DyrectedContext.Provider, {
 		value: {
 			client,
@@ -976,7 +1038,7 @@ function isNewerVersion(latest, current) {
 	return false;
 }
 function useUpdateCheck() {
-	const currentVersion = "2.5.60";
+	const currentVersion = "2.5.62";
 	const [updateInfo, setUpdateInfo] = useState(() => {
 		if (typeof window === "undefined") return null;
 		const cacheKey = "dyrected_latest_release";
@@ -1202,7 +1264,7 @@ function getStatusLabel(doc) {
 }
 function Dashboard() {
 	const { client, components, user } = useDyrected();
-	const currentVersion = "2.5.60";
+	const currentVersion = "2.5.62";
 	const [latestVersion, setLatestVersion] = useState(() => {
 		if (typeof window === "undefined") return null;
 		return localStorage.getItem("dyrected_latest_release");
@@ -11815,10 +11877,10 @@ function LivePreviewPane({ previewUrl, data, mode = "postMessage", collectionSlu
 	const [tokenSrc, setTokenSrc] = useState(null);
 	const [tokenError, setTokenError] = useState(null);
 	const lastDataKeyRef = useRef(null);
+	const dataKey = safeStringify(data);
 	useEffect(() => {
 		if (mode !== "token" || !client || !collectionSlug) return;
-		const key = safeStringify(data);
-		if (key === lastDataKeyRef.current) return;
+		if (dataKey === lastDataKeyRef.current) return;
 		let cancelled = false;
 		const timer = setTimeout(async () => {
 			try {
@@ -11828,7 +11890,7 @@ function LivePreviewPane({ previewUrl, data, mode = "postMessage", collectionSlu
 					data
 				});
 				if (cancelled) return;
-				lastDataKeyRef.current = key;
+				lastDataKeyRef.current = dataKey;
 				setTokenSrc(withPreviewToken(previewUrl, token));
 				setTokenError(null);
 			} catch (err) {
@@ -11846,7 +11908,7 @@ function LivePreviewPane({ previewUrl, data, mode = "postMessage", collectionSlu
 		collectionSlug,
 		documentId,
 		previewUrl,
-		data
+		dataKey
 	]);
 	const iframeSrc = mode === "token" ? tokenSrc ?? previewUrl : previewUrl;
 	useEffect(() => {
@@ -14672,7 +14734,7 @@ function SetupPromptUI({ config }) {
 		setCopied(true);
 		window.setTimeout(() => setCopied(false), 1800);
 	}
-	const currentVersion = "2.5.60";
+	const currentVersion = "2.5.62";
 	const [latestVersion, setLatestVersion] = useState(() => {
 		if (typeof window === "undefined") return null;
 		return localStorage.getItem("dyrected_latest_release");

package/dist/providers/dyrected-provider.d.ts

@@ -7,6 +7,6 @@ export interface DyrectedProviderProps {
     siteId?: string;
     initialToken?: string;
     defaultTechStack?: string;
-    components?: DyrectedContextType['components'];
+    components?: DyrectedContextType["components"];
 }
-export declare function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBaseUrl, siteId: initialSiteId, initialToken, defaultTechStack, components }: DyrectedProviderProps): React.JSX.Element;
+export declare function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBaseUrl, siteId: initialSiteId, initialToken, defaultTechStack, components, }: DyrectedProviderProps): React.JSX.Element;

package/dist/types/admin-components.d.ts

@@ -1,8 +1,9 @@
 import { ComponentType } from 'react';
-import { AdminConfig, CollectionConfig, GlobalConfig, PublicAdminAuthConfig } from '@dyrected/core';
+import { AdminConfig, Block, CollectionConfig, GlobalConfig, PublicAdminAuthConfig } from '@dyrected/core';
 import { DyrectedClient, PaginatedResult } from '@dyrected/sdk';
 /** All collection and global schemas returned by the backend, plus optional admin config. */
 export interface AdminSchemas {
+    blocks?: Block[];
     collections: CollectionConfig[];
     globals: GlobalConfig[];
     admin?: AdminConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/admin",
-  "version": "2.5.61",
+  "version": "2.5.62",
   "type": "module",
   "files": [
     "dist"
@@ -64,9 +64,9 @@
     "tailwind-merge": "^3.5.0",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.25.76",
-    "@dyrected/core": "^2.5.61",
-    "@dyrected/knowledge": "^0.2.13",
-    "@dyrected/sdk": "^2.5.61"
+    "@dyrected/core": "^2.5.62",
+    "@dyrected/knowledge": "^0.2.15",
+    "@dyrected/sdk": "^2.5.62"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.0.0",