@rebasepro/admin 0.2.5 → 0.4.0

package/dist/{util-0GYaJqL_.js → util-CvNp6A-r.js}

@@ -5,7 +5,7 @@ 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, 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 { 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";
@@ -2619,9 +2619,6 @@ function EntityView(t0) {
   }
   return t8;
 }
-const EntityHistoryView$2 = lazy(() => import("./index-XMII4H3d.js").then((m) => ({
-  default: m.EntityHistoryView
-})));
 const BUILTIN_ENTITY_VIEWS = {
   "__rebase_history": {
     key: "__rebase_history",
@@ -2629,7 +2626,6 @@ const BUILTIN_ENTITY_VIEWS = {
     tabComponent: React__default.createElement(HistoryIcon, {
       size: 20
     }),
-    Builder: EntityHistoryView$2,
     position: "end"
   }
 };
@@ -2709,12 +2705,12 @@ function EntityJsonPreview(t0) {
   }
   return t4;
 }
-const EntityHistoryView$1 = lazy(() => import("./index-XMII4H3d.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-z3H8iqsj.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;
@@ -2822,13 +2818,22 @@ function EntityDetailViewInner({
     status: "existing",
     entityId
   }), [collection, entityId]);
-  const [selectedTab, setSelectedTab] = useState(selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE$1);
+  const hasAppliedDefault = useRef(false);
+  const [selectedTab, setSelectedTab] = useState(() => {
+    const val = selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    hasAppliedDefault.current = true;
+    return val === "edit" ? MAIN_TAB_VALUE : val;
+  });
   useEffect(() => {
-    const target = selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE$1;
+    const val_0 = hasAppliedDefault.current ? selectedTabProp ?? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    const target = val_0 === "edit" ? MAIN_TAB_VALUE : val_0;
+    if (!hasAppliedDefault.current) {
+      hasAppliedDefault.current = true;
+    }
     if (target !== selectedTab) {
       setSelectedTab(target);
     }
-  }, [selectedTabProp, defaultSelectedView]);
+  }, [selectedTabProp]);
   const subcollections = getSubcollections(collection).filter((c2) => !c2.hideFromNavigation);
   const subcollectionsCount = subcollections?.length ?? 0;
   const customViews = collection.entityViews ?? [];
@@ -2839,7 +2844,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);
@@ -2880,7 +2885,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]);
@@ -2897,11 +2903,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;
@@ -2916,27 +2922,15 @@ function EntityDetailViewInner({
     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");
@@ -2996,9 +2990,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
@@ -7910,17 +7904,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,
@@ -8329,7 +8325,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,
@@ -8342,7 +8338,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,
@@ -8394,7 +8390,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,
@@ -8407,7 +8403,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 }) })
   ] });
@@ -8492,12 +8488,9 @@ function EntityActionButton(t0) {
   }
   return t5;
 }
