@firecms/core 3.0.0-rc.1 → 3.0.0-rc.3

package/dist/index.es.js

@@ -1,8 +1,8 @@
 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 { getColorSchemeForSeed, CHIP_COLORS, FunctionsIcon, CircleIcon, iconKeys, coolIconKeys, Icon, Tooltip, ErrorIcon, Typography, IconButton, ContentCopyIcon, OpenInNewIcon, DescriptionIcon, cls, Skeleton, Chip, defaultBorderMixin, KeyboardTabIcon, Checkbox, 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, ListAltIcon, ListIcon, FlagIcon, MailIcon, HttpIcon, FormatQuoteIcon, SubjectIcon, ShortTextIcon, MenuIcon, ChevronLeftIcon } from "@firecms/ui";
+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, Badge, CircularProgress, SearchBar, 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, WarningIcon, KeyboardArrowDownIcon, VisibilityIcon, CheckIcon, CancelIcon, Alert, NotesIcon, InfoIcon, fieldBackgroundMixin, RemoveIcon, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, ArrowDropDownIcon, FilterListOffIcon, SearchIcon, Avatar, DarkModeIcon, LightModeIcon, BrightnessMediumIcon, LogoutIcon, HandleIcon, KeyboardArrowUpIcon, 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";
@@ -14,12 +14,12 @@ import * as locales from "date-fns/locale";
 import useMeasure from "react-use-measure";
 import * as yup from "yup";
 import { FixedSizeList } from "react-window";
-import { useSensor, MouseSensor, TouchSensor, KeyboardSensor, useSensors, closestCorners, closestCenter, pointerWithin, getFirstCollision, rectIntersection, useDroppable, useDndMonitor, DndContext, MeasuringStrategy, DragOverlay, PointerSensor } from "@dnd-kit/core";
+import { useSensor, MouseSensor, TouchSensor, KeyboardSensor, useSensors, closestCenter, pointerWithin, closestCorners, getFirstCollision, rectIntersection, useDroppable, useDndMonitor, DndContext, MeasuringStrategy, DragOverlay, PointerSensor } from "@dnd-kit/core";
 import { useSortable, defaultAnimateLayoutChanges, arrayMove as arrayMove$1, SortableContext, rectSortingStrategy, verticalListSortingStrategy, sortableKeyboardCoordinates, horizontalListSortingStrategy } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { restrictToVerticalAxis, restrictToWindowEdges } from "@dnd-kit/modifiers";
 import { useDropzone } from "react-dropzone";
-import Resizer from "react-image-file-resizer";
+import Compressor from "compressorjs";
 import { FireCMSEditor } from "@firecms/editor";
 import { themes, Highlight } from "prism-react-renderer";
 import { useLocation as useLocation$1, useBlocker } from "react-router";
@@ -210,9 +210,14 @@ class EntityReference {
    * to the root of the database).
    */
   path;
