@firecms/core 3.0.0-canary.283 → 3.0.0-canary.285

package/dist/core/EntityEditView.d.ts

@@ -44,9 +44,9 @@ export interface EntityEditViewProps<M extends Record<string, any>> {
  * an entity is opened.
  */
 export declare function EntityEditView<M extends Record<string, any>, USER extends User>({ entityId, ...props }: EntityEditViewProps<M>): import("react/jsx-runtime").JSX.Element;
-export declare function EntityEditViewInner<M extends Record<string, any>>({ path, fullIdPath, entityId, selectedTab: selectedTabProp, collection, parentCollectionIds, onValuesModified, onSaved, onTabChange, entity, cachedDirtyValues, dataLoading, layout, barActions, status, setStatus, formProps, canEdit }: EntityEditViewProps<M> & {
+export declare function EntityEditViewInner<M extends Record<string, any>>({ path, fullIdPath, entityId, selectedTab: selectedTabProp, collection, parentCollectionIds, onValuesModified, onSaved, onTabChange, entity, initialDirtyValues, dataLoading, layout, barActions, status, setStatus, formProps, canEdit }: EntityEditViewProps<M> & {
     entity?: Entity<M>;
-    cachedDirtyValues?: Partial<M>;
+    initialDirtyValues?: Partial<M>;
     dataLoading: boolean;
     status: EntityStatus;
     setStatus: (status: EntityStatus) => void;

package/dist/form/EntityForm.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { Entity, EntityCollection, EntityCustomViewParams, EntityStatus, FormContext } from "../types";
+import { AuthController, Entity, EntityCollection, EntityCustomViewParams, EntityStatus, EntityValues, FormContext, PropertyConfig } from "../types";
 import { FormexController } from "@firecms/formex";
 import { ValidationError } from "yup";
 import { EntityFormActionsProps } from "./EntityFormActions";
@@ -46,5 +46,7 @@ export type EntityFormProps<M extends Record<string, any>> = {
     Builder?: React.ComponentType<EntityCustomViewParams<M>>;
     children?: React.ReactNode;
 };
+export declare function extractTouchedValues(values: any, touched: Record<string, boolean>): Record<string, any>;
 export declare function EntityForm<M extends Record<string, any>>({ path, fullIdPath, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode, formex: formexProp, disabled: disabledProp, Builder, EntityFormActionsComponent, showDefaultActions, showEntityPath, children }: EntityFormProps<M>): import("react/jsx-runtime").JSX.Element;
+export declare function getInitialEntityValues<M extends object>(authController: AuthController, collection: EntityCollection, path: string, status: "new" | "existing" | "copy", entity: Entity<M> | undefined, propertyConfigs?: Record<string, PropertyConfig>): Partial<EntityValues<M>>;
 export declare function yupToFormErrors(yupError: ValidationError): Record<string, any>;

package/dist/form/index.d.ts

@@ -1,4 +1,5 @@
-export * from "./EntityForm";
+export { EntityForm, yupToFormErrors, } from "./EntityForm";
+export type { EntityFormProps } from "./EntityForm";
 export { SelectFieldBinding } from "./field_bindings/SelectFieldBinding";
 export { MultiSelectFieldBinding } from "./field_bindings/MultiSelectFieldBinding";
 export { ArrayOfReferencesFieldBinding } from "./field_bindings/ArrayOfReferencesFieldBinding";

package/dist/index.es.js

@@ -1,11 +1,11 @@
 import { jsx, Fragment, jsxs } from "react/jsx-runtime";
 import { c } from "react-compiler-runtime";
 import * as React from "react";
-import React__default, { useRef, useEffect, useContext, useCallback, useMemo, useState, createElement, createRef, createContext, forwardRef, useLayoutEffect, useDeferredValue } from "react";
+import React__default, { useRef, useEffect, useContext, useCallback, useMemo, useState, createElement, createRef, createContext, forwardRef, useLayoutEffect } from "react";
 import { getColorSchemeForSeed, CHIP_COLORS, FunctionsIcon, CircleIcon, iconKeys, coolIconKeys, Icon, Tooltip, ErrorIcon, Typography, IconButton, ContentCopyIcon, OpenInNewIcon, DescriptionIcon, cls, Skeleton, Chip, defaultBorderMixin, KeyboardTabIcon, Checkbox, AccountCircleIcon, Markdown, TextareaAutosize, focusedDisabled, MultiSelect, MultiSelectItem, Select, SelectItem, BooleanSwitch, DateTimeField, paperMixin, EditIcon, DoNotDisturbOnIcon, Menu, MenuItem, MoreVertIcon, CircularProgress, SearchBar, Badge, ArrowUpwardIcon, Popover, FilterListIcon, Button, CenteredView, AssignmentIcon, Label, CloseIcon, TextField, BooleanSwitchWithLabel, useOutsideAlerter, Dialog, DialogTitle, DialogContent, DialogActions, FileCopyIcon, DeleteIcon, AddIcon, StarIcon, Collapse, ExpandablePanel, ArrowForwardIcon, Card, cardMixin, cardClickableMixin, Container, LoadingButton, Alert, CheckIcon, NotesIcon, InfoIcon, fieldBackgroundMixin, RemoveIcon, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, ArrowDropDownIcon, FilterListOffIcon, SearchIcon, Avatar, DarkModeIcon, LightModeIcon, BrightnessMediumIcon, LogoutIcon, HandleIcon, KeyboardArrowUpIcon, KeyboardArrowDownIcon, debounce, Sheet, Tab, Tabs, CodeIcon, OpenInFullIcon, ViewStreamIcon, RepeatIcon, BallotIcon, ScheduleIcon, AddLinkIcon, LinkIcon, DriveFolderUploadIcon, UploadFileIcon, FormatListNumberedIcon, NumbersIcon, PersonIcon, ListAltIcon, ListIcon, FlagIcon, MailIcon, HttpIcon, FormatQuoteIcon, SubjectIcon, ShortTextIcon, MenuIcon, ChevronLeftIcon } from "@firecms/ui";
 import { SnackbarProvider as SnackbarProvider$1, useSnackbar } from "notistack";
 import hash from "object-hash";
-import { getIn, useFormex, setIn, useCreateFormex, Formex, Field } from "@firecms/formex";
+import { getIn, useFormex, setIn, useCreateFormex, flattenKeys, Formex, Field } from "@firecms/formex";
 import { useNavigate, useLocation, Link, NavLink, Routes, Route, createBrowserRouter, RouterProvider } from "react-router-dom";
 import Fuse from "fuse.js";
 import equal from "react-fast-compare";
@@ -9756,27 +9756,6 @@ function customReviver(key, value) {
   }
   return value;
 }
-if (isLocalStorageAvailable) {
-  try {
-    for (let i = 0; i < localStorage.length; i++) {
-      const fullKey = localStorage.key(i);
-      if (fullKey && fullKey.startsWith(LOCAL_STORAGE_PREFIX)) {
-        const path = fullKey.substring(LOCAL_STORAGE_PREFIX.length);
-        const entityString = localStorage.getItem(fullKey);
-        if (entityString) {
-          try {
-            const entity = JSON.parse(entityString, customReviver);
-            entityCache.set(path, entity);
-          } catch (parseError) {
-            console.error(`Failed to parse entity for path "${path}" from localStorage:`, parseError);
-          }
-        }
-      }
-    }
-  } catch (error) {
-    console.error("Error accessing localStorage during initialization:", error);
-  }
-}
 function saveEntityToCache(path, data) {
   entityCache.set(path, data);
   if (isLocalStorageAvailable) {
@@ -9789,11 +9768,11 @@ function saveEntityToCache(path, data) {
     }
   }
 }
-function getEntityFromCache(path) {
+function getEntityFromCache(path, useLocalStorage = true) {
   if (entityCache.has(path)) {
     return entityCache.get(path);
   }
-  if (isLocalStorageAvailable) {
+  if (isLocalStorageAvailable && useLocalStorage) {
     try {
       const key = LOCAL_STORAGE_PREFIX + path;
       const entityString = localStorage.getItem(key);
@@ -14989,61 +14968,60 @@ function CustomIdField({
   ] });
 }
 const ErrorFocus = (t0) => {
-  const $ = c(6);
+  const $ = c(10);
   const {
     containerRef
   } = t0;
   const {
-    isSubmitting,
     isValidating,
-    errors
+    errors,
+    version
   } = useFormex();
+  const prevVersion = useRef(version);
   let t1;
-  let t2;
-  if ($[0] !== containerRef || $[1] !== errors || $[2] !== isSubmitting || $[3] !== isValidating) {
+  if ($[0] !== containerRef?.current || $[1] !== errors || $[2] !== isValidating || $[3] !== version) {
     t1 = () => {
+      if (version === prevVersion.current) {
+        return;
+      }
       const keys = Object.keys(errors);
-      if (keys.length > 0 && isSubmitting && !isValidating) {
+      if (!isValidating && keys.length > 0) {
         const errorElement = containerRef?.current?.querySelector(`#form_field_${keys[0]}`);
-        if (errorElement && containerRef?.current) {
-          const scrollableParent = getScrollableParent(containerRef.current);
-          if (scrollableParent) {
-            const top = errorElement.getBoundingClientRect().top;
-            scrollableParent.scrollTo({
-              top: scrollableParent.scrollTop + top - 196,
-              behavior: "smooth"
-            });
-          }
+        if (errorElement) {
+          errorElement.scrollIntoView({
+            behavior: "smooth",
+            block: "center"
+          });
           const input = errorElement.querySelector("input");
           if (input) {
             input.focus();
           }
         }
+        prevVersion.current = version;
       }
     };
-    t2 = [isSubmitting, isValidating, errors, containerRef];
-    $[0] = containerRef;
+    $[0] = containerRef?.current;
     $[1] = errors;
-    $[2] = isSubmitting;
-    $[3] = isValidating;
+    $[2] = isValidating;
+    $[3] = version;
     $[4] = t1;
-    $[5] = t2;
   } else {
     t1 = $[4];
-    t2 = $[5];
+  }
+  let t2;
+  if ($[5] !== containerRef || $[6] !== errors || $[7] !== isValidating || $[8] !== version) {
+    t2 = [isValidating, errors, containerRef, version];
+    $[5] = containerRef;
+    $[6] = errors;
+    $[7] = isValidating;
+    $[8] = version;
+    $[9] = t2;
+  } else {
+    t2 = $[9];
   }
   useEffect(t1, t2);
   return null;
 };
-const isScrollable = (ele) => {
-  const hasScrollableContent = ele && ele.scrollHeight > ele.clientHeight;
-  const overflowYStyle = ele ? window.getComputedStyle(ele).overflowY : null;
-  const isOverflowHidden = overflowYStyle && overflowYStyle.indexOf("hidden") !== -1;
-  return hasScrollableContent && !isOverflowHidden;
-};
-const getScrollableParent = (ele) => {
-  return !ele || ele === document.body ? document.body : isScrollable(ele) ? ele : getScrollableParent(ele.parentNode);
-};
 function EntityFormActions(t0) {
   const $ = c(16);
   const {
@@ -15064,7 +15042,7 @@ function EntityFormActions(t0) {
   const context = useFireCMSContext();
   const sideEntityController = useSideEntityController();
   let t1;
-  if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formContext || $[5] !== formex.isSubmitting || $[6] !== fullIdPath || $[7] !== fullPath || $[8] !== layout || $[9] !== navigateBack || $[10] !== openEntityMode || $[11] !== pluginActions || $[12] !== savingError || $[13] !== sideEntityController || $[14] !== status) {
+  if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formContext || $[5] !== formex || $[6] !== fullIdPath || $[7] !== fullPath || $[8] !== layout || $[9] !== navigateBack || $[10] !== openEntityMode || $[11] !== pluginActions || $[12] !== savingError || $[13] !== sideEntityController || $[14] !== status) {
     t1 = layout === "bottom" ? buildBottomActions$1({
       fullPath,
       fullIdPath,
@@ -15073,13 +15051,13 @@ function EntityFormActions(t0) {
       collection,
       context,
       sideEntityController,
-      isSubmitting: formex.isSubmitting,
       disabled,
       status,
       pluginActions,
       openEntityMode,
       navigateBack,
-      formContext
+      formContext,
+      formex
     }) : buildSideActions$1({
       fullPath,
       fullIdPath,
@@ -15088,18 +15066,18 @@ function EntityFormActions(t0) {
       collection,
       context,
       sideEntityController,
-      isSubmitting: formex.isSubmitting,
       disabled,
       status,
       pluginActions,
-      openEntityMode
+      openEntityMode,
+      formex
     });
     $[0] = collection;
     $[1] = context;
     $[2] = disabled;
     $[3] = entity;
     $[4] = formContext;
-    $[5] = formex.isSubmitting;
+    $[5] = formex;
     $[6] = fullIdPath;
     $[7] = fullPath;
     $[8] = layout;
@@ -15124,14 +15102,15 @@ function buildBottomActions$1({
   collection,
   context,
   sideEntityController,
-  isSubmitting,
   disabled,
   status,
   pluginActions,
   openEntityMode,
   navigateBack,
-  formContext
+  formContext,
+  formex
 }) {
+  const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
   return /* @__PURE__ */ jsxs(DialogActions, { position: "absolute", children: [
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) }),
     entity && (formActions ?? []).length > 0 && /* @__PURE__ */ jsx("div", { className: "flex-grow flex overflow-auto no-scrollbar", children: (formActions ?? []).map((action) => /* @__PURE__ */ jsx(IconButton, { color: "primary", onClick: (event) => {
@@ -15150,8 +15129,8 @@ function buildBottomActions$1({
       });
     }, children: action.icon }, action.name)) }),
     pluginActions,
-    /* @__PURE__ */ jsx(Button, { variant: "text", disabled: disabled || isSubmitting, color: "primary", type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
-    /* @__PURE__ */ jsxs(Button, { variant: "filled", color: "primary", type: "submit", disabled: disabled || isSubmitting, children: [
+    /* @__PURE__ */ jsx(Button, { variant: "text", disabled: disabled || formex.isSubmitting, color: "primary", type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
+    /* @__PURE__ */ jsxs(Button, { variant: "filled", color: "primary", type: "submit", disabled: disabled || formex.isSubmitting, startIcon: hasErrors ? /* @__PURE__ */ jsx(ErrorIcon, {}) : void 0, children: [
       status === "existing" && "Save",
       status === "copy" && "Create copy",
       status === "new" && "Create"
@@ -15168,22 +15147,35 @@ function buildSideActions$1({
   collection,
   context,
   sideEntityController,
-  isSubmitting,
   disabled,
   status,
-  pluginActions
+  pluginActions,
+  formex
 }) {
+  const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
   return /* @__PURE__ */ jsxs("div", { className: cls("overflow-auto h-full flex flex-col gap-2 w-80 2xl:w-96 px-4 py-16 sticky top-0 border-l", defaultBorderMixin), children: [
-    /* @__PURE__ */ jsxs(LoadingButton, { fullWidth: true, variant: "filled", color: "primary", type: "submit", size: "large", disabled: disabled || isSubmitting, children: [
+    /* @__PURE__ */ jsxs(LoadingButton, { fullWidth: true, variant: "filled", color: "primary", type: "submit", size: "large", startIcon: hasErrors ? /* @__PURE__ */ jsx(ErrorIcon, {}) : void 0, disabled: disabled || formex.isSubmitting, children: [
       status === "existing" && "Save",
       status === "copy" && "Create copy",
       status === "new" && "Create"
     ] }),
-    /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "text", disabled: disabled || isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
+    /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "text", disabled: disabled || formex.isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
     pluginActions,
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) })
   ] });
 }
+function extractTouchedValues(values, touched) {
+  let acc = {};
+  if (!touched || typeof touched !== "object") {
+    return acc;
+  }
+  Object.entries(touched).forEach(([key, value]) => {
+    if (value) {
+      acc = setIn(acc, key, getIn(values, key));
+    }
+  });
+  return acc;
+}
 function EntityForm({
   path,
   fullIdPath,
@@ -15241,7 +15233,7 @@ function EntityForm({
   const customizationController = useCustomizationController();
   const context = useFireCMSContext();
   const analyticsController = useAnalyticsController();
-  const [underlyingChanges, setUnderlyingChanges] = useState({});
+  const [underlyingChanges] = useState({});
   const [customIdLoading, setCustomIdLoading] = useState(false);
   const mustSetCustomId = (status === "new" || status === "copy") && Boolean(collection.customId) && collection.customId !== "optional";
   const initialEntityId = useMemo(() => {
@@ -15289,16 +15281,30 @@ function EntityForm({
       formexController.setSubmitting(false);
     });
   };
+  const baseInitialValues = getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs);
+  const initialValues = initialDirtyValues ? mergeDeep(baseInitialValues, initialDirtyValues) : baseInitialValues;
+  const initialDirty = Boolean(initialDirtyValues) && initialDirtyValues && Object.keys(initialDirtyValues).length > 0;
   const formex = formexProp ?? useCreateFormex({
-    initialValues: initialDirtyValues ?? getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs),
-    initialDirty: Boolean(initialDirtyValues),
+    initialValues,
+    initialDirty,
+    initialTouched: initialDirtyValues ? flattenKeys(initialDirtyValues).reduce((previousValue, currentValue) => ({
+      ...previousValue,
+      [currentValue]: true
+    }), {}) : {},
     onSubmit,
     onReset: () => {
       clearDirtyCache();
       onValuesModified?.(false);
     },
-    validation: (values_0) => {
-      return validationSchema?.validate(values_0, {
+    onValuesChangeDeferred: (values_0, controller) => {
+      const key = status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
+      if (controller.dirty) {
+        const touchedValues = extractTouchedValues(values_0, controller.touched);
+        saveEntityToCache(key, touchedValues);
+      }
+    },
+    validation: (values_1) => {
+      return validationSchema?.validate(values_1, {
         abortEarly: false
       }).then(() => {
         return {};
@@ -15381,7 +15387,7 @@ function EntityForm({
     console.error(e_3);
   }, [entityId, path, snackbarController]);
   const saveEntity = ({
-    values: values_1,
+    values: values_2,
     previousValues,
     entityId: entityId_0,
     collection: collection_0,
@@ -15390,7 +15396,7 @@ function EntityForm({
     return saveEntityWithCallbacks({
       path: path_0,
       entityId: entityId_0,
-      values: values_1,
+      values: values_2,
       previousValues,
       collection: collection_0,
       status,
@@ -15406,34 +15412,34 @@ function EntityForm({
     collection: collection_1,
     path: path_1,
     entityId: entityId_1,
-    values: values_2,
+    values: values_3,
     previousValues: previousValues_0,
     autoSave: autoSave_0
   }) => {
     if (!status) return;
     if (autoSave_0) {
-      setValuesToBeSaved(values_2);
+      setValuesToBeSaved(values_3);
     } else {
       return saveEntity({
         collection: collection_1,
         path: path_1,
         entityId: entityId_1,
-        values: values_2,
+        values: values_3,
         previousValues: previousValues_0
       });
     }
   };
   const lastSavedValues = useRef(entity?.values);
-  const save = (values_3) => {
-    lastSavedValues.current = values_3;
+  const save = (values_4) => {
+    lastSavedValues.current = values_4;
     return onSaveEntityRequest({
       collection: resolvedCollection,
       path,
       entityId,
-      values: values_3,
+      values: values_4,
       previousValues: entity?.values,
       autoSave: autoSave ?? false
-    }).then((res) => {
+    }).then(() => {
       const eventName = status === "new" ? "new_entity_saved" : status === "copy" ? "entity_copied" : status === "existing" ? "entity_edited" : "unmapped_event";
       analyticsController.onAnalyticsEvent?.(eventName, {
         path
@@ -15467,7 +15473,8 @@ function EntityForm({
       type: "error",
       message: "Error updating id, check the console"
     });
-  }, []);
+    console.error(error);
+  }, [snackbarController]);
   const pluginActions = [];
   const plugins = customizationController.plugins;
   const actionsDisabled = disabled || formex.isSubmitting || status === "existing" && !formex.dirty || Boolean(disabledProp);
@@ -15516,20 +15523,12 @@ function EntityForm({
       onValuesModified?.(modified);
     }
   }, [formex.dirty]);
-  const deferredValues = useDeferredValue(formex.values);
   const modified = formex.dirty;
   const uniqueFieldValidator = useCallback(({
     name,
-    value,
-    property
+    value
   }) => dataSource.checkUniqueField(path, name, value, entityId, collection), [dataSource, path, entityId]);
   const validationSchema = useMemo(() => entityId ? getYupEntitySchema(entityId, resolvedCollection.properties, uniqueFieldValidator) : void 0, [entityId, resolvedCollection.properties, uniqueFieldValidator]);
-  useEffect(() => {
-    const key = status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
-    if (modified) {
-      saveEntityToCache(key, deferredValues);
-    }
-  }, [deferredValues, modified, path, entityId, status]);
   useOnAutoSave(autoSave, formex, lastSavedValues, save);
   useEffect(() => {
     if (!autoSave && !formex.isSubmitting && underlyingChanges && entity) {
@@ -15548,18 +15547,18 @@ function EntityForm({
       return /* @__PURE__ */ jsx(Builder, { collection, entity, modifiedValues: formex.values, formContext });
     }
     return /* @__PURE__ */ jsx(FormLayout, { children: formFieldKeys.map((key_1) => {
-      const property_0 = resolvedCollection.properties[key_1];
-      if (property_0) {
+      const property = resolvedCollection.properties[key_1];
+      if (property) {
         const underlyingValueHasChanged = !!underlyingChanges && Object.keys(underlyingChanges).includes(key_1) && formex.touched[key_1];
-        const disabled_0 = disabledProp || !autoSave && formex.isSubmitting || isReadOnly(property_0) || Boolean(property_0.disabled);
-        const hidden = isHidden(property_0);
+        const disabled_0 = disabledProp || !autoSave && formex.isSubmitting || isReadOnly(property) || Boolean(property.disabled);
+        const hidden = isHidden(property);
         if (hidden) return null;
-        const widthPercentage = property_0.widthPercentage ?? 100;
+        const widthPercentage = property.widthPercentage ?? 100;
         const cmsFormFieldProps = {
           propertyKey: key_1,
           disabled: disabled_0,
-          property: property_0,
-          includeDescription: property_0.description || property_0.longDescription,
+          property,
+          includeDescription: property.description || property.longDescription,
           underlyingValueHasChanged: underlyingValueHasChanged && !autoSave,
           context: formContext,
           partOfArray: false,
@@ -15615,7 +15614,7 @@ function EntityForm({
   }
   const dialogActions = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, fullPath: path, fullIdPath, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex, disabled: actionsDisabled, status, pluginActions: pluginActions ?? [], openEntityMode, showDefaultActions, navigateBack, formContext });
   return /* @__PURE__ */ jsx(Formex, { value: formex, children: /* @__PURE__ */ jsxs("form", { onSubmit: formex.handleSubmit, onReset: () => formex.resetForm({
-    values: getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs)
+    values: baseInitialValues
   }), noValidate: true, className: cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", className), children: [
     /* @__PURE__ */ jsx("div", { id: `form_${path}`, className: cls("relative flex flex-row max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-6xl w-full h-fit"), children: /* @__PURE__ */ jsxs("div", { className: cls("flex flex-col w-full pt-12 pb-16 px-4 sm:px-8 md:px-10"), children: [
       formex.dirty ? /* @__PURE__ */ jsx(Tooltip, { title: "Local unsaved changes", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsx(Chip, { size: "small", colorScheme: "orangeDarker", children: /* @__PURE__ */ jsx(EditIcon, { size: "smallest" }) }) }) : /* @__PURE__ */ jsx(Tooltip, { title: "In sync with the database", className: "self-end sticky top-4 z-10", children: /* @__PURE__ */ jsx(Chip, { size: "small", children: /* @__PURE__ */ jsx(CheckIcon, { size: "smallest" }) }) }),
@@ -22828,14 +22827,14 @@ function EntityEditViewFormActions({
     collection,
     context,
     sideEntityController,
-    isSubmitting: formex.isSubmitting,
     disabled,
     status,
     sideDialogContext,
     pluginActions,
     openEntityMode,
     navigateBack,
-    formContext
+    formContext,
+    formex
   }) : buildSideActions({
     savingError,
     entity,
@@ -22843,14 +22842,14 @@ function EntityEditViewFormActions({
     collection,
     context,
     sideEntityController,
-    isSubmitting: formex.isSubmitting,
     sideDialogContext,
     disabled,
     status,
     pluginActions,
     openEntityMode,
     navigateBack,
-    formContext
+    formContext,
+    formex
   });
 }
 function buildBottomActions({
@@ -22860,15 +22859,16 @@ function buildBottomActions({
   collection,
   context,
   sideEntityController,
-  isSubmitting,
   disabled,
   status,
   sideDialogContext,
   pluginActions,
   openEntityMode,
   navigateBack,
-  formContext
+  formContext,
+  formex
 }) {
+  const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
   const canClose = openEntityMode === "side_panel";
   return /* @__PURE__ */ jsxs(DialogActions, { position: "absolute", children: [
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) }),
@@ -22888,15 +22888,16 @@ function buildBottomActions({
       return /* @__PURE__ */ jsx(EntityActionButton, { action, enabled: isEnabled, props }, action.key);
     }) }),
     pluginActions,
-    /* @__PURE__ */ jsx(Button, { variant: "text", color: "primary", disabled: disabled || isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
-    /* @__PURE__ */ jsxs(Button, { variant: canClose ? "text" : "filled", color: "primary", type: "submit", disabled: disabled || isSubmitting, onClick: () => {
+    hasErrors ? /* @__PURE__ */ jsx(ErrorTooltip, { title: "This form has errors", children: /* @__PURE__ */ jsx(ErrorIcon, { className: "ml-4", color: "error", size: "smallest" }) }) : null,
+    /* @__PURE__ */ jsx(Button, { variant: "text", color: "primary", disabled: disabled || formex.isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
+    /* @__PURE__ */ jsxs(Button, { variant: canClose ? "text" : "filled", color: "primary", type: "submit", disabled: disabled || formex.isSubmitting, onClick: () => {
       sideDialogContext.setPendingClose(false);
     }, children: [
       status === "existing" && "Save",
       status === "copy" && "Create copy",
       status === "new" && "Create"
     ] }),
-    canClose && /* @__PURE__ */ jsxs(LoadingButton, { variant: "filled", color: "primary", type: "submit", loading: isSubmitting, disabled, onClick: () => {
+    canClose && /* @__PURE__ */ jsxs(LoadingButton, { variant: "filled", color: "primary", type: "submit", loading: formex.isSubmitting, disabled, onClick: () => {
       sideDialogContext.setPendingClose?.(true);
     }, children: [
       status === "existing" && "Save and close",
@@ -22912,24 +22913,25 @@ function buildSideActions({
   collection,
   context,
   sideEntityController,
-  isSubmitting,
   disabled,
   status,
   sideDialogContext,
   pluginActions,
   openEntityMode,
   navigateBack,
-  formContext
+  formContext,
+  formex
 }) {
+  const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
   return /* @__PURE__ */ jsxs("div", { className: cls("overflow-auto h-full flex flex-col gap-2 w-80 2xl:w-96 px-4 py-16 sticky top-0 border-l", defaultBorderMixin), children: [
-    /* @__PURE__ */ jsxs(LoadingButton, { fullWidth: true, variant: "filled", color: "primary", type: "submit", size: "large", disabled: disabled || isSubmitting, onClick: () => {
+    /* @__PURE__ */ jsxs(LoadingButton, { fullWidth: true, variant: "filled", color: "primary", type: "submit", size: "large", startIcon: hasErrors ? /* @__PURE__ */ jsx(ErrorIcon, {}) : void 0, disabled: disabled || formex.isSubmitting, onClick: () => {
       sideDialogContext.setPendingClose?.(false);
     }, children: [
       status === "existing" && "Save",
       status === "copy" && "Create copy",
       status === "new" && "Create"
     ] }),
-    /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "text", disabled: disabled || isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
+    /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "text", disabled: disabled || formex.isSubmitting, type: "reset", children: status === "existing" ? "Discard" : "Clear" }),
     pluginActions,
     formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-row flex-wrap mt-2", children: formActions.map((action) => {
       const props = {
@@ -23157,7 +23159,8 @@ function EntityEditView({
     databaseId: props.databaseId,
     useCache: false
   });
-  const cachedValues = entityId ? getEntityFromCache(props.path + "/" + entityId) : getEntityFromCache(props.path + "#new");
+  const enableLocalChangesBackup = props.collection.enableLocalChangesBackup !== void 0 ? props.collection.enableLocalChangesBackup : true;
+  const initialDirtyValues = entityId ? getEntityFromCache(props.path + "/" + entityId, enableLocalChangesBackup) : getEntityFromCache(props.path + "#new", enableLocalChangesBackup);
   const authController = useAuthController();
   const initialStatus = props.copy ? "copy" : entityId ? "existing" : "new";
   const [status, setStatus] = useState(initialStatus);
@@ -23168,13 +23171,13 @@ function EntityEditView({
       return entity ? canEditEntity(props.collection, authController, props.path, entity ?? null) : void 0;
     }
   }, [authController, entity, status]);
-  if (dataLoading && !cachedValues || (!entity || canEdit === void 0) && (status === "existing" || status === "copy")) {
+  if (dataLoading && !initialDirtyValues || (!entity || canEdit === void 0) && (status === "existing" || status === "copy")) {
     return /* @__PURE__ */ jsx(CircularProgressCenter, {});
   }
-  if (entityId && !entity && !cachedValues) {
+  if (entityId && !entity && !initialDirtyValues) {
     console.error(`Entity with id ${entityId} not found in collection ${props.path}`);
   }
-  return /* @__PURE__ */ jsx(EntityEditViewInner, { ...props, entityId, entity, cachedDirtyValues: cachedValues, dataLoading, status, setStatus, canEdit });
+  return /* @__PURE__ */ jsx(EntityEditViewInner, { ...props, entityId, entity, initialDirtyValues, dataLoading, status, setStatus, canEdit });
 }
 function EntityEditViewInner({
   path,
@@ -23187,7 +23190,7 @@ function EntityEditViewInner({
   onSaved,
   onTabChange,
   entity,
-  cachedDirtyValues,
+  initialDirtyValues,
   dataLoading,
   layout = "side_panel",
   barActions,
@@ -23315,7 +23318,7 @@ function EntityEditViewInner({
     /* @__PURE__ */ jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection }),
     /* @__PURE__ */ jsx("div", { className: "h-16" })
   ] }) }) : null;
-  const entityView = /* @__PURE__ */ jsx(EntityForm, { fullIdPath, collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues: cachedDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
+  const entityView = /* @__PURE__ */ jsx(EntityForm, { fullIdPath, collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
     setUsedEntity(entity_0);
     formProps?.onEntityChange?.(entity_0);
   }, onStatusChange: (status_0) => {