@questpie/admin 3.0.3 → 3.0.5

package/dist/client/hooks/use-saved-views.mjs

@@ -9,39 +9,49 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 * Note: This hook requires the `adminModule` to be used in your app setup.
 * If admin_saved_views collection is not available, returns empty array.
 */
-function useSavedViews(collectionName) {
-	const $ = c(9);
+function useSavedViews(collectionName, userId) {
+	const $ = c(11);
 	const client = useAdminStore(_temp);
 	let t0;
-	if ($[0] !== collectionName) {
-		t0 = ["admin_saved_views", collectionName];
+	if ($[0] !== collectionName || $[1] !== userId) {
+		t0 = [
+			"admin_saved_views",
+			collectionName,
+			userId
+		];
 		$[0] = collectionName;
-		$[1] = t0;
-	} else t0 = $[1];
+		$[1] = userId;
+		$[2] = t0;
+	} else t0 = $[2];
 	let t1;
-	if ($[2] !== client?.collections || $[3] !== collectionName) {
+	if ($[3] !== client?.collections || $[4] !== collectionName || $[5] !== userId) {
 		t1 = async () => {
 			const collections = client?.collections;
 			if (!collections?.admin_saved_views) return { docs: [] };
-			return { docs: (await collections.admin_saved_views.find({ where: { collectionName } }))?.docs ?? [] };
+			const where = userId ? {
+				collectionName,
+				userId
+			} : { collectionName };
+			return { docs: (await collections.admin_saved_views.find({ where }))?.docs ?? [] };
 		};
-		$[2] = client?.collections;
-		$[3] = collectionName;
-		$[4] = t1;
-	} else t1 = $[4];
+		$[3] = client?.collections;
+		$[4] = collectionName;
+		$[5] = userId;
+		$[6] = t1;
+	} else t1 = $[6];
 	const t2 = !!client;
 	let t3;
-	if ($[5] !== t0 || $[6] !== t1 || $[7] !== t2) {
+	if ($[7] !== t0 || $[8] !== t1 || $[9] !== t2) {
 		t3 = {
 			queryKey: t0,
 			queryFn: t1,
 			enabled: t2
 		};
-		$[5] = t0;
-		$[6] = t1;
-		$[7] = t2;
-		$[8] = t3;
-	} else t3 = $[8];
+		$[7] = t0;
+		$[8] = t1;
+		$[9] = t2;
+		$[10] = t3;
+	} else t3 = $[10];
 	return useQuery(t3);
 }
 /**
@@ -50,56 +60,62 @@ function useSavedViews(collectionName) {
 function _temp(s) {
 	return s.client;
 }
-function useSaveView(collectionName) {
-	const $ = c(9);
+function useSaveView(collectionName, userId) {
+	const $ = c(11);
 	const client = useAdminStore(_temp2);
 	const queryClient = useQueryClient();
 	let t0;
-	if ($[0] !== client?.collections || $[1] !== collectionName) {
+	if ($[0] !== client?.collections || $[1] !== collectionName || $[2] !== userId) {
 		t0 = async (data) => {
 			const collections = client?.collections;
 			if (!collections?.admin_saved_views) throw new Error("admin_saved_views collection not available. Make sure to use the adminModule in your app setup.");
 			return collections.admin_saved_views.create({
 				...data,
 				collectionName,
-				userId: data.userId || "anonymous",
+				userId: data.userId || userId || "anonymous",
 				isDefault: false
 			});
 		};
 		$[0] = client?.collections;
 		$[1] = collectionName;
-		$[2] = t0;
-	} else t0 = $[2];
+		$[2] = userId;
+		$[3] = t0;
+	} else t0 = $[3];
 	let t1;
-	if ($[3] !== collectionName || $[4] !== queryClient) {
+	if ($[4] !== collectionName || $[5] !== queryClient || $[6] !== userId) {
 		t1 = () => {
-			queryClient.invalidateQueries({ queryKey: ["admin_saved_views", collectionName] });
+			queryClient.invalidateQueries({ queryKey: [
+				"admin_saved_views",
+				collectionName,
+				userId
+			] });
 		};
-		$[3] = collectionName;
-		$[4] = queryClient;
-		$[5] = t1;
-	} else t1 = $[5];
+		$[4] = collectionName;
+		$[5] = queryClient;
+		$[6] = userId;
+		$[7] = t1;
+	} else t1 = $[7];
 	let t2;
-	if ($[6] !== t0 || $[7] !== t1) {
+	if ($[8] !== t0 || $[9] !== t1) {
 		t2 = {
 			mutationFn: t0,
 			onSuccess: t1
 		};
-		$[6] = t0;
-		$[7] = t1;
-		$[8] = t2;
-	} else t2 = $[8];
+		$[8] = t0;
+		$[9] = t1;
+		$[10] = t2;
+	} else t2 = $[10];
 	return useMutation(t2);
 }
 /**
-* Hook to update an existing view
+* Hook to delete a view
 */
 function _temp2(s) {
 	return s.client;
 }
-function useDeleteSavedView(collectionName) {
-	const $ = c(8);
-	const client = useAdminStore(_temp4);
+function useDeleteSavedView(collectionName, userId) {
+	const $ = c(9);
+	const client = useAdminStore(_temp3);
 	const queryClient = useQueryClient();
 	let t0;
 	if ($[0] !== client?.collections) {
@@ -112,27 +128,32 @@ function useDeleteSavedView(collectionName) {
 		$[1] = t0;
 	} else t0 = $[1];
 	let t1;
-	if ($[2] !== collectionName || $[3] !== queryClient) {
+	if ($[2] !== collectionName || $[3] !== queryClient || $[4] !== userId) {
 		t1 = () => {
-			queryClient.invalidateQueries({ queryKey: ["admin_saved_views", collectionName] });
+			queryClient.invalidateQueries({ queryKey: [
+				"admin_saved_views",
+				collectionName,
+				userId
+			] });
 		};
 		$[2] = collectionName;
 		$[3] = queryClient;
-		$[4] = t1;
-	} else t1 = $[4];
+		$[4] = userId;
+		$[5] = t1;
+	} else t1 = $[5];
 	let t2;
-	if ($[5] !== t0 || $[6] !== t1) {
+	if ($[6] !== t0 || $[7] !== t1) {
 		t2 = {
 			mutationFn: t0,
 			onSuccess: t1
 		};
-		$[5] = t0;
-		$[6] = t1;
-		$[7] = t2;
-	} else t2 = $[7];
+		$[6] = t0;
+		$[7] = t1;
+		$[8] = t2;
+	} else t2 = $[8];
 	return useMutation(t2);
 }
-function _temp4(s) {
+function _temp3(s) {
 	return s.client;
 }
 

package/dist/client/hooks/use-server-actions.mjs

@@ -1,6 +1,8 @@
 "use client";
 
+import { useTranslation } from "../i18n/hooks.mjs";
 import { selectAdmin, selectClient, useAdminStore } from "../runtime/provider.mjs";
+import { configureField } from "../builder/field/field.mjs";
 import { useCollectionSchema } from "./use-collection-schema.mjs";
 import { c } from "react/compiler-runtime";
 
@@ -12,10 +14,10 @@ import { c } from "react/compiler-runtime";
 * Server actions have their handlers stripped during serialization; this hook
 * creates client-side wrappers that execute actions via the server API.
 */
-function getActionErrorMessage(response) {
+function getActionErrorMessage(response, t) {
 	if (response.error) return response.error;
 	if (response.result?.toast?.message) return response.result.toast.message;
-	return "Action execution failed";
+	return t("action.executionFailed");
 }
 async function applyServerActionEffects(result, ctx) {
 	if (!result) return;
@@ -28,28 +30,32 @@ function buildServerFormFields(rawFields, fieldRegistry) {
 	if (!rawFields || !fieldRegistry) return {};
 	const result = {};
 	for (const [fieldName, fieldConfig] of Object.entries(rawFields)) {
-		const fc = fieldConfig;
-		if (fieldConfig && typeof fieldConfig === "object" && "name" in fieldConfig && "field" in fieldConfig && "~options" in fieldConfig) {
+		if (!fieldConfig || typeof fieldConfig !== "object") continue;
+		if ("name" in fieldConfig && "component" in fieldConfig && "~options" in fieldConfig) {
 			result[fieldName] = fieldConfig;
 			continue;
 		}
+		const fc = fieldConfig;
 		const fieldBuilder = fieldRegistry[typeof fc.type === "string" && fc.type.length > 0 ? fc.type : "text"] ?? fieldRegistry.text ?? null;
-		if (!fieldBuilder || typeof fieldBuilder.$options !== "function") continue;
-		const options = {
-			label: fc.label,
-			description: fc.description,
-			required: fc.required,
-			defaultValue: fc.default
-		};
-		if (fc.options && typeof fc.options === "object") Object.assign(options, fc.options);
-		result[fieldName] = fieldBuilder.$options(options);
+		if (!fieldBuilder) continue;
+		const options = { ...fc };
+		delete options.type;
+		delete options.options;
+		delete options.admin;
+		delete options.default;
+		if (fc.default !== void 0) options.defaultValue = fc.default;
+		else if (fc.defaultValue !== void 0) options.defaultValue = fc.defaultValue;
+		if (Array.isArray(fc.options)) options.options = fc.options;
+		else if (fc.options && typeof fc.options === "object") Object.assign(options, fc.options);
+		if (fc.admin && typeof fc.admin === "object") Object.assign(options, fc.admin);
+		result[fieldName] = configureField(fieldBuilder, options);
 	}
 	return result;
 }
 /**
 * Map a server action definition (from collection schema) to a client ActionDefinition
 */
-function mapServerAction(serverAction, collection, fieldRegistry, client) {
+function mapServerAction(serverAction, collection, fieldRegistry, client, locale, t) {
 	const action = {
 		id: serverAction.id,
 		label: serverAction.label,
@@ -86,7 +92,7 @@ function mapServerAction(serverAction, collection, fieldRegistry, client) {
 				width: form.width,
 				onSubmit: async (data, ctx) => {
 					const routes = client?.routes;
-					if (!routes?.executeAction) throw new Error("executeAction route is not available");
+					if (!routes?.executeAction) throw new Error(t("error.serverActionFailed"));
 					const itemId = ctx.item && !Array.isArray(ctx.item) ? ctx.item.id : void 0;
 					const idsFromItems = Array.isArray(ctx.items) ? ctx.items.map((it) => it?.id).filter(Boolean) : [];
 					const idsFromItemArray = Array.isArray(ctx.item) ? ctx.item.map((it) => it?.id).filter(Boolean) : [];
@@ -96,9 +102,10 @@ function mapServerAction(serverAction, collection, fieldRegistry, client) {
 						actionId: serverAction.id,
 						itemId,
 						itemIds,
-						data
+						data,
+						locale
 					});
-					if (!response.success || response.result?.type === "error") throw new Error(getActionErrorMessage(response));
+					if (!response.success || response.result?.type === "error") throw new Error(getActionErrorMessage(response, t));
 					await applyServerActionEffects(response.result, ctx);
 				}
 			}
@@ -117,48 +124,60 @@ function mapServerAction(serverAction, collection, fieldRegistry, client) {
 * ```
 */
 function useServerActions(t0) {
-	const $ = c(9);
-	const { collection } = t0;
+	const $ = c(13);
+	const { collection, schema: schemaOverride } = t0;
 	const admin = useAdminStore(selectAdmin);
 	const client = useAdminStore(selectClient);
-	const { data: schema, isPending } = useCollectionSchema(collection);
+	const { t, locale } = useTranslation();
+	const t1 = !schemaOverride;
+	let t2;
+	if ($[0] !== t1) {
+		t2 = { enabled: t1 };
+		$[0] = t1;
+		$[1] = t2;
+	} else t2 = $[1];
+	const { data: queriedSchema, isPending: isSchemaPending } = useCollectionSchema(collection, t2);
+	const schema = schemaOverride ?? queriedSchema;
+	const isPending = schemaOverride ? false : isSchemaPending;
 	schema?.admin?.actions;
-	let t1;
+	let t3;
 	bb0: {
 		const actionsConfig = schema?.admin?.actions;
 		if (!actionsConfig?.custom?.length) {
-			let t2$2;
-			if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-				t2$2 = [];
-				$[0] = t2$2;
-			} else t2$2 = $[0];
-			t1 = t2$2;
+			let t4$2;
+			if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+				t4$2 = [];
+				$[2] = t4$2;
+			} else t4$2 = $[2];
+			t3 = t4$2;
 			break bb0;
 		}
-		let t2$1;
-		if ($[1] !== actionsConfig.custom || $[2] !== admin || $[3] !== client || $[4] !== collection) {
+		let t4$1;
+		if ($[3] !== actionsConfig.custom || $[4] !== admin || $[5] !== client || $[6] !== collection || $[7] !== locale || $[8] !== t) {
 			const fieldRegistry = admin?.getFields?.() ?? null;
-			t2$1 = actionsConfig.custom.map((serverAction) => mapServerAction(serverAction, collection, fieldRegistry, client));
-			$[1] = actionsConfig.custom;
-			$[2] = admin;
-			$[3] = client;
-			$[4] = collection;
-			$[5] = t2$1;
-		} else t2$1 = $[5];
-		t1 = t2$1;
+			t4$1 = actionsConfig.custom.map((serverAction) => mapServerAction(serverAction, collection, fieldRegistry, client, locale, t));
+			$[3] = actionsConfig.custom;
+			$[4] = admin;
+			$[5] = client;
+			$[6] = collection;
+			$[7] = locale;
+			$[8] = t;
+			$[9] = t4$1;
+		} else t4$1 = $[9];
+		t3 = t4$1;
 	}
-	const serverActions = t1;
-	let t2;
-	if ($[6] !== isPending || $[7] !== serverActions) {
-		t2 = {
+	const serverActions = t3;
+	let t4;
+	if ($[10] !== isPending || $[11] !== serverActions) {
+		t4 = {
 			serverActions,
 			isLoading: isPending
 		};
-		$[6] = isPending;
-		$[7] = serverActions;
-		$[8] = t2;
-	} else t2 = $[8];
-	return t2;
+		$[10] = isPending;
+		$[11] = serverActions;
+		$[12] = t4;
+	} else t4 = $[12];
+	return t4;
 }
 /**
 * Merge server actions with local actions config.
@@ -168,11 +187,15 @@ function mergeServerActions(localActions, serverActions) {
 	if (!serverActions.length) return localActions;
 	const headerActions = [...localActions.header?.primary ?? []];
 	const headerSecondary = [...localActions.header?.secondary ?? []];
+	const rowActions = [...localActions.row ?? []];
 	const bulkActions = [...localActions.bulk ?? []];
 	for (const action of serverActions) switch (action.scope) {
 		case "bulk":
 			bulkActions.push(action);
 			break;
+		case "row":
+			rowActions.push(action);
+			break;
 		case "header":
 			headerActions.push(action);
 			break;
@@ -183,6 +206,7 @@ function mergeServerActions(localActions, serverActions) {
 			primary: headerActions,
 			secondary: headerSecondary
 		},
+		row: rowActions,
 		bulk: bulkActions
 	};
 }