-  constructor(id, path) {
+  /**
+   * Optional database ID where the entity is stored (if multiple databases are used)
+   */
+  databaseId;
+  constructor(id, path, databaseId) {
     this.id = id;
     this.path = path;
+    this.databaseId = databaseId;
   }
   get pathWithId() {
     return `${this.path}/${this.id}`;
@@ -250,6 +255,13 @@ const pick = (obj, ...args) => ({
 function isObject(item) {
   return item && typeof item === "object" && !Array.isArray(item);
 }
+function isPlainObject(obj) {
+  if (typeof obj !== "object" || obj === null || Array.isArray(obj)) {
+    return false;
+  }
+  const proto = Object.getPrototypeOf(obj);
+  return proto === Object.prototype;
+}
 function mergeDeep(target, source, ignoreUndefined = false) {
   if (!isObject(target)) {
     return target;
@@ -270,7 +282,28 @@ function mergeDeep(target, source, ignoreUndefined = false) {
       if (sourceValue instanceof Date) {
         output[key] = new Date(sourceValue.getTime());
       } else if (Array.isArray(sourceValue)) {
-        output[key] = [...sourceValue];
+        if (Array.isArray(outputValue)) {
+          const newArray = [];
+          const maxLength = Math.max(outputValue.length, sourceValue.length);
+          for (let i = 0; i < maxLength; i++) {
+            const sourceItem = sourceValue[i];
+            const targetItem = outputValue[i];
+            if (i >= sourceValue.length) {
+              newArray[i] = targetItem;
+            } else if (i >= outputValue.length) {
+              newArray[i] = sourceItem;
+            } else if (sourceItem === null) {
+              newArray[i] = targetItem;
+            } else if (isObject(sourceItem) && isObject(targetItem)) {
+              newArray[i] = mergeDeep(targetItem, sourceItem, ignoreUndefined);
+            } else {
+              newArray[i] = sourceItem;
+            }
+          }
+          output[key] = newArray;
+        } else {
+          output[key] = [...sourceValue];
+        }
       } else if (isObject(sourceValue)) {
         if (isObject(outputValue)) {
           output[key] = mergeDeep(outputValue, sourceValue, ignoreUndefined);
@@ -517,7 +550,7 @@ function sanitizeData(values, properties) {
   return result;
 }
 function getReferenceFrom(entity) {
-  return new EntityReference(entity.id, entity.path);
+  return new EntityReference(entity.id, entity.path, entity.databaseId);
 }
 function traverseValuesProperties(inputValues, properties, operation) {
   const updatedValues = Object.entries(properties).map(([key, property]) => {
@@ -1049,6 +1082,12 @@ const applyPermissionsFunctionIfEmpty = (collections, permissionsBuilder) => {
     };
   });
 };
+function getLocalChangesBackup(collection) {
+  if (!collection.localChangesBackup) {
+    return "manual_apply";
+  }
+  return collection.localChangesBackup;
+}
 const kebabCaseRegex = /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g;
 const toKebabCase = (str) => {
   const regExpMatchArray = str.match(kebabCaseRegex);
@@ -3505,26 +3544,6 @@ function makePropertiesEditable(properties) {
   });
   return properties;
 }
-function makePropertiesNonEditable(properties) {
-  return Object.entries(properties).reduce((acc, [key, property]) => {
-    if (!isPropertyBuilder(property) && property.dataType === "map" && property.properties) {
-      const updated = {
-        ...property,
-        properties: makePropertiesNonEditable(property.properties)
-      };
-      acc[key] = updated;
-    }
-    if (isPropertyBuilder(property)) {
-      acc[key] = property;
-    } else {
-      acc[key] = {
-        ...property,
-        editable: false
-      };
-    }
-    return acc;
-  }, {});
-}
 function applyModifyFunction(modifyCollection, collection, parentPaths) {
   if (modifyCollection) {
     const modified = modifyCollection({
@@ -3606,8 +3625,8 @@ function mergePropertyOrBuilder(target, source) {
     return target;
   } else {
     const mergedProperty = mergeDeep(target, source);
-    const targetEditable = Boolean(target.editable);
-    const sourceEditable = Boolean(source.editable);
+    const targetEditable = target.editable === void 0 ? true : Boolean(target.editable);
+    const sourceEditable = source.editable === void 0 ? true : Boolean(source.editable);
     if (source.dataType === "map" && source.properties) {
       const targetProperties = "properties" in target ? target.properties : {};
       const sourceProperties = "properties" in source ? source.properties : {};
@@ -4068,6 +4087,10 @@ const AnalyticsContext = React__default.createContext({});
 const useAnalyticsController = () => {
   return useContext(AnalyticsContext);
 };
+const InternalUserManagementContext = React__default.createContext({});
+const useInternalUserManagementController = () => {
+  return useContext(InternalUserManagementContext);
+};
 const useFireCMSContext = () => {
   const authController = useAuthController();
   const sideDialogsController = useSideDialogsController();
@@ -4080,6 +4103,7 @@ const useFireCMSContext = () => {
   const dialogsController = useDialogsController();
   const customizationController = useCustomizationController();
   const analyticsController = useAnalyticsController();
+  const userManagement = useInternalUserManagementController();
   const fireCMSContextRef = React__default.useRef({
     authController,
     sideDialogsController,
@@ -4091,7 +4115,8 @@ const useFireCMSContext = () => {
     userConfigPersistence,
     dialogsController,
     customizationController,
-    analyticsController
+    analyticsController,
+    userManagement
   });
   useEffect(() => {
     fireCMSContextRef.current = {
@@ -4105,7 +4130,8 @@ const useFireCMSContext = () => {
       userConfigPersistence,
       dialogsController,
       customizationController,
-      analyticsController
+      analyticsController,
+      userManagement
     };
   }, [authController, dialogsController, navigation, sideDialogsController]);
   return fireCMSContextRef.current;
@@ -4166,7 +4192,7 @@ function useCollectionFetch(t0) {
         }
         setDataLoading(false);
         setDataLoadingError(void 0);
-        setData(entities.map(_temp$r));
+        setData(entities.map(_temp$t));
         setNoMoreToLoad(!itemCount || entities.length < itemCount);
       };
       const onError = (error) => {
@@ -4199,7 +4225,7 @@ function useCollectionFetch(t0) {
           orderBy: sortByProperty,
           order: currentSort
         }).then(onEntitiesUpdate).catch(onError);
-        return _temp2$d;
+        return _temp2$e;
       }
     };
     $[4] = collection;
@@ -4247,9 +4273,9 @@ function useCollectionFetch(t0) {
   }
   return t5;
 }
-function _temp2$d() {
+function _temp2$e() {
 }
-function _temp$r(e_0) {
+function _temp$t(e_0) {
   return {
     ...e_0
   };
@@ -4314,7 +4340,7 @@ function useEntityFetch(t0) {
         setEntity(CACHE[`${path}/${entityId}`]);
         setDataLoading(false);
         setDataLoadingError(void 0);
-        return _temp$q;
+        return _temp$s;
       } else {
         if (entityId && path && collection) {
           if (dataSource.listenEntity) {
@@ -4333,7 +4359,7 @@ function useEntityFetch(t0) {
               databaseId,
               collection
             }).then(onEntityUpdate).catch(onError);
-            return _temp2$c;
+            return _temp2$d;
           }
         } else {
           onEntityUpdate(void 0);
@@ -4380,9 +4406,9 @@ function useEntityFetch(t0) {
 }
 function _temp3$4() {
 }
-function _temp2$c() {
+function _temp2$d() {
 }
-function _temp$q() {
+function _temp$s() {
 }
 async function saveEntityWithCallbacks({
   collection,
@@ -4762,6 +4788,48 @@ function checkLargeLayout(breakpoint = "lg") {
   if (typeof window === "undefined") return false;
   return window.matchMedia(`(min-width: ${breakpoints[breakpoint] + 1}px)`).matches;
 }
+function useCollapsedGroups(groupNames) {
+  const [collapsedGroups, setCollapsedGroups] = useState(() => {
+    try {
+      const stored = localStorage.getItem("firecms-collapsed-groups");
+      return stored ? JSON.parse(stored) : {};
+    } catch {
+      return {};
+    }
+  });
+  useEffect(() => {
+    try {
+      localStorage.setItem("firecms-collapsed-groups", JSON.stringify(collapsedGroups));
+    } catch {
+    }
+  }, [collapsedGroups]);
+  useEffect(() => {
+    if (groupNames.length === 0) return;
+    const currentGroupNames = new Set(groupNames);
+    setCollapsedGroups((prev) => {
+      const cleaned = Object.fromEntries(Object.entries(prev).filter(([groupName]) => currentGroupNames.has(groupName)));
+      const prevKeys = Object.keys(prev);
+      const cleanedKeys = Object.keys(cleaned);
+      if (prevKeys.length === cleanedKeys.length && prevKeys.every((key) => cleanedKeys.includes(key))) {
+        return prev;
+      }
+      return cleaned;
+    });
+  }, [groupNames]);
+  const isGroupCollapsed = useCallback((name) => {
+    return !!collapsedGroups[name];
+  }, [collapsedGroups]);
+  const toggleGroupCollapsed = useCallback((name_0) => {
+    setCollapsedGroups((prev_0) => ({
+      ...prev_0,
+      [name_0]: !prev_0[name_0]
+    }));
+  }, []);
+  return {
+    isGroupCollapsed,
+    toggleGroupCollapsed
+  };
+}
 function ErrorTooltip(props) {
   const $ = c(2);
   let t0;
@@ -4782,6 +4850,7 @@ function ErrorView(t0) {
     tooltip
   } = t0;
   const component = error instanceof Error ? error.message : error;
+  console.warn("ErrorView", JSON.stringify(error));
   let t1;
   if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
     t1 = /* @__PURE__ */ jsx(ErrorIcon, { className: "mx-2", size: "small", color: "error" });
@@ -4966,7 +5035,7 @@ function ImagePreview(t0) {
   }
   let t9;
   if ($[16] !== url) {
-    t9 = /* @__PURE__ */ jsx(Tooltip, { title: "Open image in new tab", side: "bottom", children: /* @__PURE__ */ jsx(IconButton, { className: "invisible group-hover:visible", variant: "filled", component: "a", href: url, rel: "noopener noreferrer", target: "_blank", size: "smallest", onClick: _temp$p, children: t8 }) });
+    t9 = /* @__PURE__ */ jsx(Tooltip, { title: "Open image in new tab", side: "bottom", children: /* @__PURE__ */ jsx(IconButton, { className: "invisible group-hover:visible", variant: "filled", component: "a", href: url, rel: "noopener noreferrer", target: "_blank", size: "smallest", onClick: _temp$r, children: t8 }) });
     $[16] = url;
     $[17] = t9;
   } else {
@@ -5000,7 +5069,7 @@ function ImagePreview(t0) {
   }
   return t11;
 }
-function _temp$p(e_0) {
+function _temp$r(e_0) {
   return e_0.stopPropagation();
 }
 function UrlComponentPreview(t0) {
@@ -5033,7 +5102,7 @@ function UrlComponentPreview(t0) {
     }
     let t3;
     if ($[2] !== url) {
-      t3 = /* @__PURE__ */ jsxs("a", { className: "flex gap-4 break-words items-center font-medium text-primary visited:text-primary dark:visited:text-primary dark:text-primary", href: url, rel: "noopener noreferrer", onMouseDown: _temp$o, target: "_blank", children: [
+      t3 = /* @__PURE__ */ jsxs("a", { className: "flex gap-4 break-words items-center font-medium text-primary visited:text-primary dark:visited:text-primary dark:text-primary", href: url, rel: "noopener noreferrer", onMouseDown: _temp$q, target: "_blank", children: [
         t2,
         url
       ] });
@@ -5136,7 +5205,7 @@ function UrlComponentPreview(t0) {
         }
         let t7;
         if ($[24] !== t4 || $[25] !== t6 || $[26] !== url) {
-          t7 = /* @__PURE__ */ jsxs("a", { href: url, rel: "noopener noreferrer", target: "_blank", onClick: _temp2$b, className: "flex flex-col items-center justify-center", style: t4, children: [
+          t7 = /* @__PURE__ */ jsxs("a", { href: url, rel: "noopener noreferrer", target: "_blank", onClick: _temp2$c, className: "flex flex-col items-center justify-center", style: t4, children: [
             t5,
             t6
           ] });
@@ -5161,10 +5230,10 @@ function UrlComponentPreview(t0) {
     }
   }
 }
-function _temp2$b(e_0) {
+function _temp2$c(e_0) {
   return e_0.stopPropagation();
 }
-function _temp$o(e) {
+function _temp$q(e) {
   e.preventDefault();
 }
 function VideoPreview(t0) {
@@ -5298,7 +5367,7 @@ function SkeletonPropertyComponent(t0) {
         if (Array.isArray(arrayProperty.of)) {
           let t1;
           if ($[6] !== arrayProperty.of) {
-            t1 = arrayProperty.of.map(_temp$n);
+            t1 = arrayProperty.of.map(_temp$p);
             $[6] = arrayProperty.of;
             $[7] = t1;
           } else {
@@ -5436,7 +5505,7 @@ function SkeletonPropertyComponent(t0) {
   }
   return content || null;
 }
-function _temp$n(p, i) {
+function _temp$p(p, i) {
   return renderGenericArrayCell(p, i);
 }
 function renderMap(property, size) {
@@ -5795,7 +5864,7 @@ function ArrayPropertyPreview(t0) {
   }
   let t3;
   if ($[11] !== t2) {
-    t3 = /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2", children: t2 });
+    t3 = /* @__PURE__ */ jsx("div", { className: "w-full flex flex-col gap-2", children: t2 });
     $[11] = t2;
     $[12] = t3;
   } else {
@@ -6007,7 +6076,7 @@ const ReferencePreview = function ReferencePreview2(props) {
   }
   let t0;
   if ($[8] !== props) {
-    t0 = /* @__PURE__ */ jsx(ReferencePreviewInternal, { ...props });
+    t0 = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(ReferencePreviewInternal, { ...props }) });
     $[8] = props;
     $[9] = t0;
   } else {
@@ -6583,7 +6652,7 @@ function MapPropertyPreview(t0) {
       const isArrayOrMap = childProperty.dataType === "map" || childProperty === "array";
       return /* @__PURE__ */ jsxs("div", { className: cls(defaultBorderMixin, "last:border-b-0 border-b"), children: [
         /* @__PURE__ */ jsxs("div", { className: "flex flex-row pt-0.5 pb-0.5 gap-2", children: [
-          /* @__PURE__ */ jsx("div", { className: "min-w-[140px] w-[25%] py-1", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "font-mono break-words", color: "secondary", children: childProperty.name }) }),
+          /* @__PURE__ */ jsx("div", { className: "min-w-[140px] w-[25%] py-1", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "break-words font-semibold", color: "secondary", children: childProperty.name }) }),
           /* @__PURE__ */ jsx("div", { className: "flex-grow max-w-[75%]", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: !isArrayOrMap && /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: key_0, value: value[key_0], property: childProperty, size }) }) })
         ] }),
         isArrayOrMap && /* @__PURE__ */ jsx("div", { className: cls(defaultBorderMixin, "border-l pl-4 ml-2 my-2"), children: /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: key_0, value: value[key_0], property: childProperty, size }) })
@@ -6619,7 +6688,7 @@ function KeyValuePreview(t0) {
   }
   let t1;
   if ($[1] !== value) {
-    t1 = Object.entries(value).map(_temp$m);
+    t1 = Object.entries(value).map(_temp$o);
     $[1] = value;
     $[2] = t1;
   } else {
@@ -6635,11 +6704,11 @@ function KeyValuePreview(t0) {
   }
   return t2;
 }
-function _temp$m(t0) {
+function _temp$o(t0) {
   const [key, childValue] = t0;
   return /* @__PURE__ */ jsxs("div", { className: cls(defaultBorderMixin, "last:border-b-0 border-b"), children: [
     /* @__PURE__ */ jsxs("div", { className: "flex flex-row pt-0.5 pb-0.5 gap-2", children: [
-      /* @__PURE__ */ jsx("div", { className: "min-w-[140px] w-[25%] py-1", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "font-mono break-words", color: "secondary", children: key }) }, `table-cell-title-${key}-${key}`),
+      /* @__PURE__ */ jsx("div", { className: "min-w-[140px] w-[25%] py-1", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "font-semibold break-words", color: "secondary", children: key }) }, `table-cell-title-${key}-${key}`),
       /* @__PURE__ */ jsx("div", { className: "flex-grow max-w-[75%]", children: childValue && typeof childValue !== "object" && /* @__PURE__ */ jsx(Typography, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: childValue.toString() }) }) })
     ] }),
     typeof childValue === "object" && /* @__PURE__ */ jsx("div", { className: cls(defaultBorderMixin, "border-l pl-4"), children: /* @__PURE__ */ jsx(KeyValuePreview, { value: childValue }) })
@@ -6716,7 +6785,7 @@ function BooleanPreview(t0) {
   return t3;
 }
 function NumberPropertyPreview(t0) {
-  const $ = c(10);
+  const $ = c(12);
   const {
     value,
     property,
@@ -6734,39 +6803,178 @@ function NumberPropertyPreview(t0) {
     }
     const enumValues = t1;
     if (!enumValues) {
-      let t22;
-      if ($[2] !== value) {
-        t22 = /* @__PURE__ */ jsx(Fragment, { children: value });
-        $[2] = value;
-        $[3] = t22;
+      const t22 = size === "small" ? "text-sm" : "";
+      let t32;
+      if ($[2] !== t22 || $[3] !== value) {
+        t32 = /* @__PURE__ */ jsx("span", { className: t22, children: value });
+        $[2] = t22;
+        $[3] = value;
+        $[4] = t32;
       } else {
-        t22 = $[3];
+        t32 = $[4];
       }
-      return t22;
+      return t32;
     }
     const t2 = size !== "medium" ? "small" : "medium";
     let t3;
-    if ($[4] !== enumKey || $[5] !== enumValues || $[6] !== t2) {
+    if ($[5] !== enumKey || $[6] !== enumValues || $[7] !== t2) {
       t3 = /* @__PURE__ */ jsx(EnumValuesChip, { enumKey, enumValues, size: t2 });
-      $[4] = enumKey;
-      $[5] = enumValues;
-      $[6] = t2;
-      $[7] = t3;
+      $[5] = enumKey;
+      $[6] = enumValues;
+      $[7] = t2;
+      $[8] = t3;
     } else {
-      t3 = $[7];
+      t3 = $[8];
     }
     return t3;
   } else {
-    let t1;
-    if ($[8] !== value) {
-      t1 = /* @__PURE__ */ jsx(Fragment, { children: value });
-      $[8] = value;
+    const t1 = size === "small" ? "text-sm" : "";
+    let t2;
+    if ($[9] !== t1 || $[10] !== value) {
+      t2 = /* @__PURE__ */ jsx("span", { className: t1, children: value });
       $[9] = t1;
+      $[10] = value;
+      $[11] = t2;
+    } else {
+      t2 = $[11];
+    }
+    return t2;
+  }
+}
+function UserDisplay(t0) {
+  const $ = c(18);
+  const {
+    user
+  } = t0;
+  if (!user) {
+    let t12;
+    if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+      t12 = /* @__PURE__ */ jsx(EmptyValue, {});
+      $[0] = t12;
+    } else {
+      t12 = $[0];
+    }
+    return t12;
+  }
+  let t1;
+  if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
+    t1 = cls("inline-flex items-center gap-4 px-2 py-1 rounded-xl", "bg-surface-accent-100 dark:bg-surface-accent-800", "border", defaultBorderMixin);
+    $[1] = t1;
+  } else {
+    t1 = $[1];
+  }
+  let t2;
+  if ($[2] !== user.displayName || $[3] !== user.email || $[4] !== user.photoURL) {
+    t2 = user.photoURL ? /* @__PURE__ */ jsx("img", { src: user.photoURL, alt: user.displayName || user.email || "User", className: cls("rounded-full object-cover", "w-6 h-6") }) : /* @__PURE__ */ jsx(AccountCircleIcon, { className: cls("text-text-secondary dark:text-text-secondary-dark", "w-6 h-6") });
+    $[2] = user.displayName;
+    $[3] = user.email;
+    $[4] = user.photoURL;
+    $[5] = t2;
+  } else {
+    t2 = $[5];
+  }
+  let t3;
+  if ($[6] === Symbol.for("react.memo_cache_sentinel")) {
+    t3 = cls("font-regular truncate", "text-sm");
+    $[6] = t3;
+  } else {
+    t3 = $[6];
+  }
+  const t4 = user.displayName || user.email || "-";
+  let t5;
+  if ($[7] !== t4) {
+    t5 = /* @__PURE__ */ jsx("span", { className: t3, children: t4 });
+    $[7] = t4;
+    $[8] = t5;
+  } else {
+    t5 = $[8];
+  }
+  let t6;
+  if ($[9] !== user.displayName || $[10] !== user.email) {
+    t6 = user.displayName && user.email && /* @__PURE__ */ jsx("span", { className: cls("text-text-secondary dark:text-text-secondary-dark truncate", "text-xs"), children: user.email });
+    $[9] = user.displayName;
+    $[10] = user.email;
+    $[11] = t6;
+  } else {
+    t6 = $[11];
+  }
+  let t7;
+  if ($[12] !== t5 || $[13] !== t6) {
+    t7 = /* @__PURE__ */ jsxs("div", { className: "flex flex-col min-w-0", children: [
+      t5,
+      t6
+    ] });
+    $[12] = t5;
+    $[13] = t6;
+    $[14] = t7;
+  } else {
+    t7 = $[14];
+  }
+  let t8;
+  if ($[15] !== t2 || $[16] !== t7) {
+    t8 = /* @__PURE__ */ jsxs("div", { className: t1, children: [
+      t2,
+      t7
+    ] });
+    $[15] = t2;
+    $[16] = t7;
+    $[17] = t8;
+  } else {
+    t8 = $[17];
+  }
+  return t8;
+}
+function UserPreview(t0) {
+  const $ = c(8);
+  const {
+    value
+  } = t0;
+  const {
+    getUser
+  } = useInternalUserManagementController();
+  if (!value) {
+    let t12;
+    if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+      t12 = /* @__PURE__ */ jsx(EmptyValue, {});
+      $[0] = t12;
+    } else {
+      t12 = $[0];
+    }
+    return t12;
+  }
+  let t1;
+  if ($[1] !== getUser || $[2] !== value) {
+    t1 = getUser(value);
+    $[1] = getUser;
+    $[2] = value;
+    $[3] = t1;
+  } else {
+    t1 = $[3];
+  }
+  const user = t1;
+  if (!user) {
+    let t22;
+    if ($[4] !== value) {
+      t22 = /* @__PURE__ */ jsxs(Typography, { variant: "caption", color: "secondary", children: [
+        "User not found: ",
+        value
+      ] });
+      $[4] = value;
+      $[5] = t22;
     } else {
-      t1 = $[9];
+      t22 = $[5];
     }
-    return t1;
+    return t22;
   }
+  let t2;
+  if ($[6] !== user) {
+    t2 = /* @__PURE__ */ jsx(UserDisplay, { user });
+    $[6] = user;
+    $[7] = t2;
+  } else {
+    t2 = $[7];
+  }
+  return t2;
 }
 const PropertyPreview = React__default.memo(function PropertyPreview2(props) {
   const $ = c(31);
@@ -6868,21 +7076,25 @@ const PropertyPreview = React__default.memo(function PropertyPreview2(props) {
                     }
                     content = t02;
                   } else {
-                    if (stringProperty.reference) {
-                      if (typeof stringProperty.reference.path === "string") {
-                        content = /* @__PURE__ */ jsx(ReferencePreview, { disabled: !stringProperty.reference.path, previewProperties: stringProperty.reference.previewProperties, includeId: stringProperty.reference.includeId, includeEntityLink: stringProperty.reference.includeEntityLink, size: props.size, reference: new EntityReference(value, stringProperty.reference.path) });
-                      } else {
-                        let t02;
-                        if ($[23] === Symbol.for("react.memo_cache_sentinel")) {
-                          t02 = /* @__PURE__ */ jsx(EmptyValue, {});
-                          $[23] = t02;
+                    if (stringProperty.userSelect) {
+                      content = /* @__PURE__ */ jsx(UserPreview, { value, property: stringProperty, propertyKey, size: props.size });
+                    } else {
+                      if (stringProperty.reference) {
+                        if (typeof stringProperty.reference.path === "string") {
+                          content = /* @__PURE__ */ jsx(ReferencePreview, { disabled: !stringProperty.reference.path, previewProperties: stringProperty.reference.previewProperties, includeId: stringProperty.reference.includeId, includeEntityLink: stringProperty.reference.includeEntityLink, size: props.size, reference: new EntityReference(value, stringProperty.reference.path) });
                         } else {
-                          t02 = $[23];
+                          let t02;
+                          if ($[23] === Symbol.for("react.memo_cache_sentinel")) {
+                            t02 = /* @__PURE__ */ jsx(EmptyValue, {});
+                            $[23] = t02;
+                          } else {
+                            t02 = $[23];
+                          }
+                          content = t02;
                         }
-                        content = t02;
+                      } else {
+                        content = /* @__PURE__ */ jsx(StringPropertyPreview, { ...props, property: stringProperty, value });
                       }
-                    } else {
-                      content = /* @__PURE__ */ jsx(StringPropertyPreview, { ...props, property: stringProperty, value });
                     }
                   }
                 }
@@ -7175,98 +7387,467 @@ const AsyncPreviewComponent = React.memo(function AsyncPreviewComponentInternal(
   }
   return t3;
 });
-function EntityView({
-  entity,
-  collection,
-  path,
-  className
-}) {
-  const authController = useAuthController();
-  const customizationController = useCustomizationController();
-  const resolvedCollection = useMemo(() => resolveCollection({
-    collection,
-    path,
-    entityId: entity.id,
-    values: entity.values,
-    propertyConfigs: customizationController.propertyConfigs,
-    authController
-  }), [collection, path, entity, customizationController.propertyConfigs]);
-  const properties = resolvedCollection.properties;
-  return /* @__PURE__ */ jsx("div", { className: "w-full " + className, children: /* @__PURE__ */ jsxs("div", { className: "w-full mb-4", children: [
-    /* @__PURE__ */ jsxs("div", { className: cls(defaultBorderMixin, "flex justify-between py-2 border-b last:border-b-0"), children: [
-      /* @__PURE__ */ jsx("div", { className: "flex items-center w-1/4", children: /* @__PURE__ */ jsx("span", { className: "pl-2 text-sm text-surface-600", children: "Id" }) }),
-      /* @__PURE__ */ jsxs("div", { className: "flex-grow p-2 ml-2 w-3/4 text-surface-900 dark:text-white min-h-[56px] flex items-center", children: [
-        /* @__PURE__ */ jsx("span", { className: "flex-grow mr-2", children: entity.id }),
-        customizationController?.entityLinkBuilder && /* @__PURE__ */ jsx("a", { href: customizationController.entityLinkBuilder({
-          entity
-        }), rel: "noopener noreferrer", target: "_blank", children: /* @__PURE__ */ jsx(IconButton, { children: /* @__PURE__ */ jsx(OpenInNewIcon, { size: "small" }) }) })
-      ] })
-    ] }),
-    Object.entries(properties).map(([key, property]) => {
-      const value = entity.values?.[key];
-      return /* @__PURE__ */ jsxs("div", { className: cls(defaultBorderMixin, "flex justify-between py-2 border-b last:border-b-0"), children: [
-        /* @__PURE__ */ jsx("div", { className: "flex items-center w-1/4", children: /* @__PURE__ */ jsx("span", { className: "pl-2 text-sm text-surface-600", children: property.name }) }),
-        /* @__PURE__ */ jsx("div", { className: "flex-grow p-2 ml-2 w-3/4 text-surface-900 dark:text-white min-h-[56px] flex items-center", children: /* @__PURE__ */ jsx(
-          PropertyPreview,
-          {
-            propertyKey: key,
-            value,
-            property,
-            size: "medium"
-          }
-        ) })
-      ] }, `reference_previews_${key}`);
-    })
-  ] }) });
+function buildPropertyLabelAndGetProperty(properties, key) {
+  if (!key) return {
+    label: "",
+    property: void 0
+  };
+  const segments = [];
+  const re = /([^[.\]]+)|\[(\d+)\]/g;
+  let m;
+  while ((m = re.exec(key)) !== null) {
+    if (m[1] !== void 0) segments.push(m[1]);
+    else if (m[2] !== void 0) segments.push(Number(m[2]));
+  }
+  let currentProps = properties;
+  let currentProp;
+  let lastLabel = "";
+  const getArrayOfProp = (p) => {
+    if (!p || p.dataType !== "array") return void 0;
+    return Array.isArray(p.of) ? p.of[0] : p.of;
+  };
+  for (const seg of segments) {
+    if (typeof seg === "number") {
+      lastLabel = `[${seg}]`;
+      if (currentProp?.dataType === "array") {
+        currentProp = getArrayOfProp(currentProp);
+        if (currentProp?.dataType === "map" && currentProp.properties) {
+          currentProps = currentProp.properties;
+        } else {
+          currentProps = void 0;
+        }
+      } else {
+        currentProp = void 0;
+        currentProps = void 0;
+      }
+      continue;
+    }
+    if (currentProps && currentProps[seg]) {
+      const nextProp = currentProps[seg];
+      currentProp = nextProp;
+      lastLabel = nextProp.name || String(seg);
+      if (nextProp.dataType === "map" && nextProp.properties) {
+        currentProps = nextProp.properties;
+      } else if (nextProp.dataType === "array") {
+        currentProps = void 0;
+      } else {
+        currentProps = void 0;
+      }
+    } else {
+      currentProp = void 0;
+      currentProps = void 0;
+      lastLabel = String(seg);
+    }
+  }
+  return {
+    label: lastLabel,
+    property: currentProp
+  };
 }
-function VirtualTableInput(props) {
-  const $ = c(22);
-  const ref = React__default.useRef(null);
+const pathEndsWithIndex = (p) => /\[\d+\]$/.test(p);
+const PropertyCollectionView = (t0) => {
+  const $ = c(89);
   const {
-    value,
-    multiline,
-    updateValue,
-    focused
-  } = props;
-  const prevValue = useRef(value);
-  const [internalValue, setInternalValue] = useState(value);
-  const focusedState = useRef(false);
-  let t0;
-  if ($[0] !== internalValue || $[1] !== value) {
-    t0 = () => {
-      if (prevValue.current !== value && value !== internalValue) {
-        setInternalValue(value);
+    data,
+    properties,
+    baseKey: t1,
+    suppressHeader: t2,
+    size: t3
+  } = t0;
+  const baseKey = t1 === void 0 ? "" : t1;
+  const suppressHeader = t2 === void 0 ? false : t2;
+  const size = t3 === void 0 ? "small" : t3;
+  const isTopLevel = !!baseKey && !baseKey.includes(".") && !baseKey.includes("[");
+  if (Array.isArray(data)) {
+    let t4;
+    if ($[0] !== baseKey || $[1] !== properties) {
+      t4 = baseKey ? buildPropertyLabelAndGetProperty(properties, baseKey) : {
+        label: "",
+        property: void 0
+      };
+      $[0] = baseKey;
+      $[1] = properties;
+      $[2] = t4;
+    } else {
+      t4 = $[2];
+    }
+    const {
+      label: arrayLabel,
+      property
+    } = t4;
+    const ofProp = property?.dataType === "array" ? Array.isArray(property.of) ? property.of[0] : property.of : void 0;
+    const isArrayOfMaps = ofProp?.dataType === "map";
+    const isArrayOfPrimitives = property?.dataType === "array" && ofProp && ofProp.dataType !== "map";
+    if (baseKey && property && isArrayOfPrimitives) {
+      const t52 = `grid grid-cols-12 gap-x-4 ${isTopLevel ? "py-4" : "py-2"} items-start ${isTopLevel ? `border-b ${defaultBorderMixin} last:border-b-0` : ""}`;
+      let t62;
+      if ($[3] !== arrayLabel) {
+        t62 = /* @__PURE__ */ jsx("div", { className: "col-span-4 pr-2", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", component: "span", className: "break-words", children: arrayLabel }) });
+        $[3] = arrayLabel;
+        $[4] = t62;
+      } else {
+        t62 = $[4];
       }
-      prevValue.current = value;
-    };
-    $[0] = internalValue;
-    $[1] = value;
-    $[2] = t0;
-  } else {
-    t0 = $[2];
-  }
-  let t1;
-  if ($[3] !== value) {
-    t1 = [value];
-    $[3] = value;
-    $[4] = t1;
-  } else {
-    t1 = $[4];
-  }
-  useEffect(t0, t1);
-  let t2;
-  if ($[5] !== internalValue || $[6] !== updateValue || $[7] !== value) {
-    t2 = () => {
-      const emptyInitialValue = !value;
-      if (emptyInitialValue && !internalValue) {
-        return;
+      let t72;
+      if ($[5] !== baseKey || $[6] !== data || $[7] !== property || $[8] !== size) {
+        t72 = /* @__PURE__ */ jsx("div", { className: "col-span-8", children: /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: baseKey, value: data, property, size }) });
+        $[5] = baseKey;
+        $[6] = data;
+        $[7] = property;
+        $[8] = size;
+        $[9] = t72;
+      } else {
+        t72 = $[9];
       }
-      if (internalValue !== value) {
-        prevValue.current = internalValue;
-        updateValue(internalValue);
+      let t82;
+      if ($[10] !== t52 || $[11] !== t62 || $[12] !== t72) {
+        t82 = /* @__PURE__ */ jsxs("div", { className: t52, children: [
+          t62,
+          t72
+        ] });
+        $[10] = t52;
+        $[11] = t62;
+        $[12] = t72;
+        $[13] = t82;
+      } else {
+        t82 = $[13];
       }
-    };
-    $[5] = internalValue;
+      return t82;
+    }
+    const t5 = `${isTopLevel ? "py-4" : "py-1"} ${isTopLevel ? `border-b ${defaultBorderMixin} last:border-b-0` : ""}`;
+    let t6;
+    if ($[14] !== arrayLabel || $[15] !== baseKey || $[16] !== suppressHeader) {
+      t6 = baseKey && arrayLabel && !suppressHeader && /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", component: "span", children: arrayLabel });
+      $[14] = arrayLabel;
+      $[15] = baseKey;
+      $[16] = suppressHeader;
+      $[17] = t6;
+    } else {
+      t6 = $[17];
+    }
+    const t7 = baseKey ? `pl-4 mt-1 border-l ${defaultBorderMixin}` : "";
+    let t8;
+    if ($[18] !== baseKey || $[19] !== data || $[20] !== isArrayOfMaps || $[21] !== ofProp || $[22] !== properties || $[23] !== size) {
+      let t92;
+      if ($[25] !== baseKey || $[26] !== isArrayOfMaps || $[27] !== ofProp || $[28] !== properties || $[29] !== size) {
+        t92 = (item, index) => {
+          if (item === null || item === void 0) {
+            return null;
+          }
+          const currentKey = baseKey ? `${baseKey}[${index}]` : `[${index}]`;
+          const itemHeader = isArrayOfMaps && ofProp?.name ? `${ofProp.name} [${index}]` : `[${index}]`;
+          return /* @__PURE__ */ jsxs("div", { className: "py-1", children: [
+            /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", component: "span", children: itemHeader }),
+            /* @__PURE__ */ jsx("div", { className: `pl-4 mt-1 border-l ${defaultBorderMixin}`, children: /* @__PURE__ */ jsx(PropertyCollectionView, { data: item, properties, baseKey: currentKey, suppressHeader: true, size }) })
+          ] }, currentKey);
+        };
+        $[25] = baseKey;
+        $[26] = isArrayOfMaps;
+        $[27] = ofProp;
+        $[28] = properties;
+        $[29] = size;
+        $[30] = t92;
+      } else {
+        t92 = $[30];
+      }
+      t8 = data.map(t92);
+      $[18] = baseKey;
+      $[19] = data;
+      $[20] = isArrayOfMaps;
+      $[21] = ofProp;
+      $[22] = properties;
+      $[23] = size;
+      $[24] = t8;
+    } else {
+      t8 = $[24];
+    }
+    let t9;
+    if ($[31] !== t7 || $[32] !== t8) {
+      t9 = /* @__PURE__ */ jsx("div", { className: t7, children: t8 });
+      $[31] = t7;
+      $[32] = t8;
+      $[33] = t9;
+    } else {
+      t9 = $[33];
+    }
+    let t10;
+    if ($[34] !== t5 || $[35] !== t6 || $[36] !== t9) {
+      t10 = /* @__PURE__ */ jsxs("div", { className: t5, children: [
+        t6,
+        t9
+      ] });
+      $[34] = t5;
+      $[35] = t6;
+      $[36] = t9;
+      $[37] = t10;
+    } else {
+      t10 = $[37];
+    }
+    return t10;
+  }
+  if (typeof data === "object" && data !== null) {
+    let t4;
+    if ($[38] !== baseKey || $[39] !== properties) {
+      t4 = baseKey ? buildPropertyLabelAndGetProperty(properties, baseKey) : {
+        label: "",
+        property: void 0
+      };
+      $[38] = baseKey;
+      $[39] = properties;
+      $[40] = t4;
+    } else {
+      t4 = $[40];
+    }
+    const {
+      label,
+      property: property_0
+    } = t4;
+    if (baseKey && (!property_0 || property_0.dataType !== "map" || !property_0.properties)) {
+      if (!property_0) {
+        return null;
+      }
+      const t52 = `grid grid-cols-12 gap-x-4 ${isTopLevel ? "py-4" : "py-2"} items-start ${isTopLevel ? `border-b ${defaultBorderMixin} last:border-b-0` : ""}`;
+      let t62;
+      if ($[41] !== label) {
+        t62 = /* @__PURE__ */ jsx("div", { className: "col-span-4 pr-2", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", component: "span", className: "break-words", children: label }) });
+        $[41] = label;
+        $[42] = t62;
+      } else {
+        t62 = $[42];
+      }
+      let t72;
+      if ($[43] !== baseKey || $[44] !== data || $[45] !== property_0 || $[46] !== size) {
+        t72 = /* @__PURE__ */ jsx("div", { className: "col-span-8", children: /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: baseKey, value: data, property: property_0, size }) });
+        $[43] = baseKey;
+        $[44] = data;
+        $[45] = property_0;
+        $[46] = size;
+        $[47] = t72;
+      } else {
+        t72 = $[47];
+      }
+      let t82;
+      if ($[48] !== t52 || $[49] !== t62 || $[50] !== t72) {
+        t82 = /* @__PURE__ */ jsxs("div", { className: t52, children: [
+          t62,
+          t72
+        ] });
+        $[48] = t52;
+        $[49] = t62;
+        $[50] = t72;
+        $[51] = t82;
+      } else {
+        t82 = $[51];
+      }
+      return t82;
+    }
+    let t5;
+    if ($[52] !== baseKey || $[53] !== property_0 || $[54] !== suppressHeader) {
+      t5 = baseKey && !suppressHeader && property_0?.dataType === "map" && (property_0.name || !pathEndsWithIndex(baseKey));
+      $[52] = baseKey;
+      $[53] = property_0;
+      $[54] = suppressHeader;
+      $[55] = t5;
+    } else {
+      t5 = $[55];
+    }
+    const showMapHeader = t5;
+    const headerText = property_0?.name || label;
+    const t6 = `${isTopLevel ? "py-4" : "py-1"} ${isTopLevel ? `border-b ${defaultBorderMixin} last:border-b-0` : ""}`;
+    let t7;
+    if ($[56] !== headerText || $[57] !== showMapHeader) {
+      t7 = showMapHeader && /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", component: "span", children: headerText });
+      $[56] = headerText;
+      $[57] = showMapHeader;
+      $[58] = t7;
+    } else {
+      t7 = $[58];
+    }
+    const t8 = baseKey ? `pl-4 mt-1 border-l ${defaultBorderMixin}` : "";
+    let t9;
+    if ($[59] !== baseKey || $[60] !== data || $[61] !== properties || $[62] !== size) {
+      let t102;
+      if ($[64] !== baseKey || $[65] !== properties || $[66] !== size) {
+        t102 = (t112) => {
+          const [key, value] = t112;
+          if (value === null || value === void 0) {
+            return null;
+          }
+          const currentKey_0 = baseKey ? `${baseKey}.${key}` : key;
+          return /* @__PURE__ */ jsx(PropertyCollectionView, { data: value, properties, baseKey: currentKey_0, size }, currentKey_0);
+        };
+        $[64] = baseKey;
+        $[65] = properties;
+        $[66] = size;
+        $[67] = t102;
+      } else {
+        t102 = $[67];
+      }
+      t9 = Object.entries(data).map(t102);
+      $[59] = baseKey;
+      $[60] = data;
+      $[61] = properties;
+      $[62] = size;
+      $[63] = t9;
+    } else {
+      t9 = $[63];
+    }
+    let t10;
+    if ($[68] !== t8 || $[69] !== t9) {
+      t10 = /* @__PURE__ */ jsx("div", { className: t8, children: t9 });
+      $[68] = t8;
+      $[69] = t9;
+      $[70] = t10;
+    } else {
+      t10 = $[70];
+    }
+    let t11;
+    if ($[71] !== t10 || $[72] !== t6 || $[73] !== t7) {
+      t11 = /* @__PURE__ */ jsxs("div", { className: t6, children: [
+        t7,
+        t10
+      ] });
+      $[71] = t10;
+      $[72] = t6;
+      $[73] = t7;
+      $[74] = t11;
+    } else {
+      t11 = $[74];
+    }
+    return t11;
+  }
+  if (baseKey) {
+    let t4;
+    if ($[75] !== baseKey || $[76] !== properties) {
+      t4 = buildPropertyLabelAndGetProperty(properties, baseKey);
+      $[75] = baseKey;
+      $[76] = properties;
+      $[77] = t4;
+    } else {
+      t4 = $[77];
+    }
+    const {
+      label: label_0,
+      property: property_1
+    } = t4;
+    if (!property_1) {
+      return null;
+    }
+    const t5 = `grid grid-cols-12 gap-x-4 ${isTopLevel ? "py-4" : "py-2"} items-start ${isTopLevel ? `border-b ${defaultBorderMixin} last:border-b-0` : ""}`;
+    let t6;
+    if ($[78] !== label_0) {
+      t6 = /* @__PURE__ */ jsx("div", { className: "col-span-4 pr-2", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", component: "span", className: "break-words", children: label_0 }) });
+      $[78] = label_0;
+      $[79] = t6;
+    } else {
+      t6 = $[79];
+    }
+    let t7;
+    if ($[80] !== baseKey || $[81] !== data || $[82] !== property_1 || $[83] !== size) {
+      t7 = /* @__PURE__ */ jsx("div", { className: "col-span-8", children: /* @__PURE__ */ jsx(PropertyPreview, { propertyKey: baseKey, value: data, property: property_1, size }) });
+      $[80] = baseKey;
+      $[81] = data;
+      $[82] = property_1;
+      $[83] = size;
+      $[84] = t7;
+    } else {
+      t7 = $[84];
+    }
+    let t8;
+    if ($[85] !== t5 || $[86] !== t6 || $[87] !== t7) {
+      t8 = /* @__PURE__ */ jsxs("div", { className: t5, children: [
+        t6,
+        t7
+      ] });
+      $[85] = t5;
+      $[86] = t6;
+      $[87] = t7;
+      $[88] = t8;
+    } else {
+      t8 = $[88];
+    }
+    return t8;
+  }
+  return null;
+};
+function EntityView({
+  entity,
+  collection,
+  path,
+  className
+}) {
+  const authController = useAuthController();
+  const customizationController = useCustomizationController();
+  const resolvedCollection = useMemo(() => resolveCollection({
+    collection,
+    path,
+    entityId: entity.id,
+    values: entity.values,
+    propertyConfigs: customizationController.propertyConfigs,
+    authController
+  }), [collection, path, entity, customizationController.propertyConfigs]);
+  const properties = resolvedCollection.properties;
+  return /* @__PURE__ */ jsx("div", { className: "w-full " + className, children: /* @__PURE__ */ jsxs("div", { className: "w-full mb-4 p-4", children: [
+    /* @__PURE__ */ jsxs("div", { className: `grid grid-cols-12 gap-x-4 py-4 items-start border-b ${defaultBorderMixin}`, children: [
+      /* @__PURE__ */ jsx("div", { className: "col-span-4 pr-2", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", component: "span", className: "break-words", children: "Id" }) }),
+      /* @__PURE__ */ jsx("div", { className: "col-span-8", children: /* @__PURE__ */ jsxs("div", { className: "flex-grow text-surface-900 dark:text-white flex items-center", children: [
+        /* @__PURE__ */ jsx("span", { className: "flex-grow mr-2", children: entity.id }),
+        customizationController?.entityLinkBuilder && /* @__PURE__ */ jsx("a", { href: customizationController.entityLinkBuilder({
+          entity
+        }), rel: "noopener noreferrer", target: "_blank", children: /* @__PURE__ */ jsx(IconButton, { children: /* @__PURE__ */ jsx(OpenInNewIcon, { size: "small" }) }) })
+      ] }) })
+    ] }),
+    /* @__PURE__ */ jsx(PropertyCollectionView, { data: entity.values, properties, size: "medium" })
+  ] }) });
+}
+function VirtualTableInput(props) {
+  const $ = c(22);
+  const ref = React__default.useRef(null);
+  const {
+    value,
+    multiline,
+    updateValue,
+    focused
+  } = props;
+  const prevValue = useRef(value);
+  const [internalValue, setInternalValue] = useState(value);
+  const focusedState = useRef(false);
+  let t0;
+  if ($[0] !== internalValue || $[1] !== value) {
+    t0 = () => {
+      if (prevValue.current !== value && value !== internalValue) {
+        setInternalValue(value);
+      }
+      prevValue.current = value;
+    };
+    $[0] = internalValue;
+    $[1] = value;
+    $[2] = t0;
+  } else {
+    t0 = $[2];
+  }
+  let t1;
+  if ($[3] !== value) {
+    t1 = [value];
+    $[3] = value;
+    $[4] = t1;
+  } else {
+    t1 = $[4];
+  }
+  useEffect(t0, t1);
+  let t2;
+  if ($[5] !== internalValue || $[6] !== updateValue || $[7] !== value) {
+    t2 = () => {
+      const emptyInitialValue = !value;
+      if (emptyInitialValue && !internalValue) {
+        return;
+      }
+      if (internalValue !== value) {
+        prevValue.current = internalValue;
+        updateValue(internalValue);
+      }
+    };
+    $[5] = internalValue;
     $[6] = updateValue;
     $[7] = value;
     $[8] = t2;
@@ -7403,7 +7984,7 @@ function VirtualTableSelect(props) {
       console.trace("onChange");
       if (valueType === "number") {
         if (multiple) {
-          const newValue = updatedValue.map(_temp$l);
+          const newValue = updatedValue.map(_temp$n);
           updateValue(newValue);
         } else {
           updateValue(parseFloat(updatedValue));
@@ -7440,7 +8021,7 @@ function VirtualTableSelect(props) {
   const renderValue = t3;
   let t4;
   if ($[10] !== disabled || $[11] !== enumValues || $[12] !== internalValue || $[13] !== multiple || $[14] !== onChange || $[15] !== renderValue || $[16] !== small || $[17] !== validValue) {
-    t4 = multiple ? /* @__PURE__ */ jsx(MultiSelect, { inputRef: ref, className: "w-full h-full p-0 bg-transparent", position: "item-aligned", disabled, includeClear: false, useChips: false, value: validValue ? internalValue.map(_temp2$a) : [], onValueChange: onChange, children: enumValues?.map((enumConfig) => /* @__PURE__ */ jsx(MultiSelectItem, { value: String(enumConfig.id), children: /* @__PURE__ */ jsx(EnumValuesChip, { enumKey: enumConfig.id, enumValues, size: small ? "small" : "medium" }) }, enumConfig.id)) }) : /* @__PURE__ */ jsx(Select, { inputRef: ref, size: "large", fullWidth: true, className: "w-full h-full p-0 bg-transparent", position: "item-aligned", disabled, padding: false, value: validValue ? internalValue?.toString() : "", onValueChange: onChange, renderValue, children: enumValues?.map((enumConfig_0) => /* @__PURE__ */ jsx(SelectItem, { value: String(enumConfig_0.id), children: /* @__PURE__ */ jsx(EnumValuesChip, { enumKey: enumConfig_0.id, enumValues, size: small ? "small" : "medium" }) }, enumConfig_0.id)) });
+    t4 = multiple ? /* @__PURE__ */ jsx(MultiSelect, { inputRef: ref, className: "w-full h-full p-0 bg-transparent", position: "item-aligned", disabled, includeClear: false, useChips: false, value: validValue ? internalValue.map(_temp2$b) : [], onValueChange: onChange, children: enumValues?.map((enumConfig) => /* @__PURE__ */ jsx(MultiSelectItem, { value: String(enumConfig.id), children: /* @__PURE__ */ jsx(EnumValuesChip, { enumKey: enumConfig.id, enumValues, size: small ? "small" : "medium" }) }, enumConfig.id)) }) : /* @__PURE__ */ jsx(Select, { inputRef: ref, size: "large", fullWidth: true, className: "w-full h-full p-0 bg-transparent", position: "item-aligned", disabled, padding: false, value: validValue ? internalValue?.toString() : "", onValueChange: onChange, renderValue, children: enumValues?.map((enumConfig_0) => /* @__PURE__ */ jsx(SelectItem, { value: String(enumConfig_0.id), children: /* @__PURE__ */ jsx(EnumValuesChip, { enumKey: enumConfig_0.id, enumValues, size: small ? "small" : "medium" }) }, enumConfig_0.id)) });
     $[10] = disabled;
     $[11] = enumValues;
     $[12] = internalValue;
@@ -7455,10 +8036,10 @@ function VirtualTableSelect(props) {
   }
   return t4;
 }
-function _temp2$a(v_0) {
+function _temp2$b(v_0) {
   return v_0.toString();
 }
-function _temp$l(v) {
+function _temp$n(v) {
   return parseFloat(v);
 }
 function VirtualTableNumberInput(props) {
@@ -7589,6 +8170,89 @@ function VirtualTableDateField(props) {
   }
   return t4;
 }
+function VirtualTableUserSelect(props) {
+  const $ = c(15);
+  const {
+    internalValue,
+    disabled,
+    focused,
+    updateValue,
+    multiple
+  } = props;
+  const {
+    users,
+    getUser
+  } = useInternalUserManagementController();
+  const validValue = Array.isArray(internalValue) && multiple || !Array.isArray(internalValue) && !multiple;
+  const ref = React__default.useRef(null);
+  let t0;
+  let t1;
+  if ($[0] !== focused) {
+    t0 = () => {
+      if (ref.current && focused) {
+        ref.current?.focus({
+          preventScroll: true
+        });
+      }
+    };
+    t1 = [focused, ref];
+    $[0] = focused;
+    $[1] = t0;
+    $[2] = t1;
+  } else {
+    t0 = $[1];
+    t1 = $[2];
+  }
+  useEffect(t0, t1);
+  let t2;
+  if ($[3] !== updateValue) {
+    t2 = (updatedValue) => {
+      if (!updatedValue) {
+        updateValue(null);
+      } else {
+        updateValue(updatedValue);
+      }
+    };
+    $[3] = updateValue;
+    $[4] = t2;
+  } else {
+    t2 = $[4];
+  }
+  const onChange = t2;
+  let t3;
+  if ($[5] !== getUser) {
+    t3 = (userId) => {
+      const user = getUser(userId);
+      return /* @__PURE__ */ jsx(UserDisplay, { user });
+    };
+    $[5] = getUser;
+    $[6] = t3;
+  } else {
+    t3 = $[6];
+  }
+  const renderValue = t3;
+  let t4;
+  if ($[7] !== disabled || $[8] !== internalValue || $[9] !== multiple || $[10] !== onChange || $[11] !== renderValue || $[12] !== users || $[13] !== validValue) {
+    t4 = multiple ? /* @__PURE__ */ jsx(MultiSelect, { inputRef: ref, className: "w-full h-full p-0 bg-transparent", position: "item-aligned", disabled, includeClear: false, useChips: false, value: validValue ? internalValue : [], onValueChange: onChange, children: users?.map(_temp$m) }) : /* @__PURE__ */ jsx(Select, { inputRef: ref, size: "large", fullWidth: true, className: "w-full h-full p-0 bg-transparent", position: "item-aligned", disabled, padding: false, value: validValue ? internalValue : "", onValueChange: onChange, renderValue, children: users?.map(_temp2$a) });
+    $[7] = disabled;
+    $[8] = internalValue;
+    $[9] = multiple;
+    $[10] = onChange;
+    $[11] = renderValue;
+    $[12] = users;
+    $[13] = validValue;
+    $[14] = t4;
+  } else {
+    t4 = $[14];
+  }
+  return t4;
+}
+function _temp2$a(user_1) {
+  return /* @__PURE__ */ jsx(SelectItem, { value: user_1.uid, children: /* @__PURE__ */ jsx(UserDisplay, { user: user_1 }) }, user_1.uid);
+}
+function _temp$m(user_0) {
+  return /* @__PURE__ */ jsx(MultiSelectItem, { value: user_0.uid, children: /* @__PURE__ */ jsx(UserDisplay, { user: user_0 }) }, user_0.uid);
+}
 class ErrorBoundary extends React__default.Component {
   constructor(props) {
     super(props);
@@ -7636,7 +8300,8 @@ function useStorageUploadController({
   const processFile = storage?.processFile;
   const metadata = storage?.metadata;
   const size = multipleFilesSupported ? "medium" : "large";
-  const compression = storage?.imageCompression;
+  const imageResize = storage?.imageResize;
+  const legacyCompression = storage?.imageCompression;
   const internalInitialValue = getInternalInitialValue(multipleFilesSupported, value, metadata, size);
   const [initialValue, setInitialValue] = useState(value);
   const [internalValue, setInternalValue] = useState(internalInitialValue);
@@ -7708,6 +8373,11 @@ function useStorageUploadController({
       onChange(fieldValue ? fieldValue[0] : null);
     }
   }, [internalValue, multipleFilesSupported, onChange, storage, storageSource]);
+  const onFileUploadError = useCallback((entry_0) => {
+    console.debug("onFileUploadError", entry_0);
+    const newValue_0 = internalValue.filter((item) => item.id !== entry_0.id);
+    setInternalValue(newValue_0);
+  }, [internalValue]);
   const onFilesAdded = useCallback(async (acceptedFiles) => {
     if (!acceptedFiles.length || disabled) return;
     if (processFile) {
@@ -7726,8 +8396,8 @@ function useStorageUploadController({
     let newInternalValue;
     if (multipleFilesSupported) {
       newInternalValue = [...internalValue, ...await Promise.all(acceptedFiles.map(async (file_2) => {
-        if (compression && compressionFormat(file_2)) {
-          file_2 = await resizeAndCompressImage(file_2, compression);
+        if ((imageResize || legacyCompression) && isImageFile(file_2)) {
+          file_2 = await resizeImage(file_2, imageResize, legacyCompression);
         }
         return {
           id: getRandomId$2(),
@@ -7739,8 +8409,8 @@ function useStorageUploadController({
       }))];
     } else {
       let file_3 = acceptedFiles[0];
-      if (compression && compressionFormat(file_3)) {
-        file_3 = await resizeAndCompressImage(file_3, compression);
+      if ((imageResize || legacyCompression) && isImageFile(file_3)) {
+        file_3 = await resizeImage(file_3, imageResize, legacyCompression);
       }
       newInternalValue = [{
         id: getRandomId$2(),
@@ -7752,7 +8422,7 @@ function useStorageUploadController({
     }
     newInternalValue = removeDuplicates(newInternalValue);
     setInternalValue(newInternalValue);
-  }, [disabled, fileNameBuilder, internalValue, metadata, multipleFilesSupported, size]);
+  }, [disabled, fileNameBuilder, internalValue, metadata, multipleFilesSupported, size, imageResize, legacyCompression]);
   return {
     internalValue,
     setInternalValue,
@@ -7760,6 +8430,7 @@ function useStorageUploadController({
     fileNameBuilder,
     storagePathBuilder,
     onFileUploadComplete,
+    onFileUploadError,
     onFilesAdded,
     multipleFilesSupported
   };
@@ -7790,22 +8461,42 @@ function removeDuplicates(items) {
 function getRandomId$2() {
   return Math.floor(Math.random() * Math.floor(Number.MAX_SAFE_INTEGER));
 }
-const supportedTypes = {
-  "image/jpeg": "JPEG",
-  "image/png": "PNG",
-  "image/webp": "WEBP"
-};
-const compressionFormat = (file) => supportedTypes[file.type] ? supportedTypes[file.type] : null;
-const defaultQuality = 100;
-const resizeAndCompressImage = (file, compression) => new Promise((resolve) => {
-  const inputQuality = compression.quality === void 0 ? defaultQuality : compression.quality;
-  const quality = inputQuality >= 0 ? inputQuality <= 100 ? inputQuality : 100 : 100;
-  const format2 = compressionFormat(file);
-  if (!format2) {
-    throw Error("resizeAndCompressImage: Unsupported image format");
-  }
-  Resizer.imageFileResizer(file, compression.maxWidth || Number.MAX_VALUE, compression.maxHeight || Number.MAX_VALUE, format2, quality, 0, (file2) => resolve(file2), "file");
-});
+function isImageFile(file) {
+  return file.type === "image/jpeg" || file.type === "image/png" || file.type === "image/webp";
+}
+async function resizeImage(file, imageResize, legacyCompression) {
+  const maxWidth = imageResize?.maxWidth ?? legacyCompression?.maxWidth;
+  const maxHeight = imageResize?.maxHeight ?? legacyCompression?.maxHeight;
+  const quality = (imageResize?.quality ?? legacyCompression?.quality ?? 80) / 100;
+  const mode = imageResize?.mode ?? "contain";
+  let mimeType = file.type;
+  if (imageResize?.format && imageResize.format !== "original") {
+    mimeType = `image/${imageResize.format}`;
+  }
+  return new Promise((resolve, reject) => {
+    new Compressor(file, {
+      quality,
+      maxWidth,
+      maxHeight,
+      mimeType,
+      // Use cover mode if specified (crops to fit)
+      // Otherwise use contain mode (scales to fit)
+      ...mode === "cover" || mode === void 0 ? {
+        width: maxWidth,
+        height: maxHeight,
+        resize: "cover"
+      } : {},
+      success: (result) => {
+        const compressedFile = new File([result], file.name, {
+          type: result.type,
+          lastModified: Date.now()
+        });
+        resolve(compressedFile);
+      },
+      error: reject
+    });
+  });
+}
 function StorageUploadProgress({
   storagePath,
   entry,
@@ -8017,7 +8708,7 @@ function StorageUpload$1(t0) {
   const snackbarContext = useSnackbarController();
   let t1;
   if ($[0] !== storage.acceptedFiles) {
-    t1 = storage.acceptedFiles ? storage.acceptedFiles.map(_temp$k).reduce(_temp2$9, {}) : void 0;
+    t1 = storage.acceptedFiles ? storage.acceptedFiles.map(_temp$l).reduce(_temp2$9, {}) : void 0;
     $[0] = storage.acceptedFiles;
     $[1] = t1;
   } else {
@@ -8246,7 +8937,7 @@ function _temp2$9(a, b) {
     ...b
   };
 }
-function _temp$k(e) {
+function _temp$l(e) {
   return {
     [e]: []
   };
@@ -8353,7 +9044,7 @@ const TableReferenceFieldInternal = React__default.memo(function TableReferenceF
   let t1;
   if ($[2] !== updateValue) {
     t1 = (entities) => {
-      updateValue(entities.map(_temp$j));
+      updateValue(entities.map(_temp$k));
     };
     $[2] = updateValue;
     $[3] = t1;
@@ -8514,7 +9205,7 @@ const TableReferenceFieldInternal = React__default.memo(function TableReferenceF
   }
   return t10;
 }, equal);
-function _temp$j(e) {
+function _temp$k(e) {
   return getReferenceFrom(e);
 }
 function _temp2$8(ref) {
@@ -9376,6 +10067,9 @@ const PropertyTableCell = React__default.memo(function PropertyTableCell2({
       if (stringProperty_0.enumValues) {
         innerComponent = /* @__PURE__ */ jsx(VirtualTableSelect, { name: propertyKey, multiple: false, focused: selected, disabled, valueType: "string", small: getPreviewSizeFrom(size) !== "medium", enumValues: stringProperty_0.enumValues, error: validationError ?? error, internalValue, updateValue });
         fullHeight = true;
+      } else if (stringProperty_0.userSelect) {
+        innerComponent = /* @__PURE__ */ jsx(VirtualTableUserSelect, { name: propertyKey, multiple: false, focused: selected, disabled, small: getPreviewSizeFrom(size) !== "medium", error: validationError ?? error, internalValue, updateValue });
+        fullHeight = true;
       } else if (stringProperty_0.markdown || !stringProperty_0.storage || !stringProperty_0.reference) {
         const multiline = Boolean(stringProperty_0.multiline) || Boolean(stringProperty_0.markdown);
         innerComponent = /* @__PURE__ */ jsx(VirtualTableInput, { error: validationError ?? error, disabled, multiline, focused: selected, value: internalValue, updateValue });
@@ -9440,7 +10134,8 @@ function customReplacer(key) {
     return {
       __type: "EntityReference",
       id: value.id,
-      path: value.path
+      path: value.path,
+      databaseId: value.databaseId
     };
   }
   if (value instanceof GeoPoint) {
@@ -9464,7 +10159,7 @@ function customReviver(key, value) {
       case "Date":
         return new Date(value.value);
       case "EntityReference":
-        return new EntityReference(value.id, value.path);
+        return new EntityReference(value.id, value.path, value.databaseId);
       case "GeoPoint":
         return new GeoPoint(value.latitude, value.longitude);
       case "Vector":
@@ -9475,50 +10170,41 @@ 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) {
     try {
       const key = LOCAL_STORAGE_PREFIX + path;
       const entityString = JSON.stringify(data, customReplacer);
+      console.log("Saving entity to localStorage:", {
+        key,
+        entityString
+      });
       localStorage.setItem(key, entityString);
     } catch (error) {
       console.error(`Failed to save entity for path "${path}" to localStorage:`, error);
     }
   }
 }
+function removeEntityFromMemoryCache(path) {
+  entityCache.delete(path);
+}
+function saveEntityToMemoryCache(path, data) {
+  entityCache.set(path, data);
+}
+function getEntityFromMemoryCache(path) {
+  return entityCache.get(path);
+}
 function getEntityFromCache(path) {
-  if (entityCache.has(path)) {
-    return entityCache.get(path);
-  }
   if (isLocalStorageAvailable) {
     try {
       const key = LOCAL_STORAGE_PREFIX + path;
       const entityString = localStorage.getItem(key);
       if (entityString) {
         const entity = JSON.parse(entityString, customReviver);
-        entityCache.set(path, entity);
+        console.log("Loaded entity from localStorage:", {
+          key,
+          entity
+        });
         return entity;
       }
     } catch (error) {
@@ -9527,12 +10213,7 @@ function getEntityFromCache(path) {
   }
   return void 0;
 }
-function hasEntityInCache(path) {
-  return entityCache.has(path);
-}
 function removeEntityFromCache(path) {
-  console.debug("Removing entity from cache", path);
-  entityCache.delete(path);
   if (isLocalStorageAvailable) {
     try {
       const key = LOCAL_STORAGE_PREFIX + path;
@@ -9542,6 +10223,26 @@ function removeEntityFromCache(path) {
     }
   }
 }
+function flattenKeys(obj, prefix = "", result = []) {
+  if (isObject(obj) || Array.isArray(obj)) {
+    const plainObject = isPlainObject(obj);
+    if (!plainObject && prefix) {
+      result.push(prefix);
+    } else {
+      for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+          const newKey = prefix ? Array.isArray(obj) ? `${prefix}[${key}]` : `${prefix}.${key}` : key;
+          if (isObject(obj[key]) || Array.isArray(obj[key])) {
+            flattenKeys(obj[key], newKey, result);
+          } else {
+            result.push(newKey);
+          }
+        }
+      }
+    }
+  }
+  return result;
+}
 const EntityCollectionRowActions = function EntityCollectionRowActions2({
   entity,
   collection,
@@ -9569,7 +10270,9 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
   const hasCollapsedActions = actions.some((a) => a.collapsed || a.collapsed === void 0);
   const collapsedActions = actions.filter((a_0) => a_0.collapsed || a_0.collapsed === void 0);
   const uncollapsedActions = actions.filter((a_1) => a_1.collapsed === false);
-  const hasDraft = hasEntityInCache(fullPath + "/" + entity.id);
+  const enableLocalChangesBackup = collection ? getLocalChangesBackup(collection) : false;
+  const hasDraft = enableLocalChangesBackup ? getEntityFromCache(fullPath + "/" + entity.id) : false;
+  const iconSize = largeLayout && (size === "m" || size === "l" || size == "xl") ? "medium" : "small";
   return /* @__PURE__ */ jsxs("div", { className: cls("h-full flex items-center justify-center flex-col bg-surface-50 dark:bg-surface-900 bg-opacity-90 dark:bg-opacity-90 z-10", frozen ? "sticky left-0" : ""), onClick: useCallback((event) => {
     event.stopPropagation();
   }, []), style: {
@@ -9579,23 +10282,31 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
     contain: "strict"
   }, children: [
     (hasActions || selectionEnabled) && /* @__PURE__ */ jsxs("div", { className: "w-34 flex justify-center", children: [
-      uncollapsedActions.map((action, index) => /* @__PURE__ */ jsx(Tooltip, { title: action.name, asChild: true, children: /* @__PURE__ */ jsx(IconButton, { onClick: (event_0) => {
-        event_0.stopPropagation();
-        action.onClick({
-          view: "collection",
-          entity,
-          fullPath,
-          fullIdPath,
-          collection,
-          context,
-          selectionController,
-          highlightEntity,
-          unhighlightEntity,
-          onCollectionChange,
-          openEntityMode: openEntityMode ?? collection?.openEntityMode
-        });
-      }, size: largeLayout ? "medium" : "small", children: action.icon }) }, index)),
-      hasCollapsedActions && /* @__PURE__ */ jsx(Menu, { trigger: /* @__PURE__ */ jsx(IconButton, { size: largeLayout ? "medium" : "small", children: /* @__PURE__ */ jsx(MoreVertIcon, {}) }), children: collapsedActions.map((action_0, index_0) => /* @__PURE__ */ jsxs(MenuItem, { onClick: (e) => {
+      uncollapsedActions.map((action, index) => {
+        const isEditAction = action.key === "edit";
+        const tooltip = isEditAction && hasDraft ? "Local unsaved changes" : action.name;
+        let iconButton = /* @__PURE__ */ jsx(IconButton, { onClick: (event_0) => {
+          event_0.stopPropagation();
+          action.onClick({
+            view: "collection",
+            entity,
+            fullPath,
+            fullIdPath,
+            collection,
+            context,
+            selectionController,
+            highlightEntity,
+            unhighlightEntity,
+            onCollectionChange,
+            openEntityMode: openEntityMode ?? collection?.openEntityMode
+          });
+        }, size: iconSize, children: action.icon });
+        if (isEditAction && hasDraft) {
+          iconButton = /* @__PURE__ */ jsx(Badge, { color: "warning", children: iconButton });
+        }
+        return /* @__PURE__ */ jsx(Tooltip, { title: tooltip, asChild: true, children: iconButton }, index);
+      }),
+      hasCollapsedActions && /* @__PURE__ */ jsx(Menu, { trigger: /* @__PURE__ */ jsx(IconButton, { size: iconSize, children: /* @__PURE__ */ jsx(MoreVertIcon, {}) }), children: collapsedActions.map((action_0, index_0) => /* @__PURE__ */ jsxs(MenuItem, { onClick: (e) => {
         e.stopPropagation();
         action_0.onClick({
           view: "collection",
@@ -9614,14 +10325,11 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
         action_0.icon,
         action_0.name
       ] }, index_0)) }),
-      selectionEnabled && /* @__PURE__ */ jsx(Tooltip, { title: `Select ${entity.id}`, children: /* @__PURE__ */ jsx(Checkbox, { size: largeLayout ? "medium" : "small", checked: Boolean(isSelected), onCheckedChange }) })
+      selectionEnabled && /* @__PURE__ */ jsx(Tooltip, { title: `Select ${entity.id}`, children: /* @__PURE__ */ jsx(Checkbox, { size: iconSize, checked: Boolean(isSelected), onCheckedChange }) })
     ] }),
-    !hideId && size !== "xs" && /* @__PURE__ */ jsxs("div", { className: "w-[138px] overflow-hidden truncate font-mono text-xs text-text-secondary dark:text-text-secondary-dark max-w-full text-ellipsis px-2 align-center justify-center flex items-center gap-1", onClick: (event_1) => {
+    !hideId && size !== "xs" && /* @__PURE__ */ jsx("div", { className: "w-[138px] overflow-hidden truncate font-mono text-xs text-text-secondary dark:text-text-secondary-dark max-w-full text-ellipsis px-2 align-center justify-center flex items-center gap-1", onClick: (event_1) => {
       event_1.stopPropagation();
-    }, children: [
-      hasDraft && /* @__PURE__ */ jsx(Tooltip, { title: "Local unsaved changes", className: "inline", children: /* @__PURE__ */ jsx(Chip, { colorScheme: "orangeDarker", className: "p-0.5", children: /* @__PURE__ */ jsx(EditIcon, { size: 12 }) }) }),
-      /* @__PURE__ */ jsx("span", { className: "min-w-0 truncate text-center", children: entity ? entity.id : /* @__PURE__ */ jsx(Skeleton, {}) })
-    ] })
+    }, children: /* @__PURE__ */ jsx("span", { className: "min-w-0 truncate text-center", children: entity ? entity.id : /* @__PURE__ */ jsx(Skeleton, {}) }) })
   ] });
 };
 function CollectionTableToolbar(t0) {
@@ -9676,7 +10384,7 @@ function CollectionTableToolbar(t0) {
   }
   let t6;
   if ($[6] !== t3 || $[7] !== t4) {
-    t6 = /* @__PURE__ */ jsx(Tooltip, { title: "Table row size", side: "right", sideOffset: 4, children: /* @__PURE__ */ jsx(Select, { value: t3, className: "w-16 ml-2", size: "small", onValueChange: t4, renderValue: _temp$i, children: t5 }) });
+    t6 = /* @__PURE__ */ jsx(Tooltip, { title: "Table row size", side: "right", sideOffset: 4, children: /* @__PURE__ */ jsx(Select, { value: t3, className: "w-16 ml-2", size: "small", onValueChange: t4, renderValue: _temp$j, children: t5 }) });
     $[6] = t3;
     $[7] = t4;
     $[8] = t6;
@@ -9763,7 +10471,7 @@ function CollectionTableToolbar(t0) {
 function _temp2$7(size_0) {
   return /* @__PURE__ */ jsx(SelectItem, { value: size_0, className: "w-12 font-medium text-center", children: size_0.toUpperCase() }, size_0);
 }
-function _temp$i(v_0) {
+function _temp$j(v_0) {
   return /* @__PURE__ */ jsx("div", { className: "font-medium", children: v_0.toUpperCase() });
 }
 function getTableCellAlignment(property) {
@@ -9835,21 +10543,15 @@ function useColumnIds(collection, includeSubcollections) {
   let t0;
   bb0: {
     if (collection.propertiesOrder) {
-      let propertyColumnConfigs;
+      let t12;
       if ($[0] !== collection) {
-        propertyColumnConfigs = hideAndExpandKeys(collection, collection.propertiesOrder);
-        if (collection.collectionGroup) {
-          propertyColumnConfigs.push({
-            key: COLLECTION_GROUP_PARENT_ID,
-            disabled: true
-          });
-        }
+        t12 = hideAndExpandKeys(collection, collection.propertiesOrder);
         $[0] = collection;
-        $[1] = propertyColumnConfigs;
+        $[1] = t12;
       } else {
-        propertyColumnConfigs = $[1];
+        t12 = $[1];
       }
-      t0 = propertyColumnConfigs;
+      t0 = t12;
       break bb0;
     }
     let t1;
@@ -10883,7 +11585,7 @@ const SafeLinkRenderer = (t0) => {
   let t1;
   if ($[0] !== text) {
     const urlRegex = /https?:\/\/[^\s]+/g;
-    t1 = text.replace(urlRegex, _temp$h);
+    t1 = text.replace(urlRegex, _temp$i);
     $[0] = text;
     $[1] = t1;
   } else {
@@ -10902,7 +11604,7 @@ const SafeLinkRenderer = (t0) => {
   }
   return t2;
 };
-function _temp$h(url) {
+function _temp$i(url) {
   return `<a href="${url}" class="underline" target="_blank">Link</a><br/>`;
 }
 const operationLabels$2 = {
@@ -11110,7 +11812,7 @@ function StringNumberFilterField(t0) {
   }
   let t6;
   if ($[16] !== operation || $[17] !== t4 || $[18] !== t5) {
-    t6 = /* @__PURE__ */ jsx("div", { className: "w-[80px]", children: /* @__PURE__ */ jsx(Select, { value: operation, fullWidth: true, position: "item-aligned", onValueChange: t4, renderValue: _temp$g, children: t5 }) });
+    t6 = /* @__PURE__ */ jsx("div", { className: "w-[80px]", children: /* @__PURE__ */ jsx(Select, { value: operation, fullWidth: true, position: "item-aligned", onValueChange: t4, renderValue: _temp$h, children: t5 }) });
     $[16] = operation;
     $[17] = t4;
     $[18] = t5;
@@ -11123,7 +11825,7 @@ function StringNumberFilterField(t0) {
     t7 = !enumValues && /* @__PURE__ */ jsx(TextField, { type: dataType === "number" ? "number" : void 0, value: internalValue !== void 0 && internalValue != null ? String(internalValue) : "", onChange: (evt) => {
       const val_0 = dataType === "number" ? parseFloat(evt.target.value) : evt.target.value;
       updateFilter(operation, val_0);
-    }, endAdornment: internalValue && /* @__PURE__ */ jsx(IconButton, { onClick: (e) => updateFilter(operation, void 0), children: /* @__PURE__ */ jsx(CloseIcon, {}) }) });
+    }, endAdornment: internalValue !== void 0 && internalValue != null && /* @__PURE__ */ jsx(IconButton, { onClick: (e) => updateFilter(operation, void 0), children: /* @__PURE__ */ jsx(CloseIcon, {}) }) });
     $[20] = dataType;
     $[21] = enumValues;
     $[22] = internalValue;
@@ -11139,7 +11841,7 @@ function StringNumberFilterField(t0) {
       if (value_1 !== "") {
         updateFilter(operation, dataType === "number" ? parseInt(value_1) : value_1);
       }
-    }, endAdornment: internalValue && /* @__PURE__ */ jsx(IconButton, { className: "absolute right-2 top-3", onClick: (e_0) => updateFilter(operation, void 0), children: /* @__PURE__ */ jsx(CloseIcon, {}) }), renderValue: (enumKey) => {
+    }, endAdornment: internalValue && /* @__PURE__ */ jsx(IconButton, { onClick: (e_0) => updateFilter(operation, void 0), children: /* @__PURE__ */ jsx(CloseIcon, {}) }), renderValue: (enumKey) => {
       if (enumKey === null) {
         return "Filter for null values";
       }
@@ -11234,7 +11936,7 @@ function _temp3$3(e_1) {
 function _temp2$6(op_1) {
   return /* @__PURE__ */ jsx(SelectItem, { value: op_1, children: operationLabels$1[op_1] }, op_1);
 }
-function _temp$g(op_0) {
+function _temp$h(op_0) {
   return operationLabels$1[op_0];
 }
 function BooleanFilterField(t0) {
@@ -11296,7 +11998,7 @@ const operationLabels = {
 };
 const multipleSelectOperations = ["array-contains-any", "in"];
 function DateTimeFilterField(t0) {
-  const $ = c(38);
+  const $ = c(39);
   const {
     isArray,
     mode,
@@ -11337,7 +12039,7 @@ function DateTimeFilterField(t0) {
         newValue = newOpIsArray ? val ? [val] : [] : "";
       }
       setOperation(op);
-      setInternalValue(newValue === null ? void 0 : newValue);
+      setInternalValue(newValue);
       const hasNewValue = newValue !== null && Array.isArray(newValue) ? newValue.length > 0 : newValue !== void 0;
       if (op && hasNewValue) {
         setValue([op, newValue]);
@@ -11373,7 +12075,7 @@ function DateTimeFilterField(t0) {
   }
   let t6;
   if ($[13] !== operation || $[14] !== t4 || $[15] !== t5) {
-    t6 = /* @__PURE__ */ jsx("div", { className: "w-[80px]", children: /* @__PURE__ */ jsx(Select, { value: operation, size: "large", fullWidth: true, onValueChange: t4, renderValue: _temp$f, children: t5 }) });
+    t6 = /* @__PURE__ */ jsx("div", { className: "w-[80px]", children: /* @__PURE__ */ jsx(Select, { value: operation, size: "large", fullWidth: true, onValueChange: t4, renderValue: _temp$g, children: t5 }) });
     $[13] = operation;
     $[14] = t4;
     $[15] = t5;
@@ -11381,88 +12083,90 @@ function DateTimeFilterField(t0) {
   } else {
     t6 = $[16];
   }
-  const t7 = internalValue ?? void 0;
-  let t8;
+  const t7 = internalValue === null;
+  const t8 = internalValue ?? void 0;
+  let t9;
   if ($[17] !== operation || $[18] !== updateFilter) {
-    t8 = (dateValue) => {
+    t9 = (dateValue) => {
       updateFilter(operation, dateValue === null ? void 0 : dateValue);
     };
     $[17] = operation;
     $[18] = updateFilter;
-    $[19] = t8;
+    $[19] = t9;
   } else {
-    t8 = $[19];
+    t9 = $[19];
   }
-  let t9;
-  if ($[20] !== locale || $[21] !== mode || $[22] !== t7 || $[23] !== t8) {
-    t9 = /* @__PURE__ */ jsx(DateTimeField, { mode, size: "large", locale, value: t7, onChange: t8, clearable: true });
+  let t10;
+  if ($[20] !== locale || $[21] !== mode || $[22] !== t7 || $[23] !== t8 || $[24] !== t9) {
+    t10 = /* @__PURE__ */ jsx(DateTimeField, { mode, size: "large", locale, disabled: t7, value: t8, onChange: t9, clearable: true });
     $[20] = locale;
     $[21] = mode;
     $[22] = t7;
     $[23] = t8;
     $[24] = t9;
+    $[25] = t10;
   } else {
-    t9 = $[24];
+    t10 = $[25];
   }
-  const t10 = internalValue === null;
-  let t11;
-  if ($[25] !== internalValue || $[26] !== operation || $[27] !== updateFilter) {
-    t11 = (checked) => {
+  const t11 = internalValue === null;
+  let t12;
+  if ($[26] !== internalValue || $[27] !== operation || $[28] !== updateFilter) {
+    t12 = (checked) => {
       if (internalValue !== null) {
         updateFilter(operation, null);
       } else {
         updateFilter(operation, void 0);
       }
     };
-    $[25] = internalValue;
-    $[26] = operation;
-    $[27] = updateFilter;
-    $[28] = t11;
+    $[26] = internalValue;
+    $[27] = operation;
+    $[28] = updateFilter;
+    $[29] = t12;
   } else {
-    t11 = $[28];
+    t12 = $[29];
   }
-  let t12;
-  if ($[29] !== t10 || $[30] !== t11) {
-    t12 = /* @__PURE__ */ jsxs(Label, { className: "border cursor-pointer rounded-md p-2 flex items-center gap-2 [&:has(:checked)]:bg-surface-100 dark:[&:has(:checked)]:bg-surface-800", htmlFor: "null-filter", children: [
-      /* @__PURE__ */ jsx(Checkbox, { id: "null-filter", checked: t10, size: "small", onCheckedChange: t11 }),
+  let t13;
+  if ($[30] !== t11 || $[31] !== t12) {
+    t13 = /* @__PURE__ */ jsxs(Label, { className: "border cursor-pointer rounded-md p-2 flex items-center gap-2 [&:has(:checked)]:bg-surface-100 dark:[&:has(:checked)]:bg-surface-800", htmlFor: "null-filter", children: [
+      /* @__PURE__ */ jsx(Checkbox, { id: "null-filter", checked: t11, size: "small", onCheckedChange: t12 }),
       "Filter for null values"
     ] });
-    $[29] = t10;
     $[30] = t11;
     $[31] = t12;
+    $[32] = t13;
   } else {
-    t12 = $[31];
+    t13 = $[32];
   }
-  let t13;
-  if ($[32] !== t12 || $[33] !== t9) {
-    t13 = /* @__PURE__ */ jsxs("div", { className: "flex-grow ml-2 flex flex-col gap-2", children: [
-      t9,
-      t12
+  let t14;
+  if ($[33] !== t10 || $[34] !== t13) {
+    t14 = /* @__PURE__ */ jsxs("div", { className: "flex-grow ml-2 flex flex-col gap-2", children: [
+      t10,
+      t13
     ] });
-    $[32] = t12;
-    $[33] = t9;
+    $[33] = t10;
     $[34] = t13;
+    $[35] = t14;
   } else {
-    t13 = $[34];
+    t14 = $[35];
   }
-  let t14;
-  if ($[35] !== t13 || $[36] !== t6) {
-    t14 = /* @__PURE__ */ jsxs("div", { className: "flex w-[440px]", children: [
+  let t15;
+  if ($[36] !== t14 || $[37] !== t6) {
+    t15 = /* @__PURE__ */ jsxs("div", { className: "flex w-[440px]", children: [
       t6,
-      t13
+      t14
     ] });
-    $[35] = t13;
-    $[36] = t6;
-    $[37] = t14;
+    $[36] = t14;
+    $[37] = t6;
+    $[38] = t15;
   } else {
-    t14 = $[37];
+    t15 = $[38];
   }
-  return t14;
+  return t15;
 }
 function _temp2$5(op_1) {
   return /* @__PURE__ */ jsx(SelectItem, { value: op_1, children: operationLabels[op_1] }, op_1);
 }
-function _temp$f(op_0) {
+function _temp$g(op_0) {
   return operationLabels[op_0];
 }
 const SelectableTable = function SelectableTable2({
@@ -12166,7 +12870,7 @@ function useTableSearchHelper(t0) {
     const searchBlocked = t12;
     let t2;
     if ($[15] !== customizationController.plugins || $[16] !== dataSource?.initTextSearch) {
-      t2 = Boolean(dataSource?.initTextSearch) || customizationController.plugins?.find(_temp$e);
+      t2 = Boolean(dataSource?.initTextSearch) || customizationController.plugins?.find(_temp$f);
       $[15] = customizationController.plugins;
       $[16] = dataSource?.initTextSearch;
       $[17] = t2;
@@ -12258,7 +12962,7 @@ function useTableSearchHelper(t0) {
   }
   return t1;
 }
-function _temp$e(p_0) {
+function _temp$f(p_0) {
   return Boolean(p_0.collectionView?.onTextSearchClick);
 }
 function DeleteEntityDialog({
@@ -12851,7 +13555,7 @@ function FavouritesView(t0) {
     T0 = Collapse;
     t4 = favouriteCollections.length > 0;
     t2 = "flex flex-row flex-wrap gap-2 pb-2 min-h-[32px]";
-    t3 = favouriteCollections.map(_temp$d);
+    t3 = favouriteCollections.map(_temp$e);
     $[2] = navigationController;
     $[3] = t1;
     $[4] = T0;
@@ -12885,7 +13589,7 @@ function FavouritesView(t0) {
   }
   return t6;
 }
-function _temp$d(entry_0) {
+function _temp$e(entry_0) {
   return /* @__PURE__ */ jsx(NavigationChip, { entry: entry_0 }, entry_0.path);
 }
 const scrollsMap = {};
@@ -13102,7 +13806,7 @@ const NavigationCard = React__default.memo(function NavigationCard2(t0) {
   }
   let t4;
   if ($[4] !== actions) {
-    t4 = /* @__PURE__ */ jsx("div", { className: "flex items-center gap-1", onClick: _temp$c, children: actions });
+    t4 = /* @__PURE__ */ jsx("div", { className: "flex items-center gap-1", onClick: _temp$d, children: actions });
     $[4] = actions;
     $[5] = t4;
   } else {
@@ -13189,7 +13893,7 @@ const NavigationCard = React__default.memo(function NavigationCard2(t0) {
   }
   return t12;
 });
-function _temp$c(event) {
+function _temp$d(event) {
   event.preventDefault();
   event.stopPropagation();
 }
@@ -13602,14 +14306,16 @@ function SortableNavigationGroup(t0) {
   return t5;
 }
 function useHomePageDnd({
-  items: dndItems,
-  setItems: setDndItems,
+  items,
+  setItems,
   disabled,
   onCardMovedBetweenGroups,
   onGroupMoved,
   onNewGroupDrop,
   onPersist
 }) {
+  const dndItems = items;
+  const setDndItems = setItems;
   const [activeId, setActiveId] = useState(null);
   const [activeIsGroup, setActiveIsGroup] = useState(false);
   const [currentDraggingGroupId, setCurrentDraggingGroupId] = useState(null);
@@ -13617,6 +14323,9 @@ function useHomePageDnd({
   const [isDraggingCardOnly, setIsDraggingCardOnly] = useState(false);
   const [dialogOpenForGroup, setDialogOpenForGroup] = useState(null);
   const [isHoveringNewGroupDropZone, setIsHoveringNewGroupDropZone] = useState(false);
+  const [pendingNewGroupName, setPendingNewGroupName] = useState(null);
+  const [stateBeforeNewGroup, setStateBeforeNewGroup] = useState(null);
+  const preDragItemsRef = useRef(null);
   const interimItemsRef = useRef(null);
   useEffect(() => {
     interimItemsRef.current = dndItems;
@@ -13651,32 +14360,6 @@ function useHomePageDnd({
     if (activeIsGroup) {
       const groups = args.droppableContainers.filter((c2) => dndItems.some((g_2) => g_2.name === c2.id));
       if (!groups.length) return [];
-      if (groups.length > 0) {
-        const firstGroup = groups[0];
-        const firstGroupRect = firstGroup.rect.current;
-        const {
-          x,
-          y
-        } = args.pointerCoordinates || {
-          x: 0,
-          y: 0
-        };
-        if (firstGroupRect && y < firstGroupRect.top + 20) {
-          return [{
-            id: firstGroup.id,
-            data: {
-              insertBefore: true
-            }
-          }];
-        }
-      }
-      const cornersResult = closestCorners({
-        ...args,
-        droppableContainers: groups
-      });
-      if (cornersResult.length) {
-        return cornersResult;
-      }
       return closestCenter({
         ...args,
         droppableContainers: groups
@@ -13734,6 +14417,7 @@ function useHomePageDnd({
   }) => {
     setDndKitActiveNode(active);
     if (disabled) return;
+    preDragItemsRef.current = cloneItemsForDnd(dndItems);
     const isGroup = dndItems.some((g_7) => g_7.name === active.id);
     if (!active.data.current) active.data.current = {};
     active.data.current.type = isGroup ? "group" : "item";
@@ -13757,18 +14441,30 @@ function useHomePageDnd({
     if (!activeCont) return;
     if (overCont && activeCont !== overCont) {
       recentlyMovedToNewContainer.current = true;
-      const newState = cloneItemsForDnd(dndItems);
-      const srcIdx = newState.findIndex((g_8) => g_8.name === activeCont);
-      const tgtIdx = newState.findIndex((g_9) => g_9.name === overCont);
-      if (srcIdx === -1 || tgtIdx === -1) return;
-      const src = newState[srcIdx];
-      const tgt = newState[tgtIdx];
-      const idxInSrc = src.entries.findIndex((e_2) => e_2.url === activeIdNow);
-      if (idxInSrc === -1) return;
-      const [moved] = src.entries.splice(idxInSrc, 1);
-      tgt.entries.push(moved);
-      interimItemsRef.current = newState;
-      setDndItems(newState);
+      lastOverId.current = overIdNow;
+      setDndItems((current) => {
+        const newState = cloneItemsForDnd(current);
+        const srcIdx = newState.findIndex((g_8) => g_8.name === activeCont);
+        const tgtIdx = newState.findIndex((g_9) => g_9.name === overCont);
+        if (srcIdx === -1 || tgtIdx === -1) return current;
+        const src = newState[srcIdx];
+        const tgt = newState[tgtIdx];
+        const idxInSrc = src.entries.findIndex((e_2) => e_2.url === activeIdNow);
+        if (idxInSrc === -1) return current;
+        const [moved] = src.entries.splice(idxInSrc, 1);
+        const overIsContainer_0 = overIdNow === overCont;
+        if (overIsContainer_0) {
+          tgt.entries.push(moved);
+        } else {
+          const overIdx = tgt.entries.findIndex((e_3) => e_3.url === overIdNow);
+          if (overIdx !== -1) {
+            tgt.entries.splice(overIdx, 0, moved);
+          } else {
+            tgt.entries.push(moved);
+          }
+        }
+        return newState;
+      });
     } else if (activeCont === overCont) {
       recentlyMovedToNewContainer.current = false;
     }
@@ -13784,75 +14480,112 @@ function useHomePageDnd({
     const activeIdNow_0 = active_1.id;
     const overIdNow_0 = over_0.id;
     if (activeIsGroup) {
-      const insertBefore = over_0.data?.current?.insertBefore;
-      if (insertBefore && activeIdNow_0 !== overIdNow_0) {
+      if (activeIdNow_0 !== overIdNow_0 && dndItems.some((g_12) => g_12.name === overIdNow_0)) {
         const from = dndItems.findIndex((g_10) => g_10.name === activeIdNow_0);
-        if (from !== -1 && from !== 0) {
-          const newState_0 = arrayMove$1(dndItems, from, 0);
+        const to = dndItems.findIndex((g_11) => g_11.name === overIdNow_0);
+        if (from !== -1 && to !== -1) {
+          const newState_0 = arrayMove$1(dndItems, from, to);
           setDndItems(newState_0);
           onPersist?.(newState_0);
-          onGroupMoved?.(activeIdNow_0, from, 0);
-        }
-      } else if (activeIdNow_0 !== overIdNow_0 && dndItems.some((g_13) => g_13.name === overIdNow_0)) {
-        const from_0 = dndItems.findIndex((g_11) => g_11.name === activeIdNow_0);
-        const to = dndItems.findIndex((g_12) => g_12.name === overIdNow_0);
-        if (from_0 !== -1 && to !== -1) {
-          const newState_1 = arrayMove$1(dndItems, from_0, to);
-          setDndItems(newState_1);
-          onPersist?.(newState_1);
-          onGroupMoved?.(activeIdNow_0, from_0, to);
+          onGroupMoved?.(activeIdNow_0, from, to);
         }
       }
     } else {
-      const activeCont_0 = findDndContainer(activeIdNow_0);
+      const findContainerInState = (id_0, state) => {
+        const group_0 = state.find((g_13) => g_13.name === id_0);
+        if (group_0) return group_0.name;
+        for (const g_14 of state) {
+          if (g_14.entries.some((e_4) => e_4.url === id_0)) return g_14.name;
+        }
+        return void 0;
+      };
+      const sourceState = preDragItemsRef.current || dndItems;
+      const activeCont_0 = findContainerInState(activeIdNow_0, sourceState);
+      findDndContainer(overIdNow_0);
       if (overIdNow_0 === "new-group-drop-zone") {
         if (activeCont_0) {
-          const newState_2 = cloneItemsForDnd(dndItems);
-          const srcIdx_0 = newState_2.findIndex((g_14) => g_14.name === activeCont_0);
+          setStateBeforeNewGroup(cloneItemsForDnd(dndItems));
+          const newState_1 = cloneItemsForDnd(dndItems);
+          const srcIdx_0 = newState_1.findIndex((g_15) => g_15.name === activeCont_0);
           if (srcIdx_0 !== -1) {
-            const src_0 = newState_2[srcIdx_0];
-            const idxInSrc_0 = src_0.entries.findIndex((e_3) => e_3.url === activeIdNow_0);
+            const src_0 = newState_1[srcIdx_0];
+            const idxInSrc_0 = src_0.entries.findIndex((e_5) => e_5.url === activeIdNow_0);
             if (idxInSrc_0 !== -1) {
               const [dragged] = src_0.entries.splice(idxInSrc_0, 1);
-              if (src_0.entries.length === 0) newState_2.splice(srcIdx_0, 1);
+              if (src_0.entries.length === 0) newState_1.splice(srcIdx_0, 1);
               let tentative = "New Group";
               let counter = 1;
-              while (newState_2.some((g_15) => g_15.name === tentative)) tentative = `New Group ${counter++}`;
-              newState_2.push({
+              while (newState_1.some((g_16) => g_16.name === tentative)) tentative = `New Group ${counter++}`;
+              newState_1.push({
                 name: tentative,
                 entries: [dragged]
               });
-              setDndItems(newState_2);
-              onPersist?.(newState_2);
+              setDndItems(newState_1);
+              setPendingNewGroupName(tentative);
               setDialogOpenForGroup(tentative);
               onNewGroupDrop?.();
             }
           }
         }
       } else {
-        const overCont_0 = findDndContainer(overIdNow_0);
-        if (activeCont_0 === overCont_0) {
-          const grpIdx = dndItems.findIndex((g_16) => g_16.name === activeCont_0);
+        const overCont_1 = findDndContainer(overIdNow_0);
+        if (activeCont_0 === overCont_1) {
+          const grpIdx = dndItems.findIndex((g_17) => g_17.name === activeCont_0);
           if (grpIdx !== -1) {
-            const group_0 = dndItems[grpIdx];
-            const oldIdx = group_0.entries.findIndex((e_4) => e_4.url === activeIdNow_0);
-            let newIdx = group_0.entries.findIndex((e_5) => e_5.url === overIdNow_0);
-            if (newIdx === -1 && overIdNow_0 === activeCont_0) newIdx = group_0.entries.length - 1;
+            const group_1 = dndItems[grpIdx];
+            const oldIdx = group_1.entries.findIndex((e_6) => e_6.url === activeIdNow_0);
+            let newIdx = group_1.entries.findIndex((e_7) => e_7.url === overIdNow_0);
+            if (newIdx === -1 && overIdNow_0 === activeCont_0) newIdx = group_1.entries.length - 1;
             if (oldIdx !== -1 && newIdx !== -1 && oldIdx !== newIdx) {
-              const reordered = arrayMove$1(group_0.entries, oldIdx, newIdx);
-              const newState_3 = [...dndItems];
-              newState_3[grpIdx] = {
-                ...group_0,
+              const reordered = arrayMove$1(group_1.entries, oldIdx, newIdx);
+              const newState_2 = [...dndItems];
+              newState_2[grpIdx] = {
+                ...group_1,
                 entries: reordered
               };
-              setDndItems(newState_3);
-              onPersist?.(newState_3);
+              setDndItems(newState_2);
+              onPersist?.(newState_2);
+            }
+          }
+        } else if (overCont_1 && activeCont_0 !== overCont_1) {
+          const finalState = cloneItemsForDnd(sourceState);
+          const finalOverId = lastOverId.current || overIdNow_0;
+          const cleanOverCont = findContainerInState(finalOverId, sourceState) || overCont_1;
+          const srcIdx_1 = finalState.findIndex((g_18) => g_18.name === activeCont_0);
+          const tgtIdx_0 = finalState.findIndex((g_19) => g_19.name === cleanOverCont);
+          if (srcIdx_1 !== -1 && tgtIdx_0 !== -1) {
+            const src_1 = finalState[srcIdx_1];
+            const tgt_0 = finalState[tgtIdx_0];
+            const idxInSrc_1 = src_1.entries.findIndex((e_8) => e_8.url === activeIdNow_0);
+            if (idxInSrc_1 !== -1) {
+              const [moved_0] = src_1.entries.splice(idxInSrc_1, 1);
+              const overIsContainer_1 = finalOverId === cleanOverCont;
+              if (overIsContainer_1) {
+                tgt_0.entries.push(moved_0);
+              } else {
+                const overIdx_0 = tgt_0.entries.findIndex((e_9) => e_9.url === finalOverId);
+                if (overIdx_0 !== -1) {
+                  tgt_0.entries.splice(overIdx_0, 0, moved_0);
+                } else {
+                  tgt_0.entries.push(moved_0);
+                }
+              }
+              if (src_1.entries.length === 0) {
+                finalState.splice(srcIdx_1, 1);
+              }
+              setDndItems(finalState);
+              onPersist?.(finalState);
+              onCardMovedBetweenGroups?.(moved_0);
             }
           }
-        } else if (recentlyMovedToNewContainer.current && interimItemsRef.current) {
-          onPersist?.(interimItemsRef.current);
+        } else if (recentlyMovedToNewContainer.current) {
+          console.error("Move between containers detected but conditions not met", {
+            activeCont: activeCont_0,
+            overCont: overCont_1,
+            activeIdNow: activeIdNow_0,
+            overIdNow: overIdNow_0
+          });
         }
-        onCardMovedBetweenGroups?.(dndItems.flatMap((g_17) => g_17.entries).find((e_6) => e_6.url === activeIdNow_0));
       }
     }
     resetDragState();
@@ -13865,15 +14598,13 @@ function useHomePageDnd({
     setIsDraggingCardOnly(false);
     recentlyMovedToNewContainer.current = false;
   };
-  const handleDragCancel = () => {
-    resetDragState();
-  };
+  const handleDragCancel = () => resetDragState();
   const handleRenameGroup = (oldName, newName) => {
-    setDndItems((current) => {
-      const idx = current.findIndex((g_18) => g_18.name === oldName);
-      if (idx === -1) return current;
-      if (current.some((g_19) => g_19.name === newName && g_19.name !== oldName)) return current;
-      const updated = [...current];
+    setDndItems((current_0) => {
+      const idx = current_0.findIndex((g_20) => g_20.name === oldName);
+      if (idx === -1) return current_0;
+      if (current_0.some((g_21) => g_21.name === newName && g_21.name !== oldName)) return current_0;
+      const updated = [...current_0];
       updated[idx] = {
         ...updated[idx],
         name: newName
@@ -13881,9 +14612,20 @@ function useHomePageDnd({
       onPersist?.(updated);
       return updated;
     });
+    setPendingNewGroupName(null);
+    setStateBeforeNewGroup(null);
+    setDialogOpenForGroup(null);
   };
-  const activeItemForOverlay = disabled || !activeId || activeIsGroup ? null : dndItems.flatMap((g_20) => g_20.entries).find((e_7) => e_7.url === activeId) || null;
-  const activeGroupData = disabled || !activeId || !activeIsGroup ? null : dndItems.find((g_21) => g_21.name === activeId) || null;
+  const handleDialogClose = () => {
+    if (pendingNewGroupName && dialogOpenForGroup === pendingNewGroupName && stateBeforeNewGroup) {
+      setDndItems(stateBeforeNewGroup);
+    }
+    setPendingNewGroupName(null);
+    setStateBeforeNewGroup(null);
+    setDialogOpenForGroup(null);
+  };
+  const activeItemForOverlay = disabled || !activeId || activeIsGroup ? null : dndItems.flatMap((g_22) => g_22.entries).find((e_10) => e_10.url === activeId) || null;
+  const activeGroupData = disabled || !activeId || !activeIsGroup ? null : dndItems.find((g_23) => g_23.name === activeId) || null;
   return {
     sensors,
     collisionDetection,
@@ -13901,6 +14643,7 @@ function useHomePageDnd({
     dialogOpenForGroup,
     setDialogOpenForGroup,
     handleRenameGroup,
+    handleDialogClose,
     isHoveringNewGroupDropZone,
     setIsHoveringNewGroupDropZone
   };
@@ -14001,7 +14744,7 @@ function NewGroupDropZone(t0) {
   return t8;
 }
 function RenameGroupDialog(t0) {
-  const $ = c(41);
+  const $ = c(40);
   const {
     open,
     initialName,
@@ -14193,19 +14936,18 @@ function RenameGroupDialog(t0) {
     t15 = $[35];
   }
   let t16;
-  if ($[36] !== onClose || $[37] !== open || $[38] !== t11 || $[39] !== t15) {
-    t16 = /* @__PURE__ */ jsxs(Dialog, { open, onOpenChange: onClose, children: [
+  if ($[36] !== open || $[37] !== t11 || $[38] !== t15) {
+    t16 = /* @__PURE__ */ jsxs(Dialog, { open, children: [
       t6,
       t11,
       t15
     ] });
-    $[36] = onClose;
-    $[37] = open;
-    $[38] = t11;
-    $[39] = t15;
-    $[40] = t16;
+    $[36] = open;
+    $[37] = t11;
+    $[38] = t15;
+    $[39] = t16;
   } else {
-    t16 = $[40];
+    t16 = $[39];
   }
   return t16;
 }
@@ -14279,7 +15021,7 @@ function DefaultHomePage({
           entries: []
         });
       }
-      allProcessed = allProcessed.filter((g_4) => g_4.entries.length || groupOrderFromNavController.includes(g_4.name) || g_4.name === DEFAULT_GROUP_NAME && hasPluginAdditionalCards);
+      allProcessed = allProcessed.filter((g_4) => g_4.entries.length || g_4.name === DEFAULT_GROUP_NAME && hasPluginAdditionalCards);
     }
     const admin = allProcessed.find((g_5) => g_5.name === ADMIN_GROUP_NAME);
     return {
@@ -14305,16 +15047,11 @@ function DefaultHomePage({
     }] : draggable;
     onNavigationEntriesUpdate(all);
   };
-  const [collapsedGroups, setCollapsedGroups] = useState({});
-  const isGroupCollapsed = useCallback((name_0) => {
-    return !!collapsedGroups[name_0];
-  }, [collapsedGroups]);
-  const toggleGroupCollapsed = useCallback((name_1) => {
-    setCollapsedGroups((prev) => ({
-      ...prev,
-      [name_1]: !prev[name_1]
-    }));
-  }, []);
+  const groupNames = useMemo(() => [...items.map((item) => item.name), ...adminGroupData ? [adminGroupData.name] : []], [items, adminGroupData]);
+  const {
+    isGroupCollapsed,
+    toggleGroupCollapsed
+  } = useCollapsedGroups(groupNames);
   const {
     sensors,
     collisionDetection,
@@ -14332,6 +15069,7 @@ function DefaultHomePage({
     dialogOpenForGroup,
     setDialogOpenForGroup,
     handleRenameGroup,
+    handleDialogClose,
     isHoveringNewGroupDropZone,
     setIsHoveringNewGroupDropZone
   } = useHomePageDnd({
@@ -14339,22 +15077,12 @@ function DefaultHomePage({
     setItems: updateItems,
     disabled: !allowDragAndDrop || performingSearch,
     onPersist: persistNavigationGroups,
-    // ——► persistence here
     onGroupMoved: (g_8) => context.analyticsController?.onAnalyticsEvent?.("home_move_group", {
       name: g_8
     }),
-    onCardMovedBetweenGroups: (card) => {
-      let targetGroup = items.find((group) => group.entries.some((entry) => entry.url === card.url));
-      if (!targetGroup && adminGroupData?.entries.some((entry_0) => entry_0.url === card.url)) {
-        targetGroup = adminGroupData;
-      }
-      if (targetGroup && isGroupCollapsed(targetGroup.name)) {
-        toggleGroupCollapsed(targetGroup.name);
-      }
-      context.analyticsController?.onAnalyticsEvent?.("home_move_card", {
-        id: card.id
-      });
-    },
+    onCardMovedBetweenGroups: (card) => context.analyticsController?.onAnalyticsEvent?.("home_move_card", {
+      id: card.id
+    }),
     onNewGroupDrop: () => context.analyticsController?.onAnalyticsEvent?.("home_drop_new_group")
   });
   const {
@@ -14394,7 +15122,7 @@ function DefaultHomePage({
           frequency: 500
         }
       }, onDragStart, onDragOver, onDragEnd, onDragCancel, modifiers: dndModifiers, children: [
-        /* @__PURE__ */ jsx(SortableContext, { items: containers, strategy: verticalListSortingStrategy, children: items.map((groupData) => {
+        /* @__PURE__ */ jsx(SortableContext, { items: containers, strategy: verticalListSortingStrategy, children: items.map((groupData, groupIndex) => {
           const groupKey = groupData.name;
           const entriesInGroup = groupData.entries;
           const AdditionalCards = [];
@@ -14405,22 +15133,22 @@ function DefaultHomePage({
             group: groupKey === DEFAULT_GROUP_NAME ? void 0 : groupKey,
             context
           };
-          if (entriesInGroup.length === 0 && (AdditionalCards.length === 0 || performingSearch) && !groupOrderFromNavController.includes(groupKey)) return null;
+          if (entriesInGroup.length === 0 && (AdditionalCards.length === 0 || performingSearch)) return null;
           return /* @__PURE__ */ jsx(SortableNavigationGroup, { groupName: groupKey, disabled: dndDisabled, children: /* @__PURE__ */ jsx(NavigationGroup, { group: groupKey === DEFAULT_GROUP_NAME ? void 0 : groupKey, minimised: draggingGroupId === groupKey && !isDraggingCardOnly, isPotentialCardDropTarget: isDraggingCardOnly, dndDisabled, onEditGroup: () => {
             if (dndDisabled) return;
             setDialogOpenForGroup(groupKey);
           }, collapsed: isGroupCollapsed(groupKey), onToggleCollapsed: () => toggleGroupCollapsed(groupKey), children: /* @__PURE__ */ jsx(NavigationGroupDroppable, { id: groupKey, itemIds: entriesInGroup.map((e_4) => e_4.url), isPotentialCardDropTarget: isDraggingCardOnly, children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 ", children: [
-            entriesInGroup.map((entry_1) => /* @__PURE__ */ jsx(SortableNavigationCard, { entry: entry_1, onClick: () => {
+            entriesInGroup.map((entry) => /* @__PURE__ */ jsx(SortableNavigationCard, { entry, onClick: () => {
               let event = "unmapped_event";
-              if (entry_1.type === "collection") event = "home_navigate_to_collection";
-              else if (entry_1.type === "view") event = "home_navigate_to_view";
-              else if (entry_1.type === "admin") event = "home_navigate_to_admin_view";
+              if (entry.type === "collection") event = "home_navigate_to_collection";
+              else if (entry.type === "view") event = "home_navigate_to_view";
+              else if (entry.type === "admin") event = "home_navigate_to_admin_view";
               context.analyticsController?.onAnalyticsEvent?.(event, {
-                path: entry_1.path
+                path: entry.path
               });
-            } }, entry_1.url)),
+            } }, entry.url)),
             !performingSearch && groupKey.toLowerCase() !== ADMIN_GROUP_NAME.toLowerCase() && AdditionalCards.map((C, i_1) => /* @__PURE__ */ jsx(C, { ...actionProps }, `extra_${groupKey}_${i_1}`))
-          ] }) }) }) }, groupKey);
+          ] }) }) }) }, `group-${groupIndex}`);
         }) }, JSON.stringify(containers)),
         /* @__PURE__ */ jsx(NewGroupDropZone, { disabled: dndDisabled, setIsHovering: setIsHoveringNewGroupDropZone }),
         /* @__PURE__ */ jsx(DragOverlay, { adjustScale: false, dropAnimation, children: activeGroupData && draggingGroupId === activeGroupData.name ? /* @__PURE__ */ jsx("div", { className: "rounded-lg bg-transparent", style: {
@@ -14428,22 +15156,21 @@ function DefaultHomePage({
           margin: 0
         }, children: /* @__PURE__ */ jsx(NavigationGroup, { group: activeGroupData.name === DEFAULT_GROUP_NAME ? void 0 : activeGroupData.name, isPreview: false, minimised: true }) }) : activeItemForOverlay ? /* @__PURE__ */ jsx(NavigationCardBinding, { ...activeItemForOverlay, shrink: isHoveringNewGroupDropZone }) : null })
       ] }),
-      !performingSearch && adminGroupData && /* @__PURE__ */ jsx(NavigationGroup, { group: adminGroupData.name, collapsed: isGroupCollapsed(adminGroupData.name), onToggleCollapsed: () => toggleGroupCollapsed(adminGroupData.name), children: /* @__PURE__ */ jsx("div", { className: "grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 ", children: adminGroupData.entries.map((entry_2) => /* @__PURE__ */ jsx(NavigationCardBinding, { ...entry_2, onClick: () => {
+      !performingSearch && adminGroupData && /* @__PURE__ */ jsx(NavigationGroup, { group: adminGroupData.name, collapsed: isGroupCollapsed(adminGroupData.name), onToggleCollapsed: () => toggleGroupCollapsed(adminGroupData.name), children: /* @__PURE__ */ jsx("div", { className: "grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 ", children: adminGroupData.entries.map((entry_0) => /* @__PURE__ */ jsx(NavigationCardBinding, { ...entry_0, onClick: () => {
         let event_0 = "unmapped_event";
-        if (entry_2.type === "collection") event_0 = "home_navigate_to_collection";
-        else if (entry_2.type === "view") event_0 = "home_navigate_to_view";
-        else if (entry_2.type === "admin") event_0 = "home_navigate_to_admin_view";
+        if (entry_0.type === "collection") event_0 = "home_navigate_to_collection";
+        else if (entry_0.type === "view") event_0 = "home_navigate_to_view";
+        else if (entry_0.type === "admin") event_0 = "home_navigate_to_admin_view";
         context.analyticsController?.onAnalyticsEvent?.(event_0, {
-          path: entry_2.path
+          path: entry_0.path
         });
-      } }, entry_2.url)) }) }),
+      } }, entry_0.url)) }) }),
       additionalPluginSections,
       additionalPluginChildrenEnd,
       additionalChildrenEnd
     ] }),
-    dialogOpenForGroup && /* @__PURE__ */ jsx(RenameGroupDialog, { open: true, initialName: dialogOpenForGroup, existingGroupNames: items.map((g_9) => g_9.name).filter((n) => n !== dialogOpenForGroup), onClose: () => setDialogOpenForGroup(null), onRename: (newName) => {
+    dialogOpenForGroup && /* @__PURE__ */ jsx(RenameGroupDialog, { open: true, initialName: dialogOpenForGroup, existingGroupNames: items.map((g_9) => g_9.name).filter((n) => n !== dialogOpenForGroup), onClose: handleDialogClose, onRename: (newName) => {
       handleRenameGroup(dialogOpenForGroup, newName);
-      setDialogOpenForGroup(null);
     } })
   ] });
 }
@@ -14766,61 +15493,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 {
@@ -14841,7 +15567,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,
@@ -14850,13 +15576,13 @@ function EntityFormActions(t0) {
       collection,
       context,
       sideEntityController,
-      isSubmitting: formex.isSubmitting,
       disabled,
       status,
       pluginActions,
       openEntityMode,
       navigateBack,
-      formContext
+      formContext,
+      formex
     }) : buildSideActions$1({
       fullPath,
       fullIdPath,
@@ -14865,18 +15591,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;
@@ -14901,14 +15627,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) => {
@@ -14927,39 +15654,361 @@ 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"
     ] })
   ] });
 }
-function buildSideActions$1({
-  savingError,
-  entity,
-  formActions,
-  fullPath,
-  fullIdPath,
-  openEntityMode,
-  collection,
-  context,
-  sideEntityController,
-  isSubmitting,
-  disabled,
-  status,
-  pluginActions
-}) {
-  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: [
-      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" }),
-    pluginActions,
-    savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) })
-  ] });
+function buildSideActions$1({
+  savingError,
+  entity,
+  formActions,
+  fullPath,
+  fullIdPath,
+  openEntityMode,
+  collection,
+  context,
+  sideEntityController,
+  disabled,
+  status,
+  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", 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 || 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 LocalChangesMenu(t0) {
+  const $ = c(42);
+  const {
+    localChangesData,
+    formex,
+    onClearLocalChanges,
+    cacheKey,
+    properties
+  } = t0;
+  const snackbarController = useSnackbarController();
+  const [previewDialogOpen, setPreviewDialogOpen] = useState(false);
+  const [open, setOpen] = useState(false);
+  let t1;
+  if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+    t1 = () => setOpen(true);
+    $[0] = t1;
+  } else {
+    t1 = $[0];
+  }
+  const handleOpenMenu = t1;
+  let t2;
+  if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
+    t2 = () => setOpen(false);
+    $[1] = t2;
+  } else {
+    t2 = $[1];
+  }
+  const handleCloseMenu = t2;
+  let t3;
+  if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+    t3 = () => {
+      setPreviewDialogOpen(true);
+      handleCloseMenu();
+    };
+    $[2] = t3;
+  } else {
+    t3 = $[2];
+  }
+  const handlePreview = t3;
+  let t4;
+  if ($[3] !== formex || $[4] !== localChangesData || $[5] !== onClearLocalChanges || $[6] !== snackbarController) {
+    t4 = () => {
+      const mergedValues = mergeDeep(formex.values, localChangesData);
+      const touched = {
+        ...formex.touched
+      };
+      const previewKeys = flattenKeys(localChangesData);
+      previewKeys.forEach((key) => {
+        touched[key] = true;
+      });
+      formex.setTouched(touched);
+      formex.setValues(mergedValues);
+      snackbarController.open({
+        type: "info",
+        message: "Local changes applied to the form"
+      });
+      handleCloseMenu();
+      onClearLocalChanges?.();
+    };
+    $[3] = formex;
+    $[4] = localChangesData;
+    $[5] = onClearLocalChanges;
+    $[6] = snackbarController;
+    $[7] = t4;
+  } else {
+    t4 = $[7];
+  }
+  const handleApply = t4;
+  let t5;
+  if ($[8] !== cacheKey || $[9] !== onClearLocalChanges || $[10] !== snackbarController) {
+    t5 = () => {
+      removeEntityFromCache(cacheKey);
+      snackbarController.open({
+        type: "info",
+        message: "Local changes discarded"
+      });
+      handleCloseMenu();
+      onClearLocalChanges?.();
+    };
+    $[8] = cacheKey;
+    $[9] = onClearLocalChanges;
+    $[10] = snackbarController;
+    $[11] = t5;
+  } else {
+    t5 = $[11];
+  }
+  const handleDiscard = t5;
+  let t6;
+  if ($[12] === Symbol.for("react.memo_cache_sentinel")) {
+    t6 = /* @__PURE__ */ jsx(WarningIcon, { size: "smallest", className: "mr-1 text-yellow-600 dark:text-yellow-400" });
+    $[12] = t6;
+  } else {
+    t6 = $[12];
+  }
+  let t7;
+  if ($[13] === Symbol.for("react.memo_cache_sentinel")) {
+    t7 = /* @__PURE__ */ jsxs(Button, { size: "small", className: "font-semibold text-xs rounded-full px-4 py-1 bg-yellow-200 dark:bg-yellow-900 hover:bg-yellow-300 dark:hover:bg-yellow-800 text-yellow-800 dark:text-yellow-200", onClick: handleOpenMenu, children: [
+      t6,
+      "Unsaved Local changes",
+      /* @__PURE__ */ jsx(KeyboardArrowDownIcon, { size: "smallest" })
+    ] });
+    $[13] = t7;
+  } else {
+    t7 = $[13];
+  }
+  let t8;
+  if ($[14] === Symbol.for("react.memo_cache_sentinel")) {
+    t8 = /* @__PURE__ */ jsx("div", { className: "max-w-xs px-4 py-4 text-sm text-gray-700 dark:text-gray-300", children: "This document was edited locally and has unsaved changes. These local changes will be lost if you don't apply them." });
+    $[14] = t8;
+  } else {
+    t8 = $[14];
+  }
+  let t9;
+  if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
+    t9 = /* @__PURE__ */ jsxs(MenuItem, { dense: true, onClick: handlePreview, children: [
+      /* @__PURE__ */ jsx(VisibilityIcon, { size: "small" }),
+      "Preview Changes"
+    ] });
+    $[15] = t9;
+  } else {
+    t9 = $[15];
+  }
+  let t10;
+  if ($[16] === Symbol.for("react.memo_cache_sentinel")) {
+    t10 = /* @__PURE__ */ jsx(CheckIcon, { size: "small" });
+    $[16] = t10;
+  } else {
+    t10 = $[16];
+  }
+  let t11;
+  if ($[17] !== handleApply) {
+    t11 = /* @__PURE__ */ jsxs(MenuItem, { dense: true, onClick: handleApply, children: [
+      t10,
+      "Apply Changes"
+    ] });
+    $[17] = handleApply;
+    $[18] = t11;
+  } else {
+    t11 = $[18];
+  }
+  let t12;
+  if ($[19] === Symbol.for("react.memo_cache_sentinel")) {
+    t12 = /* @__PURE__ */ jsx(CancelIcon, { size: "small" });
+    $[19] = t12;
+  } else {
+    t12 = $[19];
+  }
+  let t13;
+  if ($[20] !== handleDiscard) {
+    t13 = /* @__PURE__ */ jsxs(MenuItem, { dense: true, onClick: handleDiscard, children: [
+      t12,
+      "Discard Local Changes"
+    ] });
+    $[20] = handleDiscard;
+    $[21] = t13;
+  } else {
+    t13 = $[21];
+  }
+  let t14;
+  if ($[22] !== open || $[23] !== t11 || $[24] !== t13) {
+    t14 = /* @__PURE__ */ jsxs(Menu, { trigger: t7, open, onOpenChange: setOpen, children: [
+      t8,
+      t9,
+      t11,
+      t13
+    ] });
+    $[22] = open;
+    $[23] = t11;
+    $[24] = t13;
+    $[25] = t14;
+  } else {
+    t14 = $[25];
+  }
+  let t15;
+  if ($[26] === Symbol.for("react.memo_cache_sentinel")) {
+    t15 = /* @__PURE__ */ jsx(DialogTitle, { variant: "h6", children: "Preview Local Changes" });
+    $[26] = t15;
+  } else {
+    t15 = $[26];
+  }
+  let t16;
+  if ($[27] === Symbol.for("react.memo_cache_sentinel")) {
+    t16 = /* @__PURE__ */ jsx(Typography, { variant: "body2", className: "mb-4", children: "These are the local changes that will be applied to the form." });
+    $[27] = t16;
+  } else {
+    t16 = $[27];
+  }
+  let t17;
+  if ($[28] === Symbol.for("react.memo_cache_sentinel")) {
+    t17 = {
+      maxHeight: 520,
+      overflow: "auto"
+    };
+    $[28] = t17;
+  } else {
+    t17 = $[28];
+  }
+  const t18 = properties;
+  let t19;
+  if ($[29] !== localChangesData || $[30] !== t18) {
+    t19 = /* @__PURE__ */ jsxs(DialogContent, { className: "my-4", children: [
+      t16,
+      /* @__PURE__ */ jsx("div", { className: `border rounded-lg ${defaultBorderMixin}`, style: t17, children: /* @__PURE__ */ jsx("div", { className: "p-4", children: /* @__PURE__ */ jsx(PropertyCollectionView, { data: localChangesData, properties: t18 }) }) })
+    ] });
+    $[29] = localChangesData;
+    $[30] = t18;
+    $[31] = t19;
+  } else {
+    t19 = $[31];
+  }
+  let t20;
+  if ($[32] === Symbol.for("react.memo_cache_sentinel")) {
+    t20 = /* @__PURE__ */ jsx(Button, { onClick: () => setPreviewDialogOpen(false), children: "Close" });
+    $[32] = t20;
+  } else {
+    t20 = $[32];
+  }
+  let t21;
+  if ($[33] !== handleApply) {
+    t21 = /* @__PURE__ */ jsxs(DialogActions, { children: [
+      t20,
+      /* @__PURE__ */ jsx(Button, { variant: "filled", onClick: () => {
+        handleApply();
+        setPreviewDialogOpen(false);
+      }, children: "Apply changes" })
+    ] });
+    $[33] = handleApply;
+    $[34] = t21;
+  } else {
+    t21 = $[34];
+  }
+  let t22;
+  if ($[35] !== previewDialogOpen || $[36] !== t19 || $[37] !== t21) {
+    t22 = /* @__PURE__ */ jsxs(Dialog, { open: previewDialogOpen, onOpenChange: setPreviewDialogOpen, maxWidth: "4xl", children: [
+      t15,
+      t19,
+      t21
+    ] });
+    $[35] = previewDialogOpen;
+    $[36] = t19;
+    $[37] = t21;
+    $[38] = t22;
+  } else {
+    t22 = $[38];
+  }
+  let t23;
+  if ($[39] !== t14 || $[40] !== t22) {
+    t23 = /* @__PURE__ */ jsxs(Fragment, { children: [
+      t14,
+      t22
+    ] });
+    $[39] = t14;
+    $[40] = t22;
+    $[41] = t23;
+  } else {
+    t23 = $[41];
+  }
+  return t23;
+}
+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 getChanges(source, comparison) {
+  const changes = {};
+  if (!source) {
+    return {};
+  }
+  if (!comparison) {
+    return source;
+  }
+  const allKeys = Array.from(/* @__PURE__ */ new Set([...Object.keys(source), ...Object.keys(comparison)]));
+  for (const key of allKeys) {
+    const sourceValue = source[key];
+    const comparisonValue = comparison[key];
+    if (equal(sourceValue, comparisonValue)) {
+      continue;
+    }
+    const sourceHasKey = source && typeof source === "object" && Object.prototype.hasOwnProperty.call(source, key);
+    const comparisonHasKey = comparison && typeof comparison === "object" && Object.prototype.hasOwnProperty.call(comparison, key);
+    if (comparisonHasKey && !sourceHasKey) {
+      changes[key] = void 0;
+    } else if (Array.isArray(sourceValue)) {
+      const comparisonArray = Array.isArray(comparisonValue) ? comparisonValue : [];
+      if (sourceValue.length < comparisonArray.length) {
+        changes[key] = sourceValue;
+        continue;
+      }
+      const changedArray = sourceValue.map((item, index) => {
+        const comparisonItem = comparisonArray[index];
+        if (equal(item, comparisonItem)) {
+          return null;
+        }
+        if (isObject(item) && item && isObject(comparisonItem) && comparisonItem) {
+          const nestedChanges = getChanges(item, comparisonItem);
+          return Object.keys(nestedChanges).length > 0 ? nestedChanges : item;
+        }
+        return item;
+      });
+      if (changedArray.some((item) => item !== null) || sourceValue.length > comparisonArray.length) {
+        changes[key] = changedArray;
+      }
+    } else if (isObject(sourceValue) && sourceValue && isObject(comparisonValue) && comparisonValue) {
+      const nestedChanges = getChanges(sourceValue, comparisonValue);
+      if (Object.keys(nestedChanges).length > 0) {
+        changes[key] = nestedChanges;
+      }
+    } else {
+      changes[key] = sourceValue;
+    }
+  }
+  return changes;
 }
 function EntityForm({
   path,
@@ -15018,7 +16067,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(() => {
@@ -15036,6 +16085,12 @@ function EntityForm({
   const [entityIdError, setEntityIdError] = useState(false);
   const [savingError, setSavingError] = useState();
   const autoSave = collection.formAutoSave && !collection.customId;
+  const baseInitialValues = useMemo(() => getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs), [authController, collection, path, status, entity, customizationController.propertyConfigs]);
+  const localChangesDataRaw = useMemo(() => entityId ? getEntityFromCache(path + "/" + entityId) : getEntityFromCache(path + "#new"), [entityId, path]);
+  const [localChangesCleared, setLocalChangesCleared] = useState(false);
+  const localChangesBackup = getLocalChangesBackup(collection);
+  const autoApplyLocalChanges = localChangesBackup === "auto_apply";
+  const manualApplyLocalChanges = localChangesBackup === "manual_apply";
   const onSubmit = (values, formexController) => {
     if (mustSetCustomId && !entityId) {
       console.error("Missing custom Id");
@@ -15066,16 +16121,40 @@ function EntityForm({
       formexController.setSubmitting(false);
     });
   };
+  const [initialValues_0, initialDirty_0] = useMemo(() => {
+    const initialValuesWithLocalChanges = autoApplyLocalChanges && localChangesDataRaw ? mergeDeep(baseInitialValues, localChangesDataRaw) : baseInitialValues;
+    const initialValues = initialDirtyValues ? mergeDeep(initialValuesWithLocalChanges, initialDirtyValues) : initialValuesWithLocalChanges;
+    const initialDirty = Boolean(initialDirtyValues) && initialDirtyValues && Object.keys(initialDirtyValues).length > 0;
+    return [initialValues, initialDirty];
+  }, [autoApplyLocalChanges, localChangesDataRaw, baseInitialValues, initialDirtyValues]);
+  const localChangesData = useMemo(() => {
+    if (!localChangesDataRaw) {
+      return void 0;
+    }
+    return getChanges(localChangesDataRaw, initialValues_0);
+  }, [localChangesDataRaw, initialValues_0]);
+  const hasLocalChanges = !localChangesCleared && localChangesData && Object.keys(localChangesData).length > 0;
   const formex = formexProp ?? useCreateFormex({
-    initialValues: initialDirtyValues ?? getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs),
-    initialDirty: Boolean(initialDirtyValues),
+    initialValues: initialValues_0,
+    initialDirty: initialDirty_0,
+    initialTouched: initialDirtyValues ? flattenKeys(initialDirtyValues).reduce((previousValue, currentValue) => ({
+      ...previousValue,
+      [currentValue]: true
+    }), {}) : {},
     onSubmit,
     onReset: () => {
       clearDirtyCache();
-      onValuesModified?.(false);
+      onValuesModified?.(false, initialValues_0);
     },
-    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 {};
@@ -15124,14 +16203,16 @@ function EntityForm({
   }, [snackbarController]);
   function clearDirtyCache() {
     if (status === "new" || status === "copy") {
+      removeEntityFromMemoryCache(path + "#new");
       removeEntityFromCache(path + "#new");
     } else {
+      removeEntityFromMemoryCache(path + "/" + entityId);
       removeEntityFromCache(path + "/" + entityId);
     }
   }
   const onSaveSuccess = (updatedEntity) => {
     clearDirtyCache();
-    onValuesModified?.(false);
+    onValuesModified?.(false, updatedEntity.values);
     if (!autoSave) snackbarController.open({
       type: "success",
       message: `${collection.singularName ?? collection.name}: Saved correctly`
@@ -15158,7 +16239,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,
@@ -15167,7 +16248,7 @@ function EntityForm({
     return saveEntityWithCallbacks({
       path: path_0,
       entityId: entityId_0,
-      values: values_1,
+      values: values_2,
       previousValues,
       collection: collection_0,
       status,
@@ -15183,34 +16264,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
@@ -15244,7 +16325,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);
@@ -15290,23 +16372,15 @@ function EntityForm({
   }, [doOnIdUpdate]);
   useEffect(() => {
     if (!autoSave) {
-      onValuesModified?.(modified);
+      onValuesModified?.(modified, formex.values);
     }
   }, [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) {
@@ -15325,18 +16399,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,
@@ -15392,10 +16466,13 @@ 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" }) }) }),
+      /* @__PURE__ */ jsxs("div", { className: "flex flex-row gap-4 self-end sticky top-4 z-10", children: [
+        manualApplyLocalChanges && hasLocalChanges && /* @__PURE__ */ jsx(LocalChangesMenu, { cacheKey: status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId, properties: resolvedCollection.properties, localChangesData, formex, onClearLocalChanges: () => setLocalChangesCleared(true) }),
+        formex.dirty ? /* @__PURE__ */ jsx(Tooltip, { title: "There are local unsaved changes", children: /* @__PURE__ */ jsx(Chip, { size: "small", className: "py-1", colorScheme: "orangeDarker", children: /* @__PURE__ */ jsx(EditIcon, { size: "smallest" }) }) }) : /* @__PURE__ */ jsx(Tooltip, { title: "The current form is in sync with the database", children: /* @__PURE__ */ jsx(Chip, { size: "small", className: "py-1", children: /* @__PURE__ */ jsx(CheckIcon, { size: "smallest" }) }) })
+      ] }),
       formView
     ] }) }),
     dialogActions
@@ -16115,7 +17192,7 @@ function StorageItemPreview(t0) {
   }
   let t5;
   if ($[14] !== placeholder) {
-    t5 = placeholder && /* @__PURE__ */ jsx("div", { onClick: _temp$b, className: "flex flex-col items-center justify-center w-full h-full", children: /* @__PURE__ */ jsx(DescriptionIcon, { className: "text-surface-700 dark:text-surface-300" }) });
+    t5 = placeholder && /* @__PURE__ */ jsx("div", { onClick: _temp$c, className: "flex flex-col items-center justify-center w-full h-full", children: /* @__PURE__ */ jsx(DescriptionIcon, { className: "text-surface-700 dark:text-surface-300" }) });
     $[14] = placeholder;
     $[15] = t5;
   } else {
@@ -16138,7 +17215,7 @@ function StorageItemPreview(t0) {
   }
   return t6;
 }
-function _temp$b(e) {
+function _temp$c(e) {
   return e.stopPropagation();
 }
 const dropZoneClasses = "box-border relative pt-[2px] items-center border border-transparent min-h-[254px] outline-none rounded-md duration-200 ease-[cubic-bezier(0.4,0,0.2,1)] focus:border-primary-solid";
@@ -16356,7 +17433,7 @@ function SortableStorageItem(t0) {
     t4 = $[7];
   }
   const style = t4;
-  const getImageSizeNumber = _temp$a;
+  const getImageSizeNumber = _temp$b;
   let child;
   if (entry.storagePathOrDownloadUrl) {
     const t52 = `storage_preview_${entry.storagePathOrDownloadUrl}`;
@@ -16431,7 +17508,7 @@ function SortableStorageItem(t0) {
   }
   return t6;
 }
-function _temp$a(previewSize) {
+function _temp$b(previewSize) {
   switch (previewSize) {
     case "small": {
       return 40;
@@ -17576,6 +18653,13 @@ function PropertyFieldBindingInternal(t0) {
   } = t0;
   const authController = useAuthController();
   const customizationController = useCustomizationController();
+  if (propertyKey === "created_by") {
+    console.log("Rendering field for created_by", {
+      propertyKey,
+      property,
+      context
+    });
+  }
   let t1;
   if ($[0] !== authController || $[1] !== autoFocus || $[2] !== context || $[3] !== customizationController.propertyConfigs || $[4] !== disabledProp || $[5] !== includeDescription || $[6] !== index || $[7] !== minimalistView || $[8] !== onPropertyChange || $[9] !== partOfArray || $[10] !== property || $[11] !== propertyKey || $[12] !== size || $[13] !== underlyingValueHasChanged) {
     t1 = (fieldProps) => {
@@ -17887,7 +18971,7 @@ function MapFieldBinding(t0) {
     } else {
       t42 = $[20];
     }
-    t3 = Object.entries(mapProperties).filter(_temp$9).map(t42);
+    t3 = Object.entries(mapProperties).filter(_temp$a).map(t42);
     $[6] = autoFocus;
     $[7] = context;
     $[8] = disabled;
@@ -17957,7 +19041,7 @@ function MapFieldBinding(t0) {
   }
   return t10;
 }
-function _temp$9(t0) {
+function _temp$a(t0) {
   const [, property_0] = t0;
   return !isHidden(property_0);
 }
@@ -19027,7 +20111,7 @@ function BlockEntry(t0) {
   const property = t4;
   let t5;
   if ($[9] !== properties) {
-    t5 = Object.entries(properties).map(_temp$8);
+    t5 = Object.entries(properties).map(_temp$9);
     $[9] = properties;
     $[10] = t5;
   } else {
@@ -19118,7 +20202,7 @@ function BlockEntry(t0) {
   }
   return t11;
 }
-function _temp$8(t0) {
+function _temp$9(t0) {
   const [key, property_0] = t0;
   return {
     id: key,
@@ -20055,6 +21139,11 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
         console.error("Save failure");
         console.error(e_0);
         setError(e_0);
+      },
+      onPreSaveHookError: (e_1) => {
+        console.error("Pre-save hook error");
+        console.error(e_1);
+        setError(e_1);
       }
     });
   };
@@ -20152,7 +21241,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     width: width_0,
     frozen
   }) => {
-    const isSelected = Boolean(usedSelectionController.selectedEntities.find((e_1) => e_1.id == entity_6.id && e_1.path == entity_6.path));
+    const isSelected = Boolean(usedSelectionController.selectedEntities.find((e_2) => e_2.id == entity_6.id && e_2.path == entity_6.path));
     const customEntityActions_0 = (collection.entityActions ?? []).map((action) => resolveEntityAction(action, customizationController.entityActions)).filter(Boolean);
     const actions_0 = getActionsForEntity({
       entity: entity_6,
@@ -20161,9 +21250,9 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     return /* @__PURE__ */ jsx(EntityCollectionRowActions, { entity: entity_6, width: width_0, frozen, isSelected, selectionEnabled, size: size_0, highlightEntity: setHighlightedEntity, unhighlightEntity: unselectNavigatedEntity, collection, fullPath, fullIdPath, actions: actions_0, hideId: collection?.hideIdFromCollection, onCollectionChange: updateLastDeleteTimestamp, selectionController: usedSelectionController, openEntityMode });
   }, [updateLastDeleteTimestamp, usedSelectionController]);
   const title = /* @__PURE__ */ jsx(Popover, { open: popOverOpen, onOpenChange: setPopOverOpen, enabled: Boolean(collection.description), trigger: /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-start", children: [
-    /* @__PURE__ */ jsx(Typography, { variant: "subtitle1", className: `leading-none truncate max-w-[160px] lg:max-w-[240px] ${collection.description ? "cursor-pointer" : "cursor-auto"}`, onClick: collection.description ? (e_2) => {
+    /* @__PURE__ */ jsx(Typography, { variant: "subtitle1", className: `leading-none truncate max-w-[160px] lg:max-w-[240px] ${collection.description ? "cursor-pointer" : "cursor-auto"}`, onClick: collection.description ? (e_3) => {
       setPopOverOpen(true);
-      e_2.stopPropagation();
+      e_3.stopPropagation();
     } : void 0, children: `${collection.name}` }),
     /* @__PURE__ */ jsx(EntitiesCount, { fullPath, collection, filter: tableController.filterValues, sortBy: tableController.sortBy, onCountChange: setDocsCount })
   ] }), children: collection.description && /* @__PURE__ */ jsx("div", { className: "m-4 text-surface-900 dark:text-white", children: /* @__PURE__ */ jsx(Markdown, { source: collection.description }) }) });
@@ -20198,7 +21287,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
       /* @__PURE__ */ jsx(Typography, { variant: "subtitle2", children: "So empty..." }),
       /* @__PURE__ */ jsxs(Button, { color: "primary", variant: "outlined", onClick: onNewClick, className: "mt-4", children: [
         /* @__PURE__ */ jsx(AddIcon, {}),
-        "Create your first entity"
+        "Create your first entry"
       ] })
     ] }) : /* @__PURE__ */ jsx(Typography, { variant: "label", children: "No results with the applied filter/sort" }), hoverRow, inlineEditing: checkInlineEditing(), AdditionalHeaderWidget: buildAdditionalHeaderWidget, AddColumnComponent: addColumnComponentInternal, getIdColumnWidth, additionalIDHeaderWidget: /* @__PURE__ */ jsx(EntityIdHeaderWidget, { path: fullPath, fullIdPath: fullIdPath ?? fullPath, collection }), openEntityMode }, `collection_table_${fullPath}`),
     popupCell && /* @__PURE__ */ jsx(PopupFormField, { open: Boolean(popupCell), onClose: onPopupClose, cellRect: popupCell?.cellRect, propertyKey: popupCell?.propertyKey, collection, entityId: popupCell.entityId, tableKey: tableKey.current, customFieldValidator: uniqueFieldValidator, path: resolvedFullPath, onCellValueChange: onValueChange, container: containerRef.current }, `popup_form_${popupCell?.propertyKey}_${popupCell?.entityId}`),
@@ -20440,7 +21529,7 @@ function PropertyConfigBadge(t0) {
     propertyConfig,
     disabled
   } = t0;
-  const classes = "h-8 w-8 p-1 rounded-full shadow text-white " + (disabled ? "bg-surface-400 dark:bg-surface-600" : "");
+  const classes = "h-8 w-8 flex items-center justify-center rounded-full shadow text-white " + (disabled ? "bg-surface-400 dark:bg-surface-600" : "");
   let t1;
   if ($[0] !== classes || $[1] !== disabled || $[2] !== propertyConfig) {
     const defaultPropertyConfig = typeof propertyConfig?.property === "object" ? getDefaultFieldConfig(propertyConfig.property) : void 0;
@@ -20455,7 +21544,7 @@ function PropertyConfigBadge(t0) {
     } else {
       t3 = $[5];
     }
-    t1 = /* @__PURE__ */ jsx("div", { className: classes, style: t3, children: propertyConfig?.Icon ? getIconForWidget(propertyConfig, "medium") : getIconForWidget(defaultPropertyConfig, "medium") });
+    t1 = /* @__PURE__ */ jsx("div", { className: classes, style: t3, children: propertyConfig?.Icon ? getIconForWidget(propertyConfig, "small") : getIconForWidget(defaultPropertyConfig, "small") });
     $[0] = classes;
     $[1] = disabled;
     $[2] = propertyConfig;
@@ -20775,7 +21864,7 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
   }
   let t7;
   if ($[18] !== breadcrumbs.breadcrumbs) {
-    t7 = (breadcrumbs.breadcrumbs ?? []).length > 0 && /* @__PURE__ */ jsx("div", { className: "mr-8 hidden lg:block", children: /* @__PURE__ */ jsx("div", { className: "flex flex-row gap-2", children: breadcrumbs.breadcrumbs.map(_temp$7) }) });
+    t7 = (breadcrumbs.breadcrumbs ?? []).length > 0 && /* @__PURE__ */ jsx("div", { className: "mr-8 hidden lg:block", children: /* @__PURE__ */ jsx("div", { className: "flex flex-row gap-2", children: breadcrumbs.breadcrumbs.map(_temp$8) }) });
     $[18] = breadcrumbs.breadcrumbs;
     $[19] = t7;
   } else {
@@ -20887,7 +21976,7 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
   }
   return t14;
 };
-function _temp$7(breadcrumb, index) {
+function _temp$8(breadcrumb, index) {
   return /* @__PURE__ */ jsxs(React__default.Fragment, { children: [
     /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", children: "/" }),
     /* @__PURE__ */ jsx(Link, { className: "visited:text-inherit visited:dark:text-inherit block", to: breadcrumb.url, children: /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", children: breadcrumb.title }) }, index)
@@ -21321,7 +22410,7 @@ function SearchIconsView(t0) {
       } else {
         const searchResult = iconsSearch.search(value);
         const limited = searchResult.slice(0, 50);
-        setKeys(limited.map(_temp$6));
+        setKeys(limited.map(_temp$7));
       }
     }, UPDATE_SEARCH_INDEX_WAIT_MS);
     $[0] = t3;
@@ -21388,7 +22477,7 @@ function SearchIconsView(t0) {
   }
   return t8;
 }
-function _temp$6(e) {
+function _temp$7(e) {
   return e.item.key;
 }
 function FieldCaption(t0) {
@@ -21472,7 +22561,7 @@ function useReferenceDialog(referenceDialogProps) {
   }
   return t2;
 }
-const fireCMSLogo = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAuDSURBVHgB7Z1fTFvXHcd/GDAk2RaHpmmTjMUVaE3bEJyHRO221OYp6VQJ8zaqSpg+beokHKnStIcKo0rrSyXgIdWeipFa8YjR+tA8YbKHTclDvJCp05QoZGuTaVsTp9vCf9j9XueCjX3te+17f+dc+3yki7EhIvbve35/zu+cc5u2NajOWHq4RenbW/R4eZsy97cou5x7Lbu8/fTnxW85sK9Ju4zH3BXsIAoe8lHvcR+FtAuv1RtNXheAYeyFO5uU+XpLv9wCAgjpYmiicFczRbqbPS8KzwkAozi1uKkbHI/GqBYFBBHp9lH/qRZdEF7DEwIwjD59fUMf4aKNbkawo0kXwdBZ74hBagGkb2/S3K0NSl4TP9LtAjEkLvgprHmHYIePZEVKAcDwY1fW9cd6IHauhUYvtEopBKkEkLy2oRl+rWSWXg/IKAQpBFDvht+LTEIQKoB6c/V2kUEIQgSAhA6Gn1hYp0bHSBaHNDGIgF0AqcUNGp5Z81xW7zYoG6cG/ezegE0AMDgMDwEoSoNZRXiDkTCfN2ARAGL88MxqwyR5tcKZG7gugMmrGxSfXSWFPZAbzL/b7roIXBMAXP6l1Jpe4imqZyLa5mpIcEUAcPUDn6y42plrJBIX/XpIcAPHBQDj911eVvHeYeLhVhqP+slpHBWAMr67IDmcGmwjJ3FMAMr4PER7WvT5AqcWojiSYirj84F5FCTXTlGzAJTx+UFlhXkVJ6hJAMr44oAInPAEVQsAdT5KPWV8caCZhqZaLVQtAPxhVeeLJ/FFbf2VqgSgWrlygSYblsdXg+0yEKP+zEfL5FUCLVkKND/Ofa894lpa+4H+fGn1BHkVLE9H78BueWhLAF5K+mDo0L5F7bpJvQdu6t8H/X/TXy9HdiNAmeUeym4epIVvz2vfn6b0f86TF6hmttCWAFB6yNzcgXFjHZ9R/6HPdYNXMrZVIIr0f39Cc4/e1B7PS+0p4AXs7EmwLAAna0+niQY+p5HnLlPku78nDlLZN2n632/rj7KBNvKN9/ZZDgWWBCCj68foHjnyMcW1y6mRbhd4grH7v6bkN2+TTNgJBZYEIJvrx2hPHP1QmOH3IqMQrIaCigLAqH/hgyckA3DxU8GfU7DtHslI5slpGrgzI0WOgFBw9/39FX+v4jwAXL9oMNLHO39F8y++Ia3xQWj/Tbrb8wqNHvsNiQYDd3Khstcu6wFkSPxg8Pkf/lRqw5cCpePw0m+FegMkgnffL58QlvUA2K4lkmjgd3TjpR97zvgA4Uq0cNGvmawwY2sqAIx+kVk/Er3Z7kFpEr1qgPFvvPwjvUwVxcTVjbKbcEwFIHL0I4ZOaDG/HsBU82z3z2jo8KckgkpeoKQARI5+GD8hQRLlNEmtehElgnJeoKQAcBSLCOrV+AYQAddsZT4w/rTJPE6RANDtE7FdGx9MPRvfAOFARGKYulXapkUCmLzK3+fHB4IJnkYAOQGqA6MlzQUGdamBXSQAnMbFjRfr/FrAex0XkOTOlVg5VCAAJH/c+/YR9xvJ+AYxLSGMa6UuJ8nrxaetFQgAR7JxAsM3Qtw3A+LnDAUw/t51nL78H3K7/9muQWpkYHzuvsHeamBHAAvMmX/smU/15kmjE2dcyAL2VgM+sx+4zeixD0mRg9MLwNPnVwM7AuCs/TH6GzHxMwMegNML5FcDugCQGHBO/Y489zEpChlhrAgy93dtvSMALqB0FfuLQceQqyKAtzfKQV0AOHufi6HDn5GiNJzzAsagf+oB+AQQ+Q5/M8QrhBnzgD8VCoAn/sP9q+TPHM7PZ8cDcMZ/5f4rw7V6CDfTAr57D/kEgH16ivJwlYNG1cfmAZDhquy/Mlx5AKoAbCn3cXX/lPGtgYHClQfgfoq+pUdKALLBFSpRCfiyTBt/sDdfYY1gG99n5VtiSgJ7lQewDNdg0XMAYoJ7DZyXOci0GQb5n4+rCaQEYB0uD6AngcSEl7d41TNsN6cJ/LVT+9pJCgs08X1ObALIpvspsLFCCgscDBK9TCywhYBsSzsp5MPn1LnzCm+iCYBYWPIHSGENrs8K5wixhYB77UoAVuH8rHxctyrNNqscwCqZA88TB7C9L3iIJwfIHDhKCmtkm3ni8gmEAK4cIP29ICmskdnP4wFQALCFgKW2gCoFLQD3z/U56UkgvnDBpWwvs8DkKTH6dQ/Qe9z60eK1MvfMSVKUJ9XxEnEQOpbz/LoH4JoMSh4+Qwpz4Pq5cqXQ8ZzNfbknTKUg4xv0IqlDfB4y/PQk8ZwAjvHlASoMmDN9hM9DGsm//tXOLUZqBWFAVQPFoEpKMyaAhtfXv4YZBQDjTx59lRSFjHVGiItI1669dQFAEaxe4FmVDOaD0c/5mUS6d3O+ne8iXWx9If0NKy+wC+foB/ke31fqRQ4S3+9TuQDxj36U/flV364H0ATAuThE5QI5uEd/9FThQC/w+7Gz/F6Aq/UpI8lnQ+z50NC51oLnBQLo72FbI7rDcPcANSJw/WOdfcTJXvcPCp4hDBhThFygQXQp+AY1GnD9EAEn8ddbi14rSv2jp/i9wISWC3DOgokGI19EKdzfUxziiwQwEm4lESuF4ycuNkQ+kOo4qeU+EeImdraFSq39KHoFxudOBgGqgoEXB9ndIicId8NdYnKeoXOlPXvJ2R8RySCA8fteGa5LEeA9DZwcFDL3geTPbKa3pADwy5Fufi8A6lEEGPlnTv9C2HsavWB+J3Gf+T9qJVHUkwgQ8/FeRM16YvTHzpl7dFMBiPQCAMbHqJk+EiKvMnn0NT2vETnlXW70g7I3j8YRcmc+En/38MRXaRr9+zx5BRgcyR5Gv0is3EK+rADApdlV/c6TogmuZmn+z1P6o8ykDwZ148sQvm68t6/icr+KAsA5Mi98sMx+NzEz4g/+SCMP/iCdEGBwzGiKHvUGqPun3mqr+HsVBQAmFtbpUkrsreTzgfETX83T0D8zJJpcV/M1mnj+VWna23D98++2k5VNP5YEAPourwi5pWw5IAR4hP6HX7J7BBkNbzA12FY288/HsgBwmhgSQllCwV5i/8pQ/6MvKfrNX8gtYGi4+GltHl/W5e1Y7zf/S+uCtCwAIFsoKAXOIYp8u0RRTQy9//sHhbSrFtCfwHYt7NjBhI7Mq5jsuH4DWwIAA5+sUmpRfFVgFQgi9EQTwpMHFFzJ0sHNlZLhAobFGQaPtQtb2WF4nNThpWVrdly/gW0BIAQgFHDeZUxRGczcJi76bf8720uB0S2cfaed1OFS8oBavxrjg6rWguMPjker+4MKZ0Hcn32ncr1vRtWbARBrRDaMFDlvbDfp20tNu0HgduKvi1k7oEDS56daT3ipeTvQ+ECb6WoThXsg4486sHDHkf1gSe0/I7J13Ggg9MYcGnSObQhEIqI8gfsg+a424y+F7XmASsRmVmn6mncmirxENRM9lXBcACDxxRqNXVknhTPk5l7cCbOu+GzDRSkR1E6uzm937RwnVzyAAXoGwzNr0nYQZQdGx8h38zBPVwUA0DPou6x6B3YZ0eZXJgaqn+GziusCMJBlbaHsIN5jgifKtDmHTQAgqVUHY1fWlDcwAYs5pt7yE9f5zYBVAADGH9OqhOR15Q0MMOoxuRMP8/dW2AVggAQRq4sa3Rtg9e74gF9Ye12YAAwaNSzA3Y9ebBU+hS5cAADGT15bp2ktLNS7EGQxvIEUAjCoZyHIZngDqQSQT72EBlkNbyCtAAywGQXNpdStTc/MKOJGXOiMxgUdt2MH6QWQDyqHucVNKcUAo0d7mvXTVby0NsJTAsgHnmFOE0Tm621K3+HfsqYfsK2593C3Tzc85+SNk3hWAPnAG+AsA1wLt7e0vEG7Hm075iUwumFgnKGIeyzhtG2vGnwvdSEAMwxh4BHJ5OOngjBLLI07qJ3QjIv7KaIbZ9xdq175P/vCeAzHXKL0AAAAAElFTkSuQmCC";
+const fireCMSLogo = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAa9SURBVHgB7Z1NbBNHFMf/a7uBEgMOHy2pSlnUql+oEG7lgNgcqZAgR9RKSU5tT9mcqp6SXNoj5tBzHAmk3ggSUo/Ziko9skXqoVIlJm3Von4IhzhAIIk7b9ab+COJvZ63610nP8netWx5Z//73syb2Zm3BjqJXc4BixaQMgHjDFCWW5iVb83aH5eL8jdC7lS2a/Ny3wGyLvJGER3CQJRsCHZBfrqCBpHaRkCJuXYb2O9EKWg0AtpKtDF5gnJr5BA+BSVm/sAsQiY8AZW1PSHR7IhE2wwhX1NAWlrlywIhwC9gPISrR8iyFJDvnQIzvALapRH5PgG+uo0bAbLIfLYAJngEtJ+awOq03LOQCAxZN6bGOdw6BV3GyV1X7iEx4hFlGQGs3qt4jBbtW6Cq65bIXW0km7x06XG0SXsCei57S+4NoDtwZUs91I5LBxfQE28O8W0o2kVIEQeDihhMwO4Vz0cEFbF1AbtfPB8RRMTWBNw54vmIVkVsMYxRDYaJnYOpztl+1LQn1VxAu3QN3dPaBkGe80sTzX60vQt7geY0IsDcMw8r+wPO9N6H2TOPXHpBbn9DcfWgehHu09OYf/YGnNJ5uE9OIyJkjyWb3+rLrQVU9R71MMIbELD238XlvjsYOXQTuUywIbziSg6zC5cw8+/HcBbPI0RkwdJnt6oPtxFw6ZbX5eFn5PANDB+5qQTkQCyfwNSfX6Lw3ycICTkclh3c7IvNBQzJdUmwide+YhOunpCFHN1sFGcrAR+AsdUl95zo/xr2q98gCkhAEpIEZUQAL6Qr99XUNY2tsL3EOp5HjcPc2x9FJh5BVQQdk47NiAlkGgZOai2QOWD2xWM+kZah1nvwl+84W2xpfS9OVlthnQWuWugS8QgKhebeuYiBfffBRK7eCutduGng2ApxEM+HX0RjrPrThoD2Y7b7tHERz4dEvPXmVbXl+DvvNq1HlQWmLoMBClPiJJ4PlWn65KfgIbVuhV4jojrNLz2CJlTIBx+cQpwZ+vVbzBYvQZP1xqRigWkLDEybnyHuXDv+BYcrS4PrsWinIqC++17J3Qmth8EJeQlPTErTVDbqQAuajEUYKOsyfPgm9DGU0Rkc9V8S6r56KMDWH8V50SctMKM9WErumzSGj9yAPj0WubAFTXhcIlp4LnrZTFVmhbYNtWiMXaXI4Cm3cUYKmNIa80mieD76UYOyQGgN2SdZQLrnovsXJKAJDRgK0TE4upzaFpjLsHTQO8JB/R6JmYEuyz3A4gEkkuW90EVfwLvyZtXffUgkB03gfWihP0N1h0MCCmhQTOu7QadY0C97UdsCxd64rGQIjtijXXahbYHuvn4kFbf3GDQhC1zTCobcfdqF6Bhur+7FN8gCUy40KGb2wjlgImmQ++pf/LV5skABTb6ncCBhMF10Rwq46kCT/LFzSBozr5yFPituqjJNQUCDpLkxuS9DeUXVXbnybWgydXwQSWHquAUGHHrzBXSgCV3RJFghWV/hKIf7GsroKgKqelB7mfzoW0OIO0zWJ3nu0LsnoKoH9a2Qru64eRFxpXB0gMn6UPCnuFV35a6DgXz/h7F0Zd6La6y3GXUTLEt0f1i7g2guFzH387TaxgESb/DUKEffV/0d8tmT/oe6wYQyixUyF1gLCrGG3r3KWZaavAt1Aq7QghIWs4mDiCQelYGxvy5UBpAqagX0GhMWK1RHq4jIMOrR1rHPnv6cebCjPFO/4KZxmYM3V4ZyIJhgZPIPBxO/zyEKrvefw+TrlrJARmrqPp9IF9qE3biQ1VEsGlIUEGChDWGXyFwshMDIPy7G/voRA0sPwQFVEddl+MQU422CMYt876a9hCaLDVfJlUNrBQaePIQthbywIAJbJbnnjAyMZw+9F3LcSVnjMm0sNiTsEq2JuIYIIDHNZ0VYjx/gxPMicivPar4nweZ7cmoUmSwuwpHw0e0yHTVf8m8v5uvXRuwcZESS379tXpwW7sqtTELlVdlxuM3EI5oLqGLDNFWgAjsHUTnnpuymPWlE8Kc98dlNvNNAMAGJ3dRPNQSf2qEOkKYbIN3UsLjtiEcEt8BquiLEocGT7GS7mX/1BCS8fjMF2wmbZaTyUk9tlxOmFfQFJLwcM1JE4wqSgSNddpQjBSiPgD67SWiZsBcn5V8PIzZCkrvSTTPprsxZzsMRkPDCHQsdtcjwhPMJT8BqvHwM8pUaRuiQaCkHWKOBAAchE42APusPI1Bi0gMJTPAgvPk9NDmgGx9GsBVK0NIA1Mg3rdlTCx9z3rYha5zY2NLjMMo/eXMboxWsnv8Br15XnnLWoGsAAAAASUVORK5CYII=";
 function useBrowserTitleAndIcon(name, logo) {
   const $ = c(4);
   let t0;
@@ -21577,22 +22666,9 @@ function useBuildNavigationController(props) {
   const buildUrlCollectionPath = useCallback((path_0) => `${removeInitialAndTrailingSlashes(baseCollectionPath)}/${encodePath(path_0)}`, [baseCollectionPath]);
   const allPluginGroups = plugins?.flatMap((plugin) => plugin.homePage?.navigationEntries ? plugin.homePage.navigationEntries.map((e) => e.name) : []) ?? [];
   const pluginGroups = [...new Set(allPluginGroups)];
-  const onNavigationEntriesOrderUpdate = useCallback((entries) => {
-    if (!plugins) {
-      return;
-    }
-    const filteredEntries = entries.filter((entry) => entry.entries.length > 0);
-    if (plugins.some((plugin_1) => plugin_1.homePage?.onNavigationEntriesUpdate)) {
-      plugins.forEach((plugin_0) => {
-        if (plugin_0.homePage?.onNavigationEntriesUpdate) {
-          plugin_0.homePage.onNavigationEntriesUpdate(filteredEntries);
-        }
-      });
-    }
-  }, [plugins]);
-  const computeTopNavigation = useCallback((collections, views, adminViews, viewsOrder_0) => {
+  const computeTopNavigation = useCallback((collections, views, adminViews, viewsOrder_0, navigationGroupMappingsOverride, onNavigationEntriesUpdateCallback) => {
     const finalNavigationGroupMappings = computeNavigationGroups({
-      navigationGroupMappings,
+      navigationGroupMappings: navigationGroupMappingsOverride ?? navigationGroupMappings,
       collections,
       views,
       plugins
@@ -21624,7 +22700,7 @@ function useBuildNavigationController(props) {
       return acc;
     }, []), ...(views ?? []).reduce((acc_0, view) => {
       if (view.hideFromNavigation) return acc_0;
-      const pathKey_0 = Array.isArray(view.path) ? view.path[0] : view.path;
+      const pathKey_0 = view.path;
       let groupName_0 = getGroup(view);
       if (finalNavigationGroupMappings) {
         for (const pluginGroupDef_0 of finalNavigationGroupMappings) {
@@ -21647,7 +22723,7 @@ function useBuildNavigationController(props) {
       return acc_0;
     }, []), ...(adminViews ?? []).reduce((acc_1, view_0) => {
       if (view_0.hideFromNavigation) return acc_1;
-      const pathKey_1 = Array.isArray(view_0.path) ? view_0.path[0] : view_0.path;
+      const pathKey_1 = view_0.path;
       const groupName_1 = NAVIGATION_ADMIN_GROUP_NAME;
       acc_1.push({
         id: `admin:${pathKey_1}`,
@@ -21681,21 +22757,43 @@ function useBuildNavigationController(props) {
       });
     }
     const collectedGroupsFromEntries = navigationEntries.map((e_0) => e_0.group).filter(Boolean);
-    const allDefinedGroups = [...pluginGroups ?? [], ...collectedGroupsFromEntries];
-    const uniqueGroups = [...new Set(allDefinedGroups)].sort((a_1, b_1) => groupOrderValue(a_1) - groupOrderValue(b_1));
+    const groupsFromMappings = finalNavigationGroupMappings.map((g_0) => g_0.name);
+    const additionalGroups = collectedGroupsFromEntries.filter((g_1) => !groupsFromMappings.includes(g_1));
+    const allDefinedGroups = [...pluginGroups ?? [], ...groupsFromMappings, ...additionalGroups];
+    const uniqueGroupsArray = [...new Set(allDefinedGroups)];
+    const adminGroups = uniqueGroupsArray.filter((g_2) => g_2 === NAVIGATION_ADMIN_GROUP_NAME);
+    const nonAdminGroups = uniqueGroupsArray.filter((g_3) => g_3 !== NAVIGATION_ADMIN_GROUP_NAME);
+    const uniqueGroups = [...nonAdminGroups, ...adminGroups];
     return {
-      allowDragAndDrop: plugins?.some((plugin_2) => plugin_2.homePage?.allowDragAndDrop) ?? false,
+      allowDragAndDrop: plugins?.some((plugin_0) => plugin_0.homePage?.allowDragAndDrop) ?? false,
       navigationEntries,
       groups: uniqueGroups,
-      onNavigationEntriesUpdate: onNavigationEntriesOrderUpdate
+      onNavigationEntriesUpdate: onNavigationEntriesUpdateCallback
     };
-  }, [navigationGroupMappings, buildCMSUrlPath, buildUrlCollectionPath, pluginGroups, onNavigationEntriesOrderUpdate]);
+  }, [navigationGroupMappings, buildCMSUrlPath, buildUrlCollectionPath, pluginGroups]);
+  const onNavigationEntriesOrderUpdate = useCallback((entries) => {
+    if (!plugins) {
+      return;
+    }
+    const filteredEntries = entries.filter((entry) => entry.entries.length > 0);
+    if (collectionsRef.current && viewsRef.current) {
+      const updatedNav = computeTopNavigation(collectionsRef.current, viewsRef.current, adminViewsRef.current ?? [], viewsOrder, filteredEntries, onNavigationEntriesOrderUpdate);
+      setTopLevelNavigation(updatedNav);
+    }
+    if (plugins.some((plugin_2) => plugin_2.homePage?.onNavigationEntriesUpdate)) {
+      plugins.forEach((plugin_1) => {
+        if (plugin_1.homePage?.onNavigationEntriesUpdate) {
+          plugin_1.homePage.onNavigationEntriesUpdate(filteredEntries);
+        }
+      });
+    }
+  }, [plugins, computeTopNavigation, viewsOrder]);
   const refreshNavigation = useCallback(async () => {
     if (disabled || authController.initialLoading) return;
     console.debug("Refreshing navigation");
     try {
       const [resolvedCollections = [], resolvedViews, resolvedAdminViews = []] = await Promise.all([resolveCollections(collectionsProp, collectionPermissions, authController, dataSourceDelegate, plugins), resolveCMSViews(viewsProp, authController, dataSourceDelegate), resolveCMSViews(adminViewsProp, authController, dataSourceDelegate)]);
-      const computedTopLevelNav = computeTopNavigation(resolvedCollections, resolvedViews, resolvedAdminViews, viewsOrder);
+      const computedTopLevelNav = computeTopNavigation(resolvedCollections, resolvedViews, resolvedAdminViews, viewsOrder, void 0, onNavigationEntriesOrderUpdate);
       let shouldUpdateTopLevelNav = false;
       if (!areCollectionListsEqual(collectionsRef.current ?? [], resolvedCollections)) {
         collectionsRef.current = resolvedCollections;
@@ -21791,7 +22889,8 @@ function useBuildNavigationController(props) {
   }, []);
   const isUrlCollectionPath = useCallback((path_1) => removeInitialAndTrailingSlashes(path_1 + "/").startsWith(removeInitialAndTrailingSlashes(fullCollectionPath) + "/"), [fullCollectionPath]);
   const urlPathToDataPath = useCallback((path_2) => {
-    if (path_2.startsWith(fullCollectionPath)) return path_2.replace(fullCollectionPath, "");
+    const decodedPath = decodeURIComponent(path_2);
+    if (decodedPath.startsWith(fullCollectionPath)) return decodedPath.replace(fullCollectionPath, "");
     throw Error("Expected path starting with " + fullCollectionPath);
   }, [fullCollectionPath]);
   const resolveIdsFrom = useCallback((path_3) => {
@@ -21979,6 +23078,42 @@ function computeNavigationGroups({
     }
     return acc;
   }, [...result ?? []]) : result;
+  const assignedEntries = /* @__PURE__ */ new Set();
+  if (result) {
+    result.forEach((group) => {
+      group.entries.forEach((entry) => assignedEntries.add(entry));
+    });
+  }
+  const unassignedGroupMap = {};
+  (collections ?? []).forEach((collection) => {
+    const entry = collection.id ?? collection.path;
+    if (!assignedEntries.has(entry)) {
+      const groupName = getGroup(collection);
+      if (!unassignedGroupMap[groupName]) unassignedGroupMap[groupName] = [];
+      unassignedGroupMap[groupName].push(entry);
+    }
+  });
+  (views ?? []).forEach((view) => {
+    const entry = view.path;
+    if (!assignedEntries.has(entry)) {
+      const groupName = getGroup(view);
+      if (!unassignedGroupMap[groupName]) unassignedGroupMap[groupName] = [];
+      unassignedGroupMap[groupName].push(entry);
+    }
+  });
+  Object.entries(unassignedGroupMap).forEach(([groupName, entries]) => {
+    if (result) {
+      const existingGroup = result.find((g) => g.name === groupName);
+      if (existingGroup) {
+        existingGroup.entries.push(...entries);
+      } else {
+        result.push({
+          name: groupName,
+          entries
+        });
+      }
+    }
+  });
   if (!result) {
     result = [];
     const groupMap = {};
@@ -21990,7 +23125,7 @@ function computeNavigationGroups({
     });
     (views ?? []).forEach((view) => {
       const name = getGroup(view);
-      const entry = Array.isArray(view.path) ? view.path[0] : view.path;
+      const entry = view.path;
       if (!groupMap[name]) groupMap[name] = [];
       groupMap[name].push(entry);
     });
@@ -22014,7 +23149,7 @@ function useBuildLocalConfigurationPersistence() {
     t0 = $[0];
   }
   const configCache = useRef(t0);
-  const getCollectionFromStorage = _temp$5;
+  const getCollectionFromStorage = _temp$6;
   let t1;
   if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
     t1 = (path) => {
@@ -22137,7 +23272,7 @@ function useBuildLocalConfigurationPersistence() {
   }
   return t11;
 }
-function _temp$5(storageKey) {
+function _temp$6(storageKey) {
   const item = localStorage.getItem(storageKey);
   return item ? JSON.parse(item) : {};
 }
@@ -22597,14 +23732,14 @@ function EntityEditViewFormActions({
     collection,
     context,
     sideEntityController,
-    isSubmitting: formex.isSubmitting,
     disabled,
     status,
     sideDialogContext,
     pluginActions,
     openEntityMode,
     navigateBack,
-    formContext
+    formContext,
+    formex
   }) : buildSideActions({
     savingError,
     entity,
@@ -22612,14 +23747,14 @@ function EntityEditViewFormActions({
     collection,
     context,
     sideEntityController,
-    isSubmitting: formex.isSubmitting,
     sideDialogContext,
     disabled,
     status,
     pluginActions,
     openEntityMode,
     navigateBack,
-    formContext
+    formContext,
+    formex
   });
 }
 function buildBottomActions({
@@ -22629,15 +23764,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 }) }),
@@ -22657,15 +23793,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",
@@ -22681,24 +23818,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 = {
@@ -22853,6 +23991,7 @@ function EntityJsonPreview(t0) {
 function createFormexStub(values) {
   const errorMessage = "You are in a read-only context. You cannot modify the formex controller.";
   return {
+    debugId: "",
     values,
     initialValues: values,
     touched: {},
@@ -22867,6 +24006,9 @@ function createFormexStub(values) {
     setValues: () => {
       throw new Error(errorMessage);
     },
+    setTouched(touched) {
+      throw new Error(errorMessage);
+    },
     setFieldValue: () => {
       throw new Error(errorMessage);
     },
@@ -22926,7 +24068,7 @@ function EntityEditView({
     databaseId: props.databaseId,
     useCache: false
   });
-  const cachedValues = entityId ? getEntityFromCache(props.path + "/" + entityId) : getEntityFromCache(props.path + "#new");
+  const initialDirtyValues = entityId ? getEntityFromMemoryCache(props.path + "/" + entityId) : getEntityFromMemoryCache(props.path + "#new");
   const authController = useAuthController();
   const initialStatus = props.copy ? "copy" : entityId ? "existing" : "new";
   const [status, setStatus] = useState(initialStatus);
@@ -22937,13 +24079,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,
@@ -22956,7 +24098,7 @@ function EntityEditViewInner({
   onSaved,
   onTabChange,
   entity,
-  cachedDirtyValues,
+  initialDirtyValues,
   dataLoading,
   layout = "side_panel",
   barActions,
@@ -23084,7 +24226,8 @@ 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) => {
+    console.log("333 EntityEditView onEntityChange:", entity_0);
     setUsedEntity(entity_0);
     formProps?.onEntityChange?.(entity_0);
   }, onStatusChange: (status_0) => {
@@ -23107,7 +24250,12 @@ function EntityEditViewInner({
   const shouldShowTopBar = Boolean(barActions) || hasAdditionalViews;
   let result = /* @__PURE__ */ jsxs("div", { className: "relative flex flex-col h-full w-full bg-white dark:bg-surface-900", children: [
     shouldShowTopBar && /* @__PURE__ */ jsxs("div", { className: cls("h-14 items-center flex overflow-visible overflow-x-scroll w-full no-scrollbar h-14 border-b pl-2 pr-2 pt-1 flex bg-surface-50 dark:bg-surface-900", defaultBorderMixin), children: [
-      barActions,
+      barActions?.({
+        path: fullIdPath ?? path,
+        entityId,
+        values: formContext?.values ?? usedEntity?.values ?? {},
+        status
+      }),
       /* @__PURE__ */ jsx("div", { className: "flex-grow" }),
       pluginActionsTop,
       globalLoading && /* @__PURE__ */ jsx("div", { className: "self-center", children: /* @__PURE__ */ jsx(CircularProgress, { size: "small" }) }),
@@ -23210,9 +24358,14 @@ function EntitySidePanel(props) {
   if (!props || !collection) {
     return /* @__PURE__ */ jsx("div", { className: "w-full" });
   }
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityEditView, { ...props, fullIdPath, layout: "side_panel", collection, parentCollectionIds, onValuesModified, onSaved: onUpdate, barActions: /* @__PURE__ */ jsxs(Fragment, { children: [
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityEditView, { ...props, fullIdPath, layout: "side_panel", collection, parentCollectionIds, onValuesModified, onSaved: onUpdate, barActions: ({
+    status,
+    values
+  }) => /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(IconButton, { className: "self-center", onClick: onClose, children: /* @__PURE__ */ jsx(CloseIcon, { size: "small" }) }),
     allowFullScreen && /* @__PURE__ */ jsx(IconButton, { className: "self-center", onClick: () => {
+      const key = status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
+      saveEntityToMemoryCache(key, values);
       if (entityId) navigate(location.pathname);
       else navigate(location.pathname + "#new");
     }, children: /* @__PURE__ */ jsx(OpenInFullIcon, { size: "small" }) })
@@ -23472,7 +24625,7 @@ function useBuildSideDialogsController() {
     t3 = () => {
       const state = location.state;
       const panelKeys = state?.panels ?? [];
-      const newPanels_0 = panelKeys.map((key) => routesStore.current[key]).filter(_temp$4);
+      const newPanels_0 = panelKeys.map((key) => routesStore.current[key]).filter(_temp$5);
       if (!equal(sidePanelsRef.current.map(_temp2$3), newPanels_0.map(_temp3$1))) {
         updateSidePanels(newPanels_0);
       }
@@ -23620,7 +24773,7 @@ function _temp3$1(p_1) {
 function _temp2$3(p_0) {
   return p_0.key;
 }
-function _temp$4(p) {
+function _temp$5(p) {
   return Boolean(p);
 }
 function useBuildDataSource({
@@ -23915,7 +25068,7 @@ function useProjectLog(t0) {
   const dataSourceKey = dataSourceDelegate.key;
   let t1;
   if ($[0] !== plugins) {
-    t1 = plugins?.map(_temp$3);
+    t1 = plugins?.map(_temp$4);
     $[0] = plugins;
     $[1] = t1;
   } else {
@@ -23951,7 +25104,7 @@ function useProjectLog(t0) {
   useEffect(t2, t3);
   return accessResponse;
 }
-function _temp$3(plugin) {
+function _temp$4(plugin) {
   return plugin.key;
 }
 function FireCMS(props) {
@@ -23964,22 +25117,27 @@ function FireCMS(props) {
     authController,
     storageSource,
     dataSourceDelegate,
-    plugins: pluginsProp,
+    plugins: _pluginsProp,
     onAnalyticsEvent,
     propertyConfigs,
     entityViews,
     entityActions,
     components,
     navigationController,
-    apiKey
+    apiKey,
+    userManagement: _userManagement
   } = props;
-  if (pluginsProp) {
+  if (_pluginsProp) {
     console.warn("The `plugins` prop is deprecated in the FireCMS component. You should pass your plugins to `useBuildNavigationController` instead.");
   }
-  const plugins = navigationController.plugins ?? pluginsProp;
+  const plugins = navigationController.plugins ?? _pluginsProp;
+  const userManagement = plugins?.find((p) => p.userManagement)?.userManagement ?? _userManagement ?? {
+    users: [],
+    getUser: (uid) => null
+  };
   const sideDialogsController = useBuildSideDialogsController();
   const sideEntityController = useBuildSideEntityController(navigationController, sideDialogsController, authController);
-  const pluginsLoading = plugins?.some((p) => p.loading) ?? false;
+  const pluginsLoading = plugins?.some((p_0) => p_0.loading) ?? false;
   const loading = authController.initialLoading || navigationController.loading || pluginsLoading;
   const customizationController = {
     dateTimeFormat,
@@ -24026,7 +25184,7 @@ function FireCMS(props) {
       accessResponse?.message && /* @__PURE__ */ jsx(Typography, { children: accessResponse?.message })
     ] });
   }
-  return /* @__PURE__ */ jsx(AnalyticsContext.Provider, { value: analyticsController, children: /* @__PURE__ */ jsx(CustomizationControllerContext.Provider, { value: customizationController, children: /* @__PURE__ */ jsx(UserConfigurationPersistenceContext.Provider, { value: userConfigPersistence, children: /* @__PURE__ */ jsx(StorageSourceContext.Provider, { value: storageSource, children: /* @__PURE__ */ jsx(DataSourceContext.Provider, { value: dataSource, children: /* @__PURE__ */ jsx(AuthControllerContext.Provider, { value: authController, children: /* @__PURE__ */ jsx(SideDialogsControllerContext.Provider, { value: sideDialogsController, children: /* @__PURE__ */ jsx(SideEntityControllerContext.Provider, { value: sideEntityController, children: /* @__PURE__ */ jsx(NavigationContext.Provider, { value: navigationController, children: /* @__PURE__ */ jsx(DialogsProvider, { children: /* @__PURE__ */ jsx(BreadcrumbsProvider, { children: /* @__PURE__ */ jsx(FireCMSInternal, { loading, children }) }) }) }) }) }) }) }) }) }) }) });
+  return /* @__PURE__ */ jsx(AnalyticsContext.Provider, { value: analyticsController, children: /* @__PURE__ */ jsx(CustomizationControllerContext.Provider, { value: customizationController, children: /* @__PURE__ */ jsx(UserConfigurationPersistenceContext.Provider, { value: userConfigPersistence, children: /* @__PURE__ */ jsx(StorageSourceContext.Provider, { value: storageSource, children: /* @__PURE__ */ jsx(DataSourceContext.Provider, { value: dataSource, children: /* @__PURE__ */ jsx(AuthControllerContext.Provider, { value: authController, children: /* @__PURE__ */ jsx(SideDialogsControllerContext.Provider, { value: sideDialogsController, children: /* @__PURE__ */ jsx(SideEntityControllerContext.Provider, { value: sideEntityController, children: /* @__PURE__ */ jsx(NavigationContext.Provider, { value: navigationController, children: /* @__PURE__ */ jsx(InternalUserManagementContext.Provider, { value: userManagement, children: /* @__PURE__ */ jsx(DialogsProvider, { children: /* @__PURE__ */ jsx(BreadcrumbsProvider, { children: /* @__PURE__ */ jsx(FireCMSInternal, { loading, children }) }) }) }) }) }) }) }) }) }) }) }) });
 }
 function FireCMSInternal(t0) {
   const $ = c(7);
@@ -24196,7 +25354,7 @@ function DefaultDrawer(t0) {
   } = navigation.topLevelNavigation;
   let t1;
   if ($[0] !== adminMenuOpen || $[1] !== analyticsController || $[2] !== className || $[3] !== closeDrawer || $[4] !== drawerOpen || $[5] !== groups || $[6] !== largeLayout || $[7] !== logo || $[8] !== navigate || $[9] !== navigationEntries || $[10] !== style || $[11] !== tooltipsOpen) {
-    const adminViews = navigationEntries.filter(_temp$2) ?? [];
+    const adminViews = navigationEntries.filter(_temp$3) ?? [];
     let t2;
     let t3;
     let t4;
@@ -24349,7 +25507,7 @@ function DefaultDrawer(t0) {
 function _temp2$2(g) {
   return g !== "Admin";
 }
-function _temp$2(e) {
+function _temp$3(e) {
   return e.type === "admin";
 }
 function DrawerLogo(t0) {
@@ -24409,6 +25567,165 @@ function DrawerLogo(t0) {
   }
   return t6;
 }
+function UserSelectFieldBinding(t0) {
+  const $ = c(43);
+  const {
+    propertyKey,
+    value,
+    setValue,
+    error,
+    showError,
+    disabled,
+    property,
+    includeDescription,
+    size: t1
+  } = t0;
+  const size = t1 === void 0 ? "large" : t1;
+  const {
+    users,
+    getUser
+  } = useInternalUserManagementController();
+  let t2;
+  if ($[0] !== setValue) {
+    t2 = (e) => {
+      e.stopPropagation();
+      e.preventDefault();
+      setValue(null);
+    };
+    $[0] = setValue;
+    $[1] = t2;
+  } else {
+    t2 = $[1];
+  }
+  const handleClearClick = t2;
+  let t3;
+  if ($[2] !== value) {
+    t3 = value !== void 0 && value != null ? value.toString() : "";
+    $[2] = value;
+    $[3] = t3;
+  } else {
+    t3 = $[3];
+  }
+  let t4;
+  if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
+    t4 = cls("w-full");
+    $[4] = t4;
+  } else {
+    t4 = $[4];
+  }
+  let t5;
+  if ($[5] !== property) {
+    t5 = getIconForProperty(property, "small");
+    $[5] = property;
+    $[6] = t5;
+  } else {
+    t5 = $[6];
+  }
+  const t6 = property.validation?.required;
+  let t7;
+  if ($[7] !== property.name || $[8] !== t5 || $[9] !== t6) {
+    t7 = /* @__PURE__ */ jsx(LabelWithIcon, { icon: t5, required: t6, title: property.name, className: "h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5 my-0" });
+    $[7] = property.name;
+    $[8] = t5;
+    $[9] = t6;
+    $[10] = t7;
+  } else {
+    t7 = $[10];
+  }
+  let t8;
+  if ($[11] !== propertyKey || $[12] !== t7) {
+    t8 = /* @__PURE__ */ jsx(PropertyIdCopyTooltip, { propertyKey, children: t7 });
+    $[11] = propertyKey;
+    $[12] = t7;
+    $[13] = t8;
+  } else {
+    t8 = $[13];
+  }
+  let t9;
+  if ($[14] !== disabled || $[15] !== handleClearClick || $[16] !== property.clearable || $[17] !== value) {
+    t9 = property.clearable && !disabled && value && /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: handleClearClick, children: /* @__PURE__ */ jsx(CloseIcon, { size: "small" }) });
+    $[14] = disabled;
+    $[15] = handleClearClick;
+    $[16] = property.clearable;
+    $[17] = value;
+    $[18] = t9;
+  } else {
+    t9 = $[18];
+  }
+  let t10;
+  if ($[19] !== setValue) {
+    t10 = (updatedValue) => {
+      const newValue = updatedValue || null;
+      return setValue(newValue);
+    };
+    $[19] = setValue;
+    $[20] = t10;
+  } else {
+    t10 = $[20];
+  }
+  let t11;
+  if ($[21] !== getUser) {
+    t11 = (userId) => {
+      const user = getUser(userId);
+      return /* @__PURE__ */ jsx(UserDisplay, { user });
+    };
+    $[21] = getUser;
+    $[22] = t11;
+  } else {
+    t11 = $[22];
+  }
+  let t12;
+  if ($[23] !== users) {
+    t12 = users && users.map(_temp$2);
+    $[23] = users;
+    $[24] = t12;
+  } else {
+    t12 = $[24];
+  }
+  let t13;
+  if ($[25] !== disabled || $[26] !== size || $[27] !== t10 || $[28] !== t11 || $[29] !== t12 || $[30] !== t3 || $[31] !== t8 || $[32] !== t9) {
+    t13 = /* @__PURE__ */ jsx(Select, { value: t3, disabled, size, fullWidth: true, position: "item-aligned", inputClassName: t4, label: t8, endAdornment: t9, onValueChange: t10, renderValue: t11, children: t12 });
+    $[25] = disabled;
+    $[26] = size;
+    $[27] = t10;
+    $[28] = t11;
+    $[29] = t12;
+    $[30] = t3;
+    $[31] = t8;
+    $[32] = t9;
+    $[33] = t13;
+  } else {
+    t13 = $[33];
+  }
+  let t14;
+  if ($[34] !== disabled || $[35] !== error || $[36] !== includeDescription || $[37] !== property || $[38] !== showError) {
+    t14 = /* @__PURE__ */ jsx(FieldHelperText, { includeDescription, showError, error, disabled, property });
+    $[34] = disabled;
+    $[35] = error;
+    $[36] = includeDescription;
+    $[37] = property;
+    $[38] = showError;
+    $[39] = t14;
+  } else {
+    t14 = $[39];
+  }
+  let t15;
+  if ($[40] !== t13 || $[41] !== t14) {
+    t15 = /* @__PURE__ */ jsxs(Fragment, { children: [
+      t13,
+      t14
+    ] });
+    $[40] = t13;
+    $[41] = t14;
+    $[42] = t15;
+  } else {
+    t15 = $[42];
+  }
+  return t15;
+}
+function _temp$2(user_0) {
+  return /* @__PURE__ */ jsx(SelectItem, { value: user_0.uid, children: /* @__PURE__ */ jsx(UserDisplay, { user: user_0 }) }, user_0.uid);
+}
 function isDefaultFieldConfigId(id) {
   return Object.keys(DEFAULT_FIELD_CONFIGS).includes(id);
 }
@@ -24510,6 +25827,16 @@ const DEFAULT_FIELD_CONFIGS = {
       Field: MultiSelectFieldBinding
     }
   },
+  user_select: {
+    key: "user_select",
+    name: "User select",
+    description: "Select a user from the user management system. Store the user ID.",
+    Icon: PersonIcon,
+    property: {
+      dataType: "string",
+      Field: UserSelectFieldBinding
+    }
+  },
   number_input: {
     key: "number_input",
     name: "Number input",
@@ -24724,6 +26051,8 @@ function getDefaultFieldId(property) {
       return "email";
     } else if (property.enumValues) {
       return "select";
+    } else if (property.userSelect) {
+      return "user_select";
     } else if (property.reference) {
       return "reference_as_string";
     } else {
@@ -25763,6 +27092,7 @@ export {
   SwitchFieldBinding,
   TextFieldBinding,
   UrlComponentPreview,
+  UserPreview,
   Vector,
   VirtualTable,
   addInitialSlash,
@@ -25816,6 +27146,7 @@ export {
   getIdIcon,
   getLabelOrConfigFrom,
   getLastSegment,
+  getLocalChangesBackup,
   getPropertiesWithPropertiesOrder,
   getPropertyInPath,
   getRandomId,
@@ -25830,13 +27161,13 @@ export {
   isEnumValueDisabled,
   isHidden,
   isObject,
+  isPlainObject,
   isPropertyBuilder,
   isReadOnly,
   isReferenceProperty,
   isValidRegExp,
   joinCollectionLists,
   makePropertiesEditable,
-  makePropertiesNonEditable,
   mergeCallbacks,
   mergeCollection,
   mergeDeep,
@@ -25897,6 +27228,7 @@ export {
   useBuildNavigationController,
   useClearRestoreValue,
   useClipboard,
+  useCollapsedGroups,
   useCollectionFetch,
   useColumnIds,
   useCustomizationController,
@@ -25907,6 +27239,7 @@ export {
   useDialogsController,
   useEntityFetch,
   useFireCMSContext,
+  useInternalUserManagementController,
   useLargeLayout,
   useModeController,
   useNavigationController,