@rebasepro/admin 0.3.0 → 0.5.0

package/dist/{util-ZM9gQuCv.js → util-COYYD8zr.js}

@@ -1,15 +1,15 @@
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
 import { c } from "react-compiler-runtime";
-import { DialogActions, Typography, IconButton, Button, AlertCircleIcon, LoadingButton, cls, defaultBorderMixin, Tooltip, CopyIcon, ImageOffIcon, ExternalLinkIcon, FileTextIcon, Skeleton, Table, TableBody, TableRow, TableCell, Chip, getColorSchemeForSeed, ErrorBoundary, FunctionSquareIcon, iconSize, CircleIcon, HashIcon, LinkIcon, Rows3Icon, UploadIcon, RepeatIcon, VoteIcon, CalendarIcon, FlagIcon, GlobeIcon, MailIcon, AlignLeftIcon, TextIcon, ArrowRightToLineIcon, HistoryIcon, CircularProgressCenter, Tab, Maximize2Icon, PencilIcon, Alert, Tabs, CodeIcon, CenteredView, useDebouncedCallback, TextareaAutosize, focusedDisabled, MultiSelect, MultiSelectItem, Select, SelectItem, TextField, BooleanSwitch, DateTimeField, useInjectStyles, fieldBackgroundInvisibleMixin, fieldBackgroundMixin, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, XIcon, PopoverPrimitive, SearchIcon, CircularProgress, ChevronDownIcon, Separator, paperMixin, CheckIcon, Menu, MenuItem, MoreVerticalIcon, Checkbox, Badge, SearchBar, Label, BooleanSwitchWithLabel, useOutsideAlerter, VirtualTable, getColorSchemeForKey, Container, PlusIcon, TableHeader, Trash2Icon, Dialog, DialogTitle, DialogContent, Sheet, debounce, coolIconKeys, lucideIcons, ExpandablePanel, HandleIcon, MinusIcon, ChevronUpIcon, Collapse, EyeOffIcon, EyeIcon, FolderUpIcon, ListOrderedIcon, UserIcon, ListIcon, QuoteIcon, FileUpload, ChevronRightIcon, SettingsIcon, Popover, CHIP_COLORS, Card, ResizablePanels, Markdown, RefreshCwIcon, TableIcon, LayoutGridIcon, KanbanIcon, ToggleButtonGroup, ColumnsIcon, CheckCircleIcon, KeyRoundIcon, Portal, FilterXIcon, FilterChip, ChevronsUpDownIcon, ArrowLeftIcon, FilterIcon, MoonIcon, SunIcon, SunMoonIcon, LogOutIcon, Avatar, ChevronsLeftIcon, ChevronsRightIcon, MenuIcon, ArrowRightIcon, AlertTriangleIcon, XCircleIcon } from "@rebasepro/ui";
+import { DialogActions, Typography, IconButton, Button, AlertCircleIcon, LoadingButton, cls, defaultBorderMixin, Tooltip, CopyIcon, ImageOffIcon, ExternalLinkIcon, FileTextIcon, Skeleton, Table, TableBody, TableRow, TableCell, Chip, getColorSchemeForSeed, ErrorBoundary, FunctionSquareIcon, iconSize, CircleIcon, HashIcon, LinkIcon, Rows3Icon, UploadIcon, RepeatIcon, VoteIcon, CalendarIcon, FlagIcon, GlobeIcon, MailIcon, AlignLeftIcon, TextIcon, ArrowRightToLineIcon, HistoryIcon, CircularProgressCenter, Tab, Maximize2Icon, PencilIcon, Alert, Tabs, CodeIcon, CenteredView, useDebouncedCallback, TextareaAutosize, focusedDisabled, MultiSelect, MultiSelectItem, Select, SelectItem, TextField, BooleanSwitch, DateTimeField, useInjectStyles, fieldBackgroundInvisibleMixin, fieldBackgroundMixin, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, XIcon, PopoverPrimitive, SearchIcon, CircularProgress, ChevronDownIcon, Separator, paperMixin, CheckIcon, Menu, MenuItem, MoreVerticalIcon, Checkbox, Badge, SearchBar, Label, BooleanSwitchWithLabel, useOutsideAlerter, VirtualTable, Dialog, Sheet, PlusIcon, debounce, coolIconKeys, lucideIcons, ExpandablePanel, HandleIcon, MinusIcon, ChevronUpIcon, Collapse, EyeOffIcon, EyeIcon, Trash2Icon, FolderUpIcon, ListOrderedIcon, UserIcon, ListIcon, QuoteIcon, FileUpload, ChevronRightIcon, TableHeader, SettingsIcon, Popover, CHIP_COLORS, Card, ResizablePanels, getColorSchemeForKey, Markdown, RefreshCwIcon, DialogContent, TableIcon, LayoutGridIcon, KanbanIcon, ToggleButtonGroup, ColumnsIcon, DialogTitle, CheckCircleIcon, KeyRoundIcon, Portal, FilterXIcon, FilterChip, ChevronsUpDownIcon, ArrowLeftIcon, FilterIcon, MoonIcon, SunIcon, SunMoonIcon, LogOutIcon, Avatar, ChevronsLeftIcon, ChevronsRightIcon, MenuIcon, ArrowRightIcon, AlertTriangleIcon, XCircleIcon } from "@rebasepro/ui";
 import * as React from "react";
 import React__default, { useRef, useEffect, useState, useMemo, lazy, Suspense, useCallback, useSyncExternalStore, useContext, createContext, forwardRef, memo, useLayoutEffect, createElement } from "react";
-import { useTranslation, useStorageSource, ErrorView, buildEnumLabel, getColorScheme, useAuthController, useCustomizationController, useAnalyticsController, IconForView, useEntityFetch, useModeController, useRebaseContext, usePermissions, createFormexStub, useSlot, resolveComponentRef, getIcon, PluginProviderStack, useUserSelector, UserDisplay, useSnackbarController, ErrorTooltip, useStorageUploadController, useData, useRelationSelector, getRowHeight, getEntityFromCache, useLargeLayout, getColumnKeysForProperty, DEFAULT_PAGE_SIZE as DEFAULT_PAGE_SIZE$1, getEntityFromMemoryCache, saveEntityToMemoryCache, CONTAINER_FULL_WIDTH, ADDITIONAL_TAB_WIDTH, FORM_CONTAINER_WIDTH, useInternalUserManagementController, ConfirmationDialog, useUnsavedChangesDialog, UnsavedChangesDialog, useColumnIds, useDataTableController, saveEntityWithCallbacks, iconsSearch, deleteEntityWithCallbacks, useUserConfigurationPersistence, useScrollRestoration, useBridgeRegistration, useAdminModeController, RebaseLogo, LanguageToggle, useRebaseRegistry, buildCollapsedDefaults, useCollapsedGroups, useBuildLocalConfigurationPersistence, useRebaseClient, CustomizationControllerContext, StudioBridgeRegistryProvider, flattenKeys, removeEntityFromCache, saveEntityToCache, removeEntityFromMemoryCache, getFormFieldKeys } from "@rebasepro/core";
+import { useTranslation, useStorageSource, ErrorView, buildEnumLabel, getColorScheme, useAuthController, useCustomizationController, useAnalyticsController, IconForView, useEntityFetch, useModeController, useRebaseContext, usePermissions, createFormexStub, useSlot, resolveComponentRef, getIcon, PluginProviderStack, useUserSelector, UserDisplay, useSnackbarController, ErrorTooltip, useStorageUploadController, useData, useRelationSelector, getRowHeight, getEntityFromCache, useLargeLayout, getColumnKeysForProperty, DEFAULT_PAGE_SIZE as DEFAULT_PAGE_SIZE$1, getEntityFromMemoryCache, saveEntityToMemoryCache, CONTAINER_FULL_WIDTH, ADDITIONAL_TAB_WIDTH, FORM_CONTAINER_WIDTH, useUnsavedChangesDialog, UnsavedChangesDialog, useColumnIds, useDataTableController, saveEntityWithCallbacks, iconsSearch, deleteEntityWithCallbacks, useInternalUserManagementController, ConfirmationDialog, useUserConfigurationPersistence, useScrollRestoration, useBridgeRegistration, useAdminModeController, RebaseLogo, LanguageToggle, useRebaseRegistry, buildCollapsedDefaults, useCollapsedGroups, useBuildLocalConfigurationPersistence, useRebaseClient, CustomizationControllerContext, StudioBridgeRegistryProvider, flattenKeys, removeEntityFromCache, saveEntityToCache, removeEntityFromMemoryCache, getFormFieldKeys } from "@rebasepro/core";
 import ExcelJS from "exceljs";
-import { isPropertyBuilder, enumToObjectEntries, getLabelOrConfigFrom, resolveArrayProperties, getEntityImagePreviewPropertyKey, resolveDefaultSelectedView, getSubcollections, removeInitialAndTrailingSlashes, resolveEnumValues, getReferenceFrom, normalizeToEntityRelation, getRelationFrom, isReadOnly, getLocalChangesBackup, getNavigationEntriesFromPath, CollectionRegistry, getParentReferencesFromPath, canReadCollection, defaultUsersCollection, resolveCollectionPathIds, resolveProperty, isHidden, getArrayResolvedProperties, DEFAULT_ONE_OF_VALUE, getDefaultValueFor, DEFAULT_ONE_OF_TYPE, getDefaultValueFortype, resolveStorageFilenameString, resolveStoragePathString, resolveRelationProperty, getTableName, getDefaultValuesFor } from "@rebasepro/common";
-import { EntityRelation, EntityReference, getDataSourceCapabilities, GeoPoint, Vector } from "@rebasepro/types";
+import { isPropertyBuilder, enumToObjectEntries, getLabelOrConfigFrom, resolveArrayProperties, getEntityImagePreviewPropertyKey, resolveDefaultSelectedView, getSubcollections, removeInitialAndTrailingSlashes, resolveEnumValues, getReferenceFrom, normalizeToEntityRelation, getRelationFrom, isReadOnly, getLocalChangesBackup, 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";
+import { EntityRelation, EntityReference, GeoPoint, getDataSourceCapabilities, Vector } from "@rebasepro/types";
 import { useFormex, setIn, Field, getIn, useCreateFormex, Formex } from "@rebasepro/formex";
 import { inferTypeFromValue } from "@rebasepro/schema-inference";
-import { hydrateRegExp, getValueInPath, mergeDeep, getHashValue, pick, randomString, toArray, defaultDateFormat, isObject } from "@rebasepro/utils";
+import { hydrateRegExp, getValueInPath, mergeDeep, getHashValue, randomString, toArray, defaultDateFormat, isObject } from "@rebasepro/utils";
 import { deepEqual as deepEqual$1 } from "fast-equals";
 import { z } from "zod";
 import { useSensor, PointerSensor, KeyboardSensor, useSensors, DndContext, closestCenter, useDroppable, DragOverlay, pointerWithin, rectIntersection } from "@dnd-kit/core";
@@ -1951,6 +1951,10 @@ function getDefaultPropertiesOrder(collection) {
   if (collection.propertiesOrder) return collection.propertiesOrder;
   return [...Object.keys(collection.properties), ...(collection.additionalFields ?? []).map((field) => field.key)];
 }
+function isHiddenProperty(property) {
+  if (!property) return false;
+  return Boolean(property.ui?.hideFromCollection);
+}
 function getEntityPreviewKeys(authController, targetCollection, fields, previewProperties, limit = 3) {
   const allProperties = Object.keys(targetCollection.properties);
   let listProperties = previewProperties?.filter((p) => allProperties.includes(p));
@@ -1967,7 +1971,7 @@ function getEntityPreviewKeys(authController, targetCollection, fields, previewP
       return !isIdProp;
     }).filter((key) => {
       const property = targetCollection.properties[key];
-      return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isRelationProperty(property);
+      return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isRelationProperty(property) && !isHiddenProperty(property);
     }).slice(0, limit);
   }
 }
