@btst/stack 2.12.2 → 3.0.0-rc.2

package/dist/packages/stack/src/plugins/cms/api/getters.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+const schemas = require('../schemas.cjs');
+
 function serializeContentType(ct) {
   const needsMigration = !ct.autoFormVersion || ct.autoFormVersion < 2;
   const migratedJsonSchema = needsMigration ? migrateToUnifiedSchema(ct.jsonSchema, ct.fieldConfig) : ct.jsonSchema;
@@ -53,6 +55,18 @@ async function getAllContentTypes(adapter) {
   });
   return contentTypes.map(serializeContentType);
 }
+function contentItemMatchesSearch(item, searchLower) {
+  if (item.slug.toLowerCase().includes(searchLower)) return true;
+  const matchesValue = (value) => typeof value === "string" && value.toLowerCase().includes(searchLower);
+  return Object.values(item.parsedData).some((value) => {
+    if (matchesValue(value)) return true;
+    if (Array.isArray(value)) return value.some(matchesValue);
+    if (typeof value === "object" && value !== null) {
+      return Object.values(value).some(matchesValue);
+    }
+    return false;
+  });
+}
 async function getAllContentItems(adapter, contentTypeSlug, params) {
   const contentType = await adapter.findOne({
     model: "contentType",
@@ -86,21 +100,43 @@ async function getAllContentItems(adapter, contentTypeSlug, params) {
       operator: "eq"
     });
   }
-  const total = await adapter.count({
+  const search = params?.search?.trim();
+  const needsInMemoryFilter = !!search;
+  const dbTotal = !needsInMemoryFilter ? await adapter.count({
     model: "contentItem",
     where: whereConditions
-  });
+  }) : void 0;
   const items = await adapter.findMany({
     model: "contentItem",
     where: whereConditions,
-    limit: params?.limit,
-    offset: params?.offset,
+    limit: !needsInMemoryFilter ? params?.limit : schemas.DEFAULT_MAX_PAGE_SIZE,
+    offset: !needsInMemoryFilter ? params?.offset : void 0,
     sortBy: { field: "createdAt", direction: "desc" },
     join: { contentType: true }
   });
+  let result = items.map(serializeContentItemWithType);
+  if (needsInMemoryFilter) {
+    const searchLower = search.toLowerCase();
+    result = result.filter(
+      (item) => contentItemMatchesSearch(item, searchLower)
+    );
+    const total = result.length;
+    const offset = params?.offset ?? 0;
+    const limit = params?.limit;
+    result = result.slice(
+      offset,
+      limit !== void 0 ? offset + limit : void 0
+    );
+    return {
+      items: result,
+      total,
+      limit: params?.limit,
+      offset: params?.offset
+    };
+  }
   return {
-    items: items.map(serializeContentItemWithType),
-    total,
+    items: result,
+    total: dbTotal ?? result.length,
     limit: params?.limit,
     offset: params?.offset
   };

package/dist/packages/stack/src/plugins/cms/api/getters.mjs

@@ -1,3 +1,5 @@
+import { DEFAULT_MAX_PAGE_SIZE } from '../schemas.mjs';
+
 function serializeContentType(ct) {
   const needsMigration = !ct.autoFormVersion || ct.autoFormVersion < 2;
   const migratedJsonSchema = needsMigration ? migrateToUnifiedSchema(ct.jsonSchema, ct.fieldConfig) : ct.jsonSchema;
@@ -51,6 +53,18 @@ async function getAllContentTypes(adapter) {
   });
   return contentTypes.map(serializeContentType);
 }
