npm - @rebasepro/admin - Versions diffs - 0.0.1-canary.f81da60 → 0.1.2 - Mend

@rebasepro/admin 0.0.1-canary.f81da60 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (95) hide show

package/dist/{util-DK1O3uM0.js → util-zfU1zOCX.js} RENAMED Viewed

@@ -2,7 +2,7 @@ import { jsxs, jsx, Fragment } from "react/jsx-runtime";
 import { c } from "react-compiler-runtime";
 import { DialogActions, Typography, IconButton, Button, LoadingButton, cls, defaultBorderMixin, Tooltip, Skeleton, Chip, getColorSchemeForSeed, ErrorBoundary, iconSize, useDebouncedCallback, TextareaAutosize, focusedDisabled, MultiSelect, MultiSelectItem, Select, SelectItem, BooleanSwitch, DateTimeField, useInjectStyles, fieldBackgroundInvisibleMixin, fieldBackgroundMixin, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, CircularProgress, Separator, paperMixin, Menu, MenuItem, Checkbox, Badge, SearchBar, Label, TextField, BooleanSwitchWithLabel, useOutsideAlerter, VirtualTable, CircularProgressCenter, Tab, Tabs, CenteredView, Sheet, iconKeys, debounce, coolIconKeys, ExpandablePanel, HandleIcon, Collapse, FileUpload, TableRow, TableCell, TableHeader, Table, TableBody, Popover, CHIP_COLORS, Card, ResizablePanels, getColorSchemeForKey, Markdown, Dialog, DialogContent, ToggleButtonGroup, DialogTitle, Avatar, Alert } from "@rebasepro/ui";
 import { AlertCircleIcon, CopyIcon, ImageOffIcon, ExternalLinkIcon, FileTextIcon, FunctionSquareIcon, CircleIcon, LinkIcon, Rows3Icon, UploadIcon, RepeatIcon, VoteIcon, CalendarIcon, FlagIcon, HashIcon, GlobeIcon, MailIcon, AlignLeftIcon, TextIcon, ArrowRightToLineIcon, XIcon, ChevronDownIcon, SearchIcon, PencilIcon, CheckIcon, MoreVerticalIcon, HistoryIcon, Maximize2Icon, CodeIcon, PlusIcon, icons, MinusIcon, ChevronUpIcon, FolderUpIcon, ListOrderedIcon, UserIcon, ListIcon, QuoteIcon, ChevronRightIcon, SettingsIcon, Trash2Icon, RefreshCwIcon, TableIcon, LayoutGridIcon, KanbanIcon, ColumnsIcon, FilterXIcon, ArrowLeftIcon, FilterIcon, MoonIcon, SunIcon, SunMoonIcon, LogOutIcon, ChevronsLeftIcon, ChevronsRightIcon, MenuIcon, AlertTriangleIcon, EyeIcon, XCircleIcon } from "lucide-react";
-import { useTranslation, useStorageSource, ErrorView, buildEnumLabel, getColorScheme, useAuthController, useCustomizationController, useAnalyticsController, IconForView, useEntityFetch, useUserSelector, UserDisplay, useSnackbarController, ErrorTooltip, useStorageUploadController, useData, useRelationSelector, getRowHeight, useLargeLayout, getEntityFromCache, getColumnKeysForProperty, DEFAULT_PAGE_SIZE as DEFAULT_PAGE_SIZE$1, useRebaseContext, usePermissions, useModeController, getEntityFromMemoryCache, useSlot, createFormexStub, PluginProviderStack, saveEntityToMemoryCache, CONTAINER_FULL_WIDTH, ADDITIONAL_TAB_WIDTH, FORM_CONTAINER_WIDTH, useUnsavedChangesDialog, UnsavedChangesDialog, useColumnIds, useDataTableController, saveEntityWithCallbacks, iconSynonyms, iconsSearch, deleteEntityWithCallbacks, useUserConfigurationPersistence, useScrollRestoration, useBridgeRegistration, useAdminModeController, RebaseLogo, LanguageToggle, useEffectiveRoleController, useRebaseRegistry, useCollapsedGroups, STUDIO_NAVIGATION_GROUPS, useInternalUserManagementController, useBuildLocalConfigurationPersistence, useRebaseClient, CustomizationControllerContext, StudioBridgeRegistryProvider, NotFoundPage, UIReferenceView, RebaseRoutes, UserSettingsView, flattenKeys, removeEntityFromCache, saveEntityToCache, removeEntityFromMemoryCache, getFormFieldKeys } from "@rebasepro/core";
+import { useTranslation, useStorageSource, ErrorView, buildEnumLabel, getColorScheme, useAuthController, useCustomizationController, useAnalyticsController, IconForView, useEntityFetch, useUserSelector, UserDisplay, useSnackbarController, ErrorTooltip, useStorageUploadController, useData, useRelationSelector, getRowHeight, useLargeLayout, getEntityFromCache, getColumnKeysForProperty, DEFAULT_PAGE_SIZE as DEFAULT_PAGE_SIZE$1, useRebaseContext, usePermissions, useModeController, getEntityFromMemoryCache, useSlot, createFormexStub, resolveComponentRef, PluginProviderStack, saveEntityToMemoryCache, CONTAINER_FULL_WIDTH, ADDITIONAL_TAB_WIDTH, FORM_CONTAINER_WIDTH, useUnsavedChangesDialog, UnsavedChangesDialog, useColumnIds, useDataTableController, saveEntityWithCallbacks, iconSynonyms, iconsSearch, deleteEntityWithCallbacks, useUserConfigurationPersistence, useScrollRestoration, useBridgeRegistration, useAdminModeController, RebaseLogo, LanguageToggle, useRebaseRegistry, buildCollapsedDefaults, useCollapsedGroups, useInternalUserManagementController, useBuildLocalConfigurationPersistence, useRebaseClient, CustomizationControllerContext, StudioBridgeRegistryProvider, NotFoundPage, UIReferenceView, RebaseRoutes, UserSettingsView, flattenKeys, removeEntityFromCache, saveEntityToCache, removeEntityFromMemoryCache, getFormFieldKeys } from "@rebasepro/core";
 import * as React from "react";
 import React__default, { useRef, useEffect, useState, useMemo, useCallback, useSyncExternalStore, useContext, lazy, Suspense, createContext, forwardRef, memo, useLayoutEffect, createElement } from "react";
 import { isPropertyBuilder, enumToObjectEntries, getLabelOrConfigFrom, resolveArrayProperties, getEntityImagePreviewPropertyKey, resolveEnumValues, getReferenceFrom, normalizeToEntityRelation, getRelationFrom, isReadOnly, getLocalChangesBackup, resolveDefaultSelectedView, getSubcollections, removeInitialAndTrailingSlashes, getNavigationEntriesFromPath, CollectionRegistry, getParentReferencesFromPath, canReadCollection, resolveCollectionPathIds, resolveProperty, isHidden, getArrayResolvedProperties, DEFAULT_ONE_OF_VALUE, getDefaultValueFor, DEFAULT_ONE_OF_TYPE, getDefaultValueFortype, resolveStorageFilenameString, resolveStoragePathString, resolveRelationProperty, getTableName, getDefaultValuesFor } from "@rebasepro/common";