@@ -1981,6 +1985,9 @@ function getEntityTitlePropertyKey(collection, propertyConfigs) {
     const property = collection.properties[key];
     if (property && !isPropertyBuilder(property)) {
       const prop = property;
+      if (isHiddenProperty(prop)) {
+        continue;
+      }
       if (prop.type === "string" && !prop.ui?.multiline && !prop.ui?.markdown && !prop.storage && !prop.isId) {
         if (!firstStringCandidate) {
           firstStringCandidate = key;
@@ -2612,9 +2619,6 @@ function EntityView(t0) {
   }
   return t8;
 }
-const EntityHistoryView$2 = lazy(() => import("./index-BCcLwgfe.js").then((m) => ({
-  default: m.EntityHistoryView
-})));
 const BUILTIN_ENTITY_VIEWS = {
   "__rebase_history": {
     key: "__rebase_history",
@@ -2622,7 +2626,6 @@ const BUILTIN_ENTITY_VIEWS = {
     tabComponent: React__default.createElement(HistoryIcon, {
       size: 20
     }),
-    Builder: EntityHistoryView$2,
     position: "end"
   }
 };
@@ -2702,12 +2705,12 @@ function EntityJsonPreview(t0) {
   }
   return t4;
 }
-const EntityHistoryView$1 = lazy(() => import("./index-BCcLwgfe.js").then((m) => ({
+const MAIN_TAB_VALUE = "__main_##Q$SC^#S6";
+const JSON_TAB_VALUE = "__json";
+const HISTORY_TAB_VALUE = "__rebase_history";
+const EntityHistoryView$1 = lazy(() => import("./index-D3S9x_RP.js").then((m) => ({
   default: m.EntityHistoryView
 })));
-const MAIN_TAB_VALUE$1 = "__main_##Q$SC^#S6";
-const JSON_TAB_VALUE$1 = "__json";
-const HISTORY_TAB_VALUE$1 = "__rebase_history";
 function EntityDetailView(t0) {
   const $ = c(15);
   let entityId;
@@ -2815,9 +2818,14 @@ function EntityDetailViewInner({
     status: "existing",
     entityId
   }), [collection, entityId]);
-  const [selectedTab, setSelectedTab] = useState(selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE$1);
+  const userHasChangedTab = useRef(false);
+  const [selectedTab, setSelectedTab] = useState(() => {
+    const val = selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    return val === "edit" ? MAIN_TAB_VALUE : val;
+  });
   useEffect(() => {
-    const target = selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE$1;
+    const val_0 = userHasChangedTab.current ? selectedTabProp ?? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    const target = val_0 === "edit" ? MAIN_TAB_VALUE : val_0;
     if (target !== selectedTab) {
       setSelectedTab(target);
     }
@@ -2832,7 +2840,7 @@ function EntityDetailViewInner({
   const {
     resolvedEntityViews
   } = resolvedSelectedEntityView(customViews, customizationController, selectedTab);
-  const mainViewVisible = selectedTab === MAIN_TAB_VALUE$1;
+  const mainViewVisible = selectedTab === MAIN_TAB_VALUE;
   const mountedTabsRef = useRef(/* @__PURE__ */ new Set());
   if (selectedTab) {
     mountedTabsRef.current.add(selectedTab);
@@ -2873,7 +2881,8 @@ function EntityDetailViewInner({
     disabled: true
   }), [entityId, parentCollectionSlugs, parentEntityIds, path, collection, context, readOnlyFormContext, layout]);
   const pluginActionsTop = useSlot("form.actions.top", formActionTopProps);
-  const detailViewConfig = collection.detailView;
+  const formViewConfig = collection.formView;
+  const FormViewBuilder = formViewConfig?.Builder ? resolveComponentRef(formViewConfig.Builder) : null;
   const titlePropertyKey = getEntityTitlePropertyKey(collection, customizationController.propertyConfigs);
   const title = (usedEntity?.values && titlePropertyKey ? getValueInPath(usedEntity.values, titlePropertyKey) : void 0) ?? collection.singularName ?? collection.name;
   const nonActionCustomViews = useMemo(() => resolvedEntityViews.filter((e) => !e.includeActions), [resolvedEntityViews]);
@@ -2890,11 +2899,11 @@ function EntityDetailViewInner({
     }), role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: readOnlyFormContext && /* @__PURE__ */ jsx(Builder, { collection, parentCollectionSlugs, parentEntityIds, entity: usedEntity, modifiedValues: usedEntity?.values, formContext: readOnlyFormContext }) }) }) }, `custom_view_${customView.key}`);
   }).filter(Boolean);
   const globalLoading = dataLoading && !usedEntity;
-  const jsonTabMounted = mountedTabsRef.current.has(JSON_TAB_VALUE$1);
-  const jsonView = selectedTab === JSON_TAB_VALUE$1 || jsonTabMounted ? /* @__PURE__ */ jsx("div", { className: cls("relative flex-1 h-full overflow-auto w-full", {
-    "hidden": selectedTab !== JSON_TAB_VALUE$1
+  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: usedEntity?.values ?? {} }) }) }, "json_view") : null;
-  const historyView = includeHistoryView && selectedTab === HISTORY_TAB_VALUE$1 ? /* @__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$1, { collection, entity: usedEntity, formContext: readOnlyFormContext, modifiedValues: usedEntity?.values }) }) }) }, "history_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$1, { collection, entity: usedEntity, formContext: readOnlyFormContext, modifiedValues: 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;
@@ -2905,31 +2914,20 @@ function EntityDetailViewInner({
     ] }, `subcol_${subcollectionId}`);
   }).filter(Boolean);
   const onSideTabClick = useCallback((value) => {
+    userHasChangedTab.current = true;
     setSelectedTab(value);
     onTabChange?.({
       path,
       entityId,
-      selectedTab: value === MAIN_TAB_VALUE$1 ? void 0 : value,
+      selectedTab: value === MAIN_TAB_VALUE ? void 0 : value,
       collection
     });
   }, [onTabChange, path, entityId, collection]);
   const propertyDetailView = () => {
-    if (detailViewConfig?.Builder) {
-      const CustomBuilder = resolveComponentRef(detailViewConfig.Builder);
-      if (CustomBuilder && usedEntity) {
-        return /* @__PURE__ */ jsx(CustomBuilder, { collection, entity: usedEntity, path, onEditClick: onEditClick ?? (() => {
-        }) });
-      }
+    if (FormViewBuilder && usedEntity) {
+      return /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: /* @__PURE__ */ jsx(FormViewBuilder, { collection, parentCollectionSlugs, parentEntityIds, entity: usedEntity, modifiedValues: usedEntity?.values, formContext: readOnlyFormContext }) }) });
     }
-    const HeaderComponent = detailViewConfig?.Header ? resolveComponentRef(detailViewConfig.Header) : null;
-    const FooterComponent = detailViewConfig?.Footer ? resolveComponentRef(detailViewConfig.Footer) : null;
-    return /* @__PURE__ */ jsxs(Fragment, { children: [
-      HeaderComponent && usedEntity && /* @__PURE__ */ jsx(HeaderComponent, { collection, entity: usedEntity, path, onEditClick: onEditClick ?? (() => {
-      }) }),
-      usedEntity && /* @__PURE__ */ jsx(EntityView, { entity: usedEntity, collection, path }),
-      FooterComponent && usedEntity && /* @__PURE__ */ jsx(FooterComponent, { collection, entity: usedEntity, path, onEditClick: onEditClick ?? (() => {
-      }) })
-    ] });
+    return /* @__PURE__ */ jsx(Fragment, { children: usedEntity && /* @__PURE__ */ jsx(EntityView, { entity: usedEntity, collection, path }) });
   };
   const subcollectionTabs = subcollections && subcollections.map((subcollection_0) => {
     const icon = getIcon(subcollection_0.icon, void 0, void 0, "small");
@@ -2989,9 +2987,9 @@ function EntityDetailViewInner({
       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_0) => {
         onSideTabClick(value_0);
       }, children: [
-        includeJsonView && /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: JSON_TAB_VALUE$1, className: "text-sm", children: /* @__PURE__ */ jsx(CodeIcon, { size: iconSize.small }) }),
-        includeHistoryView && /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: HISTORY_TAB_VALUE$1, className: "text-sm", children: /* @__PURE__ */ jsx(HistoryIcon, { size: iconSize.small }) }),
-        /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: MAIN_TAB_VALUE$1, className: "text-sm min-w-[90px]", children: collection.singularName ?? collection.name }),
+        includeJsonView && /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: JSON_TAB_VALUE, className: "text-sm", children: /* @__PURE__ */ jsx(CodeIcon, { size: iconSize.small }) }),
+        includeHistoryView && /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: HISTORY_TAB_VALUE, className: "text-sm", children: /* @__PURE__ */ jsx(HistoryIcon, { size: iconSize.small }) }),
+        /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: MAIN_TAB_VALUE, className: "text-sm min-w-[90px]", children: collection.singularName ?? collection.name }),
         customViewTabsStart,
         customViewTabsEnd,
         subcollectionTabs
@@ -7903,17 +7901,19 @@ const SelectableTable = function SelectableTable2({
     };
   }, [unselect]);
   const onFilterUpdate = useCallback((updatedFilterValues) => {
-    setFilterValues?.({
-      ...updatedFilterValues,
-      ...fixedFilter
-    });
-  }, [fixedFilter]);
+    if (setFilterValues) {
+      setFilterValues({
+        ...updatedFilterValues,
+        ...fixedFilter
+      });
+    }
+  }, [fixedFilter, setFilterValues]);
   const contextValue = useMemo(() => ({
-    setPopupCell,
     select,
     onValueChange,
     size: size ?? "m",
-    selectionStore
+    selectionStore,
+    setPopupCell
   }), [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-900", ref, children: /* @__PURE__ */ jsx(
     VirtualTable,
@@ -8322,7 +8322,7 @@ function buildBottomActions({
   const canClose = openEntityMode === "side_panel" || openEntityMode === "dialog";
   return /* @__PURE__ */ jsxs(DialogActions, { className, position: "absolute", children: [
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) }),
-    formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "grow flex overflow-auto no-scrollbar", children: formActions.map((action) => {
+    formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "grow flex overflow-auto no-scrollbar", children: formActions.map((action, index) => {
       const props = {
         view: "form",
         entity,
@@ -8335,7 +8335,7 @@ function buildBottomActions({
         formContext
       };
       const isEnabled = !action.isEnabled || action.isEnabled(props);
-      return /* @__PURE__ */ jsx(EntityActionButton, { action, enabled: isEnabled, props }, action.key);
+      return /* @__PURE__ */ jsx(EntityActionButton, { action, enabled: isEnabled, props }, action.key ?? action.name ?? index);
     }) }),
     pluginActions,
     hasErrors ? /* @__PURE__ */ jsx(ErrorTooltip, { title: "This form has errors", children: /* @__PURE__ */ jsx(AlertCircleIcon, { className: "ml-4 text-red-500", size: iconSize.smallest }) }) : null,
@@ -8387,7 +8387,7 @@ function buildSideActions({
     /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "text", disabled: disabled || formex.isSubmitting, type: "reset", children: status === "existing" ? t("discard") : t("clear") }),
     collection.defaultEntityAction === "view" && status === "existing" && /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "text", disabled, onClick: navigateBack, children: t("back_to_detail") ?? "Back to details" }),
     pluginActions,
-    formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-row flex-wrap mt-2", children: formActions.map((action) => {
+    formActions.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-row flex-wrap mt-2", children: formActions.map((action, index) => {
       const props = {
         view: "form",
         entity,
@@ -8400,7 +8400,7 @@ function buildSideActions({
         formContext
       };
       const isEnabled = !action.isEnabled || action.isEnabled(props);
-      return /* @__PURE__ */ jsx(EntityActionButton, { action, enabled: isEnabled, props }, action.key);
+      return /* @__PURE__ */ jsx(EntityActionButton, { action, enabled: isEnabled, props }, action.key ?? action.name ?? index);
     }) }),
     savingError && /* @__PURE__ */ jsx("div", { className: "text-right", children: /* @__PURE__ */ jsx(Typography, { color: "error", children: savingError.message }) })
   ] });
@@ -8485,12 +8485,9 @@ function EntityActionButton(t0) {
   }
   return t5;
 }
-const EntityHistoryView = lazy(() => import("./index-BCcLwgfe.js").then((m) => ({
+const EntityHistoryView = lazy(() => import("./index-D3S9x_RP.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(28);
   let entityId;
@@ -8651,9 +8648,14 @@ function EntityEditViewInner({
     status,
     entityId
   }), [collection, status, entityId]);
-  const [selectedTab, setSelectedTab] = useState(selectedTabProp === "edit" ? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE);
+  const userHasChangedTab = useRef(false);
+  const [selectedTab, setSelectedTab] = useState(() => {
+    const val = selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    return val === "edit" ? MAIN_TAB_VALUE : val;
+  });
   useEffect(() => {
-    const target = selectedTabProp === "edit" ? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    const val_0 = userHasChangedTab.current ? selectedTabProp ?? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    const target = val_0 === "edit" ? MAIN_TAB_VALUE : val_0;
     if (target !== selectedTab) {
       setSelectedTab(target);
     }
@@ -8683,6 +8685,7 @@ function EntityEditViewInner({
     return {
       entityId,
       disabled: false,
+      readOnly: true,
       openEntityMode: layout,
       status,
       values: usedEntity?.values ?? {},
@@ -8736,6 +8739,7 @@ function EntityEditViewInner({
     ] }, `subcol_${subcollectionId}`);
   }).filter(Boolean);
   const onSideTabClick = useCallback((value_0) => {
+    userHasChangedTab.current = true;
     setSelectedTab(value_0);
     if (status === "existing") {
       onTabChange?.({
@@ -8746,12 +8750,18 @@ function EntityEditViewInner({
       });
     }
   }, [status, onTabChange, path, entityId, collection]);
+  const formViewConfig = collection.formView;
+  const FormViewBuilder = formViewConfig?.Builder ? resolveComponentRef(formViewConfig.Builder) : null;
+  formViewConfig?.includeActions !== false;
   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 }),
+    FormViewBuilder && readOnlyFormContext ? /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: /* @__PURE__ */ jsx(FormViewBuilder, { collection, parentCollectionSlugs, parentEntityIds, entity: usedEntity, modifiedValues: usedEntity?.values, formContext: readOnlyFormContext }) }) }) : /* @__PURE__ */ jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection }),
     /* @__PURE__ */ jsx("div", { className: "h-16" })
   ] }) }) : null;
