@questpie/admin 3.2.7 → 3.4.0

package/dist/client/views/collection/auto-form-fields.mjs

@@ -385,20 +385,21 @@ function extractFieldNamesFromFieldItems(fieldItems) {
 * Supports recursive tabs/sections nesting and auto-generates
 * field list when no form config is defined.
 */
-function AutoFormFields({ app: _cms, collection, mode = "collection", config, registry, fieldResolver, fieldPrefix, allCollectionsConfig }) {
+function AutoFormFields({ app: _cms, collection, mode = "collection", config, registry, fieldResolver, fieldPrefix, allCollectionsConfig, resolvedFields: providedFields, schema: providedSchema }) {
 	const isActionForm = collection === "__action__";
+	const shouldFetchSchema = !providedFields || !providedSchema;
 	const collectionResult = useCollectionFields(mode === "collection" ? collection : "", {
 		fallbackFields: mode === "collection" ? config?.fields : void 0,
-		schemaQueryOptions: { enabled: mode === "collection" && !isActionForm }
+		schemaQueryOptions: { enabled: mode === "collection" && !isActionForm && shouldFetchSchema }
 	});
-	const globalResult = useGlobalFields(mode === "global" ? collection : "", { schemaQueryOptions: { enabled: mode === "global" } });
+	const globalResult = useGlobalFields(mode === "global" ? collection : "", { schemaQueryOptions: { enabled: mode === "global" && shouldFetchSchema } });
 	const { data: collectionMeta } = useCollectionMeta(collection, { enabled: mode === "collection" && !isActionForm });
 	const { data: globalMeta } = useGlobalMeta(collection, { enabled: mode === "global" });
 	const resolvedFields = mode === "global" ? {
-		...globalResult.fields,
+		...providedFields ?? globalResult.fields,
 		...config?.fields
-	} : collectionResult.fields;
-	const schema = mode === "global" ? globalResult.schema : collectionResult.schema;
+	} : providedFields ?? collectionResult.fields;
+	const schema = providedSchema ?? (mode === "global" ? globalResult.schema : collectionResult.schema);
 	const entityMeta = mode === "global" ? globalMeta : collectionMeta;
 	const form = useFormContext();
 	const resolveText = useResolveText();
@@ -476,20 +477,23 @@ function AutoFormFields({ app: _cms, collection, mode = "collection", config, re
 				className: "qa-form-fields__main min-w-0 flex-1",
 				children: mainContent
 			}), /* @__PURE__ */ jsx("aside", {
-				className: cn("qa-form-fields__sidebar", "w-full @max-2xl:pb-2 @2xl:max-w-[18rem] @2xl:pl-1"),
+				className: cn("qa-form-fields__sidebar", "w-full @max-2xl:pb-2 @2xl:sticky @2xl:top-4 @2xl:h-[calc(100svh-7rem)] @2xl:min-h-0 @2xl:max-w-[18rem] @2xl:shrink-0 @2xl:self-start @2xl:pl-1"),
 				children: /* @__PURE__ */ jsx("div", {
-					className: "bg-surface-low/45 space-y-4 rounded-md px-3 py-3 @2xl:sticky @2xl:top-4 @2xl:h-auto",
-					children: /* @__PURE__ */ jsx(SidebarRenderer, {
-						sidebar: formConfig.sidebar,
-						fields,
-						collection,
-						mode,
-						registry,
-						fieldPrefix,
-						allCollectionsConfig,
-						entityMeta,
-						formValues,
-						resolveText
+					className: "bg-surface-low/45 flex min-h-0 flex-col rounded-md @2xl:h-full",
+					children: /* @__PURE__ */ jsx("div", {
+						className: "scrollbar-thin min-h-0 space-y-4 overflow-y-auto px-3 py-3 @2xl:flex-1",
+						children: /* @__PURE__ */ jsx(SidebarRenderer, {
+							sidebar: formConfig.sidebar,
+							fields,
+							collection,
+							mode,
+							registry,
+							fieldPrefix,
+							allCollectionsConfig,
+							entityMeta,
+							formValues,
+							resolveText
+						})
 					})
 				})
 			})]

package/dist/client/views/collection/cells/complex-cells.mjs

@@ -1,7 +1,7 @@
 import { useResolveText, useTranslation } from "../../../i18n/hooks.mjs";
 import { cn } from "../../../lib/utils.mjs";
-import { Badge } from "../../../components/ui/badge.mjs";
 import { isBlockContent } from "../../../blocks/types.mjs";
+import { Badge } from "../../../components/ui/badge.mjs";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../../../components/ui/tooltip.mjs";
 import { useAdminConfig } from "../../../hooks/use-admin-config.mjs";
 import { formatFieldLabel, formatPrimitiveValue, getFieldLabel, getItemLabel, summarizeValue } from "./shared/cell-helpers.mjs";

package/dist/client/views/collection/columns/build-columns.mjs

@@ -1,8 +1,8 @@
 import { useResolveText } from "../../../i18n/hooks.mjs";
 import { useSafeContentLocales } from "../../../runtime/content-locales-provider.mjs";
 import { useScopedLocale } from "../../../runtime/locale-scope.mjs";
-import { DefaultCell, TextCell } from "../cells/primitive-cells.mjs";
 import { LocaleSwitcher } from "../../../components/locale-switcher.mjs";
+import { DefaultCell, TextCell } from "../cells/primitive-cells.mjs";
 import { normalizeColumnConfig } from "../../../builder/types/collection-types.mjs";
 import { computeDefaultColumns, formatHeader } from "./column-defaults.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";

package/dist/client/views/collection/columns/column-defaults.mjs

@@ -12,6 +12,18 @@ const SYSTEM_FIELDS = new Set([
 	"createdBy",
 	"updatedBy"
 ]);
+const DEFAULT_CONTENT_COLUMN_LIMIT = 4;
+const HEAVY_DEFAULT_FIELD_TYPES = new Set([
+	"relation",
+	"reverseRelation",
+	"upload",
+	"uploadMany",
+	"blocks",
+	"json",
+	"object",
+	"array",
+	"richText"
+]);
 /**
 * Compute sane default visible columns for a collection
 *
@@ -39,13 +51,14 @@ function computeDefaultColumns(fields, options) {
 	const defaultCols = [titleColumn];
 	if (!fields || Object.keys(fields).length === 0) return defaultCols;
 	const contentFields = [];
-	const systemFields = [];
 	for (const key of Object.keys(fields)) {
 		if (useTitleField && key === titleFieldName) continue;
-		if (SYSTEM_FIELDS.has(key)) systemFields.push(key);
-		else contentFields.push(key);
+		if (SYSTEM_FIELDS.has(key)) continue;
+		const fieldType = fields[key]?.name ?? "text";
+		if (HEAVY_DEFAULT_FIELD_TYPES.has(fieldType)) continue;
+		contentFields.push(key);
 	}
-	defaultCols.push(...contentFields);
+	defaultCols.push(...contentFields.slice(0, DEFAULT_CONTENT_COLUMN_LIMIT));
 	if ((options?.meta?.timestamps ?? !!fields.createdAt) && !defaultCols.includes("createdAt")) defaultCols.push("createdAt");
 	return defaultCols;
 }

package/dist/client/views/collection/field-renderer.mjs

@@ -95,6 +95,14 @@ function renderDefinitionComponent({ context, componentProps, blocks }) {
 	});
 	return /* @__PURE__ */ jsx(Component, { ...componentProps });
 }
+function BlocksDefinitionComponent({ context, componentProps }) {
+	const { data: adminConfig } = useAdminConfig();
+	return renderDefinitionComponent({
+		context,
+		componentProps,
+		blocks: adminConfig?.blocks
+	});
+}
 /**
 * Render embedded collection field
 *
@@ -133,7 +141,6 @@ function FieldRenderer({ fieldName, fieldDef, collection, mode = "collection", r
 	const form = useFormContext();
 	const { locale } = useScopedLocale();
 	const resolveText = useResolveText();
-	const { data: adminConfig } = useAdminConfig();
 	const fullFieldName = getFullFieldName(fieldName, fieldPrefix);
 	const fieldOptions = React.useMemo(() => getFieldOptions(fieldDef), [fieldDef]);
 	const dynamicDependencyPaths = React.useMemo(() => computeDynamicDependencyPaths({
@@ -222,14 +229,19 @@ function FieldRenderer({ fieldName, fieldDef, collection, mode = "collection", r
 		renderEmbeddedFields
 	});
 	if (!content && componentLoading) content = /* @__PURE__ */ jsx(FieldComponentSkeleton, { type: context.type });
-	if (!content && resolvedComponent) content = renderDefinitionComponent({
-		context: {
+	if (!content && resolvedComponent) {
+		const componentContext = {
 			...context,
 			component: resolvedComponent
-		},
-		componentProps,
-		blocks: adminConfig?.blocks
-	});
+		};
+		content = context.type === "blocks" ? /* @__PURE__ */ jsx(BlocksDefinitionComponent, {
+			context: componentContext,
+			componentProps
+		}) : renderDefinitionComponent({
+			context: componentContext,
+			componentProps
+		});
+	}
 	if (!content) content = renderConfigError(`No component registered for field type "${context.type}" (field: "${context.fieldName}").`);
 	if (className) return /* @__PURE__ */ jsx("div", {
 		className,

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

@@ -4,11 +4,11 @@ import { useSafeContentLocales } from "../../runtime/content-locales-provider.mj
 import { useScopedLocale } from "../../runtime/locale-scope.mjs";
 import { resolveIconElement } from "../../components/component-renderer.mjs";
 import { Button } from "../../components/ui/button.mjs";
-import { Badge } from "../../components/ui/badge.mjs";
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "../../components/ui/dialog.mjs";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from "../../components/ui/dropdown-menu.mjs";
 import { LocaleSwitcher } from "../../components/locale-switcher.mjs";
 import { Label } from "../../components/ui/label.mjs";
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "../../components/ui/dialog.mjs";
+import { Badge } from "../../components/ui/badge.mjs";
 import { RenderProfiler } from "../../lib/render-profiler.mjs";
 import { scrollFieldIntoView } from "../../contexts/focus-context.mjs";
 import { Checkbox } from "../../components/ui/checkbox.mjs";
@@ -144,7 +144,7 @@ function ReactiveFieldsManager({ collection, mode = "collection", reactiveConfig
 	});
 	return null;
 }
-const FormFieldsContent = React.memo(function FormFieldsContent$1({ collection, config, registry, allCollectionsConfig }) {
+const FormFieldsContent = React.memo(function FormFieldsContent$1({ collection, config, registry, allCollectionsConfig, resolvedFields, schema }) {
 	return /* @__PURE__ */ jsx(RenderProfiler, {
 		id: `form.fields.${collection}`,
 		minDurationMs: 10,
@@ -152,7 +152,9 @@ const FormFieldsContent = React.memo(function FormFieldsContent$1({ collection,
 			collection,
 			config,
 			registry,
-			allCollectionsConfig
+			allCollectionsConfig,
+			resolvedFields,
+			schema
 		})
 	});
 });
@@ -930,7 +932,7 @@ function FormView({ collection, id, config, viewConfig, navigate, basePath = "/a
 					if (handler.body) body = JSON.stringify(handler.body(actionContext));
 					setActionLoading(true);
 					const apiPromise = async () => {
-						const url = `${storeBasePath}/${collection}/${endpoint}`;
+						const url = `${client.getBasePath?.() ?? storeBasePath}/${collection}/${endpoint}`;
 						const response = await fetch(url, {
 							method,
 							headers: { "Content-Type": "application/json" },
@@ -1402,7 +1404,9 @@ function FormView({ collection, id, config, viewConfig, navigate, basePath = "/a
 									collection,
 									config: formConfigBridge,
 									registry,
-									allCollectionsConfig
+									allCollectionsConfig,
+									resolvedFields,
+									schema
 								})
 							]
 						})