@@ -1902,16 +1902,24 @@ function getEntityTitlePropertyKey(collection, propertyConfigs) {
   if (collection.titleProperty) {
     return collection.titleProperty;
   }
-  for (const key in collection.properties) {
+  const orderToSearch = collection.propertiesOrder || Object.keys(collection.properties);
+  let firstStringCandidate;
+  for (const key of orderToSearch) {
     const property = collection.properties[key];
-    if (!isPropertyBuilder(property)) {
+    if (property && !isPropertyBuilder(property)) {
       const prop = property;
       if (prop.type === "string" && !prop.ui?.multiline && !prop.ui?.markdown && !prop.storage && !prop.isId) {
-        return key;
+        if (!firstStringCandidate) {
+          firstStringCandidate = key;
+        }
+        const lowerKey = key.toLowerCase();
+        if (["name", "title", "label", "displayname", "username"].includes(lowerKey)) {
+          return key;
+        }
       }
     }
   }
-  return void 0;
+  return firstStringCandidate;
 }
 function EntityPreviewData({
   actions,
@@ -2969,7 +2977,7 @@ const UserSelector = React.forwardRef(({
   clearable = true,
   className,
   pageSize,
-  searchPlaceholder = "SearchIcon users...",
+  searchPlaceholder = "Search users...",
   noResultsText = "No users found.",
   loadingText = "Loading..."
 }, ref) => {
@@ -4442,6 +4450,7 @@ const RelationSelector = React.forwardRef(({
   const [isLoadingSelectedItems, setIsLoadingSelectedItems] = useState(false);
   const [searchString, setSearchString] = useState("");
   const localSelectionIdsRef = useRef(null);
+  const pinnedIdsRef = useRef(null);
   const {
     items: availableItems,
     isLoading,
@@ -4627,6 +4636,7 @@ const RelationSelector = React.forwardRef(({
       newSelected = [item_0];
       setIsPopoverOpen(false);
       isPopoverOpenRef.current = false;
+      pinnedIdsRef.current = null;
     }
     setSelectedItems(newSelected);
     localSelectionIdsRef.current = computeSelectionFingerprint(newSelected);
@@ -4646,10 +4656,11 @@ const RelationSelector = React.forwardRef(({
   const handleRootOpenChange = useCallback((next) => {
     if (disabled) return;
     if (next) {
+      pinnedIdsRef.current = new Set(selectedItems.map((i_1) => String(i_1.id)));
       setIsPopoverOpen(true);
       isPopoverOpenRef.current = true;
     }
-  }, [disabled]);
+  }, [disabled, selectedItems]);
   useEffect(() => {
     if (!isPopoverOpen) return;
     function handlePointerDown(ev) {
@@ -4660,11 +4671,13 @@ const RelationSelector = React.forwardRef(({
       if (contentEl?.contains(target)) return;
       setIsPopoverOpen(false);
       isPopoverOpenRef.current = false;
+      pinnedIdsRef.current = null;
     }
     function handleKey(ev_0) {
       if (ev_0.key === "Escape") {
         setIsPopoverOpen(false);
         isPopoverOpenRef.current = false;
+        pinnedIdsRef.current = null;
       }
     }
     document.addEventListener("mousedown", handlePointerDown, true);
@@ -4678,6 +4691,7 @@ const RelationSelector = React.forwardRef(({
   const closePopover = useCallback(() => {
     setIsPopoverOpen(false);
     isPopoverOpenRef.current = false;
+    pinnedIdsRef.current = null;
   }, []);
   const resolvedPlaceholder = placeholder || emptyPlaceholder || /* @__PURE__ */ jsx(EmptyValue, { className: "ml-2" });
   const portalContainer = typeof document !== "undefined" ? document.body : void 0;
@@ -4687,6 +4701,11 @@ const RelationSelector = React.forwardRef(({
       setIsPopoverOpen((o) => {
         const next_0 = !o;
         isPopoverOpenRef.current = next_0;
+        if (next_0) {
+          pinnedIdsRef.current = new Set(selectedItems.map((i_2) => String(i_2.id)));
+        } else {
+          pinnedIdsRef.current = null;
+        }
         return next_0;
       });
     }, className: cls({
@@ -4763,7 +4782,15 @@ const RelationSelector = React.forwardRef(({
             ] }),
             !isLoading && availableItems.length === 0 && /* @__PURE__ */ jsx(Command.Empty, { className: "px-4 py-6 text-center text-text-secondary dark:text-text-secondary-dark", children: noResultsText }),
             /* @__PURE__ */ jsxs(Command.Group, { children: [
-              availableItems.map((item_2) => {
+              (() => {
+                const pinned = pinnedIdsRef.current;
+                const sortedItems = pinned && pinned.size > 0 ? [...availableItems].sort((a, b) => {
+                  const aP = pinned.has(String(a.id)) ? 0 : 1;
+                  const bP = pinned.has(String(b.id)) ? 0 : 1;
+                  return aP - bP;
+                }) : availableItems;
+                return sortedItems;
+              })().map((item_2) => {
                 const isSelected_0 = selectedItems.some((v_2) => String(v_2.id) === String(item_2.id));
                 return /* @__PURE__ */ jsxs(Command.Item, { value: String(item_2.id), onMouseDown: (e_2) => {
                   e_2.preventDefault();
@@ -5041,25 +5068,12 @@ function getTableBindingForProperty(property, selected) {
     if (property.relation) {
       if (property.ui?.widget === "dialog") {
         return {
-          Component: ({
-            propertyKey,
-            internalValue,
-            updateValue,
-            disabled,
-            size,
-            property: property2
-          }) => /* @__PURE__ */ jsx(TableRelationField, { name: propertyKey, internalValue, updateValue, disabled, size, multiselect: false, relation: property2.relation, previewProperties: property2.ui?.previewProperties, includeId: property2.includeId, includeEntityLink: property2.includeEntityLink, title: property2.name ?? propertyKey, fixedFilter: property2.fixedFilter }),
+          Component: RelationDialogBindingComponent,
           allowScroll: false
         };
       } else {
         return {
-          Component: ({
-            propertyKey,
-            internalValue,
-            updateValue,
-            disabled,
-            property: property2
-          }) => /* @__PURE__ */ jsx(TableRelationSelectorField, { name: propertyKey, internalValue, updateValue, disabled, size: "small", relation: property2.relation, fixedFilter: property2.fixedFilter }),
+          Component: RelationSelectorBindingComponent,
           allowScroll: false
         };
       }
@@ -5106,6 +5120,64 @@ function getTableBindingForProperty(property, selected) {
   }
   return void 0;
 }
+function RelationDialogBindingComponent(t0) {
+  const $ = c(12);
+  const {
+    propertyKey,
+    internalValue,
+    updateValue,
+    disabled,
+    size,
+    property
+  } = t0;
+  const t1 = internalValue;
+  const t2 = property.ui?.previewProperties;
+  const t3 = property.name ?? propertyKey;
+  let t4;
+  if ($[0] !== disabled || $[1] !== property.fixedFilter || $[2] !== property.includeEntityLink || $[3] !== property.includeId || $[4] !== property.relation || $[5] !== propertyKey || $[6] !== size || $[7] !== t1 || $[8] !== t2 || $[9] !== t3 || $[10] !== updateValue) {
+    t4 = /* @__PURE__ */ jsx(TableRelationField, { name: propertyKey, internalValue: t1, updateValue, disabled, size, multiselect: false, relation: property.relation, previewProperties: t2, includeId: property.includeId, includeEntityLink: property.includeEntityLink, title: t3, fixedFilter: property.fixedFilter });
+    $[0] = disabled;
+    $[1] = property.fixedFilter;
+    $[2] = property.includeEntityLink;
+    $[3] = property.includeId;
+    $[4] = property.relation;
+    $[5] = propertyKey;
+    $[6] = size;
+    $[7] = t1;
+    $[8] = t2;
+    $[9] = t3;
+    $[10] = updateValue;
+    $[11] = t4;
+  } else {
+    t4 = $[11];
+  }
+  return t4;
+}
+function RelationSelectorBindingComponent(t0) {
+  const $ = c(7);
+  const {
+    propertyKey,
+    internalValue,
+    updateValue,
+    disabled,
+    property
+  } = t0;
+  const t1 = internalValue;
+  let t2;
+  if ($[0] !== disabled || $[1] !== property.fixedFilter || $[2] !== property.relation || $[3] !== propertyKey || $[4] !== t1 || $[5] !== updateValue) {
+    t2 = /* @__PURE__ */ jsx(TableRelationSelectorField, { name: propertyKey, internalValue: t1, updateValue, disabled, size: "small", relation: property.relation, fixedFilter: property.fixedFilter });
+    $[0] = disabled;
+    $[1] = property.fixedFilter;
+    $[2] = property.relation;
+    $[3] = propertyKey;
+    $[4] = t1;
+    $[5] = updateValue;
+    $[6] = t2;
+  } else {
+    t2 = $[6];
+  }
+  return t2;
+}
 const TableCellInner = (t0) => {
   const $ = c(12);
   const {
@@ -5316,7 +5388,7 @@ const EntityTableCell = React__default.memo(function EntityTableCell2(t0) {
   const t11 = `flex relative h-full rounded-md p-${p} border-4`;
   const t12 = showSaved ? "bg-primary/20 dark:bg-primary/20" : onHover && !disabled ? "bg-surface-50 dark:bg-surface-900" : "";
   const t13 = hideOverflow ? "overflow-hidden" : "";
-  const t14 = isSelected && !showSaved ? "bg-surface-50 dark:bg-surface-900" : "";
+  const t14 = isSelected && !showSaved ? "bg-surface-accent-50 dark:bg-surface-accent-900" : "";
   let t15;
   if ($[11] !== borderClass || $[12] !== t11 || $[13] !== t12 || $[14] !== t13 || $[15] !== t14) {
     t15 = cls("transition-colors duration-500", t11, t12, t13, t14, borderClass);
@@ -5418,7 +5490,7 @@ const EntityTableCell = React__default.memo(function EntityTableCell2(t0) {
   }
   let t25;
   if ($[43] !== error?.message || $[44] !== frozen || $[45] !== result || $[46] !== showError || $[47] !== sortableAttrsWithoutTabIndex || $[48] !== sortableNodeRef || $[49] !== sortableStyle) {
-    t25 = sortableNodeRef ? /* @__PURE__ */ jsx("div", { ref: sortableNodeRef, style: sortableStyle, className: cls("flex-shrink-0", frozen && "sticky left-0 z-10 bg-white dark:bg-surface-800"), ...sortableAttrsWithoutTabIndex, children: showError ? /* @__PURE__ */ jsx(ErrorTooltip, { className: "flex h-full w-full", align: "start", title: error?.message ?? "Error", children: result }) : result }) : showError ? /* @__PURE__ */ jsx(ErrorTooltip, { className: "flex h-full w-full", align: "start", title: error?.message ?? "Error", children: result }) : result;
+    t25 = sortableNodeRef ? /* @__PURE__ */ jsx("div", { ref: sortableNodeRef, style: sortableStyle, className: cls("flex-shrink-0", frozen && "sticky left-0 z-10 bg-white dark:bg-surface-900"), ...sortableAttrsWithoutTabIndex, children: showError ? /* @__PURE__ */ jsx(ErrorTooltip, { className: "flex h-full w-full", align: "start", title: error?.message ?? "Error", children: result }) : result }) : showError ? /* @__PURE__ */ jsx(ErrorTooltip, { className: "flex h-full w-full", align: "start", title: error?.message ?? "Error", children: result }) : result;
     $[43] = error?.message;
     $[44] = frozen;
     $[45] = result;
@@ -5684,7 +5756,7 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
   const enableLocalChangesBackup = collection ? getLocalChangesBackup(collection) : false;
   const hasDraft = enableLocalChangesBackup ? getEntityFromCache(path + "/" + entity.id) : false;
   const iconSize2 = "small";
-  const content = /* @__PURE__ */ jsxs("div", { className: cls("h-full flex items-center justify-center flex-col bg-surface-50 dark:bg-surface-800 bg-opacity-90 bg-surface-50/90 dark:bg-opacity-90 dark:bg-surface-800/90 z-10", "h-full flex items-center justify-center flex-col bg-surface-50/90 dark:bg-surface-800/90 z-10", frozen ? "sticky left-0" : ""), onClick: useCallback((event) => {
+  const content = /* @__PURE__ */ jsxs("div", { className: cls("h-full flex items-center justify-center flex-col z-10", isSelected ? "bg-surface-accent-50 dark:bg-surface-accent-900" : "bg-surface-50/90 dark:bg-surface-900/90", frozen ? "sticky left-0" : ""), onClick: useCallback((event) => {
     event.stopPropagation();
   }, []), style: {
     width,
@@ -5747,12 +5819,12 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
       tabIndex: _tabIndex,
       ...sortableAttrsWithoutTabIndex
     } = sortableAttributes ?? {};
-    return /* @__PURE__ */ jsx("div", { ref: sortableNodeRef, style: sortableStyle, className: cls("flex-shrink-0", frozen && "sticky left-0 z-10 bg-white dark:bg-surface-800"), ...sortableAttrsWithoutTabIndex, children: content });
+    return /* @__PURE__ */ jsx("div", { ref: sortableNodeRef, style: sortableStyle, className: cls("flex-shrink-0", frozen && "sticky left-0 z-10 bg-white dark:bg-surface-900"), ...sortableAttrsWithoutTabIndex, children: content });
   }
   return content;
 };
 function CollectionTableToolbar(t0) {
-  const $ = c(37);
+  const $ = c(38);
   const {
     actions,
     actionsStart,
@@ -5760,6 +5832,7 @@ function CollectionTableToolbar(t0) {
     onTextSearch,
     title,
     viewModeToggle,
+    initialSearchText,
     compact: t1
   } = t0;
   const compact = t1 === void 0 ? false : t1;
@@ -5808,7 +5881,7 @@ function CollectionTableToolbar(t0) {
   }
   let t7;
   if ($[9] !== title) {
-    t7 = title && /* @__PURE__ */ jsx("div", { className: "hidden lg:block", children: title });
+    t7 = title && /* @__PURE__ */ jsx("div", { className: "flex items-center", children: title });
     $[9] = title;
     $[10] = t7;
   } else {
@@ -5848,58 +5921,59 @@ function CollectionTableToolbar(t0) {
     t11 = $[20];
   }
   let t12;
-  if ($[21] !== onTextSearch || $[22] !== t) {
-    t12 = onTextSearch && /* @__PURE__ */ jsx(SearchBar, { size: "small", placeholder: t("search"), onTextSearch, expandable: true }, "search-bar");
-    $[21] = onTextSearch;
-    $[22] = t;
-    $[23] = t12;
+  if ($[21] !== initialSearchText || $[22] !== onTextSearch || $[23] !== t) {
+    t12 = onTextSearch && /* @__PURE__ */ jsx(SearchBar, { size: "small", placeholder: t("search"), onTextSearch, expandable: true, initialValue: initialSearchText }, "search-bar");
+    $[21] = initialSearchText;
+    $[22] = onTextSearch;
+    $[23] = t;
+    $[24] = t12;
   } else {
-    t12 = $[23];
+    t12 = $[24];
   }
   let t13;
-  if ($[24] !== t11 || $[25] !== t12) {
+  if ($[25] !== t11 || $[26] !== t12) {
     t13 = /* @__PURE__ */ jsx("div", { className: t11, children: t12 });
-    $[24] = t11;
-    $[25] = t12;
-    $[26] = t13;
+    $[25] = t11;
+    $[26] = t12;
+    $[27] = t13;
   } else {
-    t13 = $[26];
+    t13 = $[27];
   }
   let t14;
-  if ($[27] !== secondaryActions) {
+  if ($[28] !== secondaryActions) {
     t14 = /* @__PURE__ */ jsx("div", { className: "flex items-center gap-1", children: secondaryActions });
-    $[27] = secondaryActions;
-    $[28] = t14;
+    $[28] = secondaryActions;
+    $[29] = t14;
   } else {
-    t14 = $[28];
+    t14 = $[29];
   }
   let t15;
-  if ($[29] !== addButton || $[30] !== t13 || $[31] !== t14 || $[32] !== t9) {
+  if ($[30] !== addButton || $[31] !== t13 || $[32] !== t14 || $[33] !== t9) {
     t15 = /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
       t9,
       t13,
       t14,
       addButton
     ] });
-    $[29] = addButton;
-    $[30] = t13;
-    $[31] = t14;
-    $[32] = t9;
-    $[33] = t15;
+    $[30] = addButton;
+    $[31] = t13;
+    $[32] = t14;
+    $[33] = t9;
+    $[34] = t15;
   } else {
-    t15 = $[33];
+    t15 = $[34];
   }
   let t16;
-  if ($[34] !== t15 || $[35] !== t8) {
+  if ($[35] !== t15 || $[36] !== t8) {
     t16 = /* @__PURE__ */ jsxs("div", { className: t3, children: [
       t8,
       t15
     ] });
-    $[34] = t15;
-    $[35] = t8;
-    $[36] = t16;
+    $[35] = t15;
+    $[36] = t8;
+    $[37] = t16;
   } else {
-    t16 = $[36];
+    t16 = $[37];
   }
   return t16;
 }
@@ -6868,7 +6942,7 @@ const SelectableTable = function SelectableTable2({
     size: size ?? "m",
     selectionStore
   }), [setPopupCell, select, onValueChange, size, selectionStore]);
-  return /* @__PURE__ */ jsx(SelectableTableContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx("div", { className: "h-full w-full flex flex-col bg-white dark:bg-surface-800", ref, children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(SelectableTableContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx("div", { className: "h-full w-full flex flex-col bg-white dark:bg-surface-900", ref, children: /* @__PURE__ */ jsx(
     VirtualTable,
     {
       data,
@@ -6891,7 +6965,7 @@ const SelectableTable = function SelectableTable2({
       checkFilterCombination,
       createFilterField: filterable ? createFilterField : void 0,
       rowClassName: useCallback((entity) => {
-        return highlightedRow?.(entity) ? "bg-surface-50/75 bg-surface-100/75 dark:!bg-surface-800/60" : "";
+        return highlightedRow?.(entity) ? "bg-surface-accent-50 dark:!bg-surface-accent-900" : "";
       }, [highlightedRow]),
       className: "grow",
       emptyComponent,
@@ -7113,7 +7187,7 @@ const EntityCollectionTable = function EntityCollectionTable2({
       return /* @__PURE__ */ jsx(EntityTableCell, { size, width: column_1.width, savedTimestamp: void 0, value: null, align: "left", fullHeight: false, disabled: true, sortableNodeRef: props.sortableNodeRef, sortableStyle: props.sortableStyle, sortableAttributes: props.sortableAttributes, isDragging: props.isDragging, isDraggable: props.isDraggable, frozen: props.frozen, children: /* @__PURE__ */ jsx(ErrorView, { error: e instanceof Error ? e : new Error(String(e)) }) });
     }
   }, [tableRowActionsBuilder, additionalCellRenderer, propertyCellRenderer, size]);
-  return /* @__PURE__ */ jsxs("div", { ref, style, className: cls("h-full w-full flex flex-col bg-white dark:bg-surface-800", className), children: [
+  return /* @__PURE__ */ jsxs("div", { ref, style, className: cls("h-full w-full flex flex-col bg-white dark:bg-surface-900", className), children: [
     !hideToolbar && /* @__PURE__ */ jsx(CollectionTableToolbar, { onTextSearch, title, actionsStart, actions, viewModeToggle, loading: tableController.dataLoading }),
     /* @__PURE__ */ jsx(SelectableTable, { columns, size, inlineEditing, cellRenderer, onEntityClick, highlightedRow: useCallback((entity_1) => Boolean(selectedEntities?.find((e_0) => e_0.id === entity_1.id && e_0.path === entity_1.path)), [selectedEntities]), tableController, onValueChange, initialScroll, onScroll, onColumnResize, hoverRow, filterable, emptyComponent, endAdornment, AddColumnComponent, onColumnsOrderChange, extraData: useMemo(() => ({
       selectedEntityIds: selectedEntities?.map((e_1) => e_1.id)
@@ -7148,7 +7222,7 @@ function useSelectionController(onSelectionChange) {
     toggleEntitySelection
   }), [selectedEntities, setSelectedEntities, isEntitySelected, toggleEntitySelection]);
 }
-const EntityHistoryView$1 = lazy(() => import("./index-CNDetux9.js").then((m) => ({
+const EntityHistoryView$1 = lazy(() => import("./index-CS6uJ7oW.js").then((m) => ({
   default: m.EntityHistoryView
 })));
 const BUILTIN_ENTITY_VIEWS = {
@@ -7524,14 +7598,14 @@ function EntityJsonPreview(t0) {
   }
   return t4;
 }
-const EntityHistoryView = lazy(() => import("./index-CNDetux9.js").then((m) => ({
+const EntityHistoryView = lazy(() => import("./index-CS6uJ7oW.js").then((m) => ({
   default: m.EntityHistoryView
 })));
 const MAIN_TAB_VALUE = "__main_##Q$SC^#S6";
 const JSON_TAB_VALUE = "__json";
 const HISTORY_TAB_VALUE = "__rebase_history";
 function EntityEditView(t0) {
-  const $ = c(27);
+  const $ = c(28);
   let entityId;
   let props;
   if ($[0] !== t0) {
@@ -7569,13 +7643,14 @@ function EntityEditView(t0) {
     dataLoadingError
   } = useEntityFetch(t1);
   let t2;
-  if ($[8] !== entityId || $[9] !== props.path) {
-    t2 = entityId ? getEntityFromMemoryCache(props.path + "/" + entityId) : getEntityFromMemoryCache(props.path + "#new");
+  if ($[8] !== entityId || $[9] !== props.defaultValues || $[10] !== props.path) {
+    t2 = entityId ? getEntityFromMemoryCache(props.path + "/" + entityId) : props.defaultValues ?? getEntityFromMemoryCache(props.path + "#new");
     $[8] = entityId;
-    $[9] = props.path;
-    $[10] = t2;
+    $[9] = props.defaultValues;
+    $[10] = props.path;
+    $[11] = t2;
   } else {
-    t2 = $[10];
+    t2 = $[11];
   }
   const initialDirtyValues = t2;
   const {
@@ -7588,55 +7663,55 @@ function EntityEditView(t0) {
     t3 = true;
   } else {
     let t42;
-    if ($[11] !== canEditHook || $[12] !== entity || $[13] !== props.collection || $[14] !== props.path) {
+    if ($[12] !== canEditHook || $[13] !== entity || $[14] !== props.collection || $[15] !== props.path) {
       t42 = entity ? canEditHook(props.collection, props.path, entity ?? null) : void 0;
-      $[11] = canEditHook;
-      $[12] = entity;
-      $[13] = props.collection;
-      $[14] = props.path;
-      $[15] = t42;
+      $[12] = canEditHook;
+      $[13] = entity;
+      $[14] = props.collection;
+      $[15] = props.path;
+      $[16] = t42;
     } else {
-      t42 = $[15];
+      t42 = $[16];
     }
     t3 = t42;
   }
   const canEdit = t3;
   if (!dataLoading && dataLoadingError) {
     let t42;
-    if ($[16] !== dataLoadingError) {
+    if ($[17] !== dataLoadingError) {
       t42 = /* @__PURE__ */ jsx(CenteredView, { children: /* @__PURE__ */ jsx(ErrorView, { error: dataLoadingError }) });
-      $[16] = dataLoadingError;
-      $[17] = t42;
+      $[17] = dataLoadingError;
+      $[18] = t42;
     } else {
-      t42 = $[17];
+      t42 = $[18];
     }
     return t42;
   }
   if (!dataLoading && !initialDirtyValues && !entity && (status === "existing" || status === "copy")) {
     console.error(`Entity with id ${entityId} not found in collection ${props.path}`);
     let t42;
-    if ($[18] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    if ($[19] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t42 = /* @__PURE__ */ jsx(CenteredView, { children: /* @__PURE__ */ jsx(Typography, { variant: "label", children: "Entity not found" }) });
-      $[18] = t42;
+      $[19] = t42;
     } else {
-      t42 = $[18];
+      t42 = $[19];
     }
     return t42;
   }
   const t4 = initialDirtyValues;
   let t5;
-  if ($[19] !== canEdit || $[20] !== dataLoading || $[21] !== entity || $[22] !== entityId || $[23] !== props || $[24] !== status || $[25] !== t4) {
+  if ($[20] !== canEdit || $[21] !== dataLoading || $[22] !== entity || $[23] !== entityId || $[24] !== props || $[25] !== status || $[26] !== t4) {
     t5 = /* @__PURE__ */ jsx(EntityEditViewInner, { ...props, entityId, entity, initialDirtyValues: t4, dataLoading, status, setStatus, canEdit });
-    $[19] = canEdit;
-    $[20] = dataLoading;
-    $[21] = entity;
-    $[22] = entityId;
-    $[23] = props;
-    $[24] = status;
-    $[25] = t4;
-    $[26] = t5;
+    $[20] = canEdit;
+    $[21] = dataLoading;
+    $[22] = entity;
+    $[23] = entityId;
+    $[24] = props;
+    $[25] = status;
+    $[26] = t4;
+    $[27] = t5;
   } else {
-    t5 = $[26];
+    t5 = $[27];
   }
   return t5;
 }
@@ -7671,7 +7746,7 @@ function EntityEditViewInner({
   useLargeLayout();
   const customizationController = useCustomizationController();
   const plugins = customizationController.plugins;
-  const formActionTopProps = {
+  const formActionTopProps = useMemo(() => ({
     entityId,
     parentCollectionSlugs,
     parentEntityIds,
@@ -7682,7 +7757,7 @@ function EntityEditViewInner({
     formContext,
     openEntityMode: layout,
     disabled: false
-  };
+  }), [entityId, parentCollectionSlugs, parentEntityIds, path, status, collection, context, formContext, layout]);
   const pluginActionsTop = useSlot("form.actions.top", formActionTopProps);
   const defaultSelectedView = useMemo(() => resolveDefaultSelectedView(collection ? collection.defaultSelectedView : void 0, {
     status,
@@ -7709,18 +7784,15 @@ function EntityEditViewInner({
   } = resolvedSelectedEntityView(customViews, customizationController, selectedTab);
   const actionsAtTheBottom = layout === "side_panel" || selectedEntityView?.includeActions === "bottom";
   const mainViewVisible = selectedTab === MAIN_TAB_VALUE || Boolean(selectedSecondaryForm);
-  const customViewsView = customViews && resolvedEntityViews.filter((e) => !e.includeActions).map((customView) => {
-    if (!customView) return null;
-    const Builder = customView.Builder;
-    if (!Builder) {
-      console.error("INTERNAL: customView.Builder is not defined");
-      return null;
-    }
-    if (!entityId) {
-      return null;
-    }
+  const mountedTabsRef = useRef(/* @__PURE__ */ new Set());
+  if (selectedTab) {
+    mountedTabsRef.current.add(selectedTab);
+  }
+  const readOnlyFormContext = useMemo(() => {
+    if (formContext) return void 0;
+    if (!entityId) return void 0;
     const formexStub = createFormexStub(usedEntity?.values ?? {});
-    const usedFormContext = formContext ?? {
+    return {
       entityId,
       disabled: false,
       openEntityMode: layout,
@@ -7738,17 +7810,34 @@ function EntityEditViewInner({
       savingError: void 0,
       formex: formexStub
     };
+  }, [formContext, entityId, layout, status, usedEntity, collection, path]);
+  const nonActionCustomViews = useMemo(() => resolvedEntityViews.filter((e) => !e.includeActions), [resolvedEntityViews]);
+  const customViewsView = customViews && nonActionCustomViews.map((customView) => {
+    if (!customView) return null;
+    const Builder = resolveComponentRef(customView.Builder);
+    if (!Builder) {
+      console.error("INTERNAL: customView.Builder is not defined or could not be resolved");
+      return null;
+    }
+    if (!entityId) {
+      return null;
+    }
+    const isActive = selectedTab === customView.key;
+    const hasBeenMounted = mountedTabsRef.current.has(customView.key);
+    if (!isActive && !hasBeenMounted) {
+      return null;
+    }
+    const usedFormContext = formContext ?? readOnlyFormContext;
     return /* @__PURE__ */ jsx("div", { className: cls(defaultBorderMixin, "relative flex-1 w-full h-full overflow-auto", {
-      "hidden": selectedTab !== customView.key
-    }), role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: usedFormContext && /* @__PURE__ */ jsx(Builder, { collection, parentCollectionSlugs, parentEntityIds, entity: usedEntity, modifiedValues: usedFormContext?.formex?.values ?? usedEntity?.values, formContext: usedFormContext }) }) }, `custom_view_${customView.key}`);
+      "hidden": !isActive
+    }), role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: usedFormContext && /* @__PURE__ */ jsx(Builder, { collection, parentCollectionSlugs, parentEntityIds, entity: usedEntity, modifiedValues: usedFormContext?.formex?.values ?? usedEntity?.values, formContext: usedFormContext }) }) }) }, `custom_view_${customView.key}`);
   }).filter(Boolean);
   const globalLoading = dataLoading && !usedEntity || canEdit === void 0 && (status === "existing" || status === "copy");
-  const jsonView = /* @__PURE__ */ jsx("div", { className: cls("relative flex-1 h-full overflow-auto w-full", {
+  const jsonTabMounted = mountedTabsRef.current.has(JSON_TAB_VALUE);
+  const jsonView = selectedTab === JSON_TAB_VALUE || jsonTabMounted ? /* @__PURE__ */ jsx("div", { className: cls("relative flex-1 h-full overflow-auto w-full", {
     "hidden": selectedTab !== JSON_TAB_VALUE
-  }), role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityJsonPreview, { values: formContext?.values ?? entity?.values ?? {} }) }) }, "json_view");
-  const historyView = includeHistoryView ? /* @__PURE__ */ jsx("div", { className: cls("relative flex-1 h-full overflow-auto w-full", {
-    "hidden": selectedTab !== HISTORY_TAB_VALUE
-  }), role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: /* @__PURE__ */ jsx(EntityHistoryView, { collection, entity: usedEntity, formContext, modifiedValues: formContext?.values ?? usedEntity?.values }) }) }) }, "history_view") : null;
+  }), role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityJsonPreview, { values: formContext?.values ?? entity?.values ?? {} }) }) }, "json_view") : null;
+  const historyView = includeHistoryView && selectedTab === HISTORY_TAB_VALUE ? /* @__PURE__ */ jsx("div", { className: "relative flex-1 h-full overflow-auto w-full", role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: /* @__PURE__ */ jsx(EntityHistoryView, { collection, entity: usedEntity, formContext, modifiedValues: formContext?.values ?? usedEntity?.values }) }) }) }, "history_view") : null;
   const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
     const subcollectionId = subcollection.slug;
     const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.slug)}` : void 0;
@@ -7758,7 +7847,7 @@ function EntityEditViewInner({
       !globalLoading && (usedEntity && newFullPath ? /* @__PURE__ */ jsx(EntityCollectionView, { path: newFullPath, parentCollectionSlugs: [...parentCollectionSlugs, collection.slug], parentEntityIds: [...parentEntityIds, String(usedEntity?.id)], updateUrl: false, ...subcollection, openEntityMode: layout }) : /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center w-full h-full p-3", children: /* @__PURE__ */ jsx(Typography, { variant: "label", children: "You need to save your entity before adding additional collections" }) }))
     ] }, `subcol_${subcollectionId}`);
   }).filter(Boolean);
-  const onSideTabClick = (value_0) => {
+  const onSideTabClick = useCallback((value_0) => {
     setSelectedTab(value_0);
     if (status === "existing") {
       onTabChange?.({
@@ -7768,7 +7857,7 @@ function EntityEditViewInner({
         collection
       });
     }
-  };
+  }, [status, onTabChange, path, entityId, collection]);
   const entityReadOnlyView = !canEdit && entity ? /* @__PURE__ */ jsx("div", { className: cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", canEdit || !mainViewVisible || selectedSecondaryForm ? "hidden" : ""), children: /* @__PURE__ */ jsxs("div", { className: cls("relative flex flex-col max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-6xl w-full h-fit"), children: [
     /* @__PURE__ */ jsx(Typography, { className: "mt-16 mb-8 mx-8", variant: "h4", children: collection.singularName ?? collection.name }),
     /* @__PURE__ */ jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection }),
@@ -7790,7 +7879,7 @@ function EntityEditViewInner({
     };
     onSaved?.(res);
     formProps?.onSaved?.(res);
-  }, Builder: selectedSecondaryForm?.Builder });
+  }, Builder: resolveComponentRef(selectedSecondaryForm?.Builder) });
   const subcollectionTabs = subcollections && subcollections.map((subcollection_0) => /* @__PURE__ */ jsx(Tab, { className: "text-sm min-w-[90px]", value: subcollection_0.slug, children: subcollection_0.name }, `entity_detail_collection_tab_${subcollection_0.name}`));
   const customViewTabsStart = resolvedEntityViews.filter((view) => view.position === "start").map((view_0) => /* @__PURE__ */ jsx(Tab, { className: !view_0.tabComponent ? "text-sm min-w-[90px]" : void 0, value: view_0.key, children: view_0.tabComponent ?? view_0.name }, `entity_detail_collection_tab_${view_0.name}`));
   const customViewTabsEnd = resolvedEntityViews.filter((view_1) => !view_1.position || view_1.position === "end").map((view_2) => /* @__PURE__ */ jsx(Tab, { className: !view_2.tabComponent ? "text-sm min-w-[90px]" : void 0, value: view_2.key, children: view_2.tabComponent ?? view_2.name }, `entity_detail_collection_tab_${view_2.name}`));
@@ -7799,29 +7888,6 @@ function EntityEditViewInner({
     const entityUrl = urlController.buildUrlCollectionPath(`${path}/${entityId}`);
     navigate(`${entityUrl}#full`);
   }, children: /* @__PURE__ */ jsx(Maximize2Icon, { size: iconSize.smallest }) }) }) : null;
-  const subcollectionContextTitle = useMemo(() => {
-    if (selectedTab === MAIN_TAB_VALUE || selectedTab === JSON_TAB_VALUE || selectedTab === HISTORY_TAB_VALUE) {
-      return null;
-    }
-    const matchedSubcollection = subcollections.find((sc) => sc.slug === selectedTab);
-    if (!matchedSubcollection) {
-      return null;
-    }
-    const isCustomView = resolvedEntityViews.some((v) => v.key === selectedTab);
-    if (isCustomView) {
-      return null;
-    }
-    const titleKey = getEntityTitlePropertyKey(collection, customizationController.propertyConfigs);
-    const entityValues = usedEntity?.values;
-    if (!titleKey || !entityValues) {
-      return matchedSubcollection.name;
-    }
-    const titleValue = entityValues[titleKey];
-    if (!titleValue || typeof titleValue !== "string") {
-      return matchedSubcollection.name;
-    }
-    return `${matchedSubcollection.name} of ${titleValue}`;
-  }, [selectedTab, subcollections, resolvedEntityViews, collection, customizationController.propertyConfigs, usedEntity?.values]);
   let result = /* @__PURE__ */ jsxs("div", { className: "relative flex flex-col h-full w-full bg-white dark:bg-surface-800", children: [
     shouldShowTopBar && /* @__PURE__ */ jsxs("div", { className: cls("h-[52px] items-center flex overflow-hidden w-full border-b pl-2 pr-2 flex bg-surface-50 dark:bg-surface-900", defaultBorderMixin), children: [
       fullScreenButton,
@@ -7831,7 +7897,6 @@ function EntityEditViewInner({
         values: formContext?.values ?? usedEntity?.values ?? {},
         status
       }),
-      subcollectionContextTitle && /* @__PURE__ */ jsx(Typography, { variant: "label", className: "truncate min-w-0 shrink ml-2 text-surface-600 dark:text-surface-400", children: subcollectionContextTitle }),
       pluginActionsTop,
       hasAdditionalViews && /* @__PURE__ */ jsx("div", { className: "flex-1 flex justify-end min-w-0 shrink-0", children: /* @__PURE__ */ jsxs(Tabs, { className: "!w-fit max-w-full", value: selectedTab, onValueChange: (value_1) => {
         onSideTabClick(value_1);
@@ -7972,7 +8037,7 @@ function EntitySidePanel(props) {
     close
   } = useSideDialogContext();
   const navigate = useNavigate();
-  useLocation();
+  const location = useLocation();
   const sideEntityController = useSideEntityController();
   const collectionRegistryController = useCollectionRegistryController();
   const sideDialogsController = useSideDialogContext();
@@ -8047,13 +8112,15 @@ function EntitySidePanel(props) {
     selectedTab,
     collection: collection_0
   }) => {
-    sideEntityController.replace({
-      path,
-      entityId: entityId_0,
-      selectedTab,
-      updateUrl: true,
-      collection: collection_0
-    });
+    if (entityId_0) {
+      const collectionPath = removeInitialAndTrailingSlashes(path);
+      const tabSuffix = selectedTab ? "/" + selectedTab : "";
+      const fullUrl = urlController.buildUrlCollectionPath(`${collectionPath}/${entityId_0}${tabSuffix}#side`);
+      navigate(fullUrl, {
+        replace: true,
+        state: location.state
+      });
+    }
   }, formProps }) }) });
 }
 const NEW_URL_HASH = "new_side";
@@ -8546,7 +8613,7 @@ function getGroup(collectionOrView) {
   if (!trimmed || trimmed === "") {
     return NAVIGATION_DEFAULT_GROUP_NAME;
   }
-  return trimmed ?? NAVIGATION_DEFAULT_GROUP_NAME;
+  return trimmed;
 }
 function computeNavigationGroups({
   navigationGroupMappings,
@@ -8742,10 +8809,10 @@ function viewSlugsEqual(a, b) {
   }
   return true;
 }
-const UsersView$1 = lazy(() => import("./UsersView-BM2_7VPV.js").then((m) => ({
+const UsersView$1 = lazy(() => import("./UsersView-BkeblMVT.js").then((m) => ({
   default: m.UsersView
 })));
-const RolesView$1 = lazy(() => import("./RolesView-B0E7L0hE.js").then((m) => ({
+const RolesView$1 = lazy(() => import("./RolesView-CMPsaIXo.js").then((m) => ({
   default: m.RolesView
 })));
 function useResolvedViews(props) {
@@ -8797,7 +8864,6 @@ function useResolvedViews(props) {
       views.push({
         slug: "users",
         name: "Users",
-        group: NAVIGATION_ADMIN_GROUP_NAME,
         icon: "Headset",
         view: usersViewElement
       });
@@ -8805,7 +8871,6 @@ function useResolvedViews(props) {
         views.push({
           slug: "roles",
           name: "Roles",
-          group: NAVIGATION_ADMIN_GROUP_NAME,
           icon: "Shield",
           view: rolesViewElement
         });
@@ -8949,7 +9014,7 @@ function useTopLevelNavigation(props) {
     }, []), ...(adminViews ?? []).reduce((acc_1, adminView) => {
       if (adminView.hideFromNavigation) return acc_1;
       const pathKey_1 = adminView.slug;
-      let groupName_1 = adminView.group?.trim() || NAVIGATION_ADMIN_GROUP_NAME;
+      let groupName_1 = NAVIGATION_ADMIN_GROUP_NAME;
       if (finalNavigationGroupMappings) {
         for (const pluginGroupDef_1 of finalNavigationGroupMappings) {
           if (pluginGroupDef_1.entries.includes(pathKey_1)) {
@@ -9779,6 +9844,7 @@ function navigateToEntity({
   copy,
   path,
   selectedTab,
+  defaultValues,
   sideEntityController,
   onClose,
   navigation
@@ -9791,7 +9857,8 @@ function navigateToEntity({
       selectedTab,
       collection,
       updateUrl: true,
-      onClose
+      onClose,
+      defaultValues
     });
   } else {
     let to = navigation.buildUrlCollectionPath(entityId ? `${path ?? path}/${entityId}` : path ?? path);
@@ -9808,7 +9875,11 @@ function navigateToEntity({
     if (copy) {
       to += "#copy";
     }
-    navigation.navigate(to);
+    navigation.navigate(to, defaultValues ? {
+      state: {
+        defaultValues
+      }
+    } : void 0);
   }
 }
 function FieldCaption(t0) {
@@ -10427,8 +10498,9 @@ function PropertyFieldBindingInternal(t0) {
           Component = ReadOnlyFieldBinding;
         } else {
           if (resolvedProperty.ui?.Field) {
-            if (typeof resolvedProperty.ui?.Field === "function") {
-              Component = resolvedProperty.ui?.Field;
+            const resolved = resolveComponentRef(resolvedProperty.ui.Field);
+            if (resolved) {
+              Component = resolved;
             }
           } else {
             const propertyConfig = getFieldConfig(resolvedProperty, customizationController.propertyConfigs);
@@ -10452,7 +10524,7 @@ function PropertyFieldBindingInternal(t0) {
               index,
               authController
             });
-            Component = configProperty?.ui?.Field;
+            Component = resolveComponentRef(configProperty?.ui?.Field);
           }
         }
       }
@@ -10574,7 +10646,7 @@ function FieldInternal({
     onPropertyChange
   };
   return /* @__PURE__ */ jsxs(ErrorBoundary, { children: [
-    /* @__PURE__ */ jsx(UsedComponent, { ...cmsFieldProps }),
+    /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(UsedComponent, { ...cmsFieldProps }) }),
     underlyingValueHasChanged && !isSubmitting && /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "ml-3.5", children: "This value has been updated elsewhere" })
   ] });
 }
@@ -15021,10 +15093,10 @@ function getFieldConfig(property, propertyConfigs) {
 }
 function getDefaultFieldId(property) {
   if (property.type === "string") {
-    if (property.ui?.multiline) {
-      return "multiline";
-    } else if (property.ui?.markdown) {
+    if (property.ui?.markdown) {
       return "markdown";
+    } else if (property.ui?.multiline) {
+      return "multiline";
     } else if (property.storage) {
       return "file_upload";
     } else if (property.ui?.url) {
@@ -16224,12 +16296,11 @@ function useCollectionEditorDialogsState() {
 const ConfigControllerContext = React__default.createContext({});
 const CollectionEditorContext = React__default.createContext({});
 const ConfigControllerProvider = React__default.memo(function ConfigControllerProvider2(t0) {
-  const $ = c(86);
+  const $ = c(85);
   const {
     children,
     collectionConfigController,
     configPermissions,
-    reservedGroups,
     collectionInference,
     extraView,
     getUser,
@@ -16439,14 +16510,13 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
       t92 = $[20];
     }
     let t102;
-    if ($[21] !== collectionConfigController || $[22] !== collectionInference || $[23] !== currentDialog || $[24] !== extraView || $[25] !== generateCollection || $[26] !== getData || $[27] !== getUser || $[28] !== onAnalyticsEvent || $[29] !== onFetchTableMetadata || $[30] !== reservedGroups || $[31] !== t92 || $[32] !== unmappedTables) {
+    if ($[21] !== collectionConfigController || $[22] !== collectionInference || $[23] !== currentDialog || $[24] !== extraView || $[25] !== generateCollection || $[26] !== getData || $[27] !== getUser || $[28] !== onAnalyticsEvent || $[29] !== onFetchTableMetadata || $[30] !== t92 || $[31] !== unmappedTables) {
       t102 = {
         open: true,
         configController: collectionConfigController,
         collectionInference,
         ...currentDialog,
         getData,
-        reservedGroups,
         extraView,
         getUser,
         generateCollection,
@@ -16464,12 +16534,11 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
       $[27] = getUser;
       $[28] = onAnalyticsEvent;
       $[29] = onFetchTableMetadata;
-      $[30] = reservedGroups;
-      $[31] = t92;
-      $[32] = unmappedTables;
-      $[33] = t102;
+      $[30] = t92;
+      $[31] = unmappedTables;
+      $[32] = t102;
     } else {
-      t102 = $[33];
+      t102 = $[32];
     }
     t8 = t102;
   }
@@ -16484,7 +16553,7 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
     const t112 = !currentPropertyDialog.propertyKey;
     const t122 = !currentPropertyDialog.propertyKey;
     let t132;
-    if ($[34] !== currentPropertyDialog.editedCollectionId || $[35] !== currentPropertyDialog.existingEntities || $[36] !== getData || $[37] !== urlController) {
+    if ($[33] !== currentPropertyDialog.editedCollectionId || $[34] !== currentPropertyDialog.existingEntities || $[35] !== getData || $[36] !== urlController) {
       t132 = currentPropertyDialog.existingEntities || getData && currentPropertyDialog.editedCollectionId ? async () => {
         let data = [];
         if (currentPropertyDialog.existingEntities) {
@@ -16498,16 +16567,16 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
         }
         return data;
       } : void 0;
-      $[34] = currentPropertyDialog.editedCollectionId;
-      $[35] = currentPropertyDialog.existingEntities;
-      $[36] = getData;
-      $[37] = urlController;
-      $[38] = t132;
+      $[33] = currentPropertyDialog.editedCollectionId;
+      $[34] = currentPropertyDialog.existingEntities;
+      $[35] = getData;
+      $[36] = urlController;
+      $[37] = t132;
     } else {
-      t132 = $[38];
+      t132 = $[37];
     }
     let t142;
-    if ($[39] !== collectionConfigController || $[40] !== currentPropertyDialog || $[41] !== snackbarController) {
+    if ($[38] !== collectionConfigController || $[39] !== currentPropertyDialog || $[40] !== snackbarController) {
       t142 = (t153) => {
         const {
           id: id_0,
@@ -16536,15 +16605,15 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
           return false;
         });
       };
-      $[39] = collectionConfigController;
-      $[40] = currentPropertyDialog;
-      $[41] = snackbarController;
-      $[42] = t142;
+      $[38] = collectionConfigController;
+      $[39] = currentPropertyDialog;
+      $[40] = snackbarController;
+      $[41] = t142;
     } else {
-      t142 = $[42];
+      t142 = $[41];
     }
     let t152;
-    if ($[43] !== collectionConfigController || $[44] !== currentPropertyDialog.currentPropertiesOrder || $[45] !== currentPropertyDialog.editedCollectionId || $[46] !== currentPropertyDialog.namespace || $[47] !== currentPropertyDialog.parentCollectionSlugs || $[48] !== currentPropertyDialog.propertyKey || $[49] !== snackbarController) {
+    if ($[42] !== collectionConfigController || $[43] !== currentPropertyDialog.currentPropertiesOrder || $[44] !== currentPropertyDialog.editedCollectionId || $[45] !== currentPropertyDialog.namespace || $[46] !== currentPropertyDialog.parentCollectionSlugs || $[47] !== currentPropertyDialog.propertyKey || $[48] !== snackbarController) {
       t152 = () => {
         if (!currentPropertyDialog.propertyKey) {
           return;
@@ -16567,21 +16636,21 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
           return false;
         });
       };
-      $[43] = collectionConfigController;
-      $[44] = currentPropertyDialog.currentPropertiesOrder;
-      $[45] = currentPropertyDialog.editedCollectionId;
-      $[46] = currentPropertyDialog.namespace;
-      $[47] = currentPropertyDialog.parentCollectionSlugs;
-      $[48] = currentPropertyDialog.propertyKey;
-      $[49] = snackbarController;
-      $[50] = t152;
+      $[42] = collectionConfigController;
+      $[43] = currentPropertyDialog.currentPropertiesOrder;
+      $[44] = currentPropertyDialog.editedCollectionId;
+      $[45] = currentPropertyDialog.namespace;
+      $[46] = currentPropertyDialog.parentCollectionSlugs;
+      $[47] = currentPropertyDialog.propertyKey;
+      $[48] = snackbarController;
+      $[49] = t152;
     } else {
-      t152 = $[50];
+      t152 = $[49];
     }
     let t162;
     let t172;
     let t18;
-    if ($[51] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    if ($[50] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t162 = () => {
         setCurrentPropertyDialog(void 0);
       };
@@ -16589,24 +16658,24 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
         setCurrentPropertyDialog(void 0);
       };
       t18 = {};
-      $[51] = t162;
-      $[52] = t172;
-      $[53] = t18;
+      $[50] = t162;
+      $[51] = t172;
+      $[52] = t18;
     } else {
-      t162 = $[51];
-      t172 = $[52];
-      t18 = $[53];
+      t162 = $[50];
+      t172 = $[51];
+      t18 = $[52];
     }
     let t19;
-    if ($[54] !== currentPropertyDialog.collection) {
+    if ($[53] !== currentPropertyDialog.collection) {
       t19 = currentPropertyDialog.collection?.properties ? Object.keys(currentPropertyDialog.collection.properties) : [];
-      $[54] = currentPropertyDialog.collection;
-      $[55] = t19;
+      $[53] = currentPropertyDialog.collection;
+      $[54] = t19;
     } else {
-      t19 = $[55];
+      t19 = $[54];
     }
     let t20;
-    if ($[56] !== currentPropertyDialog.property || $[57] !== currentPropertyDialog.propertyKey || $[58] !== propertyConfigs || $[59] !== t102 || $[60] !== t112 || $[61] !== t122 || $[62] !== t132 || $[63] !== t142 || $[64] !== t152 || $[65] !== t19) {
+    if ($[55] !== currentPropertyDialog.property || $[56] !== currentPropertyDialog.propertyKey || $[57] !== propertyConfigs || $[58] !== t102 || $[59] !== t112 || $[60] !== t122 || $[61] !== t132 || $[62] !== t142 || $[63] !== t152 || $[64] !== t19) {
       t20 = {
         open: true,
         includeIdAndName: true,
@@ -16629,42 +16698,42 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
         property: currentPropertyDialog.property,
         propertyKey: currentPropertyDialog.propertyKey
       };
-      $[56] = currentPropertyDialog.property;
-      $[57] = currentPropertyDialog.propertyKey;
-      $[58] = propertyConfigs;
-      $[59] = t102;
-      $[60] = t112;
-      $[61] = t122;
-      $[62] = t132;
-      $[63] = t142;
-      $[64] = t152;
-      $[65] = t19;
-      $[66] = t20;
+      $[55] = currentPropertyDialog.property;
+      $[56] = currentPropertyDialog.propertyKey;
+      $[57] = propertyConfigs;
+      $[58] = t102;
+      $[59] = t112;
+      $[60] = t122;
+      $[61] = t132;
+      $[62] = t142;
+      $[63] = t152;
+      $[64] = t19;
+      $[65] = t20;
     } else {
-      t20 = $[66];
+      t20 = $[65];
     }
     t9 = t20;
   }
   const propertyDialogProps = t9;
   let t10;
   let t11;
-  if ($[67] !== collectionDialogProps || $[68] !== propertyDialogProps) {
+  if ($[66] !== collectionDialogProps || $[67] !== propertyDialogProps) {
     t11 = {
       collectionDialogProps,
       propertyDialogProps
     };
-    $[67] = collectionDialogProps;
-    $[68] = propertyDialogProps;
-    $[69] = t11;
+    $[66] = collectionDialogProps;
+    $[67] = propertyDialogProps;
+    $[68] = t11;
   } else {
-    t11 = $[69];
+    t11 = $[68];
   }
   t10 = t11;
   const dialogsState = t10;
   let t12;
   const t13 = configPermissions ?? defaultConfigPermissions;
   let t14;
-  if ($[70] !== collectionConfigController || $[71] !== createCollection || $[72] !== editCollection || $[73] !== editProperty || $[74] !== pathSuggestions || $[75] !== t13) {
+  if ($[69] !== collectionConfigController || $[70] !== createCollection || $[71] !== editCollection || $[72] !== editProperty || $[73] !== pathSuggestions || $[74] !== t13) {
     t14 = {
       editCollection,
       createCollection,
@@ -16673,44 +16742,44 @@ const ConfigControllerProvider = React__default.memo(function ConfigControllerPr
       pathSuggestions,
       configController: collectionConfigController
     };
-    $[70] = collectionConfigController;
-    $[71] = createCollection;
-    $[72] = editCollection;
-    $[73] = editProperty;
-    $[74] = pathSuggestions;
-    $[75] = t13;
-    $[76] = t14;
+    $[69] = collectionConfigController;
+    $[70] = createCollection;
+    $[71] = editCollection;
+    $[72] = editProperty;
+    $[73] = pathSuggestions;
+    $[74] = t13;
+    $[75] = t14;
   } else {
-    t14 = $[76];
+    t14 = $[75];
   }
   t12 = t14;
   const collectionEditorContextValue = t12;
   let t15;
-  if ($[77] !== children || $[78] !== dialogsState) {
+  if ($[76] !== children || $[77] !== dialogsState) {
     t15 = /* @__PURE__ */ jsx(CollectionEditorDialogsContext.Provider, { value: dialogsState, children });
-    $[77] = children;
-    $[78] = dialogsState;
-    $[79] = t15;
+    $[76] = children;
+    $[77] = dialogsState;
+    $[78] = t15;
   } else {
-    t15 = $[79];
+    t15 = $[78];
   }
   let t16;
-  if ($[80] !== collectionEditorContextValue || $[81] !== t15) {
+  if ($[79] !== collectionEditorContextValue || $[80] !== t15) {
     t16 = /* @__PURE__ */ jsx(CollectionEditorContext.Provider, { value: collectionEditorContextValue, children: t15 });
-    $[80] = collectionEditorContextValue;
-    $[81] = t15;
-    $[82] = t16;
+    $[79] = collectionEditorContextValue;
+    $[80] = t15;
+    $[81] = t16;
   } else {
-    t16 = $[82];
+    t16 = $[81];
   }
   let t17;
-  if ($[83] !== collectionConfigController || $[84] !== t16) {
+  if ($[82] !== collectionConfigController || $[83] !== t16) {
     t17 = /* @__PURE__ */ jsx(ConfigControllerContext.Provider, { value: collectionConfigController, children: t16 });
-    $[83] = collectionConfigController;
-    $[84] = t16;
-    $[85] = t17;
+    $[82] = collectionConfigController;
+    $[83] = t16;
+    $[84] = t17;
   } else {
-    t17 = $[85];
+    t17 = $[84];
   }
   return t17;
 }, deepEqual);
@@ -16844,14 +16913,14 @@ function EditorCollectionAction(t0) {
   }
   return t9;
 }
-const ImportCollectionAction = lazy(() => import("./index-C9YDsMC9.js").then((m) => ({
+const ImportCollectionAction = lazy(() => import("./index-BuZaHcyc.js").then((m) => ({
   default: m.ImportCollectionAction
 })));
-const ExportCollectionAction = lazy(() => import("./index-DO7lMeNB.js").then((m) => ({
+const ExportCollectionAction = lazy(() => import("./index-eRJbMvHi.js").then((m) => ({
   default: m.ExportCollectionAction
 })));
 function EntityCollectionViewActions(t0) {
-  const $ = c(62);
+  const $ = c(63);
   const {
     collection,
     relativePath,
@@ -16864,7 +16933,8 @@ function EntityCollectionViewActions(t0) {
     tableController,
     collectionEntitiesCount,
     compact,
-    children
+    children,
+    openNewDocument
   } = t0;
   const context = useCMSContext();
   const {
@@ -16944,7 +17014,7 @@ function EntityCollectionViewActions(t0) {
   }
   multipleDeleteButton = t5;
   let t6;
-  if ($[23] !== collection || $[24] !== collectionEntitiesCount || $[25] !== context || $[26] !== parentCollectionSlugs || $[27] !== parentEntityIds || $[28] !== path || $[29] !== relativePath || $[30] !== selectionController || $[31] !== tableController) {
+  if ($[23] !== collection || $[24] !== collectionEntitiesCount || $[25] !== context || $[26] !== openNewDocument || $[27] !== parentCollectionSlugs || $[28] !== parentEntityIds || $[29] !== path || $[30] !== relativePath || $[31] !== selectionController || $[32] !== tableController) {
     t6 = {
       path,
       relativePath,
@@ -16954,82 +17024,90 @@ function EntityCollectionViewActions(t0) {
       selectionController,
       context,
       tableController,
-      collectionEntitiesCount
+      collectionEntitiesCount,
+      openNewDocument
     };
     $[23] = collection;
     $[24] = collectionEntitiesCount;
     $[25] = context;
-    $[26] = parentCollectionSlugs;
-    $[27] = parentEntityIds;
-    $[28] = path;
-    $[29] = relativePath;
-    $[30] = selectionController;
-    $[31] = tableController;
-    $[32] = t6;
+    $[26] = openNewDocument;
+    $[27] = parentCollectionSlugs;
+    $[28] = parentEntityIds;
+    $[29] = path;
+    $[30] = relativePath;
+    $[31] = selectionController;
+    $[32] = tableController;
+    $[33] = t6;
   } else {
-    t6 = $[32];
+    t6 = $[33];
   }
   const actionProps = t6;
   let t7;
-  if ($[33] !== actionProps || $[34] !== collection.Actions) {
+  if ($[34] !== actionProps || $[35] !== collection.Actions) {
     let t82;
-    if ($[36] !== actionProps) {
-      t82 = (Action, i) => /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Action, { ...actionProps }) }, `actions_${i}`);
-      $[36] = actionProps;
-      $[37] = t82;
+    if ($[37] !== actionProps) {
+      t82 = (actionRef, i) => {
+        const Action = resolveComponentRef(actionRef);
+        if (!Action) {
+          return null;
+        }
+        return /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(Action, { ...actionProps }) }) }, `actions_${i}`);
+      };
+      $[37] = actionProps;
+      $[38] = t82;
     } else {
-      t82 = $[37];
+      t82 = $[38];
     }
     t7 = toArray(collection.Actions).map(t82);
-    $[33] = actionProps;
-    $[34] = collection.Actions;
-    $[35] = t7;
+    $[34] = actionProps;
+    $[35] = collection.Actions;
+    $[36] = t7;
   } else {
-    t7 = $[35];
+    t7 = $[36];
   }
   const actions = t7;
   const pluginActions = useSlot("collection.actions", actionProps);
   let t8;
-  if ($[38] !== actions || $[39] !== pluginActions) {
+  if ($[39] !== actions || $[40] !== pluginActions) {
     t8 = /* @__PURE__ */ jsxs(ErrorBoundary, { children: [
       actions,
       pluginActions
     ] });
-    $[38] = actions;
-    $[39] = pluginActions;
-    $[40] = t8;
+    $[39] = actions;
+    $[40] = pluginActions;
+    $[41] = t8;
   } else {
-    t8 = $[40];
+    t8 = $[41];
   }
   const t9 = actionProps;
   let t10;
-  if ($[41] !== t9) {
+  if ($[42] !== t9) {
     t10 = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(ImportCollectionAction, { ...t9 }) }) });
-    $[41] = t9;
-    $[42] = t10;
+    $[42] = t9;
+    $[43] = t10;
   } else {
-    t10 = $[42];
+    t10 = $[43];
   }
   const t11 = actionProps;
   let t12;
-  if ($[43] !== t11) {
+  if ($[44] !== t11) {
     t12 = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(ExportCollectionAction, { ...t11 }) }) });
-    $[43] = t11;
-    $[44] = t12;
+    $[44] = t11;
+    $[45] = t12;
   } else {
-    t12 = $[44];
+    t12 = $[45];
   }
   let t13;
-  if ($[45] !== actionProps || $[46] !== hasCollectionEditor) {
+  if ($[46] !== actionProps || $[47] !== hasCollectionEditor) {
     t13 = hasCollectionEditor && /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EditorCollectionAction, { ...actionProps }) });
-    $[45] = actionProps;
-    $[46] = hasCollectionEditor;
-    $[47] = t13;
+    $[46] = actionProps;
+    $[47] = hasCollectionEditor;
+    $[48] = t13;
   } else {
-    t13 = $[47];
+    t13 = $[48];
   }
   let t14;
-  if ($[48] !== children || $[49] !== t10 || $[50] !== t12 || $[51] !== t13 || $[52] !== t8) {
+  if ($[49] !== children || $[50] !== t10 || $[51] !== t12 || $[52] !== t13 || $[53] !== t8) {
     t14 = /* @__PURE__ */ jsxs(Fragment, { children: [
       children,
       t8,
@@ -17037,40 +17115,40 @@ function EntityCollectionViewActions(t0) {
       t12,
       t13
     ] });
-    $[48] = children;
-    $[49] = t10;
-    $[50] = t12;
-    $[51] = t13;
-    $[52] = t8;
-    $[53] = t14;
+    $[49] = children;
+    $[50] = t10;
+    $[51] = t12;
+    $[52] = t13;
+    $[53] = t8;
+    $[54] = t14;
   } else {
-    t14 = $[53];
+    t14 = $[54];
   }
   const secondaryActions = t14;
   const [overflowOpen, setOverflowOpen] = React__default.useState(false);
   let t15;
-  if ($[54] !== compact || $[55] !== overflowOpen || $[56] !== secondaryActions) {
+  if ($[55] !== compact || $[56] !== overflowOpen || $[57] !== secondaryActions) {
     t15 = !compact ? secondaryActions : /* @__PURE__ */ jsx(Popover, { open: overflowOpen, onOpenChange: setOverflowOpen, trigger: /* @__PURE__ */ jsx(IconButton, { size: "small", children: /* @__PURE__ */ jsx(MoreVerticalIcon, { size: iconSize.smallest }) }), children: /* @__PURE__ */ jsx("div", { className: "flex flex-row items-center gap-1 p-2", children: secondaryActions }) });
-    $[54] = compact;
-    $[55] = overflowOpen;
-    $[56] = secondaryActions;
-    $[57] = t15;
+    $[55] = compact;
+    $[56] = overflowOpen;
+    $[57] = secondaryActions;
+    $[58] = t15;
   } else {
-    t15 = $[57];
+    t15 = $[58];
   }
   let t16;
-  if ($[58] !== addButton || $[59] !== multipleDeleteButton || $[60] !== t15) {
+  if ($[59] !== addButton || $[60] !== multipleDeleteButton || $[61] !== t15) {
     t16 = /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
       t15,
       multipleDeleteButton,
       addButton
     ] });
-    $[58] = addButton;
-    $[59] = multipleDeleteButton;
-    $[60] = t15;
-    $[61] = t16;
+    $[59] = addButton;
+    $[60] = multipleDeleteButton;
+    $[61] = t15;
+    $[62] = t16;
   } else {
-    t16 = $[61];
+    t16 = $[62];
   }
   return t16;
 }
@@ -17078,11 +17156,33 @@ function resolveCollectionSlotKeys(collection, authController, propertyConfigs)
   const titleKey = getEntityTitlePropertyKey(collection);
   const imageKey = getEntityImagePreviewPropertyKey(collection);
   let statusKey;
-  for (const [key, prop] of Object.entries(collection.properties)) {
-    const p = prop;
-    if (p.type === "string" && "enum" in p && p.enum && key !== titleKey) {
-      statusKey = key;
-      break;
+  if (!statusKey && collection.previewProperties) {
+    for (const key of collection.previewProperties) {
+      const p = collection.properties[key];
+      if (p?.type === "string" && "enum" in p && p.enum && key !== titleKey) {
+        statusKey = key;
+        break;
+      }
+    }
+  }
+  if (!statusKey && collection.propertiesOrder) {
+    for (const key of collection.propertiesOrder) {
+      if (typeof key === "string" && !key.startsWith("subcollection:")) {
+        const p = collection.properties[key];
+        if (p?.type === "string" && "enum" in p && p.enum && key !== titleKey) {
+          statusKey = key;
+          break;
+        }
+      }
+    }
+  }
+  if (!statusKey) {
+    for (const [key, prop] of Object.entries(collection.properties)) {
+      const p = prop;
+      if (p.type === "string" && "enum" in p && p.enum && key !== titleKey) {
+        statusKey = key;
+        break;
+      }
     }
   }
   let dateKey;
@@ -17365,7 +17465,7 @@ function EntityCard({
   const handleSelectionChange = (checked) => {
     onSelectionChange?.(entity, checked);
   };
-  return /* @__PURE__ */ jsxs(Card, { className: cls("cursor-pointer overflow-hidden group relative", "transition-all duration-200", "hover:shadow-lg hover:-translate-y-0.5", selected && "ring-2 ring-primary", highlighted && !selected && "ring-2 ring-primary ring-opacity-50"), onClick: handleClick, children: [
+  return /* @__PURE__ */ jsxs(Card, { className: cls("cursor-pointer overflow-hidden group relative", "transition-all duration-200", "hover:shadow-lg hover:-translate-y-0.5", selected && "ring-2 ring-primary bg-surface-accent-50 dark:bg-surface-accent-900", highlighted && !selected && "ring-2 ring-primary ring-opacity-50 bg-surface-accent-50/50 dark:bg-surface-accent-900"), onClick: handleClick, children: [
     /* @__PURE__ */ jsxs("div", { className: "aspect-[4/3] relative overflow-hidden bg-surface-100 dark:bg-surface-900", children: [
       slots.image ? /* @__PURE__ */ jsx("div", { className: "w-full h-full", children: /* @__PURE__ */ jsx(PropertyPreview, { property: slots.image.property, propertyKey: slots.image.propertyKey, size: "medium", value: slots.image.value, fill: true }) }) : /* @__PURE__ */ jsx("div", { className: "w-full h-full flex items-center justify-center", children: /* @__PURE__ */ jsx(IconForView, { collectionOrView: collection, color: "disabled" }) }),
       /* @__PURE__ */ jsx("div", { className: cls("absolute inset-0 bg-black/0 group-hover:bg-black/10", "transition-colors duration-200") }),
@@ -17507,7 +17607,7 @@ function EntityCollectionCardView({
   return /* @__PURE__ */ jsx("div", { ref: containerRef, className: "flex-1 overflow-auto p-4", children: dataLoadingError ? /* @__PURE__ */ jsx("div", { className: "h-full flex items-center justify-center p-8", children: /* @__PURE__ */ jsxs(Typography, { className: "text-red-500", children: [
     "Error loading data: ",
     dataLoadingError.message
-  ] }) }) : isInitialLoading ? /* @__PURE__ */ jsx(CircularProgressCenter, {}) : isEmpty ? /* @__PURE__ */ jsx("div", { className: "h-full flex items-center justify-center p-8", children: emptyComponent ?? /* @__PURE__ */ jsx(Typography, { variant: "label", color: "secondary", children: "No entries found" }) }) : /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", { className: "max-w-7xl mx-auto", children: [
+  ] }) }) : isInitialLoading ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center py-12 px-8", children: /* @__PURE__ */ jsx(CircularProgress, { size: "small" }) }) : isEmpty ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center py-12 px-8", children: emptyComponent ?? /* @__PURE__ */ jsx(Typography, { variant: "label", color: "secondary", children: "No entries found" }) }) : /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", { className: "max-w-7xl mx-auto", children: [
     /* @__PURE__ */ jsx("div", { className: cls("grid gap-4", gridColumnsClass), children: data.map((entity_3) => /* @__PURE__ */ jsx(EntityCard, { entity: entity_3, collection, onClick: handleEntityClick, selected: isEntitySelected(entity_3), highlighted: isEntityHighlighted(entity_3), onSelectionChange: handleSelectionChange, selectionEnabled, size }, `${entity_3.path}_${entity_3.id}`)) }),
     /* @__PURE__ */ jsxs("div", { ref: loadMoreRef, className: "flex items-center justify-center py-8", children: [
       dataLoading && /* @__PURE__ */ jsx(CircularProgress, { size: "small" }),
@@ -18119,7 +18219,7 @@ function EntityCollectionListView(t0) {
     t22 = /* @__PURE__ */ jsx("div", { ref: containerRef, className: t24, children: dataLoadingError ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center p-8", children: /* @__PURE__ */ jsxs(Typography, { className: "text-red-500", children: [
       "Error loading data: ",
       dataLoadingError.message
-    ] }) }) : isInitialLoading ? /* @__PURE__ */ jsx(CircularProgressCenter, {}) : isEmpty ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center p-8", children: emptyComponent ?? /* @__PURE__ */ jsx(Typography, { variant: "label", color: "secondary", children: "No entries found" }) }) : /* @__PURE__ */ jsxs("div", { style: {
+    ] }) }) : isInitialLoading ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center py-12 px-8", children: /* @__PURE__ */ jsx(CircularProgress, { size: "small" }) }) : isEmpty ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center py-12 px-8", children: emptyComponent ?? /* @__PURE__ */ jsx(Typography, { variant: "label", color: "secondary", children: "No entries found" }) }) : /* @__PURE__ */ jsxs("div", { style: {
       height: totalHeight + footerHeight,
       position: "relative"
     }, children: [
@@ -18259,7 +18359,7 @@ const ListRow = React__default.memo(function ListRow2(t0) {
     const handleCheckboxChange = t6;
     const useColumnMode = !!collection.listProperties && collection.listProperties.length > 0;
     const extraColumns = useColumnMode ? columns.filter(_temp5) : [];
-    const t7 = isActive ? "bg-surface-accent-100 dark:bg-surface-accent-950 hover:bg-surface-accent-200 dark:hover:bg-surface-accent-900" : selected ? "bg-primary-50 dark:bg-primary-900/20 hover:bg-surface-50 dark:hover:bg-surface-800/40" : highlighted ? "bg-surface-accent-50 dark:bg-surface-accent-950 hover:bg-surface-50 dark:hover:bg-surface-800/40" : "bg-white dark:bg-surface-900 hover:bg-surface-50 dark:hover:bg-surface-800/40";
+    const t7 = isActive ? "bg-surface-accent-100 dark:bg-surface-accent-950 hover:bg-surface-accent-200 dark:hover:bg-surface-accent-950" : selected ? "bg-surface-accent-50 dark:bg-surface-accent-900 hover:bg-surface-accent-100 dark:hover:bg-surface-accent-950" : highlighted ? "bg-surface-accent-50 dark:bg-surface-accent-900 hover:bg-surface-50 dark:hover:bg-surface-800/40" : "bg-white dark:bg-surface-900 hover:bg-surface-50 dark:hover:bg-surface-800/40";
     let t8;
     if ($[24] !== rowClasses || $[25] !== t7) {
       t8 = cls("flex items-center gap-4 cursor-pointer group transition-colors duration-200 relative h-full", rowClasses, t7);
@@ -21444,7 +21544,7 @@ function FiltersDialog({
   ] });
 }
 function EntityCollectionViewStartActions(t0) {
-  const $ = c(44);
+  const $ = c(45);
   const {
     collection,
     relativePath,
@@ -21455,7 +21555,8 @@ function EntityCollectionViewStartActions(t0) {
     tableController,
     collectionEntitiesCount,
     resolvedProperties,
-    compact
+    compact,
+    openNewDocument
   } = t0;
   const context = useCMSContext();
   const largeLayout = useLargeLayout();
@@ -21478,7 +21579,7 @@ function EntityCollectionViewStartActions(t0) {
   }
   const activeFilterCount = t1;
   let t2;
-  if ($[3] !== collection || $[4] !== collectionEntitiesCount || $[5] !== context || $[6] !== parentCollectionSlugs || $[7] !== parentEntityIds || $[8] !== path || $[9] !== relativePath || $[10] !== selectionController || $[11] !== tableController) {
+  if ($[3] !== collection || $[4] !== collectionEntitiesCount || $[5] !== context || $[6] !== openNewDocument || $[7] !== parentCollectionSlugs || $[8] !== parentEntityIds || $[9] !== path || $[10] !== relativePath || $[11] !== selectionController || $[12] !== tableController) {
     t2 = {
       path,
       relativePath,
@@ -21488,24 +21589,26 @@ function EntityCollectionViewStartActions(t0) {
       selectionController,
       context,
       tableController,
-      collectionEntitiesCount
+      collectionEntitiesCount,
+      openNewDocument
     };
     $[3] = collection;
     $[4] = collectionEntitiesCount;
     $[5] = context;
-    $[6] = parentCollectionSlugs;
-    $[7] = parentEntityIds;
-    $[8] = path;
-    $[9] = relativePath;
-    $[10] = selectionController;
-    $[11] = tableController;
-    $[12] = t2;
+    $[6] = openNewDocument;
+    $[7] = parentCollectionSlugs;
+    $[8] = parentEntityIds;
+    $[9] = path;
+    $[10] = relativePath;
+    $[11] = selectionController;
+    $[12] = tableController;
+    $[13] = t2;
   } else {
-    t2 = $[12];
+    t2 = $[13];
   }
   const actionProps = t2;
   let t3;
-  if ($[13] !== navigate || $[14] !== path || $[15] !== urlController) {
+  if ($[14] !== navigate || $[15] !== path || $[16] !== urlController) {
     t3 = () => {
       let collectionUrl = urlController.buildUrlCollectionPath(path);
       const currentViewParam = new URLSearchParams(window.location.search).get("__view");
@@ -21514,88 +21617,88 @@ function EntityCollectionViewStartActions(t0) {
       }
       navigate(collectionUrl);
     };
-    $[13] = navigate;
-    $[14] = path;
-    $[15] = urlController;
-    $[16] = t3;
+    $[14] = navigate;
+    $[15] = path;
+    $[16] = urlController;
+    $[17] = t3;
   } else {
-    t3 = $[16];
+    t3 = $[17];
   }
   const handleBackClick = t3;
   let t4;
-  if ($[17] !== compact || $[18] !== handleBackClick || $[19] !== t) {
+  if ($[18] !== compact || $[19] !== handleBackClick || $[20] !== t) {
     t4 = compact && /* @__PURE__ */ jsx(Tooltip, { title: t("back"), children: /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: handleBackClick, className: "mr-1", children: /* @__PURE__ */ jsx(ArrowLeftIcon, { size: iconSize.small }) }) }, "back_tooltip");
-    $[17] = compact;
-    $[18] = handleBackClick;
-    $[19] = t;
-    $[20] = t4;
+    $[18] = compact;
+    $[19] = handleBackClick;
+    $[20] = t;
+    $[21] = t4;
   } else {
-    t4 = $[20];
+    t4 = $[21];
   }
   const backButton = t4;
   let t5;
-  if ($[21] !== activeFilterCount || $[22] !== compact || $[23] !== largeLayout || $[24] !== resolvedProperties || $[25] !== t || $[26] !== tableController.setFilterValues) {
+  if ($[22] !== activeFilterCount || $[23] !== compact || $[24] !== largeLayout || $[25] !== resolvedProperties || $[26] !== t || $[27] !== tableController.setFilterValues) {
     t5 = resolvedProperties && tableController.setFilterValues && /* @__PURE__ */ jsx(Tooltip, { title: t("filters"), children: /* @__PURE__ */ jsx(Badge, { color: "primary", invisible: activeFilterCount === 0, children: largeLayout && !compact ? /* @__PURE__ */ jsxs(Button, { variant: "text", size: "small", onClick: () => setFiltersDialogOpen(true), startIcon: /* @__PURE__ */ jsx(FilterIcon, { size: iconSize.small }), className: cls(activeFilterCount > 0 && "text-primary"), children: [
       t("filters"),
       activeFilterCount > 0 ? ` (${activeFilterCount})` : ""
-    ] }) : /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: () => setFiltersDialogOpen(true), className: cls(activeFilterCount > 0 && "text-primary"), children: /* @__PURE__ */ jsx(FilterIcon, { size: iconSize.small }) }) }) }, "filters_tooltip");
-    $[21] = activeFilterCount;
-    $[22] = compact;
-    $[23] = largeLayout;
-    $[24] = resolvedProperties;
-    $[25] = t;
-    $[26] = tableController.setFilterValues;
-    $[27] = t5;
+    ] }) : /* @__PURE__ */ jsx(Button, { variant: "text", size: "small", onClick: () => setFiltersDialogOpen(true), className: cls(activeFilterCount > 0 && "text-primary"), children: /* @__PURE__ */ jsx(FilterIcon, { size: iconSize.small }) }) }) }, "filters_tooltip");
+    $[22] = activeFilterCount;
+    $[23] = compact;
+    $[24] = largeLayout;
+    $[25] = resolvedProperties;
+    $[26] = t;
+    $[27] = tableController.setFilterValues;
+    $[28] = t5;
   } else {
-    t5 = $[27];
+    t5 = $[28];
   }
   const filtersButton = t5;
   const t6 = !collection.fixedFilter;
   let t7;
-  if ($[28] !== t6 || $[29] !== tableController) {
+  if ($[29] !== t6 || $[30] !== tableController) {
     t7 = /* @__PURE__ */ jsx(ClearFilterSortButton, { tableController, enabled: t6 }, "clear_filter");
-    $[28] = t6;
-    $[29] = tableController;
-    $[30] = t7;
+    $[29] = t6;
+    $[30] = tableController;
+    $[31] = t7;
   } else {
-    t7 = $[30];
+    t7 = $[31];
   }
   let t8;
-  if ($[31] !== backButton || $[32] !== filtersButton || $[33] !== t7) {
+  if ($[32] !== backButton || $[33] !== filtersButton || $[34] !== t7) {
     t8 = [backButton, filtersButton, t7];
-    $[31] = backButton;
-    $[32] = filtersButton;
-    $[33] = t7;
-    $[34] = t8;
+    $[32] = backButton;
+    $[33] = filtersButton;
+    $[34] = t7;
+    $[35] = t8;
   } else {
-    t8 = $[34];
+    t8 = $[35];
   }
   const actions = t8;
   const pluginActionsStart = useSlot("collection.actions.start", actionProps);
   let t9;
-  if ($[35] !== collection.fixedFilter || $[36] !== filtersDialogOpen || $[37] !== resolvedProperties || $[38] !== tableController) {
+  if ($[36] !== collection.fixedFilter || $[37] !== filtersDialogOpen || $[38] !== resolvedProperties || $[39] !== tableController) {
     t9 = resolvedProperties && tableController.setFilterValues && /* @__PURE__ */ jsx(FiltersDialog, { open: filtersDialogOpen, onOpenChange: setFiltersDialogOpen, properties: resolvedProperties, filterValues: tableController.filterValues, setFilterValues: (filterValues_0) => tableController.setFilterValues?.(filterValues_0 ?? {}), fixedFilter: collection.fixedFilter });
-    $[35] = collection.fixedFilter;
-    $[36] = filtersDialogOpen;
-    $[37] = resolvedProperties;
-    $[38] = tableController;
-    $[39] = t9;
+    $[36] = collection.fixedFilter;
+    $[37] = filtersDialogOpen;
+    $[38] = resolvedProperties;
+    $[39] = tableController;
+    $[40] = t9;
   } else {
-    t9 = $[39];
+    t9 = $[40];
   }
   let t10;
-  if ($[40] !== actions || $[41] !== pluginActionsStart || $[42] !== t9) {
+  if ($[41] !== actions || $[42] !== pluginActionsStart || $[43] !== t9) {
     t10 = /* @__PURE__ */ jsxs(Fragment, { children: [
       actions,
       pluginActionsStart,
       t9
     ] });
-    $[40] = actions;
-    $[41] = pluginActionsStart;
-    $[42] = t9;
-    $[43] = t10;
+    $[41] = actions;
+    $[42] = pluginActionsStart;
+    $[43] = t9;
+    $[44] = t10;
   } else {
-    t10 = $[43];
+    t10 = $[44];
   }
   return t10;
 }
@@ -21782,6 +21885,22 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
       onClose: unselectNavigatedEntity
     });
   }, [path, sideEntityController]);
+  const openNewDocument = useCallback((defaultValues) => {
+    const collection_3 = collectionRef.current;
+    analyticsController.onAnalyticsEvent?.("new_entity_click", {
+      path
+    });
+    navigateToEntity({
+      openEntityMode,
+      collection: collection_3,
+      entityId: void 0,
+      defaultValues,
+      path,
+      sideEntityController,
+      navigation: urlController,
+      onClose: unselectNavigatedEntity
+    });
+  }, [path, sideEntityController, openEntityMode, urlController, unselectNavigatedEntity]);
   const onMultipleDeleteClick = () => {
     analyticsController.onAnalyticsEvent?.("multiple_delete_dialog_open", {
       path
@@ -21845,8 +21964,8 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     width,
     key
   }) => {
-    const collection_3 = collectionRef.current;
-    if (!getPropertyInPath(collection_3.properties, key)) return;
+    const collection_4 = collectionRef.current;
+    if (!getPropertyInPath(collection_4.properties, key)) return;
     const localCollection = buildPropertyWidthOverwrite(key, width);
     onCollectionModifiedForUser(path, localCollection);
   }, [onCollectionModifiedForUser, path]);
@@ -22050,13 +22169,13 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     propertyKey: propertyKey_0,
     onHover
   }) => {
-    const collection_4 = collectionRef.current;
+    const collection_5 = collectionRef.current;
     const headerSlotProps = {
       property: property_3,
       propertyKey: propertyKey_0,
       onHover,
       path,
-      collection: collection_4,
+      collection: collection_5,
       tableController,
       parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY,
       parentEntityIds: parentEntityIds ?? EMPTY_ARRAY
@@ -22096,15 +22215,18 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     error: tableController.dataLoadingError
   });
   tableController.dataLoadingError && pluginErrorViews.length > 0 ? pluginErrorViews[0] : null;
-  const isFilteredOrSorted = tableController.filterValues !== void 0 || tableController.sortBy !== void 0;
+  const isSearching = !!tableController.searchString;
+  const isFilteredOrSorted = tableController.filterValues !== void 0 || tableController.sortBy !== void 0 || isSearching;
   const emptyComponent = pluginEmptyStates.length > 0 ? /* @__PURE__ */ jsx(Fragment, { children: pluginEmptyStates }) : canCreateEntities && !isFilteredOrSorted ? /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-center justify-center", children: [
     /* @__PURE__ */ jsx(Typography, { variant: "subtitle2", children: t("so_empty") }),
     /* @__PURE__ */ jsxs(Button, { onClick: onNewClick, className: "mt-4", children: [
       /* @__PURE__ */ jsx(PlusIcon, {}),
       t("create_your_first_entry")
     ] })
-  ] }) : /* @__PURE__ */ jsx(Typography, { variant: "label", children: t("no_results_filter_sort") });
-  const toolbarNode = /* @__PURE__ */ jsx(CollectionTableToolbar, { compact: isCompact, loading: tableController.dataLoading, onTextSearch: tableController.setSearchString, viewModeToggle: viewModeToggleElement, actionsStart: /* @__PURE__ */ jsx(EntityCollectionViewStartActions, { parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY, parentEntityIds: parentEntityIds ?? EMPTY_ARRAY, collection, tableController, path, relativePath: collection.slug, selectionController: usedSelectionController, collectionEntitiesCount: docsCount ?? void 0, resolvedProperties: resolvedCollection.properties, compact: isCompact }), actions: /* @__PURE__ */ jsx(EntityCollectionViewActions, { parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY, parentEntityIds: parentEntityIds ?? EMPTY_ARRAY, collection, tableController, onMultipleDeleteClick, onNewClick, path, relativePath: collection.slug, selectionController: usedSelectionController, selectionEnabled: activeSelectionEnabled, collectionEntitiesCount: docsCount ?? void 0, compact: isCompact, children: pluginToolbarWidgets }) });
+  ] }) : /* @__PURE__ */ jsx(Typography, { variant: "label", children: isSearching ? t("no_results_search", {
+    search: tableController.searchString ?? ""
+  }) : t("no_results_filter_sort") });
+  const toolbarNode = /* @__PURE__ */ jsx(CollectionTableToolbar, { compact: isCompact, loading: tableController.dataLoading, onTextSearch: tableController.setSearchString, initialSearchText: tableController.searchString, viewModeToggle: viewModeToggleElement, actionsStart: /* @__PURE__ */ jsx(EntityCollectionViewStartActions, { parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY, parentEntityIds: parentEntityIds ?? EMPTY_ARRAY, collection, tableController, path, relativePath: collection.slug, selectionController: usedSelectionController, collectionEntitiesCount: docsCount ?? void 0, resolvedProperties: resolvedCollection.properties, openNewDocument, compact: isCompact }), actions: /* @__PURE__ */ jsx(EntityCollectionViewActions, { parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY, parentEntityIds: parentEntityIds ?? EMPTY_ARRAY, collection, tableController, onMultipleDeleteClick, onNewClick, openNewDocument, path, relativePath: collection.slug, selectionController: usedSelectionController, selectionEnabled: activeSelectionEnabled, collectionEntitiesCount: docsCount ?? void 0, compact: isCompact, children: pluginToolbarWidgets }) });
   const innerView = viewMode === "kanban" ? /* @__PURE__ */ jsx(EntityCollectionBoardView, { collection, tableController, fullPath: path, parentCollectionSlugs, parentEntityIds, columnProperty: selectedKanbanProperty, onEntityClick, selectionController: usedSelectionController, selectionEnabled, highlightedEntities: highlightedEntity ? [highlightedEntity] : [], deletedEntities, emptyComponent }, `kanban-view-${path}-${selectedKanbanProperty}`) : viewMode === "cards" ? /* @__PURE__ */ jsx(EntityCollectionCardView, { collection, tableController, onEntityClick, selectionController: usedSelectionController, selectionEnabled, highlightedEntities: highlightedEntity ? [highlightedEntity] : [], onScroll: tableController.onScroll, initialScroll: tableController.initialScroll, size: cardSize, emptyComponent }, `cards-view-${path}`) : viewMode === "list" ? /* @__PURE__ */ jsx(EntityCollectionListView, { collection, tableController, onEntityClick, selectionController: usedSelectionController, selectionEnabled, highlightedEntities: highlightedEntity ? [highlightedEntity] : [], size: listSize, emptyComponent }, `list-view-${path}`) : /* @__PURE__ */ jsx(EntityCollectionTable, { hideToolbar: true, additionalFields, tableController, enablePopupIcon: true, displayedColumnIds, onSizeChanged: onTableSizeChanged, onEntityClick, onColumnResize, onValueChange, tableRowActionsBuilder, uniqueFieldValidator, selectionController: usedSelectionController, highlightedEntities: highlightedEntity ? [highlightedEntity] : [], defaultSize: tableSize, properties: resolvedCollection.properties, getPropertyFor, onScroll: tableController.onScroll, initialScroll: tableController.initialScroll, emptyComponent, hoverRow, inlineEditing: checkInlineEditing(), AdditionalHeaderWidget: buildAdditionalHeaderWidget, AddColumnComponent: addColumnComponentInternal, getIdColumnWidth, additionalIDHeaderWidget: /* @__PURE__ */ jsx(EntityIdHeaderWidget, { path, idPath: path, collection }), openEntityMode, onColumnsOrderChange }, `collection_table_${path}`);
   return /* @__PURE__ */ jsxs("div", { className: cls("overflow-hidden h-full w-full rounded-md flex flex-col dark:bg-surface-800", className), ref: containerRef, children: [
     countFetcher,
@@ -22126,6 +22248,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
 }, (a, b) => {
   return deepEqual(a.path, b.path) && deepEqual(a.parentCollectionSlugs, b.parentCollectionSlugs) && deepEqual(a.parentEntityIds, b.parentEntityIds) && deepEqual(a.isSubCollection, b.isSubCollection) && deepEqual(a.className, b.className) && deepEqual(a.properties, b.properties) && deepEqual(a.propertiesOrder, b.propertiesOrder) && deepEqual(a.hideIdFromCollection, b.hideIdFromCollection) && deepEqual(a.inlineEditing, b.inlineEditing) && deepEqual(a.selectionEnabled, b.selectionEnabled) && deepEqual(a.selectionController, b.selectionController) && deepEqual(a.Actions, b.Actions) && deepEqual(a.defaultSize, b.defaultSize) && deepEqual(a.includeJsonView, b.includeJsonView) && deepEqual(a.additionalFields, b.additionalFields) && deepEqual(a.sideDialogWidth, b.sideDialogWidth) && deepEqual(a.openEntityMode, b.openEntityMode) && deepEqual(a.exportable, b.exportable) && deepEqual(a.history, b.history) && deepEqual(a.fixedFilter, b.fixedFilter) && deepEqual(a.selectedEntityId, b.selectedEntityId) && deepEqual(a.selectedTab, b.selectedTab);
 });
+const inflightCountRequests = /* @__PURE__ */ new Map();
 function EntitiesCount({
   path,
   collection,
@@ -22166,10 +22289,17 @@ function EntitiesCount({
     }
     const whereParams = Object.keys(whereMap).length > 0 ? whereMap : void 0;
     const orderByParams = sortByProperty ? `${String(sortByProperty)}:${currentSort}` : void 0;
-    accessor.count({
-      where: whereParams,
-      orderBy: orderByParams
-    }).then((c2) => {
+    const cacheKey = `${path}|${filterKey}|${sortByProperty ?? ""}|${currentSort ?? ""}`;
+    let countPromise = inflightCountRequests.get(cacheKey);
+    if (!countPromise) {
+      countPromise = accessor.count({
+        where: whereParams,
+        orderBy: orderByParams
+      });
+      inflightCountRequests.set(cacheKey, countPromise);
+      countPromise.finally(() => inflightCountRequests.delete(cacheKey));
+    }
+    countPromise.then((c2) => {
       if (!cancelled) onCountChangeRef.current?.(c2);
     }).catch((e) => {
       console.warn("Error fetching count", e);
@@ -22635,7 +22765,7 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
   const t4 = drawerOpen && largeLayout;
   let t5;
   if ($[7] !== className || $[8] !== largeLayout || $[9] !== t2 || $[10] !== t3 || $[11] !== t4) {
-    t5 = cls("w-full h-16 transition-all ease-in duration-75 absolute top-0 max-w-full overflow-x-auto no-scrollbar", "flex flex-row gap-2 px-4 items-center", "backdrop-blur-md bg-surface-50/80 dark:bg-surface-900/80", {
+    t5 = cls("w-full h-14 transition-all ease-in duration-75 absolute top-0 max-w-full overflow-x-auto no-scrollbar", "flex flex-row gap-2 px-4 items-center", "backdrop-blur-sm bg-surface-50/95 dark:bg-surface-900/80", {
       "pl-[19rem]": t2,
       "pl-24": t3,
       "z-10": largeLayout,
@@ -22873,7 +23003,7 @@ function DrawerNavigationItem(t0) {
   } = t0;
   let t1;
   if ($[0] !== icon) {
-    t1 = /* @__PURE__ */ jsx("div", { className: "shrink-0 flex items-center justify-center w-[56px] h-[40px] text-text-secondary dark:text-text-secondary-dark", children: icon });
+    t1 = /* @__PURE__ */ jsx("div", { className: "shrink-0 flex items-center justify-center w-[44px] h-[30px] text-surface-500 dark:text-text-secondary-dark [&>svg]:size-4", children: icon });
     $[0] = icon;
     $[1] = t1;
   } else {
@@ -22898,7 +23028,7 @@ function DrawerNavigationItem(t0) {
       const {
         isActive
       } = t52;
-      return cls("rounded-lg truncate", "hover:bg-surface-100 dark:hover:bg-surface-800/60 text-text-primary dark:text-surface-300 hover:text-surface-900 dark:hover:text-white", "flex flex-row items-center", drawerOpen ? "pr-4 h-10" : "h-10", "font-semibold text-xs", isActive ? "bg-surface-100 dark:bg-surface-800/50 text-surface-900 dark:text-white" : "");
+      return cls("rounded-md truncate", "hover:bg-surface-100 dark:hover:bg-surface-800/60 text-surface-700 dark:text-surface-300 hover:text-surface-900 dark:hover:text-white", "flex flex-row items-center", drawerOpen ? "pr-4 h-[30px]" : "h-[30px]", "font-medium text-[13px]", isActive ? "bg-surface-900/[0.06] dark:bg-surface-800/50 text-surface-900 dark:text-white" : "");
     };
     $[4] = drawerOpen;
     $[5] = t4;
@@ -22954,7 +23084,7 @@ function DrawerNavigationItem(t0) {
   return t10;
 }
 function DrawerNavigationGroup(t0) {
-  const $ = c(33);
+  const $ = c(32);
   const {
     group,
     entries,
@@ -22973,9 +23103,9 @@ function DrawerNavigationGroup(t0) {
   const t1 = `drawer_group_${group}`;
   let t2;
   if ($[0] !== collapsed || $[1] !== drawerOpen || $[2] !== group || $[3] !== headerActions || $[4] !== hideHeader || $[5] !== onToggleCollapsed || $[6] !== t) {
-    t2 = !hideHeader && /* @__PURE__ */ jsxs("div", { className: cls("pl-4 pr-2 py-0.5 flex flex-row items-center transition-colors", drawerOpen ? "cursor-pointer hover:bg-surface-100 dark:hover:bg-surface-800/40 rounded-lg" : "opacity-0 invisible pointer-events-none"), onClick: drawerOpen ? onToggleCollapsed : void 0, children: [
-      /* @__PURE__ */ jsx(ChevronDownIcon, { size: iconSize.small, className: cls("text-surface-500 dark:text-surface-400 transition-transform duration-200 mr-1", collapsed ? "-rotate-90" : "rotate-0") }),
-      /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", className: "font-medium flex-grow line-clamp-1", children: group || t("views_group") }),
+    t2 = !hideHeader && /* @__PURE__ */ jsxs("div", { className: cls("pl-3 pr-2 py-0.5 flex flex-row items-center transition-colors", drawerOpen ? "cursor-pointer hover:bg-surface-100 dark:hover:bg-surface-800/40 rounded-lg" : "opacity-0 invisible pointer-events-none"), onClick: drawerOpen ? onToggleCollapsed : void 0, children: [
+      /* @__PURE__ */ jsx(ChevronDownIcon, { size: iconSize.small, className: cls("text-surface-400 dark:text-surface-400 transition-transform duration-200 mr-1", collapsed ? "-rotate-90" : "rotate-0") }),
+      /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", className: "font-semibold text-[11px] uppercase tracking-wider flex-grow line-clamp-1 text-surface-400 dark:text-surface-400", children: group || t("views_group") }),
       headerActions && /* @__PURE__ */ jsx("div", { onClick: _temp$6, children: headerActions })
     ] });
     $[0] = collapsed;
@@ -22989,75 +23119,73 @@ function DrawerNavigationGroup(t0) {
   } else {
     t2 = $[7];
   }
-  const t3 = !hideHeader && collapsed ? "overflow-hidden" : "overflow-visible";
-  const t4 = !hideHeader && "dark:bg-transparent";
-  const t5 = !hideHeader ? drawerOpen ? "rounded-lg" : "rounded-lg" : "rounded-lg";
-  const t6 = !hideHeader && collapsed ? "max-h-0 opacity-0" : "max-h-[2000px] opacity-100";
-  let t7;
-  if ($[8] !== t3 || $[9] !== t4 || $[10] !== t5 || $[11] !== t6) {
-    t7 = cls("transition-all duration-200 ease-in-out", t3, t4, t5, t6);
+  const t3 = !hideHeader && "dark:bg-transparent";
+  const t4 = !hideHeader ? drawerOpen ? "rounded-lg" : "rounded-lg" : "rounded-lg";
+  const t5 = !hideHeader && collapsed ? "max-h-0 opacity-0" : "max-h-[2000px] opacity-100";
+  let t6;
+  if ($[8] !== t3 || $[9] !== t4 || $[10] !== t5) {
+    t6 = cls("transition-all duration-200 ease-in-out", "overflow-hidden", t3, t4, t5);
     $[8] = t3;
     $[9] = t4;
     $[10] = t5;
     $[11] = t6;
-    $[12] = t7;
   } else {
-    t7 = $[12];
+    t6 = $[11];
   }
-  let t8;
-  if ($[13] !== adminMenuOpen || $[14] !== collapsed || $[15] !== drawerOpen || $[16] !== entries || $[17] !== onItemClick || $[18] !== tooltipsOpen) {
-    let t92;
-    if ($[20] !== adminMenuOpen || $[21] !== collapsed || $[22] !== drawerOpen || $[23] !== onItemClick || $[24] !== tooltipsOpen) {
-      t92 = (entry) => /* @__PURE__ */ jsx(DrawerNavigationItem, { icon: /* @__PURE__ */ jsx(IconForView, { collectionOrView: entry.collection ?? entry.view, size: "small" }), tooltipsOpen: !collapsed && tooltipsOpen, adminMenuOpen, drawerOpen, onClick: () => onItemClick?.(entry), url: entry.url, name: entry.name }, entry.id);
-      $[20] = adminMenuOpen;
-      $[21] = collapsed;
-      $[22] = drawerOpen;
-      $[23] = onItemClick;
-      $[24] = tooltipsOpen;
-      $[25] = t92;
+  let t7;
+  if ($[12] !== adminMenuOpen || $[13] !== collapsed || $[14] !== drawerOpen || $[15] !== entries || $[16] !== onItemClick || $[17] !== tooltipsOpen) {
+    let t82;
+    if ($[19] !== adminMenuOpen || $[20] !== collapsed || $[21] !== drawerOpen || $[22] !== onItemClick || $[23] !== tooltipsOpen) {
+      t82 = (entry) => /* @__PURE__ */ jsx(DrawerNavigationItem, { icon: /* @__PURE__ */ jsx(IconForView, { collectionOrView: entry.collection ?? entry.view, size: "small" }), tooltipsOpen: !collapsed && tooltipsOpen, adminMenuOpen, drawerOpen, onClick: () => onItemClick?.(entry), url: entry.url, name: entry.name }, entry.id);
+      $[19] = adminMenuOpen;
+      $[20] = collapsed;
+      $[21] = drawerOpen;
+      $[22] = onItemClick;
+      $[23] = tooltipsOpen;
+      $[24] = t82;
     } else {
-      t92 = $[25];
-    }
-    t8 = entries.map(t92);
-    $[13] = adminMenuOpen;
-    $[14] = collapsed;
-    $[15] = drawerOpen;
-    $[16] = entries;
-    $[17] = onItemClick;
-    $[18] = tooltipsOpen;
-    $[19] = t8;
+      t82 = $[24];
+    }
+    t7 = entries.map(t82);
+    $[12] = adminMenuOpen;
+    $[13] = collapsed;
+    $[14] = drawerOpen;
+    $[15] = entries;
+    $[16] = onItemClick;
+    $[17] = tooltipsOpen;
+    $[18] = t7;
   } else {
-    t8 = $[19];
+    t7 = $[18];
   }
-  let t9;
-  if ($[26] !== t7 || $[27] !== t8) {
-    t9 = /* @__PURE__ */ jsx("div", { className: t7, children: t8 });
+  let t8;
+  if ($[25] !== t6 || $[26] !== t7) {
+    t8 = /* @__PURE__ */ jsx("div", { className: t6, children: t7 });
+    $[25] = t6;
     $[26] = t7;
     $[27] = t8;
-    $[28] = t9;
   } else {
-    t9 = $[28];
+    t8 = $[27];
   }
-  let t10;
-  if ($[29] !== t1 || $[30] !== t2 || $[31] !== t9) {
-    t10 = /* @__PURE__ */ jsxs("div", { className: "my-2 mx-2 flex flex-col", children: [
+  let t9;
+  if ($[28] !== t1 || $[29] !== t2 || $[30] !== t8) {
+    t9 = /* @__PURE__ */ jsxs("div", { className: "my-2 mx-2 flex flex-col", children: [
       t2,
-      t9
+      t8
     ] }, t1);
-    $[29] = t1;
-    $[30] = t2;
+    $[28] = t1;
+    $[29] = t2;
+    $[30] = t8;
     $[31] = t9;
-    $[32] = t10;
   } else {
-    t10 = $[32];
+    t9 = $[31];
   }
-  return t10;
+  return t9;
 }
 function _temp$6(e) {
   return e.stopPropagation();
 }
 function DefaultDrawer(t0) {
-  const $ = c(71);
+  const $ = c(52);
   const {
     title,
     logo,
@@ -23094,48 +23222,49 @@ function DefaultDrawer(t0) {
   const context = useRebaseContext();
   const tooltipsOpen = drawerHovered && !drawerOpen && !adminMenuOpen;
   const largeLayout = useLargeLayout();
-  useNavigate();
   const adminModeController = useAdminModeController();
-  useEffectiveRoleController();
   const registry = useRebaseRegistry();
-  navigationState.topLevelNavigation?.navigationEntries.filter(_temp$5) ?? [];
   let t2;
-  if ($[1] !== navigationState.topLevelNavigation?.groups) {
-    t2 = navigationState.topLevelNavigation?.groups ?? [];
-    $[1] = navigationState.topLevelNavigation?.groups;
+  if ($[1] !== navigationState.topLevelNavigation?.navigationEntries) {
+    t2 = navigationState.topLevelNavigation?.navigationEntries ?? [];
+    $[1] = navigationState.topLevelNavigation?.navigationEntries;
     $[2] = t2;
   } else {
     t2 = $[2];
   }
-  let groupsToRender = t2;
-  if (adminModeController.mode === "studio") {
-    let t32;
-    if ($[3] !== groupsToRender) {
-      t32 = groupsToRender.filter(_temp2$2);
-      $[3] = groupsToRender;
-      $[4] = t32;
-    } else {
-      t32 = $[4];
-    }
-    groupsToRender = t32;
+  const allNavigationEntries = t2;
+  const filteredEntries = adminModeController.mode === "studio" ? allNavigationEntries.filter(_temp$5) : allNavigationEntries.filter(_temp2$2);
+  const entryGroups = new Set(filteredEntries.map(_temp3$2).filter(Boolean));
+  let t3;
+  if ($[3] !== navigationState.topLevelNavigation?.groups) {
+    t3 = navigationState.topLevelNavigation?.groups ?? [];
+    $[3] = navigationState.topLevelNavigation?.groups;
+    $[4] = t3;
   } else {
-    let t32;
-    if ($[5] !== groupsToRender) {
-      t32 = groupsToRender.filter(_temp3$2);
-      $[5] = groupsToRender;
-      $[6] = t32;
-    } else {
-      t32 = $[6];
-    }
-    groupsToRender = t32;
+    t3 = $[4];
   }
+  const orderedGroups = t3;
+  const groupsToRender = [...orderedGroups.filter((g) => entryGroups.has(g)), ...[...entryGroups].filter((g_0) => !orderedGroups.includes(g_0))];
+  registry.cmsConfig?.navigationGroupMappings;
+  let t4;
+  const t5 = registry.cmsConfig?.navigationGroupMappings;
+  let t6;
+  if ($[5] !== t5) {
+    t6 = buildCollapsedDefaults(t5, "drawer");
+    $[5] = t5;
+    $[6] = t6;
+  } else {
+    t6 = $[6];
+  }
+  t4 = t6;
+  const collapsedDefaults = t4;
   const {
     isGroupCollapsed,
     toggleGroupCollapsed
-  } = useCollapsedGroups(groupsToRender, "drawer");
-  let t3;
+  } = useCollapsedGroups(groupsToRender, "drawer", collapsedDefaults);
+  let t7;
   if ($[7] !== context || $[8] !== drawerHovered || $[9] !== drawerOpen) {
-    t3 = {
+    t7 = {
       drawerOpen,
       drawerHovered,
       context
@@ -23143,14 +23272,14 @@ function DefaultDrawer(t0) {
     $[7] = context;
     $[8] = drawerHovered;
     $[9] = drawerOpen;
-    $[10] = t3;
+    $[10] = t7;
   } else {
-    t3 = $[10];
+    t7 = $[10];
   }
-  const headerSlot = useSlot("navigation.header", t3);
-  let t4;
+  const headerSlot = useSlot("navigation.header", t7);
+  let t8;
   if ($[11] !== context || $[12] !== drawerHovered || $[13] !== drawerOpen) {
-    t4 = {
+    t8 = {
       drawerOpen,
       drawerHovered,
       context
@@ -23158,18 +23287,17 @@ function DefaultDrawer(t0) {
     $[11] = context;
     $[12] = drawerHovered;
     $[13] = drawerOpen;
-    $[14] = t4;
+    $[14] = t8;
   } else {
-    t4 = $[14];
+    t8 = $[14];
   }
-  const footerSlot = useSlot("navigation.footer", t4);
+  const footerSlot = useSlot("navigation.footer", t8);
   if (!navigationState.topLevelNavigation) {
     return null;
   }
-  const navigationEntries = navigationState.topLevelNavigation.navigationEntries;
-  let t5;
+  let t9;
   if ($[15] !== analyticsController || $[16] !== closeDrawer || $[17] !== closeHover || $[18] !== drawerOpen || $[19] !== largeLayout) {
-    t5 = (view) => {
+    t9 = (view) => {
       const eventName = view.type === "collection" ? "drawer_navigate_to_collection" : view.type === "view" ? "drawer_navigate_to_view" : "unmapped_event";
       analyticsController.onAnalyticsEvent?.(eventName, {
         url: view.url
@@ -23187,139 +23315,112 @@ function DefaultDrawer(t0) {
     $[17] = closeHover;
     $[18] = drawerOpen;
     $[19] = largeLayout;
-    $[20] = t5;
+    $[20] = t9;
   } else {
-    t5 = $[20];
+    t9 = $[20];
   }
-  const onItemClick = t5;
+  const onItemClick = t9;
   const drawerVisuallyOpen = drawerOpen || drawerHovered;
-  let t6;
+  const t10 = "navigation";
+  const t11 = "Main navigation";
+  let t12;
   if ($[21] !== className) {
-    t6 = cls("flex flex-col h-full relative grow w-full", className);
+    t12 = cls("flex flex-col h-full relative grow w-full", className);
     $[21] = className;
-    $[22] = t6;
+    $[22] = t12;
   } else {
-    t6 = $[22];
+    t12 = $[22];
   }
-  let t7;
+  let t13;
   if ($[23] !== drawerHovered || $[24] !== drawerOpen || $[25] !== logoDestination || $[26] !== resolvedLogo || $[27] !== title) {
-    t7 = /* @__PURE__ */ jsx(DrawerLogo, { logo: resolvedLogo, title, logoDestination, drawerOpen, drawerHovered });
+    t13 = /* @__PURE__ */ jsx(DrawerLogo, { logo: resolvedLogo, title, logoDestination, drawerOpen, drawerHovered });
     $[23] = drawerHovered;
     $[24] = drawerOpen;
     $[25] = logoDestination;
     $[26] = resolvedLogo;
     $[27] = title;
-    $[28] = t7;
+    $[28] = t13;
   } else {
-    t7 = $[28];
+    t13 = $[28];
   }
-  let t8;
+  let t14;
   if ($[29] !== drawerHovered || $[30] !== drawerOpen || $[31] !== registry.studioConfig) {
-    t8 = registry.studioConfig && /* @__PURE__ */ jsx(DrawerModeSwitch, { drawerOpen, drawerHovered });
+    t14 = registry.studioConfig && /* @__PURE__ */ jsx(DrawerModeSwitch, { drawerOpen, drawerHovered });
     $[29] = drawerHovered;
     $[30] = drawerOpen;
     $[31] = registry.studioConfig;
-    $[32] = t8;
+    $[32] = t14;
   } else {
-    t8 = $[32];
+    t14 = $[32];
   }
-  const t9 = scrolled ? "linear-gradient(to bottom, transparent 0, black 20px, black calc(100% - 20px), transparent 100%)" : "linear-gradient(to bottom, black 0, black calc(100% - 20px), transparent 100%)";
-  let t10;
-  if ($[33] !== t9) {
-    t10 = {
-      maskImage: t9
+  const t15 = "flex-grow min-h-0 overflow-y-auto overflow-x-hidden no-scrollbar";
+  const t16 = scrolled ? "linear-gradient(to bottom, transparent 0, black 20px, black calc(100% - 20px), transparent 100%)" : "linear-gradient(to bottom, black 0, black calc(100% - 20px), transparent 100%)";
+  let t17;
+  if ($[33] !== t16) {
+    t17 = {
+      maskImage: t16
     };
-    $[33] = t9;
-    $[34] = t10;
-  } else {
-    t10 = $[34];
-  }
-  let t11;
-  if ($[35] !== adminMenuOpen || $[36] !== adminModeController.mode || $[37] !== drawerVisuallyOpen || $[38] !== groupsToRender || $[39] !== isGroupCollapsed || $[40] !== navigationEntries || $[41] !== onItemClick || $[42] !== toggleGroupCollapsed || $[43] !== tooltipsOpen) {
-    let t122;
-    if ($[45] !== adminMenuOpen || $[46] !== adminModeController.mode || $[47] !== drawerVisuallyOpen || $[48] !== isGroupCollapsed || $[49] !== navigationEntries || $[50] !== onItemClick || $[51] !== toggleGroupCollapsed || $[52] !== tooltipsOpen) {
-      t122 = (group) => {
-        const entriesInGroup = Object.values(navigationEntries).filter((e_0) => e_0.group === group);
-        return /* @__PURE__ */ jsx(DrawerNavigationGroup, { group, entries: entriesInGroup, collapsed: isGroupCollapsed(group), onToggleCollapsed: () => toggleGroupCollapsed(group), drawerOpen: drawerVisuallyOpen, tooltipsOpen, adminMenuOpen, onItemClick, hideHeader: adminModeController.mode === "studio" }, `drawer_group_${group}`);
-      };
-      $[45] = adminMenuOpen;
-      $[46] = adminModeController.mode;
-      $[47] = drawerVisuallyOpen;
-      $[48] = isGroupCollapsed;
-      $[49] = navigationEntries;
-      $[50] = onItemClick;
-      $[51] = toggleGroupCollapsed;
-      $[52] = tooltipsOpen;
-      $[53] = t122;
-    } else {
-      t122 = $[53];
-    }
-    t11 = groupsToRender.map(t122);
-    $[35] = adminMenuOpen;
-    $[36] = adminModeController.mode;
-    $[37] = drawerVisuallyOpen;
-    $[38] = groupsToRender;
-    $[39] = isGroupCollapsed;
-    $[40] = navigationEntries;
-    $[41] = onItemClick;
-    $[42] = toggleGroupCollapsed;
-    $[43] = tooltipsOpen;
-    $[44] = t11;
+    $[33] = t16;
+    $[34] = t17;
   } else {
-    t11 = $[44];
+    t17 = $[34];
   }
-  let t12;
-  if ($[54] !== t10 || $[55] !== t11) {
-    t12 = /* @__PURE__ */ jsx("div", { ref: scrollRef, onScroll: handleScroll, className: "flex-grow min-h-0 overflow-y-auto overflow-x-visible no-scrollbar", style: t10, children: t11 });
-    $[54] = t10;
-    $[55] = t11;
-    $[56] = t12;
+  const t18 = groupsToRender.map((group) => {
+    const entriesInGroup = filteredEntries.filter((e_2) => e_2.group === group);
+    return /* @__PURE__ */ jsx(DrawerNavigationGroup, { group, entries: entriesInGroup, collapsed: isGroupCollapsed(group), onToggleCollapsed: () => toggleGroupCollapsed(group), drawerOpen: drawerVisuallyOpen, tooltipsOpen, adminMenuOpen, onItemClick }, `drawer_group_${group}`);
+  });
+  let t19;
+  if ($[35] !== t17 || $[36] !== t18) {
+    t19 = /* @__PURE__ */ jsx("div", { ref: scrollRef, onScroll: handleScroll, className: t15, style: t17, children: t18 });
+    $[35] = t17;
+    $[36] = t18;
+    $[37] = t19;
   } else {
-    t12 = $[56];
+    t19 = $[37];
   }
-  let t13;
-  if ($[57] !== closeDrawer || $[58] !== drawerHovered || $[59] !== drawerOpen || $[60] !== openDrawer) {
-    t13 = /* @__PURE__ */ jsx(DrawerToggle, { drawerOpen, drawerHovered, openDrawer, closeDrawer });
-    $[57] = closeDrawer;
-    $[58] = drawerHovered;
-    $[59] = drawerOpen;
-    $[60] = openDrawer;
-    $[61] = t13;
+  let t20;
+  if ($[38] !== closeDrawer || $[39] !== drawerHovered || $[40] !== drawerOpen || $[41] !== openDrawer) {
+    t20 = /* @__PURE__ */ jsx(DrawerToggle, { drawerOpen, drawerHovered, openDrawer, closeDrawer });
+    $[38] = closeDrawer;
+    $[39] = drawerHovered;
+    $[40] = drawerOpen;
+    $[41] = openDrawer;
+    $[42] = t20;
   } else {
-    t13 = $[61];
+    t20 = $[42];
   }
-  let t14;
-  if ($[62] !== footerSlot || $[63] !== headerSlot || $[64] !== style || $[65] !== t12 || $[66] !== t13 || $[67] !== t6 || $[68] !== t7 || $[69] !== t8) {
-    t14 = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", { role: "navigation", "aria-label": "Main navigation", className: t6, style, children: [
-      t7,
-      t8,
+  let t21;
+  if ($[43] !== footerSlot || $[44] !== headerSlot || $[45] !== style || $[46] !== t12 || $[47] !== t13 || $[48] !== t14 || $[49] !== t19 || $[50] !== t20) {
+    t21 = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", { role: t10, "aria-label": t11, className: t12, style, children: [
+      t13,
+      t14,
       headerSlot,
-      t12,
+      t19,
       footerSlot,
-      t13
+      t20
     ] }) });
-    $[62] = footerSlot;
-    $[63] = headerSlot;
-    $[64] = style;
-    $[65] = t12;
-    $[66] = t13;
-    $[67] = t6;
-    $[68] = t7;
-    $[69] = t8;
-    $[70] = t14;
-  } else {
-    t14 = $[70];
+    $[43] = footerSlot;
+    $[44] = headerSlot;
+    $[45] = style;
+    $[46] = t12;
+    $[47] = t13;
+    $[48] = t14;
+    $[49] = t19;
+    $[50] = t20;
+    $[51] = t21;
+  } else {
+    t21 = $[51];
   }
-  return t14;
+  return t21;
 }
-function _temp3$2(g_0) {
-  return !STUDIO_NAVIGATION_GROUPS.includes(g_0);
+function _temp3$2(e_1) {
+  return e_1.group;
 }
-function _temp2$2(g) {
-  return STUDIO_NAVIGATION_GROUPS.includes(g);
+function _temp2$2(e_0) {
+  return e_0.type !== "view";
 }
 function _temp$5(e) {
-  return e.type === "admin";
+  return e.type === "view" || e.type === "admin";
 }
 function DrawerLogo(t0) {
   const $ = c(17);
@@ -23526,7 +23627,7 @@ function DrawerModeSwitch(t0) {
   const t1 = showSwitch ? "opacity-100 h-7 mt-2 mb-0" : "opacity-0 pointer-events-none h-7 mt-2 mb-0";
   let t2;
   if ($[0] !== t1) {
-    t2 = cls("overflow-hidden transition-all duration-200 ease-in-out px-3", t1);
+    t2 = cls("shrink-0 overflow-hidden transition-all duration-200 ease-in-out px-3", t1);
     $[0] = t1;
     $[1] = t2;
   } else {
@@ -23816,7 +23917,7 @@ const Scaffold = React__default.memo(function Scaffold2(props) {
   const t17 = hasAppBar && !padding;
   let t18;
   if ($[27] !== padding || $[28] !== t16 || $[29] !== t17) {
-    t18 = cls(defaultBorderMixin, "bg-white dark:bg-surface-800", "grow overflow-auto m-0", {
+    t18 = cls(defaultBorderMixin, "bg-surface-50 dark:bg-surface-800", "grow overflow-auto m-0", {
       "lg:mt-4": t16,
       "mt-1 lg:m-0 lg:mx-2 lg:mb-2 lg:rounded-lg lg:border-t lg:border-x lg:border-solid": padding,
       "border-t": t17
@@ -23888,7 +23989,7 @@ const DrawerHeader = () => {
   const $ = c(1);
   let t0;
   if ($[0] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t0 = /* @__PURE__ */ jsx("div", { className: "flex flex-col min-h-16" });
+    t0 = /* @__PURE__ */ jsx("div", { className: "flex flex-col min-h-14" });
     $[0] = t0;
   } else {
     t0 = $[0];
@@ -23903,7 +24004,7 @@ function DrawerWrapper(props) {
   const {
     t
   } = useTranslation();
-  const t0 = isFloating ? `absolute top-0 left-0 bottom-0 z-50 bg-surface-50 ${"dark:bg-surface-900"} shadow-2xl border-r` : `relative bg-surface-50 ${"dark:bg-surface-900"}`;
+  const t0 = isFloating ? `absolute top-0 left-0 bottom-0 z-50 bg-surface-50 ${"dark:bg-surface-900"} shadow-lg border-r` : `relative bg-surface-50 ${"dark:bg-surface-900"}`;
   let t1;
   if ($[0] !== t0) {
     t1 = cls("h-full overflow-hidden", defaultBorderMixin, t0);
@@ -24191,7 +24292,7 @@ function useLocalCollectionsConfigController(clientOrUrl, baseCollections = [],
 }
 const EMPTY_PLUGINS = [];
 const EMPTY_COLLECTIONS = [];
-const CollectionsStudioView = lazy(() => import("./CollectionsStudioView-B549BDpU.js").then((n) => n.b).then((m) => ({
+const CollectionsStudioView = lazy(() => import("./CollectionsStudioView-BDzMFzqH.js").then((n) => n.b).then((m) => ({
   default: m.CollectionsStudioView
 })));
 function RebaseNavigation({
@@ -24203,10 +24304,9 @@ function RebaseNavigation({
   const userManagement = useInternalUserManagementController();
   const userConfigPersistence = useBuildLocalConfigurationPersistence();
   const collectionEditorConfig = registry.cmsConfig?.collectionEditor;
-  const collectionEditorEnabled = Boolean(collectionEditorConfig);
+  const collectionEditorEnabled = Boolean(collectionEditorConfig) || Boolean(registry.studioConfig);
   const collectionEditorOptions = useMemo(() => {
-    if (!collectionEditorConfig) return void 0;
-    if (collectionEditorConfig === true) return {};
+    if (collectionEditorConfig === true || !collectionEditorConfig) return {};
     return collectionEditorConfig;
   }, [collectionEditorConfig]);
   const cmsCollections = registry.cmsConfig?.collections ?? EMPTY_COLLECTIONS;
@@ -24235,7 +24335,6 @@ function RebaseNavigation({
     return {
       slug: "schema",
       name: "Edit collections",
-      group: "Database",
       icon: "LayoutList",
       nestedRoutes: true,
       view: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: /* @__PURE__ */ jsx(CollectionsStudioView, { configController: internalConfigController }) })
@@ -24250,6 +24349,7 @@ function RebaseNavigation({
     plugins: registry.cmsConfig?.plugins ?? EMPTY_PLUGINS,
     collections: collectionsBuilder,
     views: devViews,
+    navigationGroupMappings: registry.cmsConfig?.navigationGroupMappings,
     authController: context.authController,
     data: context.data,
     collectionRegistryController,
@@ -24670,6 +24770,7 @@ function EntityFullScreenRoute({
   const urlController = useUrlController();
   const navigate = useNavigate();
   const location = useLocation$1();
+  const defaultValues = location.state?.defaultValues;
   const hash = location.hash;
   const navigationPath = urlController.urlPathToDataPath(pathname);
   const blocked = useRef(false);
@@ -24702,9 +24803,14 @@ function EntityFullScreenRoute({
   let blocker = void 0;
   try {
     blocker = useBlocker(({
+      currentLocation,
       nextLocation
     }) => {
       if (nextLocation.pathname.startsWith(entityPath)) return false;
+      const nextHash = nextLocation.hash;
+      if (nextHash === "#side" || nextHash === "#new_side") return false;
+      const currentHash = currentLocation.hash;
+      if ((currentHash === "#side" || currentHash === "#new_side") && (nextLocation.pathname === basePath || nextLocation.pathname.startsWith(entityPath))) return false;
       return blocked.current;
     });
   } catch (e) {
@@ -24727,15 +24833,16 @@ function EntityFullScreenRoute({
   const fullIdPath = isNew ? lastCollectionEntry.slug : lastEntityEntry.slug;
   const collectionPath = urlController.resolveDatabasePathsFrom(fullIdPath);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
+    /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, defaultValues: isNew ? defaultValues : void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
       const newSelectedTab = params.selectedTab;
       const newEntityId = params.entityId;
+      const savedHash = isNew ? "" : hash;
       if (newSelectedTab) {
-        navigate(`${basePath}/${newEntityId}/${newSelectedTab}${hash}`, {
+        navigate(`${basePath}/${newEntityId}/${newSelectedTab}${savedHash}`, {
           replace: true
         });
       } else {
-        navigate(`${basePath}/${newEntityId}${hash}`, {
+        navigate(`${basePath}/${newEntityId}${savedHash}`, {
           replace: true
         });
       }
@@ -24795,10 +24902,10 @@ function CustomViewRoute(t0) {
   useEffect(t1, t2);
   return view.view;
 }
-const CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-D509-IMx.js").then((m) => ({
+const CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-ywdxhs1L.js").then((m) => ({
   default: m.CollectionEditorDialog
 })));
-const PropertyFormDialog = lazy(() => import("./PropertyEditView-UtDO8g0A.js").then((n) => n.d).then((m) => ({
+const PropertyFormDialog = lazy(() => import("./PropertyEditView-BuZrNnBN.js").then((n) => n.d).then((m) => ({
   default: m.PropertyFormDialog
 })));
 function CollectionEditorDialogs() {
@@ -24847,13 +24954,13 @@ function CollectionEditorDialogs() {
 }
 function _temp$2() {
 }
-const ContentHomePage = lazy(() => import("./ContentHomePage--Bl1FXk7.js").then((m) => ({
+const ContentHomePage = lazy(() => import("./ContentHomePage-0tHuEIm_.js").then((m) => ({
   default: m.ContentHomePage
 })));
-const UsersView = lazy(() => import("./UsersView-BM2_7VPV.js").then((m) => ({
+const UsersView = lazy(() => import("./UsersView-BkeblMVT.js").then((m) => ({
   default: m.UsersView
 })));
-const RolesView = lazy(() => import("./RolesView-B0E7L0hE.js").then((m) => ({
+const RolesView = lazy(() => import("./RolesView-CMPsaIXo.js").then((m) => ({
   default: m.RolesView
 })));
 function SettingsView() {
@@ -25881,15 +25988,18 @@ const PropertyPreview = React__default.memo(function PropertyPreview2(props) {
       content = t02;
     } else {
       if (property.ui?.Preview) {
-        content = createElement(property.ui?.Preview, {
-          propertyKey,
-          value,
-          property,
-          size,
-          height,
-          width,
-          customProps: property.ui?.customProps
-        });
+        const ResolvedPreview = resolveComponentRef(property.ui.Preview);
+        if (ResolvedPreview) {
+          content = /* @__PURE__ */ jsx(Suspense, { fallback: null, children: createElement(ResolvedPreview, {
+            propertyKey,
+            value,
+            property,
+            size,
+            height,
+            width,
+            customProps: property.ui?.customProps
+          }) });
+        }
       } else {
         if (value === void 0 || value === null) {
           let t02;
@@ -28003,4 +28113,4 @@ export {
   ArrayOfReferencesPreview as y,
   ArrayOfStorageComponentsPreview as z
 };
-//# sourceMappingURL=util-DK1O3uM0.js.map
+//# sourceMappingURL=util-zfU1zOCX.js.map