-  const entityView = /* @__PURE__ */ jsx(EntityForm, { collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, navigateBack, ...formProps, onEntityChange: (entity_0) => {
+  const entityView = FormViewBuilder ? (
+    // formView.Builder replaces the default form
+    /* @__PURE__ */ jsx("div", { className: cls("relative flex-1 w-full h-full overflow-auto", (!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : ""), children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(CircularProgressCenter, {}), children: (formContext ?? readOnlyFormContext) && /* @__PURE__ */ jsx(FormViewBuilder, { collection, parentCollectionSlugs, parentEntityIds, entity: usedEntity, modifiedValues: (formContext ?? readOnlyFormContext)?.formex?.values ?? usedEntity?.values, formContext: formContext ?? readOnlyFormContext }) }) }) })
+  ) : /* @__PURE__ */ jsx(EntityForm, { collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, navigateBack, ...formProps, onEntityChange: (entity_0) => {
     setUsedEntity(entity_0);
     formProps?.onEntityChange?.(entity_0);
   }, onStatusChange: (status_0) => {
@@ -8945,7 +8955,6 @@ function EntitySidePanel(props) {
     close
   } = useSideDialogContext();
   const navigate = useNavigate();
-  const location = useLocation();
   const sideEntityController = useSideEntityController();
   const collectionRegistryController = useCollectionRegistryController();
   const sideDialogsController = useSideDialogContext();
@@ -8988,6 +8997,29 @@ function EntitySidePanel(props) {
   useEffect(() => {
     setShowEditInPanel(selectedTab === "edit");
   }, [entityId, selectedTab]);
+  const hasCorrectedDefaultView = useRef(false);
+  useEffect(() => {
+    hasCorrectedDefaultView.current = false;
+  }, [entityId]);
+  useEffect(() => {
+    if (hasCorrectedDefaultView.current) return;
+    if (selectedTab) return;
+    if (!entityId || !collection?.defaultSelectedView) return;
+    const effectiveDefault = resolveDefaultSelectedView(collection.defaultSelectedView, {
+      status: "existing",
+      entityId
+    });
+    if (effectiveDefault && effectiveDefault !== "edit") {
+      hasCorrectedDefaultView.current = true;
+      sideEntityController.replace({
+        path,
+        entityId,
+        selectedTab: effectiveDefault,
+        updateUrl: collection.openEntityMode !== "dialog",
+        collection
+      });
+    }
+  }, [selectedTab, entityId, collection, path, sideEntityController]);
   const onValuesModified = useCallback((modified) => {
     setBlockedNavigationMessage(modified ? /* @__PURE__ */ jsxs(Fragment, { children: [
       " You have unsaved changes in this ",
@@ -9021,12 +9053,12 @@ function EntitySidePanel(props) {
       return;
     }
     if (tabEntityId) {
-      const collectionPath = removeInitialAndTrailingSlashes(path);
-      const tabSuffix = selectedTab_0 ? "/" + selectedTab_0 : "";
-      const fullUrl = urlController.buildUrlCollectionPath(`${collectionPath}/${tabEntityId}${tabSuffix}#side`);
-      navigate(fullUrl, {
-        replace: true,
-        state: location.state
+      sideEntityController.replace({
+        path,
+        entityId: tabEntityId,
+        selectedTab: selectedTab_0,
+        updateUrl: true,
+        collection: paramCollection ?? collection
       });
     }
   } }) : /* @__PURE__ */ jsx(EntityEditView, { ...props, layout: collection?.openEntityMode === "dialog" ? "dialog" : "side_panel", collection, parentCollectionSlugs, parentEntityIds, onValuesModified, onSaved: onUpdate, navigateBack: () => setShowEditInPanel(false), barActions: ({
@@ -9052,20 +9084,20 @@ function EntitySidePanel(props) {
       }
     }, children: /* @__PURE__ */ jsx(Maximize2Icon, {}) })
   ] }), onTabChange: ({
-    entityId: entityId_0,
+    entityId: tabEntityId_0,
     selectedTab: selectedTab_1,
     collection: paramCollection_0
   }) => {
     if (collection?.openEntityMode === "dialog" || paramCollection_0?.openEntityMode === "dialog") {
       return;
     }
-    if (entityId_0) {
-      const collectionPath_0 = removeInitialAndTrailingSlashes(path);
-      const tabSuffix_0 = selectedTab_1 ? "/" + selectedTab_1 : "";
-      const fullUrl_0 = urlController.buildUrlCollectionPath(`${collectionPath_0}/${entityId_0}${tabSuffix_0}#side`);
-      navigate(fullUrl_0, {
-        replace: true,
-        state: location.state
+    if (tabEntityId_0) {
+      sideEntityController.replace({
+        path,
+        entityId: tabEntityId_0,
+        selectedTab: selectedTab_1,
+        updateUrl: true,
+        collection: paramCollection_0 ?? collection
       });
     }
   }, formProps }) }) });
@@ -9077,7 +9109,7 @@ function getEntityViewWidth(props, small, customizationController) {
   const {
     selectedSecondaryForm
   } = resolvedSelectedEntityView(props.collection?.entityViews, customizationController, props.selectedTab);
-  const shouldUseSmallLayout = !props.selectedTab || props.selectedTab === JSON_TAB_VALUE || props.selectedTab === HISTORY_TAB_VALUE || Boolean(selectedSecondaryForm);
+  const shouldUseSmallLayout = !props.selectedTab || props.selectedTab === "edit" || props.selectedTab === JSON_TAB_VALUE || props.selectedTab === HISTORY_TAB_VALUE || Boolean(selectedSecondaryForm);
   let resolvedWidth;
   if (props.width) {
     resolvedWidth = typeof props.width === "number" ? `${props.width}px` : props.width;
@@ -9200,8 +9232,8 @@ const useBuildSideEntityController = (collectionRegistryController, urlControlle
       entityId: props_0.entityId
     });
     sideDialogsController.open(propsToSidePanel({
-      selectedTab: defaultSelectedView,
-      ...props_0
+      ...props_0,
+      selectedTab: props_0.selectedTab ?? defaultSelectedView
     }, urlController.buildUrlCollectionPath, urlController.resolveDatabasePathsFrom, smallLayout, customizationController, authController, location.search));
   }, [sideDialogsController, urlController.buildUrlCollectionPath, urlController.resolveDatabasePathsFrom, smallLayout, authController.user, location.search]);
   const replace = useCallback((props_1) => {
@@ -9235,6 +9267,7 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
         path: navigationEntry.slug,
         entityId: navigationEntry.entityId,
         copy: false,
+        collection: navigationEntry.parentCollection,
         width: navigationEntry.parentCollection?.sideDialogWidth
       };
     } else if (navigationEntry.type === "custom_view") {
@@ -9247,6 +9280,15 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
       }
     }
   }
+  if (sidePanel && !sidePanel.selectedTab && sidePanel.collection) {
+    const defaultView = resolveDefaultSelectedView(sidePanel.collection.defaultSelectedView, {
+      status: sidePanel.copy ? "copy" : sidePanel.entityId ? "existing" : "new",
+      entityId: sidePanel.entityId
+    });
+    if (defaultView) {
+      sidePanel.selectedTab = defaultView;
+    }
+  }
   if (newFlag) {
     sidePanel = {
       path: lastCollectionPath,
@@ -9719,11 +9761,7 @@ function useResolvedCollections(props) {
       try {
         const resolved = await resolveCollections(collectionsProp, authControllerRef.current, dataRef.current, pluginsRef.current);
         if (cancelled) return;
-        const defaults = [];
-        if (userManagementRef.current) {
-          defaults.push(defaultUsersCollection);
-        }
-        const deduped = Array.from(new Map([...defaults, ...resolved].map((c2) => [c2.slug, c2])).values());
+        const deduped = [...resolved];
         const changed = collectionRegistryController.collectionRegistryRef.current.registerMultiple(deduped);
         if (changed) {
           console.debug("Collections have changed", deduped);
@@ -9755,481 +9793,6 @@ function useResolvedCollections(props) {
     refresh
   }), [resolvedCollections, loading, error, refresh]);
 }
-function RoleChip(t0) {
-  const $ = c(9);
-  const {
-    role
-  } = t0;
-  let colorScheme;
-  if (role.isAdmin) {
-    let t12;
-    if ($[0] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-      t12 = getColorSchemeForKey("blue");
-      $[0] = t12;
-    } else {
-      t12 = $[0];
-    }
-    colorScheme = t12;
-  } else {
-    if (role.id === "editor") {
-      let t12;
-      if ($[1] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-        t12 = getColorSchemeForKey("yellow");
-        $[1] = t12;
-      } else {
-        t12 = $[1];
-      }
-      colorScheme = t12;
-    } else {
-      if (role.id === "viewer") {
-        let t12;
-        if ($[2] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-          t12 = getColorSchemeForKey("gray");
-          $[2] = t12;
-        } else {
-          t12 = $[2];
-        }
-        colorScheme = t12;
-      } else {
-        let t12;
-        if ($[3] !== role.id) {
-          t12 = getColorSchemeForSeed(role.id);
-          $[3] = role.id;
-          $[4] = t12;
-        } else {
-          t12 = $[4];
-        }
-        colorScheme = t12;
-      }
-    }
-  }
-  let t1;
-  if ($[5] !== colorScheme || $[6] !== role.id || $[7] !== role.name) {
-    t1 = /* @__PURE__ */ jsx(Chip, { colorScheme, children: role.name }, role.id);
-    $[5] = colorScheme;
-    $[6] = role.id;
-    $[7] = role.name;
-    $[8] = t1;
-  } else {
-    t1 = $[8];
-  }
-  return t1;
-}
-function RolesView({
-  userManagement: userManagementProp
-}) {
-  const userManagementContext = useInternalUserManagementController();
-  const userManagement = userManagementProp ?? userManagementContext;
-  if (!userManagement) {
-    return null;
-  }
-  const {
-    roles,
-    saveRole,
-    deleteRole,
-    loading,
-    allowDefaultRolesCreation,
-    rolesError
-  } = userManagement;
-  const snackbarController = useSnackbarController();
-  const {
-    t
-  } = useTranslation();
-  const breadcrumbs = useBreadcrumbsController();
-  React__default.useEffect(() => {
-    breadcrumbs.set({
-      breadcrumbs: [{
-        title: t("roles"),
-        url: "/roles"
-      }]
-    });
-  }, []);
-  const [dialogOpen, setDialogOpen] = useState(false);
-  const [selectedRole, setSelectedRole] = useState();
-  const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false);
-  const [roleToDelete, setRoleToDelete] = useState();
-  const [deleteInProgress, setDeleteInProgress] = useState(false);
-  const handleAddRole = () => {
-    setSelectedRole(void 0);
-    setDialogOpen(true);
-  };
-  const handleEditRole = (role) => {
-    setSelectedRole(role);
-    setDialogOpen(true);
-  };
-  const handleClose = () => {
-    setDialogOpen(false);
-    setSelectedRole(void 0);
-  };
-  const handleDelete = async () => {
-    if (!roleToDelete || !deleteRole) return;
-    setDeleteInProgress(true);
-    try {
-      await deleteRole(roleToDelete);
-      snackbarController.open({
-        type: "success",
-        message: t("role_deleted_successfully")
-      });
-      setDeleteConfirmOpen(false);
-      setRoleToDelete(void 0);
-    } catch (error) {
-      snackbarController.open({
-        type: "error",
-        message: error instanceof Error ? error.message : t("error_deleting_role")
-      });
-    } finally {
-      setDeleteInProgress(false);
-    }
-  };
-  const createDefaultRoles = async () => {
-    if (!saveRole) return;
-    const defaultRoles = [{
-      id: "admin",
-      name: "Admin",
-      isAdmin: true
-    }, {
-      id: "editor",
-      name: "Editor",
-      isAdmin: false
-    }, {
-      id: "viewer",
-      name: "Viewer",
-      isAdmin: false
-    }];
-    try {
-      for (const role_0 of defaultRoles) {
-        await saveRole(role_0);
-      }
-      snackbarController.open({
-        type: "success",
-        message: t("saved_correctly")
-      });
-    } catch (error_0) {
-      snackbarController.open({
-        type: "error",
-        message: error_0 instanceof Error ? error_0.message : t("error_saving_role")
-      });
-    }
-  };
-  if (loading) {
-    return /* @__PURE__ */ jsx(CenteredView, { children: /* @__PURE__ */ jsx(CircularProgress, {}) });
-  }
-  return /* @__PURE__ */ jsxs(Container, { className: "w-full flex flex-col py-4 gap-4", maxWidth: "6xl", children: [
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center mt-12 mb-4 gap-4", children: [
-      /* @__PURE__ */ jsx(Typography, { gutterBottom: true, variant: "h4", className: "grow mb-0", component: "h4", children: t("roles") }),
-      /* @__PURE__ */ jsx(Button, { startIcon: /* @__PURE__ */ jsx(PlusIcon, {}), onClick: handleAddRole, disabled: !saveRole, children: t("add_role") })
-    ] }),
-    /* @__PURE__ */ jsx("div", { className: "w-full overflow-auto", children: /* @__PURE__ */ jsxs(Table, { className: "w-full", children: [
-      /* @__PURE__ */ jsxs(TableHeader, { children: [
-        /* @__PURE__ */ jsx(TableCell, { header: true, children: t("role") }),
-        /* @__PURE__ */ jsx(TableCell, { header: true, className: "items-center", children: t("is_admin") }),
-        /* @__PURE__ */ jsx(TableCell, { header: true, className: "w-24 text-right", children: t("actions") })
-      ] }),
-      /* @__PURE__ */ jsxs(TableBody, { children: [
-        roles && roles.map((role_1) => {
-          return /* @__PURE__ */ jsxs(TableRow, { onClick: () => saveRole && handleEditRole(role_1), children: [
-            /* @__PURE__ */ jsx(TableCell, { children: /* @__PURE__ */ jsx(RoleChip, { role: role_1 }) }),
-            /* @__PURE__ */ jsx(TableCell, { className: "items-center", children: /* @__PURE__ */ jsx(Checkbox, { checked: role_1.isAdmin ?? false, disabled: true }) }),
-            /* @__PURE__ */ jsx(TableCell, { className: "text-right whitespace-nowrap", children: /* @__PURE__ */ jsx("div", { className: "flex justify-end items-center gap-1", children: !role_1.isAdmin && deleteRole && /* @__PURE__ */ jsx(Tooltip, { asChild: true, title: t("delete_this_role"), children: /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: (e) => {
-              e.stopPropagation();
-              setRoleToDelete(role_1);
-              setDeleteConfirmOpen(true);
-            }, children: /* @__PURE__ */ jsx(Trash2Icon, { size: iconSize.small }) }) }) }) })
-          ] }, role_1.id);
-        }),
-        (!roles || roles.length === 0) && /* @__PURE__ */ jsx(TableRow, { children: /* @__PURE__ */ jsx(TableCell, { colspan: 3, children: /* @__PURE__ */ jsxs(CenteredView, { className: "flex flex-col gap-4 my-8 items-center", children: [
-          /* @__PURE__ */ jsx(Typography, { variant: "label", children: rolesError ? t("no_permission_to_view_roles") : t("no_roles_yet") }),
-          rolesError && /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", children: t("no_permission_description") }),
-          !rolesError && allowDefaultRolesCreation && saveRole && /* @__PURE__ */ jsx(Button, { onClick: createDefaultRoles, children: t("create_default_roles") })
-        ] }) }) })
-      ] })
-    ] }) }),
-    saveRole && /* @__PURE__ */ jsx(RoleDetailsForm, { open: dialogOpen, role: selectedRole, saveRole, handleClose }, selectedRole?.id ?? "new"),
-    /* @__PURE__ */ jsx(ConfirmationDialog, { open: deleteConfirmOpen, loading: deleteInProgress, onAccept: handleDelete, onCancel: () => {
-      setDeleteConfirmOpen(false);
-      setRoleToDelete(void 0);
-    }, title: /* @__PURE__ */ jsx(Fragment, { children: t("delete_confirmation_title") }), body: /* @__PURE__ */ jsx(Fragment, { children: t("delete_role_confirmation") }) })
-  ] });
-}
-function RoleDetailsForm({
-  open,
-  role: roleProp,
-  saveRole,
-  handleClose
-}) {
-  const snackbarController = useSnackbarController();
-  const {
-    t
-  } = useTranslation();
-  const isNewRole = !roleProp;
-  const [roleId, setRoleId] = useState(roleProp?.id || "");
-  const [roleName, setRoleName] = useState(roleProp?.name || "");
-  const [isAdmin, setIsAdmin] = useState(roleProp?.isAdmin ?? false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [errors, setErrors] = useState({});
-  const [submitCount, setSubmitCount] = useState(0);
-  const validate = () => {
-    const newErrors = {};
-    if (!roleId) newErrors.id = "Required";
-    if (!roleName) newErrors.name = "Required";
-    setErrors(newErrors);
-    return Object.keys(newErrors).length === 0;
-  };
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-    setSubmitCount((c2) => c2 + 1);
-    if (!validate()) return;
-    setIsSubmitting(true);
-    try {
-      await saveRole({
-        id: roleId,
-        name: roleName,
-        isAdmin
-      });
-      handleClose();
-    } catch (error) {
-      snackbarController.open({
-        type: "error",
-        message: error instanceof Error ? error.message : "Failed to save role"
-      });
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-  return /* @__PURE__ */ jsx(Dialog, { open, onOpenChange: (open_0) => !open_0 ? handleClose() : void 0, maxWidth: "4xl", children: /* @__PURE__ */ jsxs("form", { onSubmit: handleSubmit, autoComplete: "off", noValidate: true, style: {
-    display: "flex",
-    flexDirection: "column",
-    position: "relative",
-    height: "100%"
-  }, children: [
-    /* @__PURE__ */ jsx(DialogTitle, { variant: "h4", gutterBottom: false, children: t("role") }),
-    /* @__PURE__ */ jsx(DialogContent, { className: "h-full grow overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-12 gap-4", children: [
-      /* @__PURE__ */ jsxs("div", { className: "col-span-12 sm:col-span-4", children: [
-        /* @__PURE__ */ jsx(TextField, { name: "id", required: true, error: submitCount > 0 && Boolean(errors.id), value: roleId, onChange: (e_0) => setRoleId(e_0.target.value), label: t("role_id"), disabled: !isNewRole }),
-        submitCount > 0 && errors.id && /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "error", children: errors.id })
-      ] }),
-      /* @__PURE__ */ jsxs("div", { className: "col-span-12 sm:col-span-4", children: [
-        /* @__PURE__ */ jsx(TextField, { name: "name", required: true, error: submitCount > 0 && Boolean(errors.name), value: roleName, onChange: (e_1) => setRoleName(e_1.target.value), label: t("role_name") }),
-        submitCount > 0 && errors.name && /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "error", children: errors.name })
-      ] }),
-      /* @__PURE__ */ jsx("div", { className: "col-span-12 sm:col-span-4 flex items-start pt-2", children: /* @__PURE__ */ jsxs(Label, { className: "flex items-center gap-2 cursor-pointer mt-3", children: [
-        /* @__PURE__ */ jsx(Checkbox, { checked: isAdmin, onCheckedChange: (checked) => setIsAdmin(Boolean(checked)) }),
-        /* @__PURE__ */ jsx(Typography, { variant: "body2", className: "font-medium", children: t("is_admin") })
-      ] }) }),
-      /* @__PURE__ */ jsx("div", { className: "col-span-12", children: /* @__PURE__ */ jsx(CollectionPermissionsMatrix, { roleId, isAdmin }) })
-    ] }) }),
-    /* @__PURE__ */ jsxs(DialogActions, { children: [
-      /* @__PURE__ */ jsx(Button, { variant: "text", onClick: handleClose, children: t("cancel") }),
-      /* @__PURE__ */ jsx(LoadingButton, { variant: "filled", type: "submit", disabled: isSubmitting, loading: isSubmitting, children: isNewRole ? t("create_role") : t("update") })
-    ] })
-  ] }) });
-}
-const CRUD_OPS = [{
-  op: "select",
-  label: "read"
-}, {
-  op: "insert",
-  label: "create"
-}, {
-  op: "update",
-  label: "edit"
-}, {
-  op: "delete",
-  label: "delete"
-}];
-function hasRoleAccess(rules, roleId, op) {
-  if (!rules || rules.length === 0) return true;
-  const applicable = rules.filter((r) => r.operation === op || r.operation === "all" || r.operations?.includes(op) || r.operations?.includes("all"));
-  if (applicable.length === 0) return false;
-  const forRole = applicable.filter((r) => !r.roles || r.roles.length === 0 || r.roles.includes(roleId) || r.roles.includes("public"));
-  if (forRole.length === 0) return false;
-  for (const r of forRole) {
-    if ((r.mode ?? "permissive") === "restrictive") return false;
-  }
-  return forRole.some((r) => (r.mode ?? "permissive") === "permissive");
-}
-function PermCell(t0) {
-  const $ = c(3);
-  const {
-    granted
-  } = t0;
-  const t1 = granted ? "text-green-500 dark:text-green-400 font-bold" : "text-surface-300 dark:text-surface-600";
-  const t2 = granted ? "✓" : "✗";
-  let t3;
-  if ($[0] !== t1 || $[1] !== t2) {
-    t3 = /* @__PURE__ */ jsx("span", { className: t1, children: t2 });
-    $[0] = t1;
-    $[1] = t2;
-    $[2] = t3;
-  } else {
-    t3 = $[2];
-  }
-  return t3;
-}
-function CollectionPermissionsMatrix(t0) {
-  const $ = c(34);
-  const {
-    roleId,
-    isAdmin
-  } = t0;
-  const {
-    collections
-  } = useCollectionRegistryController();
-  const {
-    t
-  } = useTranslation();
-  if (!collections || collections.length === 0) {
-    let t12;
-    if ($[0] !== t) {
-      t12 = t("no_collections_configured");
-      $[0] = t;
-      $[1] = t12;
-    } else {
-      t12 = $[1];
-    }
-    let t22;
-    if ($[2] !== t12) {
-      t22 = /* @__PURE__ */ jsx("div", { className: "mt-4", children: /* @__PURE__ */ jsx(Typography, { variant: "label", className: "text-surface-400", children: t12 }) });
-      $[2] = t12;
-      $[3] = t22;
-    } else {
-      t22 = $[3];
-    }
-    return t22;
-  }
-  const topLevel = collections;
-  let t1;
-  if ($[4] !== t) {
-    t1 = t("collection_permissions");
-    $[4] = t;
-    $[5] = t1;
-  } else {
-    t1 = $[5];
-  }
-  let t2;
-  if ($[6] !== t1) {
-    t2 = /* @__PURE__ */ jsx(Typography, { variant: "label", className: "mb-2 block text-surface-500 dark:text-surface-400 uppercase tracking-wide text-xs", children: t1 });
-    $[6] = t1;
-    $[7] = t2;
-  } else {
-    t2 = $[7];
-  }
-  let t3;
-  if ($[8] !== t) {
-    t3 = t("collection");
-    $[8] = t;
-    $[9] = t3;
-  } else {
-    t3 = $[9];
-  }
-  let t4;
-  if ($[10] !== t3) {
-    t4 = /* @__PURE__ */ jsx(TableCell, { header: true, children: t3 });
-    $[10] = t3;
-    $[11] = t4;
-  } else {
-    t4 = $[11];
-  }
-  let t5;
-  if ($[12] !== t) {
-    t5 = CRUD_OPS.map((t62) => {
-      const {
-        op,
-        label
-      } = t62;
-      return /* @__PURE__ */ jsx(TableCell, { header: true, align: "center", className: "w-20", children: t(label) }, op);
-    });
-    $[12] = t;
-    $[13] = t5;
-  } else {
-    t5 = $[13];
-  }
-  let t6;
-  if ($[14] !== t4 || $[15] !== t5) {
-    t6 = /* @__PURE__ */ jsxs(TableHeader, { children: [
-      t4,
-      t5
-    ] });
-    $[14] = t4;
-    $[15] = t5;
-    $[16] = t6;
-  } else {
-    t6 = $[16];
-  }
-  let t7;
-  if ($[17] !== isAdmin || $[18] !== roleId || $[19] !== t || $[20] !== topLevel) {
-    let t82;
-    if ($[22] !== isAdmin || $[23] !== roleId || $[24] !== t) {
-      t82 = (collection) => {
-        const capabilities = getDataSourceCapabilities(collection.driver);
-        const rules = capabilities.supportsRLS && "securityRules" in collection ? collection.securityRules : void 0;
-        const noRules = !rules || rules.length === 0;
-        return /* @__PURE__ */ jsxs(TableRow, { children: [
-          /* @__PURE__ */ jsxs(TableCell, { children: [
-            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5", children: [
-              /* @__PURE__ */ jsx("span", { className: "font-medium", children: collection.name }),
-              noRules && !isAdmin && /* @__PURE__ */ jsx(Tooltip, { title: t("no_security_rules_defined"), children: /* @__PURE__ */ jsx(Chip, { size: "smallest", colorScheme: "gray", children: t("no_rules") }) })
-            ] }),
-            /* @__PURE__ */ jsx("span", { className: "text-xs text-surface-400 font-mono", children: collection.slug })
-          ] }),
-          CRUD_OPS.map((t92) => {
-            const {
-              op: op_0
-            } = t92;
-            return /* @__PURE__ */ jsx(TableCell, { align: "center", className: "w-20", children: /* @__PURE__ */ jsx(PermCell, { granted: isAdmin || hasRoleAccess(rules, roleId, op_0) }) }, op_0);
-          })
-        ] }, collection.slug);
-      };
-      $[22] = isAdmin;
-      $[23] = roleId;
-      $[24] = t;
-      $[25] = t82;
-    } else {
-      t82 = $[25];
-    }
-    t7 = topLevel.map(t82);
-    $[17] = isAdmin;
-    $[18] = roleId;
-    $[19] = t;
-    $[20] = topLevel;
-    $[21] = t7;
-  } else {
-    t7 = $[21];
-  }
-  let t8;
-  if ($[26] !== t7) {
-    t8 = /* @__PURE__ */ jsx(TableBody, { children: t7 });
-    $[26] = t7;
-    $[27] = t8;
-  } else {
-    t8 = $[27];
-  }
-  let t9;
-  if ($[28] !== t6 || $[29] !== t8) {
-    t9 = /* @__PURE__ */ jsx("div", { className: `rounded-lg overflow-hidden border w-full ${defaultBorderMixin}`, children: /* @__PURE__ */ jsxs(Table, { className: "w-full", children: [
-      t6,
-      t8
-    ] }) });
-    $[28] = t6;
-    $[29] = t8;
-    $[30] = t9;
-  } else {
-    t9 = $[30];
-  }
-  let t10;
-  if ($[31] !== t2 || $[32] !== t9) {
-    t10 = /* @__PURE__ */ jsxs("div", { className: "mt-4", children: [
-      t2,
-      t9
-    ] });
-    $[31] = t2;
-    $[32] = t9;
-    $[33] = t10;
-  } else {
-    t10 = $[33];
-  }
-  return t10;
-}
 function viewSlugsEqual(a, b) {
   if (a === b) return true;
   if (!a || !b) return false;
@@ -10247,8 +9810,7 @@ function useResolvedViews(props) {
     data,
     plugins,
     adminMode = "content",
-    effectiveRoleController,
-    userManagement
+    effectiveRoleController
   } = props;
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(void 0);
@@ -10280,24 +9842,6 @@ function useResolvedViews(props) {
   }, [adminMode, effectiveRoleController?.effectiveRole, authController]);
   const resolvedAuthControllerRef = useRef(resolvedAuthController);
   resolvedAuthControllerRef.current = resolvedAuthController;