+function contentItemMatchesSearch(item, searchLower) {
+  if (item.slug.toLowerCase().includes(searchLower)) return true;
+  const matchesValue = (value) => typeof value === "string" && value.toLowerCase().includes(searchLower);
+  return Object.values(item.parsedData).some((value) => {
+    if (matchesValue(value)) return true;
+    if (Array.isArray(value)) return value.some(matchesValue);
+    if (typeof value === "object" && value !== null) {
+      return Object.values(value).some(matchesValue);
+    }
+    return false;
+  });
+}
 async function getAllContentItems(adapter, contentTypeSlug, params) {
   const contentType = await adapter.findOne({
     model: "contentType",
@@ -84,21 +98,43 @@ async function getAllContentItems(adapter, contentTypeSlug, params) {
       operator: "eq"
     });
   }
-  const total = await adapter.count({
+  const search = params?.search?.trim();
+  const needsInMemoryFilter = !!search;
+  const dbTotal = !needsInMemoryFilter ? await adapter.count({
     model: "contentItem",
     where: whereConditions
-  });
+  }) : void 0;
   const items = await adapter.findMany({
     model: "contentItem",
     where: whereConditions,
-    limit: params?.limit,
-    offset: params?.offset,
+    limit: !needsInMemoryFilter ? params?.limit : DEFAULT_MAX_PAGE_SIZE,
+    offset: !needsInMemoryFilter ? params?.offset : void 0,
     sortBy: { field: "createdAt", direction: "desc" },
     join: { contentType: true }
   });
+  let result = items.map(serializeContentItemWithType);
+  if (needsInMemoryFilter) {
+    const searchLower = search.toLowerCase();
+    result = result.filter(
+      (item) => contentItemMatchesSearch(item, searchLower)
+    );
+    const total = result.length;
+    const offset = params?.offset ?? 0;
+    const limit = params?.limit;
+    result = result.slice(
+      offset,
+      limit !== void 0 ? offset + limit : void 0
+    );
+    return {
+      items: result,
+      total,
+      limit: params?.limit,
+      offset: params?.offset
+    };
+  }
   return {
-    items: items.map(serializeContentItemWithType),
-    total,
+    items: result,
+    total: dbTotal ?? result.length,
     limit: params?.limit,
     offset: params?.offset
   };

package/dist/packages/stack/src/plugins/cms/api/plugin.cjs

@@ -369,12 +369,17 @@ const cmsBackendPlugin = (config) => {
         },
         async (ctx) => {
           const { typeSlug } = ctx.params;
-          const { slug, limit, offset } = ctx.query;
+          const { slug, search, limit, offset } = ctx.query;
           const contentType = await getContentType(typeSlug);
           if (!contentType) {
             throw ctx.error(404, { message: "Content type not found" });
           }
-          return getters.getAllContentItems(adapter, typeSlug, { slug, limit, offset });
+          return getters.getAllContentItems(adapter, typeSlug, {
+            slug,
+            search,
+            limit,
+            offset
+          });
         }
       );
       const getContentItem = api.createEndpoint(
@@ -436,7 +441,7 @@ const cmsBackendPlugin = (config) => {
           if (!validation.success) {
             throw ctx.error(400, {
               message: "Validation failed",
-              errors: validation.error.issues
+              issues: validation.error.issues
             });
           }
           const existing = await adapter.findOne({
@@ -457,7 +462,7 @@ const cmsBackendPlugin = (config) => {
           }
           const processedData = validation.data;
           if (config.hooks?.onBeforeCreate) {
-            await utils$1.runHookWithShim(
+            await utils$1.runHook(
               () => config.hooks.onBeforeCreate(processedData, context),
               ctx.error,
               "Create operation denied"
@@ -558,14 +563,14 @@ const cmsBackendPlugin = (config) => {
             if (!validation.success) {
               throw ctx.error(400, {
                 message: "Validation failed",
-                errors: validation.error.issues
+                issues: validation.error.issues
               });
             }
             validatedData = validation.data;
           }
           const processedData = validatedData;
           if (config.hooks?.onBeforeUpdate && validatedData) {
-            await utils$1.runHookWithShim(
+            await utils$1.runHook(
               () => config.hooks.onBeforeUpdate(id, validatedData, context),
               ctx.error,
               "Update operation denied"
@@ -620,7 +625,7 @@ const cmsBackendPlugin = (config) => {
             throw ctx.error(404, { message: "Content item not found" });
           }
           if (config.hooks?.onBeforeDelete) {
-            await utils$1.runHookWithShim(
+            await utils$1.runHook(
               () => config.hooks.onBeforeDelete(id, context),
               ctx.error,
               "Delete operation denied"

package/dist/packages/stack/src/plugins/cms/api/plugin.mjs

@@ -8,7 +8,7 @@ import { serializeContentType, getAllContentItems, serializeContentItemWithType,
 import { createCMSContentItem } from './mutations.mjs';
 import { syncRelations, extractRelationFields, isNewRelationValue, isExistingRelationValue } from './relations.mjs';
 import { CMS_QUERY_KEYS } from './query-key-defs.mjs';
-import { runHookWithShim } from '../../utils.mjs';
+import { runHook } from '../../utils.mjs';
 
 async function syncContentTypes(adapter, config) {
   for (const ct of config.contentTypes) {
@@ -367,12 +367,17 @@ const cmsBackendPlugin = (config) => {
         },
         async (ctx) => {
           const { typeSlug } = ctx.params;
-          const { slug, limit, offset } = ctx.query;
+          const { slug, search, limit, offset } = ctx.query;
           const contentType = await getContentType(typeSlug);
           if (!contentType) {
             throw ctx.error(404, { message: "Content type not found" });
           }
-          return getAllContentItems(adapter, typeSlug, { slug, limit, offset });
+          return getAllContentItems(adapter, typeSlug, {
+            slug,
+            search,
+            limit,
+            offset
+          });
         }
       );
       const getContentItem = createEndpoint(
@@ -434,7 +439,7 @@ const cmsBackendPlugin = (config) => {
           if (!validation.success) {
             throw ctx.error(400, {
               message: "Validation failed",
-              errors: validation.error.issues
+              issues: validation.error.issues
             });
           }
           const existing = await adapter.findOne({
@@ -455,7 +460,7 @@ const cmsBackendPlugin = (config) => {
           }
           const processedData = validation.data;
           if (config.hooks?.onBeforeCreate) {
-            await runHookWithShim(
+            await runHook(
               () => config.hooks.onBeforeCreate(processedData, context),
               ctx.error,
               "Create operation denied"
@@ -556,14 +561,14 @@ const cmsBackendPlugin = (config) => {
             if (!validation.success) {
               throw ctx.error(400, {
                 message: "Validation failed",
-                errors: validation.error.issues
+                issues: validation.error.issues
               });
             }
             validatedData = validation.data;
           }
           const processedData = validatedData;
           if (config.hooks?.onBeforeUpdate && validatedData) {
-            await runHookWithShim(
+            await runHook(
               () => config.hooks.onBeforeUpdate(id, validatedData, context),
               ctx.error,
               "Update operation denied"
@@ -618,7 +623,7 @@ const cmsBackendPlugin = (config) => {
             throw ctx.error(404, { message: "Content item not found" });
           }
           if (config.hooks?.onBeforeDelete) {
-            await runHookWithShim(
+            await runHook(
               () => config.hooks.onBeforeDelete(id, context),
               ctx.error,
               "Delete operation denied"

package/dist/packages/stack/src/plugins/cms/api/query-key-defs.cjs

@@ -4,7 +4,8 @@ function contentListDiscriminator(params) {
   return {
     typeSlug: params.typeSlug,
     limit: params.limit ?? 20,
-    offset: params.offset ?? 0
+    offset: params.offset ?? 0,
+    search: params.search !== void 0 && params.search.trim() === "" ? void 0 : params.search
   };
 }
 const CMS_QUERY_KEYS = {
@@ -15,7 +16,7 @@ const CMS_QUERY_KEYS = {
   typesList: () => ["cmsTypes", "list", "list"],
   /**
    * Key for the cmsContent.list({ typeSlug, limit, offset }) query.
-   * Full key: ["cmsContent", "list", { typeSlug, limit, offset }]
+   * Full key: ["cmsContent", "list", { typeSlug, limit, offset, search }]
    */
   contentList: (params) => ["cmsContent", "list", contentListDiscriminator(params)],
   /**

package/dist/packages/stack/src/plugins/cms/api/query-key-defs.mjs

@@ -2,7 +2,8 @@ function contentListDiscriminator(params) {
   return {
     typeSlug: params.typeSlug,
     limit: params.limit ?? 20,
-    offset: params.offset ?? 0
+    offset: params.offset ?? 0,
+    search: params.search !== void 0 && params.search.trim() === "" ? void 0 : params.search
   };
 }
 const CMS_QUERY_KEYS = {
@@ -13,7 +14,7 @@ const CMS_QUERY_KEYS = {
   typesList: () => ["cmsTypes", "list", "list"],
   /**
    * Key for the cmsContent.list({ typeSlug, limit, offset }) query.
-   * Full key: ["cmsContent", "list", { typeSlug, limit, offset }]
+   * Full key: ["cmsContent", "list", { typeSlug, limit, offset, search }]
    */
   contentList: (params) => ["cmsContent", "list", contentListDiscriminator(params)],
   /**

package/dist/packages/stack/src/plugins/cms/client/components/forms/content-form.cjs

@@ -12,10 +12,29 @@ const label = require('../../../../../../../ui/src/components/label.cjs');
 const badge = require('../../../../../../../ui/src/components/badge.cjs');
 const context = require('@btst/stack/context');
 const utils = require('../../../utils.cjs');
-const index = require('../../localization/index.cjs');
 const fileUpload = require('./file-upload.cjs');
 const relationField = require('./relation-field.cjs');
 
+function useServerFieldErrors(form, fieldErrors) {
+  const appliedFieldsRef = React.useRef([]);
+  React.useEffect(() => {
+    if (!form) return;
+    for (const field of appliedFieldsRef.current) {
+      if (field in fieldErrors) continue;
+      const { error } = form.getFieldState(field);
+      if (error?.type === "server") {
+        form.clearErrors(field);
+      }
+    }
+    appliedFieldsRef.current = Object.keys(fieldErrors);
+    for (const [field, message] of Object.entries(fieldErrors)) {
+      form.setError(field, {
+        type: "server",
+        message: Array.isArray(message) ? message.join(", ") : message
+      });
+    }
+  }, [fieldErrors, form]);
+}
 function buildFieldConfigFromJsonSchema(jsonSchema, uploadImage, fieldComponents, imagePicker, imageInputField) {
   const baseConfig = helpers.buildFieldConfigFromJsonSchema(jsonSchema, fieldComponents);
   const properties = jsonSchema.properties;
@@ -105,22 +124,30 @@ function ContentForm({
   initialSlug = "",
   isEditing = false,
   onSubmit,
-  onCancel
+  onCancel,
+  fieldErrors,
+  errorMessage,
+  isSubmitting: isSubmittingProp
 }) {
+  const t = context.useTranslate();
   const {
-    localization: customLocalization,
+    localization,
     uploadImage,
     imagePicker,
     imageInputField,
     fieldComponents
   } = context.usePluginOverrides("cms");
-  const localization = { ...index.CMS_LOCALIZATION, ...customLocalization };
   const [slug, setSlug] = React.useState(initialSlug);
   const [slugManuallyEdited, setSlugManuallyEdited] = React.useState(isEditing);
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const [isSubmittingLocal, setIsSubmittingLocal] = React.useState(false);
   const [formData, setFormData] = React.useState(initialData);
   const [slugError, setSlugError] = React.useState(null);
   const [submitError, setSubmitError] = React.useState(null);
+  const isSubmitting = isSubmittingProp || isSubmittingLocal;
+  const [formInstance, setFormInstance] = React.useState(null);
+  const serverFieldErrors = React.useMemo(() => fieldErrors ?? {}, [fieldErrors]);
+  useServerFieldErrors(formInstance, serverFieldErrors);
+  const hasFieldErrors = Object.keys(serverFieldErrors).length > 0;
   const hasSyncedPrefillRef = React.useRef(false);
   React.useEffect(() => {
     const hasData = Object.keys(initialData).length > 0;
@@ -165,7 +192,10 @@ function ContentForm({
     () => findSlugSourceField(jsonSchema),
     [jsonSchema]
   );
-  const handleValuesChange = (values) => {
+  const handleValuesChange = (values, form) => {
+    if (form) {
+      setFormInstance((current) => current === form ? current : form);
+    }
     setFormData(values);
     if (!isEditing && !slugManuallyEdited && slugSourceField) {
       const sourceValue = values[slugSourceField];
@@ -178,24 +208,29 @@ function ContentForm({
     setSlugError(null);
     setSubmitError(null);
     if (!slug.trim()) {
-      setSlugError("Slug is required");
+      setSlugError(
+        localization?.CMS_EDITOR_SLUG_REQUIRED ?? t("cms.editor.slugRequired", "Slug is required")
+      );
       return;
     }
-    setIsSubmitting(true);
+    setIsSubmittingLocal(true);
     try {
       await onSubmit({ slug, data });
     } catch (error) {
-      const message = error instanceof Error ? error.message : localization.CMS_TOAST_ERROR;
+      const message = error instanceof Error ? error.message : localization?.CMS_TOAST_ERROR ?? t("cms.toasts.error", "An error occurred. Please try again.");
       setSubmitError(message);
     } finally {
-      setIsSubmitting(false);
+      setIsSubmittingLocal(false);
     }
   };
+  const bannerMessage = errorMessage ?? submitError ?? (hasFieldErrors && !formInstance ? Object.entries(serverFieldErrors).map(
+    ([field, message]) => `${field}: ${Array.isArray(message) ? message.join(", ") : message}`
+  ).join(" \xB7 ") : void 0);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-6", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-2", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(label.Label, { htmlFor: "slug", children: localization.CMS_LABEL_SLUG }),
-        !isEditing && /* @__PURE__ */ jsxRuntime.jsx(badge.Badge, { variant: "outline", className: "text-xs", children: slugManuallyEdited ? localization.CMS_EDITOR_SLUG_MANUAL : localization.CMS_EDITOR_SLUG_AUTO })
+        /* @__PURE__ */ jsxRuntime.jsx(label.Label, { htmlFor: "slug", children: localization?.CMS_LABEL_SLUG ?? t("cms.common.slugLabel", "Slug") }),
+        !isEditing && /* @__PURE__ */ jsxRuntime.jsx(badge.Badge, { variant: "outline", className: "text-xs", children: slugManuallyEdited ? localization?.CMS_EDITOR_SLUG_MANUAL ?? t("cms.editor.slugManual", "Manually set") : localization?.CMS_EDITOR_SLUG_AUTO ?? t("cms.editor.slugAuto", "Auto-generated from first field") })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(
         input.Input,
@@ -210,13 +245,19 @@ function ContentForm({
             }
           },
           disabled: isEditing,
-          placeholder: slugSourceField ? `Auto-generated from ${slugSourceField}` : "Enter slug..."
+          placeholder: slugSourceField ? (localization?.CMS_EDITOR_SLUG_PLACEHOLDER_AUTO ?? t(
+            "cms.editor.slugPlaceholderAuto",
+            "Auto-generated from {field}"
+          )).replace("{field}", slugSourceField) : localization?.CMS_EDITOR_SLUG_PLACEHOLDER ?? t("cms.editor.slugPlaceholder", "Enter slug...")
         }
       ),
       slugError && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-destructive", children: slugError }),
-      /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground", children: localization.CMS_LABEL_SLUG_DESCRIPTION })
+      /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground", children: localization?.CMS_LABEL_SLUG_DESCRIPTION ?? t(
+        "cms.common.slugDescription",
+        "URL-friendly identifier for this item"
+      ) })
     ] }),
-    submitError && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rounded-md border border-destructive/50 bg-destructive/10 p-3", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-destructive", children: submitError }) }),
+    bannerMessage && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rounded-md border border-destructive/50 bg-destructive/10 p-3", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-destructive", children: bannerMessage }) }),
     /* @__PURE__ */ jsxRuntime.jsx(
       steppedAutoForm.default,
       {
@@ -226,14 +267,14 @@ function ContentForm({
         onSubmit: handleSubmit,
         fieldConfig,
         isSubmitting,
-        submitButtonText: isSubmitting ? localization.CMS_STATUS_SAVING : localization.CMS_BUTTON_SAVE,
+        submitButtonText: isSubmitting ? localization?.CMS_STATUS_SAVING ?? t("cms.common.saving", "Saving...") : localization?.CMS_BUTTON_SAVE ?? t("cms.common.save", "Save"),
         children: onCancel && /* @__PURE__ */ jsxRuntime.jsx(
           "button",
           {
             type: "button",
             onClick: onCancel,
             className: "px-4 py-2 text-sm text-muted-foreground hover:text-foreground",
-            children: localization.CMS_BUTTON_CANCEL
+            children: localization?.CMS_BUTTON_CANCEL ?? t("cms.common.cancel", "Cancel")
           }
         )
       }

package/dist/packages/stack/src/plugins/cms/client/components/forms/content-form.mjs

@@ -1,6 +1,6 @@
 "use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { useState, useRef, useEffect, useMemo } from 'react';
+import { useState, useMemo, useRef, useEffect } from 'react';
 import { z } from 'zod';
 import SteppedAutoForm from '../../../../../../../ui/src/components/auto-form/stepped-auto-form.mjs';
 import { buildFieldConfigFromJsonSchema as buildFieldConfigFromJsonSchema$1 } from '../../../../../../../ui/src/components/auto-form/helpers.mjs';
@@ -8,12 +8,31 @@ import { formSchemaToZod } from '../../../../../../../ui/src/lib/schema-converte
 import { Input } from '../../../../../../../ui/src/components/input.mjs';
 import { Label } from '../../../../../../../ui/src/components/label.mjs';
 import { Badge } from '../../../../../../../ui/src/components/badge.mjs';
-import { usePluginOverrides } from '@btst/stack/context';
+import { useTranslate, usePluginOverrides } from '@btst/stack/context';
 import { slugify } from '../../../utils.mjs';
-import { CMS_LOCALIZATION } from '../../localization/index.mjs';
 import { CMSFileUpload } from './file-upload.mjs';
 import { RelationField } from './relation-field.mjs';
 
+function useServerFieldErrors(form, fieldErrors) {
+  const appliedFieldsRef = useRef([]);
+  useEffect(() => {
+    if (!form) return;
+    for (const field of appliedFieldsRef.current) {
+      if (field in fieldErrors) continue;
+      const { error } = form.getFieldState(field);
+      if (error?.type === "server") {
+        form.clearErrors(field);
+      }
+    }
+    appliedFieldsRef.current = Object.keys(fieldErrors);
+    for (const [field, message] of Object.entries(fieldErrors)) {
+      form.setError(field, {
+        type: "server",
+        message: Array.isArray(message) ? message.join(", ") : message
+      });
+    }
+  }, [fieldErrors, form]);
+}
 function buildFieldConfigFromJsonSchema(jsonSchema, uploadImage, fieldComponents, imagePicker, imageInputField) {
   const baseConfig = buildFieldConfigFromJsonSchema$1(jsonSchema, fieldComponents);
   const properties = jsonSchema.properties;
@@ -103,22 +122,30 @@ function ContentForm({
   initialSlug = "",
   isEditing = false,
   onSubmit,
-  onCancel
+  onCancel,
+  fieldErrors,
+  errorMessage,
+  isSubmitting: isSubmittingProp
 }) {
+  const t = useTranslate();
   const {
-    localization: customLocalization,
+    localization,
     uploadImage,
     imagePicker,
     imageInputField,
     fieldComponents
   } = usePluginOverrides("cms");
-  const localization = { ...CMS_LOCALIZATION, ...customLocalization };
   const [slug, setSlug] = useState(initialSlug);
   const [slugManuallyEdited, setSlugManuallyEdited] = useState(isEditing);
-  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [isSubmittingLocal, setIsSubmittingLocal] = useState(false);
   const [formData, setFormData] = useState(initialData);
   const [slugError, setSlugError] = useState(null);
   const [submitError, setSubmitError] = useState(null);
+  const isSubmitting = isSubmittingProp || isSubmittingLocal;
+  const [formInstance, setFormInstance] = useState(null);
+  const serverFieldErrors = useMemo(() => fieldErrors ?? {}, [fieldErrors]);
+  useServerFieldErrors(formInstance, serverFieldErrors);
+  const hasFieldErrors = Object.keys(serverFieldErrors).length > 0;
   const hasSyncedPrefillRef = useRef(false);
   useEffect(() => {
     const hasData = Object.keys(initialData).length > 0;
@@ -163,7 +190,10 @@ function ContentForm({
     () => findSlugSourceField(jsonSchema),
     [jsonSchema]
   );
-  const handleValuesChange = (values) => {
+  const handleValuesChange = (values, form) => {
+    if (form) {
+      setFormInstance((current) => current === form ? current : form);
+    }
     setFormData(values);
     if (!isEditing && !slugManuallyEdited && slugSourceField) {
       const sourceValue = values[slugSourceField];
@@ -176,24 +206,29 @@ function ContentForm({
     setSlugError(null);
     setSubmitError(null);
     if (!slug.trim()) {
-      setSlugError("Slug is required");
+      setSlugError(
+        localization?.CMS_EDITOR_SLUG_REQUIRED ?? t("cms.editor.slugRequired", "Slug is required")
+      );
       return;
     }
-    setIsSubmitting(true);
+    setIsSubmittingLocal(true);
     try {
       await onSubmit({ slug, data });
     } catch (error) {
-      const message = error instanceof Error ? error.message : localization.CMS_TOAST_ERROR;
+      const message = error instanceof Error ? error.message : localization?.CMS_TOAST_ERROR ?? t("cms.toasts.error", "An error occurred. Please try again.");
       setSubmitError(message);
     } finally {
-      setIsSubmitting(false);
+      setIsSubmittingLocal(false);
     }
   };
+  const bannerMessage = errorMessage ?? submitError ?? (hasFieldErrors && !formInstance ? Object.entries(serverFieldErrors).map(
+    ([field, message]) => `${field}: ${Array.isArray(message) ? message.join(", ") : message}`
+  ).join(" \xB7 ") : void 0);
   return /* @__PURE__ */ jsxs("div", { className: "space-y-6", children: [
     /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
       /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-        /* @__PURE__ */ jsx(Label, { htmlFor: "slug", children: localization.CMS_LABEL_SLUG }),
-        !isEditing && /* @__PURE__ */ jsx(Badge, { variant: "outline", className: "text-xs", children: slugManuallyEdited ? localization.CMS_EDITOR_SLUG_MANUAL : localization.CMS_EDITOR_SLUG_AUTO })
+        /* @__PURE__ */ jsx(Label, { htmlFor: "slug", children: localization?.CMS_LABEL_SLUG ?? t("cms.common.slugLabel", "Slug") }),
+        !isEditing && /* @__PURE__ */ jsx(Badge, { variant: "outline", className: "text-xs", children: slugManuallyEdited ? localization?.CMS_EDITOR_SLUG_MANUAL ?? t("cms.editor.slugManual", "Manually set") : localization?.CMS_EDITOR_SLUG_AUTO ?? t("cms.editor.slugAuto", "Auto-generated from first field") })
       ] }),
       /* @__PURE__ */ jsx(
         Input,
@@ -208,13 +243,19 @@ function ContentForm({
             }
           },
           disabled: isEditing,
-          placeholder: slugSourceField ? `Auto-generated from ${slugSourceField}` : "Enter slug..."
+          placeholder: slugSourceField ? (localization?.CMS_EDITOR_SLUG_PLACEHOLDER_AUTO ?? t(
+            "cms.editor.slugPlaceholderAuto",
+            "Auto-generated from {field}"
+          )).replace("{field}", slugSourceField) : localization?.CMS_EDITOR_SLUG_PLACEHOLDER ?? t("cms.editor.slugPlaceholder", "Enter slug...")
         }
       ),
       slugError && /* @__PURE__ */ jsx("p", { className: "text-sm text-destructive", children: slugError }),
-      /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: localization.CMS_LABEL_SLUG_DESCRIPTION })
+      /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: localization?.CMS_LABEL_SLUG_DESCRIPTION ?? t(
+        "cms.common.slugDescription",
+        "URL-friendly identifier for this item"
+      ) })
     ] }),
-    submitError && /* @__PURE__ */ jsx("div", { className: "rounded-md border border-destructive/50 bg-destructive/10 p-3", children: /* @__PURE__ */ jsx("p", { className: "text-sm text-destructive", children: submitError }) }),
+    bannerMessage && /* @__PURE__ */ jsx("div", { className: "rounded-md border border-destructive/50 bg-destructive/10 p-3", children: /* @__PURE__ */ jsx("p", { className: "text-sm text-destructive", children: bannerMessage }) }),
     /* @__PURE__ */ jsx(
       SteppedAutoForm,
       {
@@ -224,14 +265,14 @@ function ContentForm({
         onSubmit: handleSubmit,
         fieldConfig,
         isSubmitting,
-        submitButtonText: isSubmitting ? localization.CMS_STATUS_SAVING : localization.CMS_BUTTON_SAVE,
+        submitButtonText: isSubmitting ? localization?.CMS_STATUS_SAVING ?? t("cms.common.saving", "Saving...") : localization?.CMS_BUTTON_SAVE ?? t("cms.common.save", "Save"),
         children: onCancel && /* @__PURE__ */ jsx(
           "button",
           {
             type: "button",
             onClick: onCancel,
             className: "px-4 py-2 text-sm text-muted-foreground hover:text-foreground",
-            children: localization.CMS_BUTTON_CANCEL
+            children: localization?.CMS_BUTTON_CANCEL ?? t("cms.common.cancel", "Cancel")
           }
         )
       }