-const EntityHistoryView = lazy(() => import("./index-XMII4H3d.js").then((m) => ({
+const EntityHistoryView = lazy(() => import("./index-z3H8iqsj.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;
@@ -8658,13 +8651,22 @@ function EntityEditViewInner({
     status,
     entityId
   }), [collection, status, entityId]);
-  const [selectedTab, setSelectedTab] = useState(selectedTabProp === "edit" ? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE);
+  const hasAppliedDefault = useRef(false);
+  const [selectedTab, setSelectedTab] = useState(() => {
+    const val = selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    hasAppliedDefault.current = true;
+    return val === "edit" ? MAIN_TAB_VALUE : val;
+  });
   useEffect(() => {
-    const target = selectedTabProp === "edit" ? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    const val_0 = hasAppliedDefault.current ? selectedTabProp ?? MAIN_TAB_VALUE : selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+    const target = val_0 === "edit" ? MAIN_TAB_VALUE : val_0;
+    if (!hasAppliedDefault.current) {
+      hasAppliedDefault.current = true;
+    }
     if (target !== selectedTab) {
       setSelectedTab(target);
     }
-  }, [selectedTabProp, defaultSelectedView]);
+  }, [selectedTabProp]);
   const subcollections = getSubcollections(collection).filter((c2) => !c2.hideFromNavigation);
   const subcollectionsCount = subcollections?.length ?? 0;
   const customViews = collection.entityViews ?? [];
@@ -8690,6 +8692,7 @@ function EntityEditViewInner({
     return {
       entityId,
       disabled: false,
+      readOnly: true,
       openEntityMode: layout,
       status,
       values: usedEntity?.values ?? {},
@@ -8753,12 +8756,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) => {
@@ -8952,7 +8961,6 @@ function EntitySidePanel(props) {
     close
   } = useSideDialogContext();
   const navigate = useNavigate();
-  const location = useLocation();
   const sideEntityController = useSideEntityController();
   const collectionRegistryController = useCollectionRegistryController();
   const sideDialogsController = useSideDialogContext();
@@ -8995,6 +9003,26 @@ function EntitySidePanel(props) {
   useEffect(() => {
     setShowEditInPanel(selectedTab === "edit");
   }, [entityId, selectedTab]);
+  const hasCorrectedDefaultView = useRef(false);
+  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 ",
@@ -9028,12 +9056,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: ({
@@ -9059,20 +9087,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 }) }) });
@@ -9084,7 +9112,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;
@@ -9207,8 +9235,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) => {
@@ -9242,6 +9270,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") {
@@ -9254,6 +9283,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,
@@ -9726,11 +9764,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);
@@ -10948,6 +10982,9 @@ function useCollectionInlineEditor(t0) {
         setError,
         data: entity
       } = t32;
+      if (!entity) {
+        return;
+      }
       const updatedValues = setIn({}, propertyKey, value_0);
       const saveProps = {
         path: entity.path ?? path,
@@ -11525,7 +11562,7 @@ function FormLayout(t0) {
   return t2;
 }
 function ReadOnlyFieldBinding(t0) {
-  const $ = c(18);
+  const $ = c(23);
   const {
     propertyKey,
     value,
@@ -11535,6 +11572,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" });
@@ -11545,49 +11583,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) {
@@ -18555,10 +18606,10 @@ function EditorCollectionAction(t0) {
   }
   return t8;
 }
-const ImportCollectionAction = lazy(() => import("./index-DJSL_SCr.js").then((m) => ({
+const ImportCollectionAction = lazy(() => import("./index-BrqSvMG0.js").then((m) => ({
   default: m.ImportCollectionAction
 })));
-const ExportCollectionAction = lazy(() => import("./index-DHaOV-7A.js").then((m) => ({
+const ExportCollectionAction = lazy(() => import("./index-Cb0bPnzZ.js").then((m) => ({
   default: m.ExportCollectionAction
 })));
 function EntityCollectionViewActions(t0) {
@@ -19041,35 +19092,71 @@ 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) => {
+        const ui = p.ui;
+        if (ui?.hideFromCollection) return true;
+        if (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 ?? targetCollection.table;
+      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({
@@ -19144,6 +19231,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,
@@ -19157,7 +19256,6 @@ function EntityCollectionCardView({
   size = "m"
 }) {
   const containerRef = useRef(null);
-  const loadMoreRef = useRef(null);
   const hasRestoredScroll = useRef(false);
   const {
     data,
@@ -19190,36 +19288,48 @@ function EntityCollectionCardView({
     if (!dataLoading) isLoadingMore.current = false;
   }, [dataLoading]);
   useEffect(() => {
-    if (!loadMoreRef.current) return;
-    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
     });
-    observer.observe(loadMoreRef.current);
-    return () => observer.disconnect();
-  }, [setItemCount, data.length]);
+    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++;
@@ -19230,10 +19340,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({
@@ -19242,10 +19354,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);
@@ -19262,12 +19374,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 ",
@@ -19659,7 +19771,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: {
@@ -24748,7 +24860,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: cls("flex-1 flex flex-col", viewMode === "list" && "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
@@ -26926,7 +27038,7 @@ function useLocalCollectionsConfigController(clientOrUrl, baseCollections = [],
 }
 const EMPTY_PLUGINS = [];
 const EMPTY_COLLECTIONS = [];
-const CollectionsStudioView = lazy(() => import("./CollectionsStudioView-C-Ts1rZt.js").then((n) => n.b).then((m) => ({
+const CollectionsStudioView = lazy(() => import("./CollectionsStudioView-bsg4AT_Z.js").then((n) => n.b).then((m) => ({
   default: m.CollectionsStudioView
 })));
 function RebaseNavigation({
@@ -27164,10 +27276,10 @@ function _temp$3(event) {
   event.preventDefault();
   event.stopPropagation();
 }
-const CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-Cn8-tGyL.js").then((m) => ({
+const CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-Bo86h-d-.js").then((m) => ({
   default: m.CollectionEditorDialog
 })));
-const PropertyFormDialog = lazy(() => import("./PropertyEditView-BDNYkfNf.js").then((n) => n.P).then((m) => ({
+const PropertyFormDialog = lazy(() => import("./PropertyEditView-jCWCxmCz.js").then((n) => n.P).then((m) => ({
   default: m.PropertyFormDialog
 })));
 function CollectionEditorDialogs() {
@@ -28759,6 +28871,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);
         };
@@ -29862,15 +29977,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") {
@@ -29879,7 +29994,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) => {
@@ -29900,10 +30015,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`,
@@ -29911,7 +30026,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`,
@@ -29983,7 +30098,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`,
@@ -29991,7 +30106,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`,
@@ -30387,4 +30502,4 @@ export {
   EntityCollectionTable as y,
   EntityCollectionView as z
 };
-//# sourceMappingURL=util-0GYaJqL_.js.map
+//# sourceMappingURL=util-CvNp6A-r.js.map