-  const hasRoles = !!userManagement?.roles;
-  const rolesViewElement = useMemo(() => hasRoles ? /* @__PURE__ */ jsx(RolesView, {}) : null, [hasRoles]);
-  const injectedAdminViews = useMemo(() => {
-    const views = [];
-    const isUserAdmin = userManagement?.isAdmin !== false;
-    if (userManagement && isUserAdmin && userManagement.roles && rolesViewElement) {
-      views.push({
-        slug: "roles",
-        name: "Roles",
-        icon: "Shield",
-        view: rolesViewElement,
-        group: "Settings"
-      });
-    }
-    return views;
-  }, [userManagement, rolesViewElement]);
-  const injectedAdminViewsRef = useRef(injectedAdminViews);
-  injectedAdminViewsRef.current = injectedAdminViews;
   const initialLoading = resolvedAuthController.initialLoading;
   const user = resolvedAuthController.user;
   useEffect(() => {
@@ -10305,13 +9849,7 @@ function useResolvedViews(props) {
     let cancelled = false;
     (async () => {
       try {
-        const [newViews, newAdminViewsProp] = await Promise.all([resolveAppViews(viewsProp, resolvedAuthControllerRef.current, dataRef.current, pluginsRef.current), resolveAppViews(adminViewsProp, resolvedAuthControllerRef.current, dataRef.current)]);
-        const customSlugs = new Set(newAdminViewsProp.flatMap((v) => Array.isArray(v.slug) ? v.slug : [v.slug]));
-        const finalInjected = injectedAdminViewsRef.current.filter((v_0) => {
-          const slugs = Array.isArray(v_0.slug) ? v_0.slug : [v_0.slug];
-          return slugs.every((s) => !customSlugs.has(s));
-        });
-        const newAdminViews = [...newAdminViewsProp, ...finalInjected];
+        const [newViews, newAdminViews] = await Promise.all([resolveAppViews(viewsProp, resolvedAuthControllerRef.current, dataRef.current, pluginsRef.current), resolveAppViews(adminViewsProp, resolvedAuthControllerRef.current, dataRef.current)]);
         if (!viewSlugsEqual(viewsRef.current, newViews)) {
           viewsRef.current = newViews;
           setResolvedViews(newViews);
@@ -10502,7 +10040,7 @@ function useTopLevelNavigation(props) {
   }), [topLevelNavigation]);
 }
 function useBuildNavigationStateController(props) {
-  const $ = c(38);
+  const $ = c(37);
   const {
     authController,
     collections: collectionsProp,
@@ -10549,7 +10087,7 @@ function useBuildNavigationStateController(props) {
     refresh: refreshCollections
   } = useResolvedCollections(t1);
   let t2;
-  if ($[8] !== adminMode || $[9] !== adminViewsProp || $[10] !== authController || $[11] !== data || $[12] !== effectiveRoleController || $[13] !== plugins || $[14] !== userManagement || $[15] !== viewsProp) {
+  if ($[8] !== adminMode || $[9] !== adminViewsProp || $[10] !== authController || $[11] !== data || $[12] !== effectiveRoleController || $[13] !== plugins || $[14] !== viewsProp) {
     t2 = {
       authController,
       views: viewsProp,
@@ -10557,8 +10095,7 @@ function useBuildNavigationStateController(props) {
       data,
       plugins,
       adminMode,
-      effectiveRoleController,
-      userManagement
+      effectiveRoleController
     };
     $[8] = adminMode;
     $[9] = adminViewsProp;
@@ -10566,11 +10103,10 @@ function useBuildNavigationStateController(props) {
     $[11] = data;
     $[12] = effectiveRoleController;
     $[13] = plugins;
-    $[14] = userManagement;
-    $[15] = viewsProp;
-    $[16] = t2;
+    $[14] = viewsProp;
+    $[15] = t2;
   } else {
-    t2 = $[16];
+    t2 = $[15];
   }
   const {
     views,
@@ -10580,7 +10116,7 @@ function useBuildNavigationStateController(props) {
     refresh: refreshViews
   } = useResolvedViews(t2);
   let t3;
-  if ($[17] !== adminMode || $[18] !== adminViews || $[19] !== collectionRegistryController || $[20] !== collections || $[21] !== navigationGroupMappings || $[22] !== plugins || $[23] !== urlController || $[24] !== views || $[25] !== viewsOrder) {
+  if ($[16] !== adminMode || $[17] !== adminViews || $[18] !== collectionRegistryController || $[19] !== collections || $[20] !== navigationGroupMappings || $[21] !== plugins || $[22] !== urlController || $[23] !== views || $[24] !== viewsOrder) {
     t3 = {
       collections,
       views,
@@ -10592,40 +10128,40 @@ function useBuildNavigationStateController(props) {
       adminMode,
       collectionRegistryController
     };
-    $[17] = adminMode;
-    $[18] = adminViews;
-    $[19] = collectionRegistryController;
-    $[20] = collections;
-    $[21] = navigationGroupMappings;
-    $[22] = plugins;
-    $[23] = urlController;
-    $[24] = views;
-    $[25] = viewsOrder;
-    $[26] = t3;
+    $[16] = adminMode;
+    $[17] = adminViews;
+    $[18] = collectionRegistryController;
+    $[19] = collections;
+    $[20] = navigationGroupMappings;
+    $[21] = plugins;
+    $[22] = urlController;
+    $[23] = views;
+    $[24] = viewsOrder;
+    $[25] = t3;
   } else {
-    t3 = $[26];
+    t3 = $[25];
   }
   const {
     topLevelNavigation
   } = useTopLevelNavigation(t3);
   let t4;
-  if ($[27] !== refreshCollections || $[28] !== refreshViews) {
+  if ($[26] !== refreshCollections || $[27] !== refreshViews) {
     t4 = () => {
       refreshCollections();
       refreshViews();
     };
-    $[27] = refreshCollections;
-    $[28] = refreshViews;
-    $[29] = t4;
+    $[26] = refreshCollections;
+    $[27] = refreshViews;
+    $[28] = t4;
   } else {
-    t4 = $[29];
+    t4 = $[28];
   }
   const refreshNavigation = t4;
   let t5;
   const t6 = collectionsLoading || viewsLoading;
   const t7 = collectionsError ?? viewsError;
   let t8;
-  if ($[30] !== adminViews || $[31] !== plugins || $[32] !== refreshNavigation || $[33] !== t6 || $[34] !== t7 || $[35] !== topLevelNavigation || $[36] !== views) {
+  if ($[29] !== adminViews || $[30] !== plugins || $[31] !== refreshNavigation || $[32] !== t6 || $[33] !== t7 || $[34] !== topLevelNavigation || $[35] !== views) {
     t8 = {
       views,
       adminViews,
@@ -10635,16 +10171,16 @@ function useBuildNavigationStateController(props) {
       refreshNavigation,
       plugins
     };
-    $[30] = adminViews;
-    $[31] = plugins;
-    $[32] = refreshNavigation;
-    $[33] = t6;
-    $[34] = t7;
-    $[35] = topLevelNavigation;
-    $[36] = views;
-    $[37] = t8;
+    $[29] = adminViews;
+    $[30] = plugins;
+    $[31] = refreshNavigation;
+    $[32] = t6;
+    $[33] = t7;
+    $[34] = topLevelNavigation;
+    $[35] = views;
+    $[36] = t8;
   } else {
-    t8 = $[37];
+    t8 = $[36];
   }
   t5 = t8;
   return t5;
@@ -11443,6 +10979,9 @@ function useCollectionInlineEditor(t0) {
         setError,
         data: entity
       } = t32;
+      if (!entity) {
+        return;
+      }
       const updatedValues = setIn({}, propertyKey, value_0);
       const saveProps = {
         path: entity.path ?? path,
@@ -12020,7 +11559,7 @@ function FormLayout(t0) {
   return t2;
 }
 function ReadOnlyFieldBinding(t0) {
-  const $ = c(18);
+  const $ = c(23);
   const {
     propertyKey,
     value,
@@ -12030,6 +11569,7 @@ function ReadOnlyFieldBinding(t0) {
     property,
     includeDescription
   } = t0;
+  const skipCardWrapper = property.type === "relation" || property.type === "reference";
   let t1;
   if ($[0] !== minimalistView || $[1] !== property || $[2] !== propertyKey) {
     t1 = !minimalistView && /* @__PURE__ */ jsx(LabelWithIconAndTooltip, { propertyKey, icon: getIconForProperty(property, "small"), required: property.validation?.required, title: property.name ?? propertyKey, className: "h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5" });
@@ -12040,49 +11580,62 @@ function ReadOnlyFieldBinding(t0) {
   } else {
     t1 = $[3];
   }
-  let t2;
-  if ($[4] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t2 = cls(paperMixin, "w-full min-h-14 p-4 md:p-6 overflow-x-scroll no-scrollbar");
+  const t2 = !skipCardWrapper && paperMixin;
+  const t3 = !skipCardWrapper && "p-4 md:p-6";
+  let t4;
+  if ($[4] !== t2 || $[5] !== t3) {
+    t4 = cls(t2, "w-full min-h-14 overflow-x-scroll no-scrollbar", t3);
     $[4] = t2;
+    $[5] = t3;
+    $[6] = t4;
   } else {
-    t2 = $[4];
+    t4 = $[6];
   }
-  let t3;
-  if ($[5] !== property || $[6] !== propertyKey || $[7] !== value) {
-    t3 = /* @__PURE__ */ jsx("div", { className: t2, children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyPreview, { propertyKey, value, property, size: "medium" }) }) });
-    $[5] = property;
-    $[6] = propertyKey;
-    $[7] = value;
-    $[8] = t3;
+  let t5;
+  if ($[7] !== property || $[8] !== propertyKey || $[9] !== value) {
+    t5 = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyPreview, { propertyKey, value, property, size: "medium" }) });
+    $[7] = property;
+    $[8] = propertyKey;
+    $[9] = value;
+    $[10] = t5;
   } else {
-    t3 = $[8];
+    t5 = $[10];
   }
-  let t4;
-  if ($[9] !== error || $[10] !== includeDescription || $[11] !== property || $[12] !== showError) {
-    t4 = /* @__PURE__ */ jsx(FieldHelperText, { includeDescription, showError, error, property });
-    $[9] = error;
-    $[10] = includeDescription;
-    $[11] = property;
-    $[12] = showError;
-    $[13] = t4;
+  let t6;
+  if ($[11] !== t4 || $[12] !== t5) {
+    t6 = /* @__PURE__ */ jsx("div", { className: t4, children: t5 });
+    $[11] = t4;
+    $[12] = t5;
+    $[13] = t6;
   } else {
-    t4 = $[13];
+    t6 = $[13];
   }
-  let t5;
-  if ($[14] !== t1 || $[15] !== t3 || $[16] !== t4) {
-    t5 = /* @__PURE__ */ jsxs(Fragment, { children: [
+  let t7;
+  if ($[14] !== error || $[15] !== includeDescription || $[16] !== property || $[17] !== showError) {
+    t7 = /* @__PURE__ */ jsx(FieldHelperText, { includeDescription, showError, error, property });
+    $[14] = error;
+    $[15] = includeDescription;
+    $[16] = property;
+    $[17] = showError;
+    $[18] = t7;
+  } else {
+    t7 = $[18];
+  }
+  let t8;
+  if ($[19] !== t1 || $[20] !== t6 || $[21] !== t7) {
+    t8 = /* @__PURE__ */ jsxs(Fragment, { children: [
       t1,
-      t3,
-      t4
+      t6,
+      t7
     ] });
-    $[14] = t1;
-    $[15] = t3;
-    $[16] = t4;
-    $[17] = t5;
+    $[19] = t1;
+    $[20] = t6;
+    $[21] = t7;
+    $[22] = t8;
   } else {
-    t5 = $[17];
+    t8 = $[22];
   }
-  return t5;
+  return t8;
 }
 const PropertyFieldBinding = React__default.memo(PropertyFieldBindingInternal, (a, b) => {
   if (a.propertyKey !== b.propertyKey) {
@@ -12253,7 +11806,6 @@ function FieldInternal({
     propertyKey,
     property,
     Component,
-    // Cast component here since it is a generic component type
     plugins
   });
   const UsedComponent = WrappedComponent ?? Component;
@@ -14063,10 +13615,9 @@ function gettype(value) {
   return void 0;
 }
 function MapFieldBinding(t0) {
-  const $ = c(41);
+  const $ = c(37);
   const {
     propertyKey,
-    value,
     showError,
     error,
     disabled,
@@ -14078,52 +13629,26 @@ function MapFieldBinding(t0) {
     context,
     onPropertyChange
   } = t0;
-  const pickOnlySomeKeys = property.pickOnlySomeKeys || false;
   const expanded = property.ui?.expanded === void 0 ? true : property.ui?.expanded;
   const minimalistView = minimalistViewProp || property.ui?.minimalistView;
   useTranslation();
   if (!property.properties) {
     throw Error(`You need to specify a 'properties' prop (or specify a custom field) in your map property ${propertyKey}`);
   }
-  let mapProperties;
-  if (pickOnlySomeKeys) {
-    if (value) {
-      let t12;
-      if ($[0] !== property.properties || $[1] !== value) {
-        t12 = pick(property.properties, ...Object.keys(value).filter((key) => key in property.properties));
-        $[0] = property.properties;
-        $[1] = value;
-        $[2] = t12;
-      } else {
-        t12 = $[2];
-      }
-      mapProperties = t12;
-    } else {
-      let t12;
-      if ($[3] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-        t12 = {};
-        $[3] = t12;
-      } else {
-        t12 = $[3];
-      }
-      mapProperties = t12;
-    }
-  } else {
-    mapProperties = property.properties;
-  }
+  const mapProperties = property.properties;
   const t1 = minimalistView && property.ui?.widthPercentage !== void 0 ? "mt-8" : void 0;
   let t2;
-  if ($[4] !== t1) {
+  if ($[0] !== t1) {
     t2 = cls("py-1 flex flex-col space-y-2", t1);
-    $[4] = t1;
-    $[5] = t2;
+    $[0] = t1;
+    $[1] = t2;
   } else {
-    t2 = $[5];
+    t2 = $[1];
   }
   let t3;
-  if ($[6] !== autoFocus || $[7] !== context || $[8] !== disabled || $[9] !== includeDescription || $[10] !== mapProperties || $[11] !== onPropertyChange || $[12] !== propertyKey) {
+  if ($[2] !== autoFocus || $[3] !== context || $[4] !== disabled || $[5] !== includeDescription || $[6] !== mapProperties || $[7] !== onPropertyChange || $[8] !== propertyKey) {
     let t42;
-    if ($[14] !== autoFocus || $[15] !== context || $[16] !== disabled || $[17] !== includeDescription || $[18] !== onPropertyChange || $[19] !== propertyKey) {
+    if ($[10] !== autoFocus || $[11] !== context || $[12] !== disabled || $[13] !== includeDescription || $[14] !== onPropertyChange || $[15] !== propertyKey) {
       t42 = (t52, index) => {
         const [entryKey, childProperty] = t52;
         const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.ui?.disabled);
@@ -14146,40 +13671,40 @@ function MapFieldBinding(t0) {
         };
         return /* @__PURE__ */ jsx("div", { className: "relative", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyFieldBinding, { ...fieldBindingProps }) }) }, `map-${propertyKey}-${index}`);
       };
-      $[14] = autoFocus;
-      $[15] = context;
-      $[16] = disabled;
-      $[17] = includeDescription;
-      $[18] = onPropertyChange;
-      $[19] = propertyKey;
-      $[20] = t42;
+      $[10] = autoFocus;
+      $[11] = context;
+      $[12] = disabled;
+      $[13] = includeDescription;
+      $[14] = onPropertyChange;
+      $[15] = propertyKey;
+      $[16] = t42;
     } else {
-      t42 = $[20];
+      t42 = $[16];
     }
     t3 = Object.entries(mapProperties).filter(_temp$h).map(t42);
-    $[6] = autoFocus;
-    $[7] = context;
-    $[8] = disabled;
-    $[9] = includeDescription;
-    $[10] = mapProperties;
-    $[11] = onPropertyChange;
-    $[12] = propertyKey;
-    $[13] = t3;
+    $[2] = autoFocus;
+    $[3] = context;
+    $[4] = disabled;
+    $[5] = includeDescription;
+    $[6] = mapProperties;
+    $[7] = onPropertyChange;
+    $[8] = propertyKey;
+    $[9] = t3;
   } else {
-    t3 = $[13];
+    t3 = $[9];
   }
   let t4;
-  if ($[21] !== t2 || $[22] !== t3) {
+  if ($[17] !== t2 || $[18] !== t3) {
     t4 = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx("div", { className: t2, children: t3 }) });
-    $[21] = t2;
-    $[22] = t3;
-    $[23] = t4;
+    $[17] = t2;
+    $[18] = t3;
+    $[19] = t4;
   } else {
-    t4 = $[23];
+    t4 = $[19];
   }
   const mapFormView = t4;
   let t5;
-  if ($[24] !== expanded || $[25] !== mapFormView || $[26] !== minimalistView || $[27] !== onPropertyChange || $[28] !== property || $[29] !== propertyKey) {
+  if ($[20] !== expanded || $[21] !== mapFormView || $[22] !== minimalistView || $[23] !== onPropertyChange || $[24] !== property || $[25] !== propertyKey) {
     t5 = !minimalistView && /* @__PURE__ */ jsx(ExpandablePanel, { initiallyExpanded: expanded, onExpandedChange: (expanded_0) => {
       onPropertyChange?.({
         ui: {
@@ -14188,44 +13713,44 @@ function MapFieldBinding(t0) {
         }
       });
     }, className: property.ui?.widthPercentage !== void 0 ? "mt-8" : void 0, innerClassName: "px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2 bg-white dark:bg-surface-900", title: /* @__PURE__ */ jsx(LabelWithIconAndTooltip, { propertyKey, icon: getIconForProperty(property, "small"), required: property.validation?.required, title: property.name ?? propertyKey, className: "text-text-secondary dark:text-text-secondary-dark" }), children: mapFormView });
-    $[24] = expanded;
-    $[25] = mapFormView;
-    $[26] = minimalistView;
-    $[27] = onPropertyChange;
-    $[28] = property;
-    $[29] = propertyKey;
-    $[30] = t5;
+    $[20] = expanded;
+    $[21] = mapFormView;
+    $[22] = minimalistView;
+    $[23] = onPropertyChange;
+    $[24] = property;
+    $[25] = propertyKey;
+    $[26] = t5;
   } else {
-    t5 = $[30];
+    t5 = $[26];
   }
   const t6 = minimalistView && mapFormView;
   const t7 = showError ?? false;
   const t8 = error && !partOfArray ? error : void 0;
   let t9;
-  if ($[31] !== disabled || $[32] !== includeDescription || $[33] !== property || $[34] !== t7 || $[35] !== t8) {
+  if ($[27] !== disabled || $[28] !== includeDescription || $[29] !== property || $[30] !== t7 || $[31] !== t8) {
     t9 = /* @__PURE__ */ jsx(FieldHelperText, { includeDescription, showError: t7, error: t8, disabled, property });
-    $[31] = disabled;
-    $[32] = includeDescription;
-    $[33] = property;
-    $[34] = t7;
-    $[35] = t8;
-    $[36] = t9;
+    $[27] = disabled;
+    $[28] = includeDescription;
+    $[29] = property;
+    $[30] = t7;
+    $[31] = t8;
+    $[32] = t9;
   } else {
-    t9 = $[36];
+    t9 = $[32];
   }
   let t10;
-  if ($[37] !== t5 || $[38] !== t6 || $[39] !== t9) {
+  if ($[33] !== t5 || $[34] !== t6 || $[35] !== t9) {
     t10 = /* @__PURE__ */ jsxs(ErrorBoundary, { children: [
       t5,
       t6,
       t9
     ] });
-    $[37] = t5;
-    $[38] = t6;
-    $[39] = t9;
-    $[40] = t10;
+    $[33] = t5;
+    $[34] = t6;
+    $[35] = t9;
+    $[36] = t10;
   } else {
-    t10 = $[40];
+    t10 = $[36];
   }
   return t10;
 }
@@ -19050,10 +18575,10 @@ function EditorCollectionAction(t0) {
   }
   return t8;
 }
-const ImportCollectionAction = lazy(() => import("./index-UQOMHwt1.js").then((m) => ({
+const ImportCollectionAction = lazy(() => import("./index-DrrT332R.js").then((m) => ({
   default: m.ImportCollectionAction
 })));
-const ExportCollectionAction = lazy(() => import("./index-DY2k5TtG.js").then((m) => ({
+const ExportCollectionAction = lazy(() => import("./index-D9RNzm01.js").then((m) => ({
   default: m.ExportCollectionAction
 })));
 function EntityCollectionViewActions(t0) {
@@ -19536,35 +19061,70 @@ function resolveEntitySlots(entity, collection, slotKeys) {
 }
 function resolveRelationDisplayName(relation, prop) {
   const data = "data" in relation ? relation.data : void 0;
-  if (!data || !data.values) {
-    const id2 = "id" in relation ? relation.id : void 0;
-    return id2 !== void 0 ? String(id2) : void 0;
-  }
-  const values = data.values;
+  let targetCollection;
   try {
-    const targetCollection = prop.relation?.target?.();
+    const resolved = prop.relation?.target?.() ?? (typeof prop.target === "function" ? prop.target() : void 0);
+    if (resolved && typeof resolved === "object") {
+      targetCollection = resolved;
+    }
+  } catch {
+  }
+  const extractDisplayName = (values) => {
     if (targetCollection) {
       const targetTitleKey = targetCollection.titleProperty;
       if (targetTitleKey && values[targetTitleKey] !== void 0) {
         return String(values[targetTitleKey]);
       }
+      const isHiddenProp = (p) => {
+        if (p.ui?.hideFromCollection) return true;
+        if (typeof p.ui?.disabled === "object" && p.ui.disabled.hidden) return true;
+        return false;
+      };
+      const isDisplayCandidate = (p) => {
+        return p.type === "string" && !p.multiline && !p.markdown && !p.storage && !("isId" in p && p.isId) && !isHiddenProp(p);
+      };
+      const priorityKeys = ["name", "title", "label", "displayName"];
+      for (const pk of priorityKeys) {
+        const p = targetCollection.properties[pk];
+        if (p && isDisplayCandidate(p) && values[pk] !== void 0 && values[pk] !== null) {
+          return String(values[pk]);
+        }
+      }
       for (const [k, p] of Object.entries(targetCollection.properties)) {
         const tp = p;
-        if (tp.type === "string" && !tp.multiline && !tp.markdown && !tp.storage && !("isId" in tp && tp.isId)) {
+        if (isDisplayCandidate(tp)) {
           if (values[k] !== void 0 && values[k] !== null) {
             return String(values[k]);
           }
         }
       }
     }
-  } catch {
-  }
-  for (const [, v] of Object.entries(values)) {
-    if (typeof v === "string" && v.length > 0 && v.length < 200) {
-      return v;
+    for (const [, v] of Object.entries(values)) {
+      if (typeof v === "string" && v.length > 0 && v.length < 200) {
+        return v;
+      }
     }
+    return void 0;
+  };
+  if (data && data.values) {
+    const result = extractDisplayName(data.values);
+    if (result) return result;
   }
   const id = "id" in relation ? relation.id : void 0;
+  if (id !== void 0 && targetCollection) {
+    try {
+      const slug = targetCollection.slug ?? ("table" in targetCollection ? targetCollection.table : void 0);
+      if (slug) {
+        const cacheKey = `${slug}/${id}`;
+        const cached = getEntityFromCache(cacheKey);
+        if (cached?.values) {
+          const result = extractDisplayName(cached.values);
+          if (result) return result;
+        }
+      }
+    } catch {
+    }
+  }
   return id !== void 0 ? String(id) : void 0;
 }
 function EntityCard({
@@ -19639,6 +19199,18 @@ function getGridColumnsClass(size) {
       return "grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6";
   }
 }
+function getScrollParent$1(element) {
+  if (!element) return null;
+  let parent = element.parentElement;
+  while (parent) {
+    const overflowY = window.getComputedStyle(parent).overflowY;
+    if (overflowY === "auto" || overflowY === "scroll") {
+      return parent;
+    }
+    parent = parent.parentElement;
+  }
+  return document.documentElement;
+}
 function EntityCollectionCardView({
   collection,
   tableController,
@@ -19652,7 +19224,6 @@ function EntityCollectionCardView({
   size = "m"
 }) {
   const containerRef = useRef(null);
-  const loadMoreRef = useRef(null);
   const hasRestoredScroll = useRef(false);
   const {
     data,
@@ -19685,37 +19256,48 @@ function EntityCollectionCardView({
     if (!dataLoading) isLoadingMore.current = false;
   }, [dataLoading]);
   useEffect(() => {
-    const observer = new IntersectionObserver((entries) => {
+    const el = containerRef.current;
+    if (!el) return;
+    const scrollEl = getScrollParent$1(el);
+    if (!scrollEl) return;
+    let rafId = null;
+    const update = () => {
+      rafId = null;
       const {
         paginationEnabled: pe,
         noMoreToLoad: nm,
-        dataLoading: dl,
         itemCount: ic,
         pageSize: ps
       } = paginationStateRef.current;
-      if (entries[0].isIntersecting && pe && !dl && !nm && !isLoadingMore.current) {
+      if (pe && !nm && !isLoadingMore.current && scrollEl.scrollHeight - scrollEl.scrollTop - scrollEl.clientHeight < 400) {
         isLoadingMore.current = true;
         setItemCount?.((ic ?? ps) + ps);
       }
-    }, {
-      root: containerRef.current,
-      rootMargin: "400px",
-      threshold: 0
+    };
+    const onScrollEvent = () => {
+      if (rafId === null) rafId = requestAnimationFrame(update);
+    };
+    scrollEl.addEventListener("scroll", onScrollEvent, {
+      passive: true
     });
-    if (loadMoreRef.current) {
-      observer.observe(loadMoreRef.current);
-    }
-    return () => observer.disconnect();
+    const ro = new ResizeObserver(() => update());
+    ro.observe(scrollEl);
+    update();
+    return () => {
+      scrollEl.removeEventListener("scroll", onScrollEvent);
+      ro.disconnect();
+      if (rafId !== null) cancelAnimationFrame(rafId);
+    };
   }, [setItemCount]);
   useEffect(() => {
     if (!containerRef.current || !initialScroll || hasRestoredScroll.current || data.length === 0) return;
+    const scrollEl_0 = getScrollParent$1(containerRef.current);
+    if (!scrollEl_0) return;
     let attempts = 0;
     const maxAttempts = 5;
     const tryRestore = () => {
-      const el = containerRef.current;
-      if (!el) return;
-      if (el.scrollHeight >= initialScroll || attempts >= maxAttempts) {
-        el.scrollTop = initialScroll;
+      if (scrollEl_0.scrollHeight >= initialScroll || attempts >= maxAttempts) {
+        scrollEl_0.scrollTop = initialScroll;
         hasRestoredScroll.current = true;
       } else {
         attempts++;
@@ -19726,10 +19308,12 @@ function EntityCollectionCardView({
   }, [initialScroll, data.length]);
   const lastScrollOffset = useRef(0);
   useEffect(() => {
-    const container = containerRef.current;
-    if (!container || !onScroll) return;
+    const el_0 = containerRef.current;
+    if (!el_0 || !onScroll) return;
+    const scrollEl_1 = getScrollParent$1(el_0);
+    if (!scrollEl_1) return;
     const handleScroll = () => {
-      const currentOffset = container.scrollTop;
+      const currentOffset = scrollEl_1.scrollTop;
       const direction = currentOffset > lastScrollOffset.current ? "forward" : "backward";
       lastScrollOffset.current = currentOffset;
       onScroll({
@@ -19738,10 +19322,10 @@ function EntityCollectionCardView({
         scrollUpdateWasRequested: false
       });
     };
-    container.addEventListener("scroll", handleScroll, {
+    scrollEl_1.addEventListener("scroll", handleScroll, {
       passive: true
     });
-    return () => container.removeEventListener("scroll", handleScroll);
+    return () => scrollEl_1.removeEventListener("scroll", handleScroll);
   }, [onScroll]);
   const handleEntityClick = useCallback((entity) => {
     onEntityClick?.(entity);
@@ -19758,12 +19342,12 @@ function EntityCollectionCardView({
   const gridColumnsClass = getGridColumnsClass(size);
   const isInitialLoading = dataLoading && data.length === 0 && !dataLoadingError;
   const isEmpty = !dataLoading && data.length === 0 && !dataLoadingError;
-  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: [
+  return /* @__PURE__ */ jsx("div", { ref: containerRef, className: "w-full 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("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: [
+  ] }) }) : 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: "w-full 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: [
+    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-center py-8", children: [
       dataLoading && /* @__PURE__ */ jsx(CircularProgress, { size: "small" }),
       !dataLoading && noMoreToLoad && data.length > 0 && /* @__PURE__ */ jsxs(Typography, { variant: "caption", color: "secondary", children: [
         "All ",
@@ -19820,6 +19404,13 @@ function getScrollParent(element) {
   return document.documentElement;
 }
 function isComplexPropertyType(property) {
+  if (property.type === "array") {
+    const ofProp = "of" in property ? property.of : void 0;
+    const innerProp = ofProp ? Array.isArray(ofProp) ? ofProp[0] : ofProp : void 0;
+    if (innerProp && typeof innerProp === "object" && "enum" in innerProp && innerProp.enum) {
+      return false;
+    }
+  }
   return property.type === "array" || property.type === "map" || property.type === "reference" || property.type === "relation";
 }
 function compactValueSummary(value, property) {
@@ -20148,7 +19739,7 @@ function EntityCollectionListView({
   return /* @__PURE__ */ jsx("div", { ref: containerRef, className: cls("w-full", selectedEntityId === void 0 && "rounded-lg overflow-hidden border " + defaultBorderMixin), 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("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" }) }) : (
+  ] }) }) : 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: "w-full flex items-center justify-center py-12 px-8", children: emptyComponent ?? /* @__PURE__ */ jsx(Typography, { variant: "label", color: "secondary", children: "No entries found" }) }) : (
     /* Spacer with total height — no internal scroll.
        The nearest scrollable ancestor provides the scrollbar. */
     /* @__PURE__ */ jsxs("div", { style: {
@@ -23617,6 +23208,7 @@ const resetPasswordAction = {
     return Promise.resolve(void 0);
   }
 };
+const innerClicked = /* @__PURE__ */ new WeakSet();
 function useDraggable({
   containerRef,
   innerRef,
@@ -23628,7 +23220,7 @@ function useDraggable({
   let relY = 0;
   const listeningRef = React__default.useRef(false);
   const onMouseDown = useCallback((event) => {
-    if (event.button !== 0 || !containerRef.current || event.defaultPrevented || event.innerClicked) {
+    if (event.button !== 0 || !containerRef.current || event.defaultPrevented || innerClicked.has(event)) {
       return;
     }
     const {
@@ -23643,7 +23235,7 @@ function useDraggable({
     listeningRef.current = true;
   }, [containerRef, onMove]);
   const onMouseDownInner = useCallback((event_0) => {
-    event_0.innerClicked = true;
+    innerClicked.add(event_0);
   }, []);
   const onSelect = useCallback((event_1) => {
     event_1.preventDefault();
@@ -25237,7 +24829,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
       /* @__PURE__ */ jsx(EntityCollectionListView, { collection, tableController, onEntityClick, selectionController: usedSelectionController, selectionEnabled, highlightedEntities: highlightedEntity ? [highlightedEntity] : [], size: listSize, emptyComponent, selectedEntityId: selectedEntityIdProp, getActionsForEntity, path, openEntityMode }, `list-view-${path}`)
     ] }) : innerView }, `split-list-view-${path}`) : /* @__PURE__ */ jsxs("div", { className: "flex flex-col w-full h-full", children: [
       toolbarNode,
-      /* @__PURE__ */ jsx("div", { className: "flex-1 flex flex-col overflow-y-auto", children: viewMode === "list" ? /* @__PURE__ */ jsxs("div", { className: cls("flex flex-col w-full", selectedEntityIdProp === void 0 ? "max-w-6xl mx-auto px-3 md:px-4 lg:px-6 py-4" : ""), children: [
+      /* @__PURE__ */ jsx("div", { className: cls("flex-1 flex flex-col", (viewMode === "list" || viewMode === "cards") && "overflow-y-auto"), children: viewMode === "list" ? /* @__PURE__ */ jsxs("div", { className: cls("flex flex-col w-full", selectedEntityIdProp === void 0 ? "max-w-6xl mx-auto px-3 md:px-4 lg:px-6 py-4" : ""), children: [
         /* @__PURE__ */ jsx("div", { className: cls("grid transition-[grid-template-rows,transform,margin] duration-150 ease-out", selectedEntityIdProp === void 0 ? "grid-rows-[1fr] translate-y-0 mt-12 mb-6" : "grid-rows-[0fr] -translate-y-2 mt-0 mb-0"), children: /* @__PURE__ */ jsx("div", { className: "overflow-hidden flex items-center gap-4", children: /* @__PURE__ */ jsx(Typography, { gutterBottom: true, variant: "h4", className: "grow mb-0", component: "h4", children: collection.name }) }) }),
         pluginInsights.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex-shrink-0", children: pluginInsights }),
         innerView
@@ -26643,7 +26235,7 @@ function DrawerToggle(t0) {
   }
   let t14;
   if ($[31] !== t1 || $[32] !== t13 || $[33] !== t2) {
-    t14 = /* @__PURE__ */ jsx("div", { className: "shrink-0 mt-auto px-2 py-2", children: /* @__PURE__ */ jsx(Tooltip, { title: t1, side: "right", sideOffset: 12, asChild: true, open: t2, children: t13 }) });
+    t14 = /* @__PURE__ */ jsx("div", { className: "shrink-0 mt-auto px-4 pt-0.5 pb-2", children: /* @__PURE__ */ jsx(Tooltip, { title: t1, side: "right", sideOffset: 12, asChild: true, open: t2, children: t13 }) });
     $[31] = t1;
     $[32] = t13;
     $[33] = t2;
@@ -26797,7 +26389,7 @@ function DrawerFooterActions({
   } else {
     avatarComponent = null;
   }
-  return /* @__PURE__ */ jsx("div", { className: "shrink-0 pb-1", ref: portalRef, children: avatarComponent && /* @__PURE__ */ jsxs("div", { className: "flex items-center px-[16px] py-1", children: [
+  return /* @__PURE__ */ jsx("div", { className: "shrink-0 pt-2 pb-0", ref: portalRef, children: avatarComponent && /* @__PURE__ */ jsxs("div", { className: "flex items-center px-[16px] py-1", children: [
     /* @__PURE__ */ jsxs(Menu, { trigger: /* @__PURE__ */ jsx("div", { className: cls("shrink-0 flex items-center justify-center w-[44px] cursor-pointer", "rounded-md py-1", "hover:bg-surface-accent-100 dark:hover:bg-surface-800", "transition-colors duration-150"), role: "button", tabIndex: 0, "aria-label": t("user_menu") || "User menu", children: avatarComponent }), side: "top", align: "start", children: [
       user && /* @__PURE__ */ jsxs("div", { className: "px-4 py-2 mb-1", children: [
         user.displayName && /* @__PURE__ */ jsx(Typography, { variant: "body1", color: "secondary", children: user.displayName }),
@@ -27415,7 +27007,7 @@ function useLocalCollectionsConfigController(clientOrUrl, baseCollections = [],
 }
 const EMPTY_PLUGINS = [];
 const EMPTY_COLLECTIONS = [];
-const CollectionsStudioView = lazy(() => import("./CollectionsStudioView-Bc3Rxxc2.js").then((n) => n.b).then((m) => ({
+const CollectionsStudioView = lazy(() => import("./CollectionsStudioView-Brr_b06v.js").then((n) => n.b).then((m) => ({
   default: m.CollectionsStudioView
 })));
 function RebaseNavigation({
@@ -27653,10 +27245,10 @@ function _temp$3(event) {
   event.preventDefault();
   event.stopPropagation();
 }
-const CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-D0VqpLPO.js").then((m) => ({
+const CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-C8E440oK.js").then((m) => ({
   default: m.CollectionEditorDialog
 })));
-const PropertyFormDialog = lazy(() => import("./PropertyEditView-CvRSV-A2.js").then((n) => n.P).then((m) => ({
+const PropertyFormDialog = lazy(() => import("./PropertyEditView-ChBleIbN.js").then((n) => n.P).then((m) => ({
   default: m.PropertyFormDialog
 })));
 function CollectionEditorDialogs() {
@@ -29248,6 +28840,9 @@ const PropertyCollectionView = (t0) => {
           if (value === null || value === void 0) {
             return null;
           }
+          if (baseKey === "" && !properties[key]) {
+            return null;
+          }
           const currentKey_0 = baseKey ? `${baseKey}.${key}` : key;
           return /* @__PURE__ */ jsx(PropertyCollectionView, { data: value, properties, baseKey: currentKey_0, size }, currentKey_0);
         };
@@ -30351,15 +29946,15 @@ function validateProperty(property, path, errors) {
     });
     return;
   }
-  if (!property.dataType) {
+  if (!property.type) {
     errors.push({
-      path: `${path}.dataType`,
+      path: `${path}.type`,
       message: "Required field is missing"
     });
-  } else if (!VALID_DATA_TYPES.includes(property.dataType)) {
+  } else if (!VALID_DATA_TYPES.includes(property.type)) {
     errors.push({
-      path: `${path}.dataType`,
-      message: `Invalid value "${property.dataType}", expected one of: ${VALID_DATA_TYPES.join(", ")}`
+      path: `${path}.type`,
+      message: `Invalid value "${property.type}", expected one of: ${VALID_DATA_TYPES.join(", ")}`
     });
   }
   if (property.name !== void 0 && typeof property.name !== "string") {
@@ -30368,7 +29963,7 @@ function validateProperty(property, path, errors) {
       message: "Must be a string"
     });
   }
-  if (property.dataType === "array") {
+  if (property.type === "array") {
     if (property.of) {
       if (Array.isArray(property.of)) {
         property.of.forEach((ofProp, index) => {
@@ -30389,10 +29984,10 @@ function validateProperty(property, path, errors) {
       }
     }
   }
-  if (property.dataType === "map" && property.properties) {
+  if (property.type === "map" && property.properties) {
     validateProperties(property.properties, `${path}.properties`, errors);
   }
-  if (property.dataType === "reference") {
+  if (property.type === "reference") {
     if (property.path !== void 0 && typeof property.path !== "string") {
       errors.push({
         path: `${path}.path`,
@@ -30400,7 +29995,7 @@ function validateProperty(property, path, errors) {
       });
     }
   }
-  if (property.dataType === "relation") {
+  if (property.type === "relation") {
     if (property.target !== void 0 && typeof property.target !== "string" && typeof property.target !== "function") {
       errors.push({
         path: `${path}.target`,
@@ -30472,7 +30067,7 @@ function validateProperty(property, path, errors) {
       });
     }
   }
-  if (property.dataType === "vector") {
+  if (property.type === "vector") {
     if (property.dimensions !== void 0 && (typeof property.dimensions !== "number" || isNaN(property.dimensions) || property.dimensions <= 0)) {
       errors.push({
         path: `${path}.dimensions`,
@@ -30480,7 +30075,7 @@ function validateProperty(property, path, errors) {
       });
     }
   }
-  if (property.dataType === "string" && property.storage) {
+  if (property.type === "string" && property.storage) {
     if (typeof property.storage !== "object") {
       errors.push({
         path: `${path}.storage`,
@@ -30750,7 +30345,7 @@ export {
   MapFieldBinding as Z,
   MapPropertyPreview as _,
   ArrayContainer as a,
-  isReferenceProperty as a$,
+  mergeEntityActions as a$,
   MultiSelectFieldBinding as a0,
   NavigationCard as a1,
   NavigationStateContext as a2,
@@ -30761,98 +30356,96 @@ export {
   PropertyPreview as a7,
   ReadOnlyFieldBinding as a8,
   RebaseNavigation as a9,
-  VirtualTableInput as aA,
-  buildCollectionGenerationCallback as aB,
-  buildSidePanelsFromUrl as aC,
-  convertDataToEntity as aD,
-  convertFileToJson as aE,
-  copyEntityAction as aF,
-  deleteEntityAction as aG,
-  editEntityAction as aH,
-  flattenEntry as aI,
-  getBracketNotation as aJ,
-  getDefaultFieldConfig as aK,
-  getDefaultFieldId as aL,
-  getDefaultPropertiesOrder as aM,
-  getEntityPreviewKeys as aN,
-  getEntityTitlePropertyKey as aO,
-  getEntityViewWidth as aP,
-  getFieldConfig as aQ,
-  getFieldId as aR,
-  getFullId as aS,
-  getFullIdPath as aT,
-  getIconForProperty as aU,
-  getIconForWidget as aV,
-  getInferenceType as aW,
-  getPropertiesWithPropertiesOrder as aX,
-  getPropertyInPath as aY,
-  getResolvedPropertyInPath as aZ,
-  idToPropertiesPath as a_,
+  buildSidePanelsFromUrl as aA,
+  convertDataToEntity as aB,
+  convertFileToJson as aC,
+  copyEntityAction as aD,
+  deleteEntityAction as aE,
+  editEntityAction as aF,
+  flattenEntry as aG,
+  getBracketNotation as aH,
+  getDefaultFieldConfig as aI,
+  getDefaultFieldId as aJ,
+  getDefaultPropertiesOrder as aK,
+  getEntityPreviewKeys as aL,
+  getEntityTitlePropertyKey as aM,
+  getEntityViewWidth as aN,
+  getFieldConfig as aO,
+  getFieldId as aP,
+  getFullId as aQ,
+  getFullIdPath as aR,
+  getIconForProperty as aS,
+  getIconForWidget as aT,
+  getInferenceType as aU,
+  getPropertiesWithPropertiesOrder as aV,
+  getPropertyInPath as aW,
+  getResolvedPropertyInPath as aX,
+  idToPropertiesPath as aY,
+  isReferenceProperty as aZ,
+  isRelationProperty as a_,
   ReferenceAsStringFieldBinding as aa,
   ReferenceFieldBinding as ab,
   ReferencePreview as ac,
   RelationPreview as ad,
   RepeatFieldBinding as ae,
-  RoleChip as af,
-  RolesView as ag,
-  Scaffold as ah,
-  SearchIconsView as ai,
-  SelectFieldBinding as aj,
-  SelectableTable as ak,
-  SelectableTableContext as al,
-  SideDialogs as am,
-  SideEntityControllerContext as an,
-  SideEntityProvider as ao,
-  SkeletonPropertyComponent as ap,
-  StorageThumbnail as aq,
-  StorageThumbnailInternal as ar,
-  StorageUploadFieldBinding as as,
-  StringPropertyPreview as at,
-  SwitchFieldBinding as au,
-  TextFieldBinding as av,
-  UrlComponentPreview as aw,
-  UrlContext as ax,
-  UserPreview as ay,
-  VectorFieldBinding as az,
+  Scaffold as af,
+  SearchIconsView as ag,
+  SelectFieldBinding as ah,
+  SelectableTable as ai,
+  SelectableTableContext as aj,
+  SideDialogs as ak,
+  SideEntityControllerContext as al,
+  SideEntityProvider as am,
+  SkeletonPropertyComponent as an,
+  StorageThumbnail as ao,
+  StorageThumbnailInternal as ap,
+  StorageUploadFieldBinding as aq,
+  StringPropertyPreview as ar,
+  SwitchFieldBinding as as,
+  TextFieldBinding as at,
+  UrlComponentPreview as au,
+  UrlContext as av,
+  UserPreview as aw,
+  VectorFieldBinding as ax,
+  VirtualTableInput as ay,
+  buildCollectionGenerationCallback as az,
   ArrayCustomShapedFieldBinding as b,
-  isRelationProperty as b0,
-  mergeEntityActions as b1,
-  namespaceToPropertiesOrderPath as b2,
-  namespaceToPropertiesPath as b3,
-  processValueMapping as b4,
-  renderSkeletonCaptionText as b5,
-  renderSkeletonIcon as b6,
-  renderSkeletonImageThumbnail as b7,
-  renderSkeletonText as b8,
-  resetPasswordAction as b9,
-  validateCollectionJson as bA,
-  zodToFormErrors as bB,
-  resolveEntityAction as ba,
-  resolveEntityView as bb,
-  sanitizeUrl as bc,
-  unflattenObject as bd,
-  useApp as be,
-  useBreadcrumbsController as bf,
-  useBuildCollectionRegistryController as bg,
-  useBuildNavigationStateController as bh,
-  useBuildSideEntityController as bi,
-  useBuildUrlController as bj,
-  useCMSContext as bk,
-  useClearRestoreValue as bl,
-  useCollectionEditorController as bm,
-  useCollectionRegistryController as bn,
-  useCollectionsConfigController as bo,
-  useEntitySelectionDialog as bp,
-  useImportConfig as bq,
-  useLocalCollectionsConfigController as br,
-  useNavigationStateController as bs,
-  useResolvedCollections as bt,
-  useResolvedViews as bu,
-  useSelectionController as bv,
-  useSideDialogsController as bw,
-  useSideEntityController as bx,
-  useTopLevelNavigation as by,
-  useUrlController as bz,
+  namespaceToPropertiesOrderPath as b0,
+  namespaceToPropertiesPath as b1,
+  processValueMapping as b2,
+  renderSkeletonCaptionText as b3,
+  renderSkeletonIcon as b4,
+  renderSkeletonImageThumbnail as b5,
+  renderSkeletonText as b6,
+  resetPasswordAction as b7,
+  resolveEntityAction as b8,
+  resolveEntityView as b9,
+  sanitizeUrl as ba,
+  unflattenObject as bb,
+  useApp as bc,
+  useBreadcrumbsController as bd,
+  useBuildCollectionRegistryController as be,
+  useBuildNavigationStateController as bf,
+  useBuildSideEntityController as bg,
+  useBuildUrlController as bh,
+  useCMSContext as bi,
+  useClearRestoreValue as bj,
+  useCollectionEditorController as bk,
+  useCollectionRegistryController as bl,
+  useCollectionsConfigController as bm,
+  useEntitySelectionDialog as bn,
+  useImportConfig as bo,
+  useLocalCollectionsConfigController as bp,
+  useNavigationStateController as bq,
+  useResolvedCollections as br,
+  useResolvedViews as bs,
+  useSelectionController as bt,
+  useSideDialogsController as bu,
+  useSideEntityController as bv,
+  useTopLevelNavigation as bw,
+  useUrlController as bx,
+  validateCollectionJson as by,
+  zodToFormErrors as bz,
   ArrayEnumPreview as c,
   ArrayOfReferencesFieldBinding as d,
   ArrayOfReferencesPreview as e,
@@ -30878,4 +30471,4 @@ export {
   EntityCollectionTable as y,
   EntityCollectionView as z
 };
-//# sourceMappingURL=util-ZM9gQuCv.js.map
+//# sourceMappingURL=util-COYYD8zr.js.map