@rebasepro/admin 0.6.1 → 0.8.0

package/dist/{src-BYniefVu.js → src-cxV1ODRG.js}

@@ -2,14 +2,14 @@ import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import * as React$1 from "react";
 import React, { Suspense, createContext, createElement, forwardRef, lazy, memo, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import { deepEqual } from "fast-equals";
-import { Alert, AlertCircleIcon, AlertTriangleIcon, AlignLeftIcon, ArrowLeftIcon, ArrowRightToLineIcon, Avatar, Badge, BooleanSwitch, BooleanSwitchWithLabel, Button, CHIP_COLORS, CalendarIcon, Card, CenteredView, CheckCircleIcon, CheckIcon, Checkbox, ChevronDownIcon, ChevronRightIcon, ChevronUpIcon, ChevronsLeftIcon, ChevronsRightIcon, ChevronsUpDownIcon, Chip, CircleIcon, CircularProgress, CircularProgressCenter, CodeIcon, Collapse, ColumnsIcon, Container, CopyIcon, DateTimeField, Dialog, DialogActions, DialogContent, DialogTitle, DownloadIcon, ErrorBoundary, ExpandablePanel, ExternalLinkIcon, EyeIcon, EyeOffIcon, FileTextIcon, FileUpload, FilterChip, FilterIcon, FilterXIcon, FlagIcon, FolderUpIcon, FunctionSquareIcon, GlobeIcon, HandleIcon, HashIcon, HistoryIcon, IconButton, ImageOffIcon, KanbanIcon, KeyRoundIcon, Label, LayoutGridIcon, LinkIcon, ListIcon, ListOrderedIcon, LoadingButton, LogOutIcon, MailIcon, Markdown, Maximize2Icon, Menu, MenuIcon, MenuItem, MinusIcon, MoonIcon, MoreVerticalIcon, MultiSelect, MultiSelectItem, PencilIcon, PlusIcon, Popover, PopoverPrimitive, Portal, QuoteIcon, RadioGroup, RadioGroupItem, RefreshCwIcon, RepeatIcon, ResizablePanels, Rows3Icon, SearchBar, SearchIcon, Select, SelectItem, Separator, SettingsIcon, Sheet, Skeleton, StarIcon, SunIcon, SunMoonIcon, Tab, Table, TableBody, TableCell, TableHeader, TableIcon, TableRow, Tabs, TextField, TextIcon, TextareaAutosize, ToggleButtonGroup, Tooltip, Trash2Icon, Typography, UploadIcon, UserIcon, VirtualTable, VoteIcon, XCircleIcon, XIcon, cls, coolIconKeys, debounce, defaultBorderMixin, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, fieldBackgroundInvisibleMixin, fieldBackgroundMixin, focusedDisabled, getColorSchemeForKey, getColorSchemeForSeed, iconSize, lucideIcons, paperMixin, useDebouncedCallback, useInjectStyles, useOutsideAlerter } from "@rebasepro/ui";
-import { CollectionRegistry, DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE, addInitialSlash, canReadCollection, enumToObjectEntries, getArrayResolvedProperties, getCollectionBySlugWithin, getCollectionPathsCombinations, getDefaultValueFor, getDefaultValueFortype, getDefaultValuesFor, getEntityImagePreviewPropertyKey, getLabelOrConfigFrom, getLastSegment, getLastSegment as getLastSegment$1, getLocalChangesBackup, getNavigationEntriesFromPath, getParentReferencesFromPath, getReferenceFrom, getRelationFrom, getSubcollections, getTableName, isHidden, isPropertyBuilder, isReadOnly, normalizeToEntityRelation, removeInitialAndTrailingSlashes, removeInitialAndTrailingSlashes as removeInitialAndTrailingSlashes$1, removeInitialSlash, removeTrailingSlash, resolveArrayProperties, resolveCollectionPathIds, resolveCollectionPathIds as resolveCollectionPathIds$1, resolveDefaultSelectedView, resolveEnumValues, resolveProperty, resolveRelationProperty, resolveStorageFilenameString, resolveStoragePathString } from "@rebasepro/common";
-import { ADDITIONAL_TAB_WIDTH, CONTAINER_FULL_WIDTH, CollectionComponentOverrideProvider, ConfirmationDialog, CustomizationControllerContext, DEFAULT_PAGE_SIZE, ErrorTooltip, ErrorView, FORM_CONTAINER_WIDTH, IconForView, LanguageToggle, LoginView, NotFoundPage, PluginProviderStack, RebaseLogo, RebaseRoutes, SchemaDriftBanner, StudioBridgeRegistryProvider, UIReferenceView, UnsavedChangesDialog, UserDisplay, UserSettingsView, buildCollapsedDefaults, buildEnumLabel, createFormexStub, deleteEntityWithCallbacks, flattenKeys, getColorScheme, getColumnKeysForProperty, getEntityFromCache, getEntityFromMemoryCache, getFormFieldKeys, getIcon, getRowHeight, iconsSearch, removeEntityFromCache, removeEntityFromMemoryCache, resolveComponentRef, saveEntityToCache, saveEntityToMemoryCache, saveEntityWithCallbacks, useAdminModeController, useAnalyticsController, useApiConfig, useAuthController, useBridgeRegistration, useBuildLocalConfigurationPersistence, useCollapsedGroups, useColumnIds, useComponentOverride, useCustomizationController, useData, useDataTableController, useEntityFetch, useLargeLayout, useModeController, usePermissions, useRebaseClient, useRebaseContext, useRebaseRegistry, useRebaseRegistryDispatch, useRelationSelector, useRestoreScroll, useScrollRestoration, useSlot, useSnackbarController, useStorageSource, useStorageUploadController, useTranslation, useUnsavedChangesDialog, useUserConfigurationPersistence } from "@rebasepro/core";
+import { Alert, AlertCircleIcon, AlertTriangleIcon, AlignLeftIcon, ArrowLeftIcon, ArrowRightToLineIcon, Avatar, Badge, BooleanSwitchWithLabel, Button, CHIP_COLORS, CalendarIcon, Card, CardView, CenteredView, CheckCircleIcon, CheckIcon, Checkbox, ChevronDownIcon, ChevronRightIcon, ChevronUpIcon, ChevronsLeftIcon, ChevronsRightIcon, ChevronsUpDownIcon, Chip, CircleIcon, CircularProgress, CircularProgressCenter, CodeIcon, Collapse, ColumnsIcon, Container, CopyIcon, DateTimeField, Dialog, DialogActions, DialogContent, DialogTitle, DownloadIcon, ErrorBoundary, ExpandablePanel, ExternalLinkIcon, EyeIcon, EyeOffIcon, FileTextIcon, FileUpload, FilterChip, FilterIcon, FilterXIcon, FlagIcon, FolderUpIcon, FunctionSquareIcon, GlobeIcon, HandleIcon, HashIcon, HistoryIcon, IconButton, ImageOffIcon, KanbanIcon, KanbanView, KeyRoundIcon, Label, LayoutGridIcon, LinkIcon, ListIcon, ListOrderedIcon, ListView, LoaderIcon, LoadingButton, LogOutIcon, MailIcon, Markdown, Maximize2Icon, Menu, MenuIcon, MenuItem, MinusIcon, MoonIcon, MoreVerticalIcon, MultiSelect, MultiSelectItem, PencilIcon, PlusIcon, Popover, PopoverPrimitive, Portal, QuoteIcon, RadioGroup, RadioGroupItem, RefreshCwIcon, RepeatIcon, ResizablePanels, Rows3Icon, SearchBar, SearchIcon, Select, SelectItem, Separator, SettingsIcon, Sheet, Skeleton, StarIcon, SunIcon, SunMoonIcon, Tab, Table, TableBody, TableCell, TableHeader, TableIcon, TableRow, TableView, Tabs, TextField, TextIcon, TextareaAutosize, ToggleButtonGroup, Tooltip, Trash2Icon, Typography, UploadIcon, UserIcon, VirtualTableDateField, VirtualTableInput, VirtualTableInput as VirtualTableInput$1, VirtualTableNumberInput, VirtualTableSwitch, VoteIcon, XCircleIcon, XIcon, cls, coolIconKeys, createVirtualTableSelectionStore, debounce, defaultBorderMixin, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, fieldBackgroundInvisibleMixin, fieldBackgroundMixin, focusedDisabled, getColorSchemeForSeed, iconSize, lucideIcons, paperMixin, useDebouncedCallback, useInjectStyles, useOutsideAlerter } from "@rebasepro/ui";
+import { CollectionRegistry, DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE, addInitialSlash, buildRoutedRebaseData, canReadCollection, enumToObjectEntries, getArrayResolvedProperties, getCollectionBySlugWithin, getCollectionPathsCombinations, getDefaultValueFor, getDefaultValueFortype, getDefaultValuesFor, getEntityImagePreviewPropertyKey, getLabelOrConfigFrom, getLastSegment, getLastSegment as getLastSegment$1, getLocalChangesBackup, getNavigationEntriesFromPath, getParentReferencesFromPath, getReferenceFrom, getRelationFrom, getSubcollections, getTableName, isHidden, isPropertyBuilder, isReadOnly, normalizeToEntityRelation, removeInitialAndTrailingSlashes, removeInitialAndTrailingSlashes as removeInitialAndTrailingSlashes$1, removeInitialSlash, removeTrailingSlash, resolveArrayProperties, resolveCollectionPathIds, resolveCollectionPathIds as resolveCollectionPathIds$1, resolveDataSource, resolveDefaultSelectedView, resolveEnumValues, resolveProperty, resolveRelationProperty, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource } from "@rebasepro/common";
+import { ADDITIONAL_TAB_WIDTH, CONTAINER_FULL_WIDTH, CollectionComponentOverrideProvider, ConfirmationDialog, CustomizationControllerContext, DEFAULT_PAGE_SIZE, ErrorTooltip, ErrorView, FORM_CONTAINER_WIDTH, IconForView, LanguageToggle, LoginView, NotFoundPage, PluginProviderStack, RebaseDataContext, RebaseLogo, RebaseRoutes, SchemaDriftBanner, StorageSourceContext, StudioBridgeRegistryProvider, UIReferenceView, UnsavedChangesDialog, UserDisplay, UserSettingsView, buildCollapsedDefaults, buildEnumLabel, createFormexStub, deleteEntityWithCallbacks, flattenKeys, getColorScheme, getColumnKeysForProperty, getEntityFromCache, getEntityFromMemoryCache, getFormFieldKeys, getIcon, getRowHeight, iconsSearch, removeEntityFromCache, removeEntityFromMemoryCache, resolveComponentRef, saveEntityToCache, saveEntityToMemoryCache, saveEntityWithCallbacks, useAdminModeController, useAnalyticsController, useApiConfig, useAuthController, useBridgeRegistration, useBuildLocalConfigurationPersistence, useCollapsedGroups, useColumnIds, useComponentOverride, useCustomizationController, useData, useDataSources, useDataTableController, useEntityFetch, useLargeLayout, useModeController, usePermissions, useRebaseClient, useRebaseContext, useRebaseRegistry, useRebaseRegistryDispatch, useRelationSelector, useRestoreScroll, useScrollRestoration, useSlot, useSnackbarController, useStorageSource, useStorageSources, useStorageUploadController, useTranslation, useUnsavedChangesDialog, useUserConfigurationPersistence } from "@rebasepro/core";
 import { Field, Formex, getIn, setIn, useCreateFormex, useFormex } from "@rebasepro/formex";
 import { z } from "zod";
 import { defaultDateFormat, getArrayValuesCount, getHashValue, getValueInPath, hydrateRegExp, isObject, mergeDeep, prettifyIdentifier, randomString, slugify, toArray } from "@rebasepro/utils";
+import { EntityReference, EntityRelation, GeoPoint, Vector, getCollectionDataPath, getDataSourceCapabilities } from "@rebasepro/types";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { EntityReference, EntityRelation, GeoPoint, Vector, getDataSourceCapabilities } from "@rebasepro/types";
 import { Link, NavLink, Outlet, Route, useBlocker, useLocation, useNavigate, useSearchParams } from "react-router-dom";
 import { Highlight, themes } from "prism-react-renderer";
 import { Command } from "cmdk";
@@ -21,7 +21,6 @@ import { SortableContext, arrayMove, defaultAnimateLayoutChanges, horizontalList
 import { CSS } from "@dnd-kit/utilities";
 import ExcelJS from "exceljs";
 import { buildEntityPropertiesFromData, inferTypeFromValue } from "@rebasepro/schema-inference";
-import { createPortal } from "react-dom";
 import { generateKeyBetween, generateNKeysBetween } from "fractional-indexing";
 import Fuse from "fuse.js";
 import { format } from "date-fns";
@@ -293,16 +292,11 @@ function getZodBinarySchema({ property }) {
 //#endregion
 //#region src/form/EntityFormActions.tsx
 function EntityFormActions({ path, collection, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode, navigateBack, formContext }) {
-	const context = useCMSContext();
-	const sideEntityController = context.sideEntityController;
-	const { t } = useTranslation();
 	const bottomActionsProps = {
 		path,
 		savingError,
 		entity,
 		collection,
-		context,
-		sideEntityController,
 		disabled,
 		status,
 		pluginActions,
@@ -310,7 +304,6 @@ function EntityFormActions({ path, collection, entity, layout, savingError, form
 		navigateBack,
 		formContext,
 		formex,
-		t,
 		className: layout === "responsive" ? "@6xl:hidden" : void 0
 	};
 	const sideActionsProps = {
@@ -318,8 +311,6 @@ function EntityFormActions({ path, collection, entity, layout, savingError, form
 		savingError,
 		entity,
 		collection,
-		context,
-		sideEntityController,
 		disabled,
 		status,
 		pluginActions,
@@ -327,7 +318,6 @@ function EntityFormActions({ path, collection, entity, layout, savingError, form
 		navigateBack,
 		formContext,
 		formex,
-		t,
 		className: layout === "responsive" ? "hidden @6xl:flex" : void 0
 	};
 	const bottomActions = buildBottomActions$1(bottomActionsProps);
@@ -335,7 +325,7 @@ function EntityFormActions({ path, collection, entity, layout, savingError, form
 	if (layout === "responsive") return /* @__PURE__ */ jsxs(Fragment, { children: [bottomActions, sideActions] });
 	return layout === "bottom" ? bottomActions : sideActions;
 }
-function buildBottomActions$1({ savingError, entity, path, formActions, collection, context, sideEntityController, disabled, status, pluginActions, openEntityMode, navigateBack, formContext, formex, t, className }) {
+function buildBottomActions$1({ savingError, entity, path, formActions, collection, disabled, status, pluginActions, openEntityMode, navigateBack, formContext, formex, className }) {
 	const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
 	return /* @__PURE__ */ jsxs(DialogActions, {
 		position: "absolute",
@@ -357,10 +347,10 @@ function buildBottomActions$1({ savingError, entity, path, formActions, collecti
 						if (entity) action.onClick({
 							view: "form",
 							entity,
-							path: path ?? collection.slug,
+							path: path ?? getCollectionDataPath(collection),
 							collection,
-							context,
-							sideEntityController,
+							context: void 0,
+							sideEntityController: void 0,
 							openEntityMode,
 							navigateBack,
 							formContext
@@ -375,47 +365,55 @@ function buildBottomActions$1({ savingError, entity, path, formActions, collecti
 				disabled: disabled || formex.isSubmitting,
 				color: "primary",
 				type: "reset",
-				children: status === "existing" ? t("discard") : t("clear")
+				children: status === "existing" ? "Discard" : "Clear"
 			}),
-			/* @__PURE__ */ jsxs(Button, {
-				variant: "filled",
-				color: "primary",
-				type: "submit",
-				disabled: disabled || formex.isSubmitting,
-				startIcon: hasErrors ? /* @__PURE__ */ jsx(AlertCircleIcon, {}) : void 0,
-				children: [
-					status === "existing" && t("save"),
-					status === "copy" && t("create_copy"),
-					status === "new" && t("create")
-				]
+			/* @__PURE__ */ jsx(Tooltip, {
+				title: hasErrors ? "Fix highlighted errors before saving" : void 0,
+				children: /* @__PURE__ */ jsxs(LoadingButton, {
+					variant: "filled",
+					color: "primary",
+					type: "submit",
+					loading: formex.isSubmitting,
+					disabled: disabled || formex.isSubmitting,
+					startIcon: hasErrors ? /* @__PURE__ */ jsx(AlertCircleIcon, {}) : void 0,
+					children: [
+						status === "existing" && "Save",
+						status === "copy" && "Create copy",
+						status === "new" && "Create"
+					]
+				})
 			})
 		]
 	});
 }
-function buildSideActions$1({ savingError, entity, formActions, path, openEntityMode, collection, context, sideEntityController, disabled, status, pluginActions, formex, t, className }) {
+function buildSideActions$1({ savingError, entity, formActions, path, openEntityMode, collection, disabled, status, pluginActions, formex, className }) {
 	const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
 	return /* @__PURE__ */ jsxs("div", {
 		className: cls("overflow-auto h-full flex flex-col gap-2 w-80 2xl:w-96 px-4 py-16 sticky top-0 border-l", defaultBorderMixin, className),
 		children: [
-			/* @__PURE__ */ jsxs(LoadingButton, {
-				fullWidth: true,
-				variant: "filled",
-				color: "primary",
-				type: "submit",
-				startIcon: hasErrors ? /* @__PURE__ */ jsx(AlertCircleIcon, {}) : void 0,
-				disabled: disabled || formex.isSubmitting,
-				children: [
-					status === "existing" && t("save"),
-					status === "copy" && t("create_copy"),
-					status === "new" && t("create")
-				]
+			/* @__PURE__ */ jsx(Tooltip, {
+				title: hasErrors ? "Fix highlighted errors before saving" : void 0,
+				children: /* @__PURE__ */ jsxs(LoadingButton, {
+					fullWidth: true,
+					variant: "filled",
+					color: "primary",
+					type: "submit",
+					loading: formex.isSubmitting,
+					startIcon: hasErrors ? /* @__PURE__ */ jsx(AlertCircleIcon, {}) : void 0,
+					disabled: disabled || formex.isSubmitting,
+					children: [
+						status === "existing" && "Save",
+						status === "copy" && "Create copy",
+						status === "new" && "Create"
+					]
+				})
 			}),
 			/* @__PURE__ */ jsx(Button, {
 				fullWidth: true,
 				variant: "text",
 				disabled: disabled || formex.isSubmitting,
 				type: "reset",
-				children: status === "existing" ? t("discard") : t("clear")
+				children: status === "existing" ? "Discard" : "Clear"
 			}),
 			pluginActions,
 			savingError && /* @__PURE__ */ jsx("div", {
@@ -786,26 +784,32 @@ function renderSkeletonIcon() {
 */
 var StorageThumbnail = React.memo(StorageThumbnailInternal, areEqual$1);
 function areEqual$1(prevProps, nextProps) {
-	return prevProps.size === nextProps.size && prevProps.storagePathOrDownloadUrl === nextProps.storagePathOrDownloadUrl && prevProps.storeUrl === nextProps.storeUrl && prevProps.interactive === nextProps.interactive && prevProps.fill === nextProps.fill;
+	return prevProps.size === nextProps.size && prevProps.storagePathOrDownloadUrl === nextProps.storagePathOrDownloadUrl && prevProps.storeUrl === nextProps.storeUrl && prevProps.interactive === nextProps.interactive && prevProps.fill === nextProps.fill && prevProps.storageSourceKey === nextProps.storageSourceKey;
 }
 var URL_CACHE = {};
-function StorageThumbnailInternal({ storeUrl, interactive, storagePathOrDownloadUrl, size, fill }) {
+function StorageThumbnailInternal({ storeUrl, interactive, storagePathOrDownloadUrl, size, fill, storageSourceKey }) {
 	const [error, setError] = React.useState(void 0);
-	const storage = useStorageSource();
-	const [downloadConfig, setDownloadConfig] = React.useState(URL_CACHE[storagePathOrDownloadUrl]);
+	const defaultStorage = useStorageSource();
+	const storage = resolveStorageSource({
+		sourceKey: storageSourceKey,
+		sources: useStorageSources().sources,
+		defaultSource: defaultStorage
+	});
+	const cacheKey = `${storageSourceKey ?? ""}::${storagePathOrDownloadUrl}`;
+	const [downloadConfig, setDownloadConfig] = React.useState(URL_CACHE[cacheKey]);
 	useEffect(() => {
 		if (!storagePathOrDownloadUrl) return;
 		let unmounted = false;
 		storage.getSignedUrl(storagePathOrDownloadUrl).then(function(downloadConfig) {
 			if (!unmounted) {
 				setDownloadConfig(downloadConfig);
-				URL_CACHE[storagePathOrDownloadUrl] = downloadConfig;
+				URL_CACHE[cacheKey] = downloadConfig;
 			}
 		}).catch(setError);
 		return () => {
 			unmounted = true;
 		};
-	}, [storagePathOrDownloadUrl]);
+	}, [storagePathOrDownloadUrl, cacheKey]);
 	if (!storagePathOrDownloadUrl) return null;
 	const filetype = downloadConfig?.metadata ? getFiletype(downloadConfig?.metadata.contentType) : void 0;
 	const previewType = filetype?.startsWith("image") ? "image" : filetype?.startsWith("video") ? "video" : filetype?.startsWith("audio") ? "audio" : "file";
@@ -953,7 +957,6 @@ function getDefaultIconForProperty(property) {
 			if (property.ui?.url) return GlobeIcon;
 			if (property.email) return MailIcon;
 			if (property.ui?.multiline || property.ui?.markdown) return AlignLeftIcon;
-			if (property.reference) return LinkIcon;
 			return TextIcon;
 		case "number": return HashIcon;
 		case "boolean": return FlagIcon;
@@ -1056,6 +1059,21 @@ function isHiddenProperty(property) {
 	if (!property) return false;
 	return Boolean(property.ui?.hideFromCollection);
 }
+/**
+* Returns true when the property holds file-storage content (single image,
+* array of images, generic upload, …).  These properties are rendered by the
+* dedicated image-slot and should NOT appear as regular preview columns.
+*/
+function isStorageProperty$1(property) {
+	if (!property) return false;
+	if (property.type === "string" && property.storage) return true;
+	if (property.type === "string" && property.ui?.url === "image") return true;
+	if (property.type === "array" && property.of && !Array.isArray(property.of)) {
+		const inner = property.of;
+		if (inner.type === "string" && (inner.storage || inner.ui?.url === "image")) return true;
+	}
+	return false;
+}
 function getEntityPreviewKeys(authController, targetCollection, fields, previewProperties, limit = 3) {
 	const allProperties = Object.keys(targetCollection.properties);
 	let listProperties = previewProperties?.filter((p) => allProperties.includes(p));
@@ -1069,7 +1087,7 @@ function getEntityPreviewKeys(authController, targetCollection, fields, previewP
 			return !(prop && typeof prop === "object" && "isId" in prop && Boolean(prop.isId)) && key !== "id";
 		}).filter((key) => {
 			const property = targetCollection.properties[key];
-			return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isHiddenProperty(property) && (hasExplicitOrder || !isRelationProperty(property));
+			return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isHiddenProperty(property) && !isStorageProperty$1(property) && (hasExplicitOrder || !isRelationProperty(property));
 		}).slice(0, limit);
 	}
 }
@@ -1578,7 +1596,7 @@ var MAIN_TAB_VALUE = "__main_##Q$SC^#S6";
 var JSON_TAB_VALUE = "__json";
 //#endregion
 //#region src/components/EntityDetailView.tsx
-var EntityHistoryView$1 = lazy(() => import("./history-BO6VT85a.js").then((m) => ({ default: m.EntityHistoryView })));
+var EntityHistoryView$1 = lazy(() => import("./history-B3cqBzEV.js").then((m) => ({ default: m.EntityHistoryView })));
 function EntityDetailView({ entityId, ...props }) {
 	const { entity, dataLoading, dataLoadingError } = useEntityFetch({
 		path: props.path,
@@ -1770,7 +1788,7 @@ function EntityDetailViewInner({ path, entityId, selectedTab: selectedTabProp, c
 	}, "history_view") : null;
 	const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
 		const subcollectionId = subcollection.slug;
-		const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.slug)}` : void 0;
+		const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(getCollectionDataPath(subcollection))}` : void 0;
 		if (activeTab !== subcollectionId) return null;
 		return /* @__PURE__ */ jsxs("div", {
 			className: "relative flex-1 h-full overflow-auto w-full",
@@ -2060,44 +2078,9 @@ function DetailViewSkeleton({ collection }) {
 }
 //#endregion
 //#region src/components/SelectableTable/SelectionStore.ts
-/**
-* A ref-based selection store that avoids React context re-renders.
-*
-* The problem with putting `selectedCell` in a React context value is that
-* ANY cell selection change triggers a context value change, which forces
-* ALL consumers (every PropertyTableCell in the table) to re-render.
-* This causes the DOM to be replaced between mousedown and click events,
-* breaking `alwaysInteractive` cells (like relation selectors) where the
-* user needs to click a button on the very first interaction.
-*
-* This store uses `useSyncExternalStore` so only cells whose `selected`
-* derivation actually changed will re-render.
-*/
 function createSelectionStore() {
-	let selectedCell = void 0;
-	const listeners = /* @__PURE__ */ new Set();
-	function getSnapshot() {
-		return selectedCell;
-	}
-	function subscribe(listener) {
-		listeners.add(listener);
-		return () => listeners.delete(listener);
-	}
-	function select(cell) {
-		selectedCell = cell;
-		listeners.forEach((l) => l());
-	}
-	return {
-		getSnapshot,
-		subscribe,
-		select
-	};
+	return createVirtualTableSelectionStore();
 }
-/**
-* Hook that subscribes a cell to the selection store and returns
-* whether THIS cell is selected. Only re-renders when the cell's
-* `selected` boolean actually changes (not on every store update).
-*/
 function useCellSelected(store, propertyKey, entityPath, entityId) {
 	const selectorRef = useRef({
 		propertyKey,
@@ -2118,69 +2101,6 @@ function useCellSelected(store, propertyKey, entityPath, entityId) {
 	return useSyncExternalStore(store.subscribe, getSnapshot, getSnapshot);
 }
 //#endregion
-//#region src/components/EntityCollectionTable/fields/VirtualTableInput.tsx
-function VirtualTableInput(props) {
-	const ref = React.useRef(null);
-	const { disabled, value, multiline, updateValue, focused } = props;
-	const prevValue = useRef(value);
-	const [internalValue, setInternalValue] = useState(value);
-	const focusedState = useRef(false);
-	useEffect(() => {
-		if (prevValue.current !== value && value !== internalValue) setInternalValue(value);
-		prevValue.current = value;
-	}, [value]);
-	const doUpdate = React.useCallback(() => {
-		if (!value && !internalValue) return;
-		if (internalValue !== value && internalValue !== prevValue.current) {
-			prevValue.current = internalValue;
-			updateValue(internalValue);
-		}
-	}, [
-		internalValue,
-		updateValue,
-		value
-	]);
-	useDebouncedCallback(internalValue, doUpdate, !focused, 400);
-	useEffect(() => {
-		if (ref.current && focused && !focusedState.current) {
-			focusedState.current = true;
-			ref.current.focus({ preventScroll: true });
-			ref.current.selectionStart = ref.current.value.length;
-			ref.current.selectionEnd = ref.current.value.length;
-		} else focusedState.current = focused;
-	}, [focused, ref]);
-	return /* @__PURE__ */ jsx(TextareaAutosize, {
-		className: focusedDisabled,
-		ref,
-		style: {
-			padding: 0,
-			margin: 0,
-			width: "100%",
-			color: "unset",
-			fontWeight: "unset",
-			fontSize: "unset",
-			fontFamily: "unset",
-			background: "unset",
-			border: "unset",
-			resize: "none",
-			outline: "none"
-		},
-		value: internalValue ?? "",
-		onChange: (evt) => {
-			const newValue = evt.target.value;
-			if (multiline || !newValue.endsWith("\n")) setInternalValue(newValue);
-		},
-		onFocus: () => {
-			focusedState.current = true;
-		},
-		onBlur: () => {
-			focusedState.current = false;
-			doUpdate();
-			if (props.onBlur) props.onBlur();
-		}
-	});
-}
-//#endregion
 //#region src/components/EntityCollectionTable/fields/VirtualTableSelect.tsx
 function VirtualTableSelect(props) {
 	const { enumValues, internalValue, disabled, small, focused, updateValue, multiple, valueType } = props;
@@ -2254,78 +2174,6 @@ function VirtualTableSelect(props) {
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionTable/fields/VirtualTableNumberInput.tsx
-function VirtualTableNumberInput(props) {
-	const { align, value, updateValue, focused } = props;
-	const propStringValue = value && typeof value === "number" ? value.toString() : "";
-	const [internalValue, setInternalValue] = useState(propStringValue);
-	const prevValue = useRef(value);
-	useEffect(() => {
-		if (prevValue.current !== value && String(value) !== internalValue) setInternalValue(value ? value.toString() : null);
-		prevValue.current = value;
-	}, [value]);
-	useDebouncedCallback(internalValue, React.useCallback(() => {
-		if (internalValue !== propStringValue) if (internalValue !== void 0 && internalValue !== null) {
-			const numberValue = parseFloat(internalValue);
-			if (isNaN(numberValue)) return;
-			if (numberValue !== void 0 && numberValue !== null) updateValue(numberValue);
-		} else updateValue(null);
-	}, [internalValue, value]), !focused, 400);
-	useEffect(() => {
-		if (!focused && propStringValue !== internalValue) setInternalValue(value !== void 0 && value !== null ? value.toString() : null);
-	}, [value, focused]);
-	const inputRef = React.useRef(null);
-	useEffect(() => {
-		if (inputRef.current && focused) inputRef.current.focus({ preventScroll: true });
-	}, [focused, inputRef]);
-	const regexp = /^-?[0-9]+[,.]?[0-9]*$/;
-	return /* @__PURE__ */ jsx(TextField, {
-		inputRef,
-		invisible: true,
-		size: "small",
-		className: "w-full",
-		inputClassName: cls("p-0 m-0 bg-transparent border-none outline-hidden font-normal leading-normal text-unset", focusedDisabled),
-		inputStyle: { textAlign: align },
-		value: internalValue ?? "",
-		onChange: (evt) => {
-			const newValue = evt.target.value.replace(",", ".");
-			if (newValue.length === 0) setInternalValue(null);
-			if (regexp.test(newValue) || newValue.startsWith("-")) setInternalValue(newValue);
-		}
-	});
-}
-//#endregion
-//#region src/components/EntityCollectionTable/fields/VirtualTableSwitch.tsx
-function VirtualTableSwitch(props) {
-	const { internalValue, updateValue, focused } = props;
-	const ref = React.useRef(null);
-	useEffect(() => {
-		if (ref.current && focused) ref.current.focus({ preventScroll: true });
-	}, [focused, ref]);
-	return /* @__PURE__ */ jsx(BooleanSwitch, {
-		ref,
-		size: "small",
-		value: Boolean(internalValue),
-		onValueChange: updateValue
-	});
-}
-//#endregion
-//#region src/components/EntityCollectionTable/fields/VirtualTableDateField.tsx
-function VirtualTableDateField(props) {
-	const { locale } = useCustomizationController();
-	const { disabled, error, mode, timezone, internalValue, updateValue } = props;
-	return /* @__PURE__ */ jsx(DateTimeField, {
-		value: internalValue ?? void 0,
-		onChange: (dateValue) => updateValue(dateValue ?? null),
-		invisible: true,
-		inputClassName: cls("w-full h-full", focusedDisabled),
-		className: cls("w-full h-full", focusedDisabled),
-		mode,
-		timezone,
-		locale
-	});
-}
-//#endregion
 //#region src/components/UserSelector.tsx
 var DEFAULT_PAGE_SIZE$2 = 10;
 /**
@@ -2657,8 +2505,9 @@ function VirtualTableUserSelect(props) {
 }
 //#endregion
 //#region src/form/components/StorageUploadProgress.tsx
-function StorageUploadProgress({ storagePath, entry, metadata, onFileUploadComplete, imageSize, simple }) {
-	const storageSource = useStorageSource();
+function StorageUploadProgress({ storagePath, entry, metadata, onFileUploadComplete, imageSize, simple, storageSource: storageSourceProp }) {
+	const defaultStorageSource = useStorageSource();
+	const storageSource = storageSourceProp ?? defaultStorageSource;
 	const snackbarController = useSnackbarController();
 	const [error, setError] = React.useState();
 	const [loading, setLoading] = React.useState(false);
@@ -2787,7 +2636,7 @@ var rejectDropClasses$1 = "transition-colors duration-200 ease-[cubic-bezier(0,0
 function TableStorageUpload(props) {
 	const { propertyKey, error, selected, openPopup, value, disabled, property, entity, path, previewSize, updateValue } = props;
 	const storageSource = useStorageSource();
-	const { internalValue, setInternalValue, onFilesAdded, storage, onFileUploadComplete, storagePathBuilder, multipleFilesSupported } = useStorageUploadController({
+	const { internalValue, setInternalValue, onFilesAdded, storage, onFileUploadComplete, storagePathBuilder, multipleFilesSupported, resolvedStorageSource } = useStorageUploadController({
 		entityValues: entity.values,
 		entityId: entity.id,
 		path,
@@ -2798,24 +2647,27 @@ function TableStorageUpload(props) {
 		value,
 		disabled
 	});
-	return /* @__PURE__ */ jsx(StorageUpload$1, {
-		internalValue,
-		setInternalValue,
-		name: propertyKey,
-		disabled,
-		autoFocus: false,
-		openPopup,
-		error,
-		selected,
-		property,
-		onChange: updateValue,
-		entity,
-		storagePathBuilder,
-		storage,
-		multipleFilesSupported,
-		onFilesAdded,
-		onFileUploadComplete,
-		previewSize
+	return /* @__PURE__ */ jsx(StorageSourceContext.Provider, {
+		value: resolvedStorageSource,
+		children: /* @__PURE__ */ jsx(StorageUpload$1, {
+			internalValue,
+			setInternalValue,
+			name: propertyKey,
+			disabled,
+			autoFocus: false,
+			openPopup,
+			error,
+			selected,
+			property,
+			onChange: updateValue,
+			entity,
+			storagePathBuilder,
+			storage,
+			multipleFilesSupported,
+			onFilesAdded,
+			onFileUploadComplete,
+			previewSize
+		})
 	});
 }
 function StorageUpload$1({ property, name, internalValue, setInternalValue, openPopup, entity, selected, error, onChange, multipleFilesSupported, previewSize: previewSizeInput, disabled, autoFocus, storage, onFilesAdded, onFileUploadComplete, storagePathBuilder }) {
@@ -3086,7 +2938,7 @@ var TableMultipleRelationFieldInternal = React.memo(function TableMultipleRelati
 	const selectedEntityIds = value.map((ref) => ref.id);
 	const relationDialogController = useEntitySelectionDialog({
 		multiselect: true,
-		path: collection.slug,
+		path: getCollectionDataPath(collection),
 		collection,
 		onMultipleEntitiesSelected,
 		selectedEntityIds,
@@ -3160,7 +3012,7 @@ var TableRelationFieldInternal = React.memo(function TableRelationFieldInternal(
 	const selectedEntityIds = internalValue ? Array.isArray(internalValue) ? internalValue.map((ref) => ref.id) : internalValue.id ? [internalValue.id] : [] : [];
 	const relationDialogController = useEntitySelectionDialog({
 		multiselect,
-		path: collection.slug,
+		path: getCollectionDataPath(collection),
 		collection,
 		onMultipleEntitiesSelected,
 		onSingleEntitySelected,
@@ -3248,7 +3100,7 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 	const localSelectionIdsRef = useRef(null);
 	const pinnedIdsRef = useRef(null);
 	const { items: availableItems, isLoading, hasMore, search, loadMore, entityToRelationItem } = useRelationSelector({
-		path: collection.slug,
+		path: getCollectionDataPath(collection),
 		collection,
 		fixedFilter,
 		pageSize
@@ -3744,32 +3596,7 @@ function isStorageProperty(property) {
 	return false;
 }
 function getTableBindingForProperty(property, selected) {
-	const isAStorageProperty = isStorageProperty(property);
-	if (property.type === "string" && property.reference?.path) return {
-		Component: ({ propertyKey, property, internalValue, updateValue, disabled, size, path }) => {
-			const referenceProperty = property.reference;
-			if (!referenceProperty) return null;
-			return /* @__PURE__ */ jsx(TableReferenceField, {
-				name: propertyKey,
-				internalValue: internalValue ? new EntityReference({
-					id: internalValue,
-					path: referenceProperty.path
-				}) : void 0,
-				updateValue: (v) => updateValue(v ? v.id : null),
-				disabled,
-				size,
-				path: referenceProperty.path,
-				multiselect: false,
-				previewProperties: referenceProperty.ui?.previewProperties,
-				includeId: referenceProperty.includeId,
-				includeEntityLink: referenceProperty.includeEntityLink,
-				title: property.name,
-				fixedFilter: referenceProperty.fixedFilter
-			});
-		},
-		allowScroll: false
-	};
-	else if (isAStorageProperty) return {
+	if (isStorageProperty(property)) return {
 		Component: ({ validationError, error, disabled, selected, openPopup, property, entity, path, internalValue, size, updateValue, propertyKey }) => /* @__PURE__ */ jsx(TableStorageUpload, {
 			error: validationError ?? error,
 			disabled,
@@ -3847,7 +3674,7 @@ function getTableBindingForProperty(property, selected) {
 			}),
 			fullHeight: true
 		};
-		else if (stringProperty.ui?.markdown || !stringProperty.storage || !stringProperty.reference) {
+		else if (stringProperty.ui?.markdown || !stringProperty.storage) {
 			const multiline = Boolean(stringProperty.ui?.multiline) || Boolean(stringProperty.ui?.markdown);
 			return {
 				Component: ({ error, validationError, disabled, selected, internalValue, updateValue }) => /* @__PURE__ */ jsx(VirtualTableInput, {
@@ -3869,15 +3696,19 @@ function getTableBindingForProperty(property, selected) {
 		updateValue
 	}) };
 	else if (property.type === "date") return {
-		Component: ({ propertyKey, error, validationError, disabled, selected, property, internalValue, updateValue }) => /* @__PURE__ */ jsx(VirtualTableDateField, {
-			name: propertyKey,
-			error: validationError ?? error,
-			disabled,
-			mode: property.mode,
-			focused: selected,
-			internalValue,
-			updateValue
-		}),
+		Component: ({ propertyKey, error, validationError, disabled, selected, property, internalValue, updateValue }) => {
+			const { locale } = useCustomizationController();
+			return /* @__PURE__ */ jsx(VirtualTableDateField, {
+				name: propertyKey,
+				error: validationError ?? error,
+				disabled,
+				mode: property.mode,
+				focused: selected,
+				internalValue,
+				updateValue,
+				locale
+			});
+		},
 		fullHeight: true,
 		hideOverflow: false,
 		allowScroll: false
@@ -5164,7 +4995,12 @@ var SelectableTable = function SelectableTable({ onValueChange, cellRenderer, on
 	}, [onEntityClick, inlineEditing]);
 	const select = useCallback((cell) => {
 		setLocalSelectedCell(cell);
-		selectionStore.select(cell);
+		if (cell) selectionStore.select({
+			...cell,
+			columnKey: cell.propertyKey,
+			rowId: cell.entityId
+		});
+		else selectionStore.select(void 0);
 	}, [selectionStore]);
 	const unselect = useCallback(() => {
 		setLocalSelectedCell(void 0);
@@ -5206,7 +5042,7 @@ var SelectableTable = function SelectableTable({ onValueChange, cellRenderer, on
 		children: /* @__PURE__ */ jsx("div", {
 			className: "h-full w-full flex flex-col bg-white dark:bg-surface-900",
 			ref,
-			children: /* @__PURE__ */ jsx(VirtualTable, {
+			children: /* @__PURE__ */ jsx(TableView, {
 				data,
 				columns,
 				cellRenderer: (props) => cellRenderer(props),
@@ -5350,6 +5186,7 @@ var EntityCollectionTable = function EntityCollectionTable({ className, style, f
 	const customFieldValidator = uniqueFieldValidator;
 	const propertyCellRenderer = useCallback(({ column, columnIndex, rowData, rowIndex, sortableNodeRef, sortableStyle, sortableAttributes, isDragging, isDraggable, frozen }) => {
 		const entity = rowData;
+		if (!entity) return null;
 		const propertyKey = column.key;
 		const columnCustom = column.custom;
 		let disabled = columnCustom?.disabled ?? false;
@@ -5389,6 +5226,7 @@ var EntityCollectionTable = function EntityCollectionTable({ className, style, f
 	]);
 	const additionalCellRenderer = useCallback(({ column, rowData, width, sortableNodeRef, sortableStyle, sortableAttributes, isDragging, isDraggable, frozen }) => {
 		const entity = rowData;
+		if (!entity) return null;
 		const additionalField = additionalFieldsMap[column.key];
 		const value = additionalField.dependencies ? Object.entries(entity.values).filter(([key, value]) => additionalField.dependencies.includes(key)).reduce((a, b) => ({
 			...a,
@@ -5697,7 +5535,7 @@ function buildBottomActions({ savingError, entity, formActions, collection, cont
 					const props = {
 						view: "form",
 						entity,
-						path: collection.slug,
+						path: getCollectionDataPath(collection),
 						collection,
 						context,
 						sideEntityController,
@@ -5734,19 +5572,22 @@ function buildBottomActions({ savingError, entity, formActions, collection, cont
 				onClick: navigateBack,
 				children: t("back_to_detail") ?? "Back to details"
 			}),
-			/* @__PURE__ */ jsxs(Button, {
-				variant: canClose ? "text" : "filled",
-				color: "primary",
-				type: "submit",
-				disabled: disabled || formex.isSubmitting,
-				onClick: () => {
-					sideDialogContext.setPendingClose(false);
-				},
-				children: [
-					status === "existing" && t("save"),
-					status === "copy" && t("create_copy"),
-					status === "new" && t("create")
-				]
+			/* @__PURE__ */ jsx(Tooltip, {
+				title: hasErrors ? t("fix_errors_before_saving") ?? "Fix highlighted errors before saving" : void 0,
+				children: /* @__PURE__ */ jsxs(Button, {
+					variant: canClose ? "text" : "filled",
+					color: "primary",
+					type: "submit",
+					disabled: disabled || formex.isSubmitting,
+					onClick: () => {
+						sideDialogContext.setPendingClose(false);
+					},
+					children: [
+						status === "existing" && t("save"),
+						status === "copy" && t("create_copy"),
+						status === "new" && t("create")
+					]
+				})
 			}),
 			canClose && /* @__PURE__ */ jsxs(LoadingButton, {
 				variant: "filled",
@@ -5771,21 +5612,25 @@ function buildSideActions({ savingError, entity, formActions, collection, contex
 	return /* @__PURE__ */ jsxs("div", {
 		className: cls("overflow-auto h-full flex flex-col gap-2 w-80 2xl:w-96 px-4 py-16 sticky top-0 border-l", defaultBorderMixin, className),
 		children: [
-			/* @__PURE__ */ jsxs(LoadingButton, {
-				fullWidth: true,
-				variant: "filled",
-				color: "primary",
-				type: "submit",
-				startIcon: hasErrors ? /* @__PURE__ */ jsx(AlertCircleIcon, {}) : void 0,
-				disabled: disabled || formex.isSubmitting,
-				onClick: () => {
-					sideDialogContext.setPendingClose?.(false);
-				},
-				children: [
-					status === "existing" && t("save"),
-					status === "copy" && t("create_copy"),
-					status === "new" && t("create")
-				]
+			/* @__PURE__ */ jsx(Tooltip, {
+				title: hasErrors ? t("fix_errors_before_saving") ?? "Fix highlighted errors before saving" : void 0,
+				children: /* @__PURE__ */ jsxs(LoadingButton, {
+					fullWidth: true,
+					variant: "filled",
+					color: "primary",
+					type: "submit",
+					loading: formex.isSubmitting,
+					startIcon: hasErrors ? /* @__PURE__ */ jsx(AlertCircleIcon, {}) : void 0,
+					disabled: disabled || formex.isSubmitting,
+					onClick: () => {
+						sideDialogContext.setPendingClose?.(false);
+					},
+					children: [
+						status === "existing" && t("save"),
+						status === "copy" && t("create_copy"),
+						status === "new" && t("create")
+					]
+				})
 			}),
 			/* @__PURE__ */ jsx(Button, {
 				fullWidth: true,
@@ -5808,7 +5653,7 @@ function buildSideActions({ savingError, entity, formActions, collection, contex
 					const props = {
 						view: "form",
 						entity,
-						path: collection.slug,
+						path: getCollectionDataPath(collection),
 						collection,
 						context,
 						sideEntityController,
@@ -5875,7 +5720,7 @@ function EntityActionButton({ action, enabled, props }) {
 }
 //#endregion
 //#region src/components/EntityEditView.tsx
-var EntityHistoryView = lazy(() => import("./history-BO6VT85a.js").then((m) => ({ default: m.EntityHistoryView })));
+var EntityHistoryView = lazy(() => import("./history-B3cqBzEV.js").then((m) => ({ default: m.EntityHistoryView })));
 /**
 * This is the default view that is used as the content of a side panel when
 * an entity is opened.
@@ -5927,7 +5772,7 @@ function EntityEditView({ entityId, ...props }) {
 }
 function EntityEditViewInner({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionSlugs, parentEntityIds, onValuesModified, onSaved, onTabChange, navigateBack, entity, initialDirtyValues, dataLoading, layout = "side_panel", barActions, status, setStatus, formProps, canEdit }) {
 	const ResolvedFormActions = useComponentOverride("Entity.FormActions", EntityEditViewFormActions);
-	const ResolvedEntityForm = useComponentOverride("Entity.Form", EntityForm);
+	const ResolvedEntityForm = useComponentOverride("Entity.Form", EntityFormBinding);
 	const ResolvedCollectionView = useComponentOverride("Collection.View", EntityCollectionView);
 	const context = useRebaseContext();
 	const urlController = useUrlController();
@@ -6093,7 +5938,7 @@ function EntityEditViewInner({ path, entityId, selectedTab: selectedTabProp, col
 	}, "history_view") : null;
 	const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
 		const subcollectionId = subcollection.slug;
-		const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.slug)}` : void 0;
+		const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(getCollectionDataPath(subcollection))}` : void 0;
 		if (activeTab !== subcollectionId) return null;
 		return /* @__PURE__ */ jsxs("div", {
 			className: "relative flex-1 h-full overflow-auto w-full",
@@ -7070,8 +6915,9 @@ function useEntityHistory(params) {
 //#endregion
 //#region src/hooks/navigation/useBuildCollectionRegistryController.tsx
 function useBuildCollectionRegistryController(props) {
-	const { userConfigPersistence } = props;
-	const collectionRegistryRef = useRef(new CollectionRegistry());
+	const { userConfigPersistence, dataSources } = props;
+	const collectionRegistryRef = useRef(new CollectionRegistry(void 0, dataSources));
+	if (dataSources) collectionRegistryRef.current.setDataSources(dataSources);
 	const [initialised, setInitialised] = useState(false);
 	const getCollection = useCallback((slugOrPath, includeUserOverride = false) => {
 		const registry = collectionRegistryRef.current;
@@ -7163,7 +7009,9 @@ function useBuildCollectionRegistryController(props) {
 		return paths;
 	}, []);
 	const collections = collectionRegistryRef.current.getCollections();
-	if (!initialised && collections.length > 0) setInitialised(true);
+	useEffect(() => {
+		if (!initialised && collections.length > 0) setInitialised(true);
+	}, [initialised, collections.length]);
 	return useMemo(() => ({
 		collections,
 		initialised,
@@ -7491,7 +7339,7 @@ var editEntityAction = {
 		if (!entity) throw new Error("INTERNAL: editEntityAction: Entity is undefined");
 		if (!sideEntityController) throw new Error("INTERNAL: editEntityAction: sideEntityController is undefined");
 		highlightEntity?.(entity);
-		context.analyticsController?.onAnalyticsEvent?.("entity_click", {
+		context?.analyticsController?.onAnalyticsEvent?.("entity_click", {
 			path: entity.path,
 			entityId: entity.id
 		});
@@ -7501,6 +7349,7 @@ var editEntityAction = {
 			status: "existing",
 			entityId: entity.id
 		});
+		if (!context?.urlController) throw new Error("INTERNAL: editEntityAction: urlController is undefined");
 		navigateToEntity({
 			openEntityMode,
 			collection,
@@ -7523,11 +7372,12 @@ var copyEntityAction = {
 		if (!entity) throw new Error("INTERNAL: copyEntityAction: Entity is undefined");
 		if (!sideEntityController) throw new Error("INTERNAL: copyEntityAction: sideEntityController is undefined");
 		highlightEntity?.(entity);
-		context.analyticsController?.onAnalyticsEvent?.("copy_entity_click", {
+		context?.analyticsController?.onAnalyticsEvent?.("copy_entity_click", {
 			path: entity.path,
 			entityId: entity.id
 		});
 		const usedPath = path ?? collection?.slug ?? entity.path;
+		if (!context?.urlController) throw new Error("INTERNAL: copyEntityAction: urlController is undefined");
 		navigateToEntity({
 			openEntityMode,
 			collection,
@@ -7548,7 +7398,7 @@ var deleteEntityAction = {
 	isEnabled: ({ entity }) => Boolean(entity),
 	onClick({ entity, path, collection, context, selectionController, onCollectionChange, navigateBack, openEntityMode }) {
 		if (!entity) throw new Error("INTERNAL: deleteEntityAction: Entity is undefined");
-		if (!context.dialogsController) throw new Error("INTERNAL: deleteEntityAction: context.dialogsController is undefined");
+		if (!context?.dialogsController) throw new Error("INTERNAL: deleteEntityAction: context.dialogsController is undefined");
 		const { closeDialog } = context.dialogsController.open({
 			key: "delete_entity_dialog_" + entity.id,
 			Component: ({ open }) => {
@@ -7560,10 +7410,10 @@ var deleteEntityAction = {
 					callbacks: collection.callbacks,
 					open,
 					onEntityDelete: () => {
-						context.analyticsController?.onAnalyticsEvent?.("single_entity_deleted", { path });
+						context?.analyticsController?.onAnalyticsEvent?.("single_entity_deleted", { path });
 						selectionController?.setSelectedEntities(selectionController.selectedEntities.filter((e) => e.id !== entity.id));
 						onCollectionChange?.();
-						if (openEntityMode === "full_screen" && context.urlController) {
+						if (openEntityMode === "full_screen" && context?.urlController) {
 							const collectionUrl = context.urlController.buildUrlCollectionPath(path);
 							context.urlController.navigate(collectionUrl, { replace: true });
 						} else navigateBack?.();
@@ -7643,7 +7493,7 @@ var resetPasswordAction = {
 	isEnabled: ({ entity }) => Boolean(entity),
 	onClick({ entity, context }) {
 		if (!entity) throw new Error("INTERNAL: resetPasswordAction: Entity is undefined");
-		if (!context.dialogsController) throw new Error("INTERNAL: resetPasswordAction: context.dialogsController is undefined");
+		if (!context?.dialogsController) throw new Error("INTERNAL: resetPasswordAction: context.dialogsController is undefined");
 		const user = {
 			uid: entity.id,
 			email: entity.values?.email,
@@ -7787,12 +7637,34 @@ async function resolveAppViews(baseViews, authController, data, plugins) {
 	if (plugins) {
 		for (const plugin of plugins) if (plugin.views && plugin.views.length > 0) resolvedViews = [...resolvedViews, ...plugin.views];
 	}
+	if (process.env.NODE_ENV !== "production") {
+		const slugCounts = /* @__PURE__ */ new Map();
+		resolvedViews.forEach((v) => {
+			slugCounts.set(v.slug, (slugCounts.get(v.slug) ?? 0) + 1);
+		});
+		slugCounts.forEach((count, slug) => {
+			if (count > 1) console.warn(`[Rebase] Duplicate view slug "${slug}" detected (${count} views). Last-write-wins. Ensure unique slugs across CMS views and plugins.`);
+		});
+	}
+	resolvedViews = filterViewsByRole(resolvedViews, authController);
 	return resolvedViews;
 }
+/**
+* Filter views by the `roles` field on AppView.
+* When `roles` is set, the view is only included if the current user
+* has at least one of the listed roles. Views without `roles` (or with
+* an empty array) are always included.
+*/
+function filterViewsByRole(views, authController) {
+	const userRoles = authController.user?.roles ?? [];
+	return views.filter((view) => {
+		if (!view.roles || view.roles.length === 0) return true;
+		return view.roles.some((role) => userRoles.includes(role));
+	});
+}
 //#endregion
 //#region src/hooks/navigation/utils.ts
 var NAVIGATION_DEFAULT_GROUP_NAME = "Views";
-var NAVIGATION_ADMIN_GROUP_NAME = "Admin";
 function getGroup(collectionOrView) {
 	const trimmed = collectionOrView.group?.trim();
 	if (!trimmed || trimmed === "") return NAVIGATION_DEFAULT_GROUP_NAME;
@@ -7801,7 +7673,8 @@ function getGroup(collectionOrView) {
 function computeNavigationGroups({ navigationGroupMappings, collections, views, plugins }) {
 	let result = navigationGroupMappings ? navigationGroupMappings.map((g) => ({
 		name: g.name,
-		entries: [...g.entries]
+		entries: [...g.entries],
+		...g.collapsedByDefault !== void 0 && { collapsedByDefault: g.collapsedByDefault }
 	})) : navigationGroupMappings;
 	if (plugins) result = plugins.reduce((acc, plugin) => {
 		if (plugin.hooks?.navigationEntries) plugin.hooks.navigationEntries.forEach((entry) => {
@@ -7891,48 +7764,38 @@ function areCollectionsEqual(a, b, visitedSlugs = []) {
 	return deepEqual(Object.fromEntries(Object.entries(a).filter(([k, v]) => typeof v !== "function" && k !== "subcollections")), Object.fromEntries(Object.entries(b).filter(([k, v]) => typeof v !== "function" && k !== "subcollections")));
 }
 //#endregion
-//#region src/hooks/navigation/useResolvedCollections.ts
+//#region src/hooks/navigation/useAsyncResolver.ts
 /**
-* Hook that resolves collection props (which may be async builders or arrays)
-* into concrete EntityCollection[], and registers them with the CollectionRegistry.
-*
-* When userManagement is provided, the default users collection is always
-* prepended. Developer collections override via generic slug-based dedup
-* (Map keyed by slug, last-write-wins). No hardcoded string checks.
+* Generic hook that resolves an async value with loading/error/refresh
+* state management, cancellation on unmount or deps change, and
+* ref-based change detection to prevent unnecessary state updates.
 *
-* Uses refs for potentially-unstable dependencies (driver, authController,
-* plugins) to avoid re-triggering effects when their object identity changes.
+* Extracted from the common pattern in useResolvedCollections and
+* useResolvedViews.
 */
-function useResolvedCollections(props) {
-	const { authController, collections: collectionsProp, data, plugins, disabled, collectionRegistryController } = props;
+function useAsyncResolver({ resolver, initialValue, isEqual, deps, disabled }) {
+	const [data, setData] = useState(initialValue);
 	const [loading, setLoading] = useState(true);
 	const [error, setError] = useState(void 0);
-	const [resolvedCollections, setResolvedCollections] = useState([]);
 	const [refreshTrigger, setRefreshTrigger] = useState(0);
 	const refresh = useCallback(() => {
 		setRefreshTrigger((prev) => prev + 1);
 	}, []);
-	const dataRef = useRef(data);
-	dataRef.current = data;
-	const authControllerRef = useRef(authController);
-	authControllerRef.current = authController;
-	const pluginsRef = useRef(plugins);
-	pluginsRef.current = plugins;
-	const resolvedCollectionsRef = useRef([]);
-	const initialLoading = authController.initialLoading;
-	const user = authController.user;
+	const dataRef = useRef(initialValue);
+	const resolverRef = useRef(resolver);
+	resolverRef.current = resolver;
+	const isEqualRef = useRef(isEqual);
+	isEqualRef.current = isEqual;
 	useEffect(() => {
-		if (disabled || initialLoading) return;
+		if (disabled) return;
 		let cancelled = false;
 		(async () => {
 			try {
-				const resolved = await resolveCollections(collectionsProp, authControllerRef.current, dataRef.current, pluginsRef.current);
+				const result = await resolverRef.current();
 				if (cancelled) return;
-				const deduped = [...resolved];
-				if (collectionRegistryController.collectionRegistryRef.current.registerMultiple(deduped)) console.debug("Collections have changed", deduped);
-				if (!areCollectionListsEqual(resolvedCollectionsRef.current, deduped)) {
-					resolvedCollectionsRef.current = deduped;
-					setResolvedCollections(deduped);
+				if (!isEqualRef.current(dataRef.current, result)) {
+					dataRef.current = result;
+					setData(result);
 				}
 				setError(void 0);
 			} catch (e) {
@@ -7948,20 +7811,66 @@ function useResolvedCollections(props) {
 			cancelled = true;
 		};
 	}, [
-		collectionsProp,
-		disabled,
-		collectionRegistryController.collectionRegistryRef,
+		...deps,
 		refreshTrigger,
-		initialLoading,
-		user
+		disabled
+	]);
+	return useMemo(() => ({
+		data,
+		loading,
+		error,
+		refresh
+	}), [
+		data,
+		loading,
+		error,
+		refresh
 	]);
+}
+//#endregion
+//#region src/hooks/navigation/useResolvedCollections.ts
+/**
+* Hook that resolves collection props (which may be async builders or arrays)
+* into concrete EntityCollection[], and registers them with the CollectionRegistry.
+*
+* When userManagement is provided, the default users collection is always
+* prepended. Developer collections override via generic slug-based dedup
+* (Map keyed by slug, last-write-wins). No hardcoded string checks.
+*
+* Uses refs for potentially-unstable dependencies (driver, authController,
+* plugins) to avoid re-triggering effects when their object identity changes.
+*/
+function useResolvedCollections(props) {
+	const { authController, collections: collectionsProp, data, plugins, disabled, collectionRegistryController } = props;
+	const userIdentity = authController.user ? `${authController.user.uid}:${(authController.user.roles ?? []).sort().join(",")}` : null;
+	const dataRef = useRef(data);
+	dataRef.current = data;
+	const authControllerRef = useRef(authController);
+	authControllerRef.current = authController;
+	const pluginsRef = useRef(plugins);
+	pluginsRef.current = plugins;
+	const { data: collections, loading, error, refresh } = useAsyncResolver({
+		resolver: async () => {
+			const deduped = [...await resolveCollections(collectionsProp, authControllerRef.current, dataRef.current, pluginsRef.current)];
+			if (collectionRegistryController.collectionRegistryRef.current.registerMultiple(deduped)) console.debug("Collections have changed", deduped);
+			return deduped;
+		},
+		initialValue: [],
+		isEqual: areCollectionListsEqual,
+		deps: [
+			collectionsProp,
+			userIdentity,
+			disabled
+		],
+		disabled: disabled || authController.initialLoading
+	});
 	return useMemo(() => ({
-		collections: resolvedCollections,
+		collections,
 		loading,
 		error,
 		refresh
 	}), [
-		resolvedCollections,
+		collections,
 		loading,
 		error,
 		refresh
@@ -7982,6 +7891,13 @@ function viewSlugsEqual(a, b) {
 	return true;
 }
 /**
+* Equality check for the combined views data.
+* Compares both views and adminViews by slug identity.
+*/
+function areResolvedViewsEqual(a, b) {
+	return viewSlugsEqual(a.views, b.views) && viewSlugsEqual(a.adminViews, b.adminViews);
+}
+/**
 * Hook that resolves view and admin view props (which may be async builders or arrays)
 * into concrete AppView[].
 *
@@ -7990,16 +7906,7 @@ function viewSlugsEqual(a, b) {
 */
 function useResolvedViews(props) {
 	const { authController, views: viewsProp, adminViews: adminViewsProp, data, plugins, adminMode = "content", effectiveRoleController } = props;
-	const [loading, setLoading] = useState(true);
-	const [error, setError] = useState(void 0);
-	const [resolvedViews, setResolvedViews] = useState(void 0);
-	const [resolvedAdminViews, setResolvedAdminViews] = useState(void 0);
-	const [refreshTrigger, setRefreshTrigger] = useState(0);
-	const refresh = useCallback(() => {
-		setRefreshTrigger((prev) => prev + 1);
-	}, []);
-	const viewsRef = useRef(void 0);
-	const adminViewsRef = useRef(void 0);
+	const userIdentity = authController.user ? `${authController.user.uid}:${(authController.user.roles ?? []).sort().join(",")}` : null;
 	const dataRef = useRef(data);
 	dataRef.current = data;
 	const authControllerRef = useRef(authController);
@@ -8023,51 +7930,35 @@ function useResolvedViews(props) {
 	const resolvedAuthControllerRef = useRef(resolvedAuthController);
 	resolvedAuthControllerRef.current = resolvedAuthController;
 	const initialLoading = resolvedAuthController.initialLoading;
-	const user = resolvedAuthController.user;
-	useEffect(() => {
-		if (initialLoading) return;
-		let cancelled = false;
-		(async () => {
-			try {
-				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);
-				}
-				if (!viewSlugsEqual(adminViewsRef.current, newAdminViews)) {
-					adminViewsRef.current = newAdminViews;
-					setResolvedAdminViews(newAdminViews);
-				}
-				setError(void 0);
-			} catch (e) {
-				if (!cancelled) {
-					console.error("Error resolving views:", e);
-					setError(e);
-				}
-			} finally {
-				if (!cancelled) setLoading(false);
-			}
-		})();
-		return () => {
-			cancelled = true;
-		};
-	}, [
-		viewsProp,
-		adminViewsProp,
-		refreshTrigger,
-		adminMode,
-		initialLoading,
-		user
-	]);
+	const { data: resolvedData, loading, error, refresh } = useAsyncResolver({
+		resolver: async () => {
+			const [newViews, newAdminViews] = await Promise.all([resolveAppViews(viewsProp, resolvedAuthControllerRef.current, dataRef.current, pluginsRef.current), resolveAppViews(adminViewsProp, resolvedAuthControllerRef.current, dataRef.current)]);
+			return {
+				views: newViews,
+				adminViews: newAdminViews
+			};
+		},
+		initialValue: {
+			views: void 0,
+			adminViews: void 0
+		},
+		isEqual: areResolvedViewsEqual,
+		deps: [
+			viewsProp,
+			adminViewsProp,
+			adminMode,
+			userIdentity
+		],
+		disabled: initialLoading
+	});
 	return useMemo(() => ({
-		views: resolvedViews,
-		adminViews: resolvedAdminViews,
+		views: resolvedData.views,
+		adminViews: resolvedData.adminViews,
 		loading,
 		error,
 		refresh
 	}), [
-		resolvedViews,
-		resolvedAdminViews,
+		resolvedData,
 		loading,
 		error,
 		refresh
@@ -8176,21 +8067,24 @@ function useTopLevelNavigation(props) {
 			}, [])
 		];
 		const groupOrderValue = (groupName) => {
-			if (groupName === "Admin") return 1;
+			if (groupName === "Admin" || groupName === "Settings" || groupName === "Admin") return 1;
 			return 0;
 		};
-		navigationEntries = navigationEntries.sort((a, b) => {
-			return groupOrderValue(a.group) - groupOrderValue(b.group);
-		});
 		const usedViewsOrder = viewsOrder ?? navigationEntriesOrder;
-		if (usedViewsOrder) navigationEntries = navigationEntries.sort((a, b) => {
-			const getSortPath = (navEntry) => typeof navEntry.slug === "string" ? navEntry.slug : navEntry.slug[0];
-			const aIndex = usedViewsOrder.indexOf(getSortPath(a));
-			const bIndex = usedViewsOrder.indexOf(getSortPath(b));
-			if (aIndex === -1 && bIndex === -1) return 0;
-			if (aIndex === -1) return 1;
-			if (bIndex === -1) return -1;
-			return aIndex - bIndex;
+		navigationEntries = navigationEntries.sort((a, b) => {
+			const groupDiff = groupOrderValue(a.group) - groupOrderValue(b.group);
+			if (groupDiff !== 0) return groupDiff;
+			if (usedViewsOrder) {
+				const getSortPath = (navEntry) => typeof navEntry.slug === "string" ? navEntry.slug : navEntry.slug[0];
+				const aIndex = usedViewsOrder.indexOf(getSortPath(a));
+				const bIndex = usedViewsOrder.indexOf(getSortPath(b));
+				if (aIndex !== -1 || bIndex !== -1) {
+					if (aIndex === -1) return 1;
+					if (bIndex === -1) return -1;
+					return aIndex - bIndex;
+				}
+			}
+			return 0;
 		});
 		const collectedGroupsFromEntries = navigationEntries.map((e) => e.group).filter(Boolean);
 		const groupsFromMappings = finalNavigationGroupMappings.map((g) => g.name);
@@ -8201,8 +8095,8 @@ function useTopLevelNavigation(props) {
 			...additionalGroups
 		];
 		const uniqueGroupsArray = [...new Set(allDefinedGroups)];
-		const adminGroups = uniqueGroupsArray.filter((g) => g === NAVIGATION_ADMIN_GROUP_NAME);
-		const uniqueGroups = [...uniqueGroupsArray.filter((g) => g !== NAVIGATION_ADMIN_GROUP_NAME), ...adminGroups];
+		const lastGroups = uniqueGroupsArray.filter((g) => g === "Admin" || g === "Settings" || g === "Admin");
+		const uniqueGroups = [...uniqueGroupsArray.filter((g) => g !== "Admin" && g !== "Settings" && g !== "Admin"), ...lastGroups];
 		const computedTopLevelNav = {
 			allowDragAndDrop: plugins?.some((plugin) => plugin.hooks?.allowDragAndDrop) ?? false,
 			navigationEntries,
@@ -8269,9 +8163,15 @@ function useBuildNavigationStateController(props) {
 		adminMode,
 		collectionRegistryController
 	});
+	const pendingRefreshRef = useRef(false);
 	const refreshNavigation = useCallback(() => {
-		refreshCollections();
-		refreshViews();
+		if (pendingRefreshRef.current) return;
+		pendingRefreshRef.current = true;
+		queueMicrotask(() => {
+			pendingRefreshRef.current = false;
+			refreshCollections();
+			refreshViews();
+		});
 	}, [refreshCollections, refreshViews]);
 	return useMemo(() => ({
 		views,
@@ -8279,8 +8179,7 @@ function useBuildNavigationStateController(props) {
 		topLevelNavigation,
 		loading: collectionsLoading || viewsLoading,
 		navigationLoadingError: collectionsError ?? viewsError,
-		refreshNavigation,
-		plugins
+		refreshNavigation
 	}), [
 		views,
 		adminViews,
@@ -8289,8 +8188,7 @@ function useBuildNavigationStateController(props) {
 		viewsLoading,
 		collectionsError,
 		viewsError,
-		refreshNavigation,
-		plugins
+		refreshNavigation
 	]);
 }
 //#endregion
@@ -8352,14 +8250,18 @@ var BreadcrumbContext = React.createContext({
 var BreadcrumbsProvider = ({ children }) => {
 	const [breadcrumbs, setBreadcrumbs] = useState([]);
 	const set = useCallback((props) => {
-		setBreadcrumbs((prev) => props.breadcrumbs.map((newEntry) => {
-			const prevEntry = newEntry.id ? prev.find((p) => p.id === newEntry.id) : void 0;
-			if (prevEntry && newEntry.count === null && typeof prevEntry.count === "number") return {
-				...newEntry,
-				count: prevEntry.count
-			};
-			return newEntry;
-		}));
+		setBreadcrumbs((prev) => {
+			const next = props.breadcrumbs.map((newEntry) => {
+				const prevEntry = newEntry.id ? prev.find((p) => p.id === newEntry.id) : void 0;
+				if (prevEntry && newEntry.count === null && typeof prevEntry.count === "number") return {
+					...newEntry,
+					count: prevEntry.count
+				};
+				return newEntry;
+			});
+			if (prev.length === next.length && prev.every((p, i) => p.title === next[i].title && p.url === next[i].url && p.id === next[i].id && p.count === next[i].count)) return prev;
+			return next;
+		});
 	}, []);
 	const updateCount = useCallback((id, count) => {
 		setBreadcrumbs((prev) => prev.map((entry) => entry.id === id ? {
@@ -8502,11 +8404,7 @@ function SideDialogView({ offsetPosition, panel, panelIndex, isTopPanel }) {
 			overlayStyle: { zIndex: 40 + panelIndex * 10 },
 			style: { zIndex: 45 + panelIndex * 10 },
 			onOpenChange: (open) => {
-				if (!open) {
-					const suggestionMenu = document.querySelector("[data-suggestion-menu=\"true\"]");
-					if (suggestionMenu && window.getComputedStyle(suggestionMenu).visibility !== "hidden") return;
-					onCloseRequest();
-				}
+				if (!open) onCloseRequest();
 			},
 			onPointerDownOutside: !isTopPanel ? preventDismiss : void 0,
 			onInteractOutside: !isTopPanel ? preventDismiss : void 0,
@@ -8736,7 +8634,7 @@ function EntitySelectionDialogActions({ collection, path, onClear, onNewClick })
 //#region src/components/EntityCollectionView/hooks/useCollectionInlineEditor.ts
 function useCollectionInlineEditor({ path, collection, dataClient, context }) {
 	const uniqueFieldValidator = useCallback(async ({ name, value, property, entityId }) => {
-		const conflictingEntities = (await dataClient.collection(path).find({ where: { [name]: "eq." + value } })).data;
+		const conflictingEntities = (await dataClient.collection(path).find({ where: { [name]: ["==", value] } })).data;
 		return conflictingEntities.length === 0 || conflictingEntities.length === 1 && conflictingEntities[0].id === entityId;
 	}, [path, dataClient]);
 	const onValueChange = useCallback(({ value, propertyKey, onValueUpdated, setError, data: entity }) => {
@@ -8969,7 +8867,7 @@ function FormEntry({ propertyKey, widthPercentage = 100, children }) {
 //#region src/form/components/FormLayout.tsx
 function FormLayout({ children, className }) {
 	return /* @__PURE__ */ jsx("div", {
-		className: cls("flex flex-wrap gap-x-4 w-full space-y-8", className),
+		className: cls("flex flex-wrap gap-x-4 w-full space-y-6", className),
 		children
 	});
 }
@@ -8994,7 +8892,7 @@ function ReadOnlyFieldBinding({ propertyKey, value, error, showError, minimalist
 			className: "h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"
 		}),
 		/* @__PURE__ */ jsx("div", {
-			className: cls(!skipCardWrapper && paperMixin, "w-full min-h-14 overflow-x-scroll no-scrollbar", !skipCardWrapper && "p-4 md:p-6"),
+			className: cls("w-full overflow-x-scroll no-scrollbar flex items-center", skipCardWrapper ? "" : "rounded-lg border border-surface-200 dark:border-surface-700 px-4 md:px-6 min-h-10 opacity-80"),
 			children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyPreview, {
 				propertyKey,
 				value,
@@ -9281,7 +9179,7 @@ var buildIdsMap = (value) => value && Array.isArray(value) && value.length > 0 ?
 	...a,
 	...b
 }), {}) : {};
-function SortableItem$1({ id, index, size, disabled, buildEntry, remove, copy, addInIndex, canAddElements, sortable, storedProps, updateItemCustomProps }) {
+function SortableItem({ id, index, size, disabled, buildEntry, remove, copy, addInIndex, canAddElements, sortable, storedProps, updateItemCustomProps }) {
 	const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id });
 	return /* @__PURE__ */ jsx(ArrayContainerItem, {
 		nodeRef: setNodeRef,
@@ -9510,7 +9408,7 @@ function ArrayContainer({ droppableId, addLabel, value, disabled = false, buildE
 			children: /* @__PURE__ */ jsxs("div", {
 				className: cls("space-y-1", className),
 				id: droppableId,
-				children: [hasValue && internalIds.map((internalId, index) => /* @__PURE__ */ jsx(SortableItem$1, {
+				children: [hasValue && internalIds.map((internalId, index) => /* @__PURE__ */ jsx(SortableItem, {
 					id: internalId,
 					index,
 					size,
@@ -10433,8 +10331,18 @@ function MarkdownEditorFieldBinding({ property, propertyKey, value, setValue, in
 	const disabled = disabledProp || isSubmitting;
 	const highlight = customProps?.highlight;
 	const editorProps = customProps?.editorProps;
-	const storageSource = useStorageSource();
+	const defaultStorageSource = useStorageSource();
 	const storage = property.storage;
+	const storageSources = useStorageSources();
+	const storageSource = useMemo(() => resolveStorageSource({
+		sourceKey: storage?.storageSource,
+		sources: storageSources.sources,
+		defaultSource: defaultStorageSource
+	}), [
+		storage?.storageSource,
+		storageSources.sources,
+		defaultStorageSource
+	]);
 	const entityValues = context.values;
 	const entityId = context.entityId;
 	const path = context.path;
@@ -10645,91 +10553,6 @@ function MultiSelectFieldBinding({ propertyKey, value, setValue, error, showErro
 	})] });
 }
 //#endregion
-//#region src/form/field_bindings/ReferenceAsStringFieldBinding.tsx
-/**
-* Field that opens a reference selection dialog and stores the entity ID as a string.
-*
-* This is one of the internal components that get mapped natively inside forms
-* and tables to the specified properties.
-* @group Form fields
-*/
-function ReferenceAsStringFieldBinding(props) {
-	if (typeof props.property.reference?.path !== "string") return /* @__PURE__ */ jsx(ReadOnlyFieldBinding, { ...props });
-	return /* @__PURE__ */ jsx(ReferenceAsStringFieldBindingInternal, { ...props });
-}
-function ReferenceAsStringFieldBindingInternal({ propertyKey, value, setValue, error, showError, isSubmitting, disabled, minimalistView, property, includeDescription, size = "medium" }) {
-	if (!property.reference?.path) throw new Error("Property path is required for ReferenceAsStringFieldBinding");
-	useClearRestoreValue({
-		property,
-		value,
-		setValue
-	});
-	const collectionRegistryController = useCollectionRegistryController();
-	const path = property.reference.path;
-	const collection = useMemo(() => {
-		return path ? collectionRegistryController.getCollection(path) : void 0;
-	}, [path]);
-	const referenceValue = useMemo(() => {
-		if (value && path) return new EntityReference({
-			id: value,
-			path
-		});
-	}, [value, path]);
-	if (!collection) throw Error(`Couldn't find the corresponding collection for the path: ${path}`);
-	const referenceDialogController = useEntitySelectionDialog({
-		multiselect: false,
-		path,
-		collection,
-		onSingleEntitySelected: useCallback((e) => {
-			setValue(e ? String(e.id) : null);
-		}, [setValue]),
-		selectedEntityIds: value ? [value] : void 0,
-		fixedFilter: property.reference?.fixedFilter
-	});
-	const onEntryClick = (e) => {
-		e.preventDefault();
-		referenceDialogController.open();
-	};
-	return /* @__PURE__ */ jsxs(Fragment, { children: [
-		!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"
-		}),
-		!collection && /* @__PURE__ */ jsx(ErrorView, { error: "The specified collection does not exist. Check console" }),
-		collection && /* @__PURE__ */ jsxs(Fragment, { children: [referenceValue && /* @__PURE__ */ jsx(ReferencePreview, {
-			disabled: !path,
-			previewProperties: property.reference?.ui?.previewProperties,
-			hover: !disabled,
-			size,
-			onClick: disabled || isSubmitting ? void 0 : onEntryClick,
-			reference: referenceValue,
-			includeEntityLink: property.reference?.includeEntityLink,
-			includeId: property.reference?.includeId
-		}), !value && /* @__PURE__ */ jsx("div", {
-			className: "justify-center text-left",
-			children: /* @__PURE__ */ jsxs(EntityPreviewContainer, {
-				className: cls("px-6 h-16 text-sm font-medium flex items-center gap-6", disabled || isSubmitting ? "text-surface-accent-500" : "cursor-pointer text-surface-accent-700 dark:text-surface-accent-300 hover:bg-surface-accent-50 dark:hover:bg-surface-800 group-hover:bg-surface-accent-50 dark:group-hover:bg-surface-800"),
-				onClick: onEntryClick,
-				size: "medium",
-				children: [/* @__PURE__ */ jsx(IconForView, {
-					collectionOrView: collection,
-					className: "text-surface-300 dark:text-surface-600"
-				}), `Edit ${property.name}`.toUpperCase()]
-			})
-		})] }),
-		/* @__PURE__ */ jsx(FieldHelperText, {
-			includeDescription,
-			showError,
-			error,
-			disabled,
-			property
-		})
-	] });
-}
-//#endregion
 //#region src/form/field_bindings/ReferenceFieldBinding.tsx
 /**
 * Field that opens a reference selection dialog.
@@ -11022,9 +10845,9 @@ var acceptDropClasses = "transition-colors duration-200 ease-[cubic-bezier(0,0,0
 var rejectDropClasses = "transition-colors duration-200 ease-[cubic-bezier(0,0,0.2,1)] border-2 border-solid border-red-500";
 function StorageUploadFieldBinding({ propertyKey, value, setValue, error, showError, autoFocus, minimalistView, property, includeDescription, context, isSubmitting }) {
 	useAuthController();
-	const storageSource = useStorageSource(context.collection);
+	const storageSource = useStorageSource();
 	const disabled = isReadOnly(property) || !!property.ui?.disabled || isSubmitting || context.disabled;
-	const { internalValue, setInternalValue, onFilesAdded, storage, onFileUploadComplete, storagePathBuilder, multipleFilesSupported } = useStorageUploadController({
+	const { internalValue, setInternalValue, onFilesAdded, storage, onFileUploadComplete, storagePathBuilder, multipleFilesSupported, resolvedStorageSource } = useStorageUploadController({
 		entityValues: context.values,
 		entityId: context.entityId,
 		path: context.path,
@@ -11048,19 +10871,22 @@ function StorageUploadFieldBinding({ propertyKey, value, setValue, error, showEr
 			title: property.name ?? propertyKey,
 			className: "h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"
 		}),
-		/* @__PURE__ */ jsx(StorageUpload, {
-			value: internalValue,
-			name: propertyKey,
-			disabled: disabled ?? false,
-			autoFocus: autoFocus ?? false,
-			property,
-			onChange: setValue,
-			setInternalValue,
-			onFilesAdded,
-			onFileUploadComplete,
-			storagePathBuilder,
-			storage,
-			multipleFilesSupported
+		/* @__PURE__ */ jsx(StorageSourceContext.Provider, {
+			value: resolvedStorageSource,
+			children: /* @__PURE__ */ jsx(StorageUpload, {
+				value: internalValue,
+				name: propertyKey,
+				disabled: disabled ?? false,
+				autoFocus: autoFocus ?? false,
+				property,
+				onChange: setValue,
+				setInternalValue,
+				onFilesAdded,
+				onFileUploadComplete,
+				storagePathBuilder,
+				storage,
+				multipleFilesSupported
+			})
 		}),
 		/* @__PURE__ */ jsx(FieldHelperText, {
 			includeDescription,
@@ -11567,7 +11393,7 @@ function MultipleRelationFieldBinding({ propertyKey, value: valueProp, error, sh
 	const { t } = useTranslation();
 	if (property.type !== "relation") throw Error("RelationFieldBinding expected a property containing a relation");
 	const parentCollection = context.collection;
-	const capabilities = parentCollection ? getDataSourceCapabilities(parentCollection.driver) : void 0;
+	const capabilities = parentCollection ? getDataSourceCapabilities(parentCollection.engine) : void 0;
 	if (!parentCollection || !capabilities?.supportsRelations || !("relations" in parentCollection) || !parentCollection.relations) throw Error("RelationFieldBinding expected a collection with relations support");
 	const relation = resolveRelationProperty(property, parentCollection.relations, propertyKey).relation;
 	if (!relation) throw Error("Property relation is required for MultipleRelationFieldBinding");
@@ -11578,7 +11404,7 @@ function MultipleRelationFieldBinding({ propertyKey, value: valueProp, error, sh
 	}, [setValue]);
 	const referenceDialogController = useEntitySelectionDialog({
 		multiselect: true,
-		path: collection.slug,
+		path: getCollectionDataPath(collection),
 		collection,
 		onMultipleEntitiesSelected,
 		selectedEntityIds,
@@ -11664,7 +11490,7 @@ function RelationFieldBinding(props) {
 	const { property, propertyKey, context } = props;
 	if (property.type !== "relation") throw Error("RelationFieldBinding expected a property containing a relation");
 	const collection = context.collection;
-	const capabilities = collection ? getDataSourceCapabilities(collection.driver) : void 0;
+	const capabilities = collection ? getDataSourceCapabilities(collection.engine) : void 0;
 	if (!collection || !capabilities?.supportsRelations || !("relations" in collection) || !collection.relations) throw Error("RelationFieldBinding expected a collection with relations support");
 	const relation = resolveRelationProperty(property, collection.relations, propertyKey).relation;
 	const manyRelation = relation?.cardinality === "many";
@@ -11724,7 +11550,7 @@ function SingleRelationFieldBinding({ propertyKey, value, size, error, showError
 	}, [setValue]);
 	const referenceDialogController = useEntitySelectionDialog({
 		multiselect: false,
-		path: collection.slug,
+		path: getCollectionDataPath(collection),
 		collection,
 		onSingleEntitySelected,
 		selectedEntityIds: validValue && normalizedValue ? [normalizedValue.id] : void 0,
@@ -11996,17 +11822,6 @@ var DEFAULT_FIELD_CONFIGS = {
 			ui: { Field: StorageUploadFieldBinding }
 		}
 	},
-	reference_as_string: {
-		key: "reference_as_string",
-		name: "Reference (as string)",
-		description: "The value refers to a different collection (it is saved as a string)",
-		Icon: LinkIcon,
-		color: "#154fb3",
-		property: {
-			type: "string",
-			ui: { Field: ReferenceAsStringFieldBinding }
-		}
-	},
 	reference: {
 		key: "reference",
 		name: "Reference",
@@ -12152,7 +11967,6 @@ function getDefaultFieldId(property) {
 	else if (property.email) return "email";
 	else if (property.enum) return "select";
 	else if (property.userSelect) return "user_select";
-	else if (property.reference) return "reference_as_string";
 	else return "text_field";
 	else if (property.type === "number") {
 		if (property.enum) return "number_select";
@@ -13237,8 +13051,8 @@ function resolveCollectionSlotKeys(collection, authController, propertyConfigs)
 	const sortedPreviewKeys = hasExplicitOrder ? previewKeys : [...previewKeys].sort((a, b) => {
 		const propA = collection.properties[a];
 		const propB = collection.properties[b];
-		const scoreA = propA?.type === "string" ? propA.multiline ? 2 : 1 : 0;
-		return (propB?.type === "string" ? propB.multiline ? 2 : 1 : 0) - scoreA;
+		const scoreA = propA?.type === "string" ? propA.ui?.multiline ? 2 : 1 : 0;
+		return (propB?.type === "string" ? propB.ui?.multiline ? 2 : 1 : 0) - scoreA;
 	});
 	return {
 		titleKey,
@@ -13431,7 +13245,7 @@ function resolveRelationDisplayName(relation, prop) {
 				return false;
 			};
 			const isDisplayCandidate = (p) => {
-				return p.type === "string" && !p.multiline && !p.markdown && !p.storage && !("isId" in p && p.isId) && !isHiddenProp(p);
+				return p.type === "string" && !p.ui?.multiline && !p.ui?.markdown && !p.storage && !("isId" in p && p.isId) && !isHiddenProp(p);
 			};
 			for (const pk of [
 				"name",
@@ -13592,189 +13406,57 @@ function EntityCard({ entity, collection, onClick, selected, highlighted, onSele
 //#endregion
 //#region src/components/EntityCollectionView/EntityCollectionCardView.tsx
 /**
-* Get grid column classes based on the size.
-* Smaller size = more columns (smaller cards)
-* Larger size = fewer columns (larger cards)
-*/
-function getGridColumnsClass(size) {
-	switch (size) {
-		case "xs": return "grid-cols-4 sm:grid-cols-5 md:grid-cols-6 lg:grid-cols-8 xl:grid-cols-10";
-		case "s": return "grid-cols-3 sm:grid-cols-4 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-8";
-		case "m": return "grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6";
-		case "l": return "grid-cols-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-4";
-		case "xl": return "grid-cols-1 sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-3";
-		default: 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;
-}
-/**
 * Card grid view for displaying entities with infinite scroll.
 * Alternative to the EntityCollectionTable for visual browsing.
 */
 function EntityCollectionCardView({ collection, tableController, onEntityClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, onScroll, initialScroll, size = "m" }) {
 	const ResolvedEntityCard = useComponentOverride("Collection.Card", EntityCard);
-	const containerRef = useRef(null);
-	const hasRestoredScroll = useRef(false);
 	const { data, dataLoading, noMoreToLoad, dataLoadingError, itemCount, setItemCount, pageSize = 50, paginationEnabled } = tableController;
-	const isLoadingMore = useRef(false);
-	const paginationStateRef = useRef({
-		paginationEnabled,
-		noMoreToLoad,
-		dataLoading,
-		itemCount,
-		pageSize
-	});
-	useEffect(() => {
-		paginationStateRef.current = {
-			paginationEnabled,
-			noMoreToLoad,
-			dataLoading,
-			itemCount,
-			pageSize
-		};
-	}, [
-		paginationEnabled,
-		noMoreToLoad,
-		dataLoading,
-		itemCount,
-		pageSize
-	]);
-	useEffect(() => {
-		if (!dataLoading) isLoadingMore.current = false;
-	}, [dataLoading]);
-	useEffect(() => {
-		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, itemCount: ic, pageSize: ps } = paginationStateRef.current;
-			if (pe && !nm && !isLoadingMore.current && scrollEl.scrollHeight - scrollEl.scrollTop - scrollEl.clientHeight < 400) {
-				isLoadingMore.current = true;
-				setItemCount?.((ic ?? ps) + ps);
-			}
-		};
-		const onScrollEvent = () => {
-			if (rafId === null) rafId = requestAnimationFrame(update);
-		};
-		scrollEl.addEventListener("scroll", onScrollEvent, { passive: true });
-		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 = getScrollParent$1(containerRef.current);
-		if (!scrollEl) return;
-		let attempts = 0;
-		const maxAttempts = 5;
-		const tryRestore = () => {
-			if (scrollEl.scrollHeight >= initialScroll || attempts >= maxAttempts) {
-				scrollEl.scrollTop = initialScroll;
-				hasRestoredScroll.current = true;
-			} else {
-				attempts++;
-				requestAnimationFrame(tryRestore);
-			}
-		};
-		requestAnimationFrame(tryRestore);
-	}, [initialScroll, data.length]);
-	const lastScrollOffset = useRef(0);
-	useEffect(() => {
-		const el = containerRef.current;
-		if (!el || !onScroll) return;
-		const scrollEl = getScrollParent$1(el);
-		if (!scrollEl) return;
-		const handleScroll = () => {
-			const currentOffset = scrollEl.scrollTop;
-			const direction = currentOffset > lastScrollOffset.current ? "forward" : "backward";
-			lastScrollOffset.current = currentOffset;
-			onScroll({
-				scrollDirection: direction,
-				scrollOffset: currentOffset,
-				scrollUpdateWasRequested: false
-			});
-		};
-		scrollEl.addEventListener("scroll", handleScroll, { passive: true });
-		return () => scrollEl.removeEventListener("scroll", handleScroll);
-	}, [onScroll]);
 	const handleEntityClick = useCallback((entity) => {
 		onEntityClick?.(entity);
 	}, [onEntityClick]);
 	const handleSelectionChange = useCallback((entity, selected) => {
 		selectionController?.toggleEntitySelection(entity, selected);
 	}, [selectionController]);
-	const isEntitySelected = useCallback((entity) => {
-		return selectionController?.isEntitySelected(entity) ?? false;
-	}, [selectionController]);
-	const isEntityHighlighted = useCallback((entity) => {
-		return highlightedEntities?.some((e) => e.id === entity.id && e.path === entity.path) ?? false;
-	}, [highlightedEntities]);
-	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: "w-full p-4",
-		children: dataLoadingError && data.length === 0 ? /* @__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: "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) => /* @__PURE__ */ jsx(ResolvedEntityCard, {
-					entity,
-					collection,
-					onClick: handleEntityClick,
-					selected: isEntitySelected(entity),
-					highlighted: isEntityHighlighted(entity),
-					onSelectionChange: handleSelectionChange,
-					selectionEnabled,
-					size
-				}, `${entity.path}_${entity.id}`))
-			}), /* @__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 ",
-						data.length,
-						" entries loaded"
-					]
-				})]
-			})]
-		}) })
+	const selectedIds = useMemo(() => new Set(selectionController?.selectedEntities.map((e) => e.id)), [selectionController?.selectedEntities]);
+	const highlightedIds = useMemo(() => new Set(highlightedEntities?.map((e) => e.id)), [highlightedEntities]);
+	const handleRowSelectionChange = useCallback((entity, selected) => {
+		handleSelectionChange(entity, selected);
+	}, [handleSelectionChange]);
+	return /* @__PURE__ */ jsx(CardView, {
+		data,
+		dataLoading,
+		noMoreToLoad,
+		dataLoadingError,
+		itemCount,
+		setItemCount,
+		pageSize,
+		paginationEnabled,
+		onItemClick: handleEntityClick,
+		selectedIds,
+		highlightedIds,
+		selectionEnabled,
+		onSelectionChange: handleRowSelectionChange,
+		onScroll,
+		initialScroll,
+		size,
+		emptyComponent,
+		renderCard: useCallback((entity, { selected, highlighted, onClick }) => /* @__PURE__ */ jsx(ResolvedEntityCard, {
+			entity,
+			collection,
+			onClick,
+			selected,
+			highlighted,
+			onSelectionChange: handleRowSelectionChange,
+			selectionEnabled,
+			size
+		}, `${entity.path}_${entity.id}`), [
+			collection,
+			selectionEnabled,
+			size,
+			handleRowSelectionChange,
+			ResolvedEntityCard
+		])
 	});
 }
 //#endregion
@@ -13792,38 +13474,9 @@ function getRowClasses(size) {
 		default: return "py-3 px-5";
 	}
 }
-/**
-* Estimated row height in pixels for virtualization, based on size.
-*/
-function getEstimatedRowHeight(size) {
-	switch (size) {
-		case "xs": return 44;
-		case "s": return 52;
-		case "m": return 64;
-		case "l": return 76;
-		case "xl": return 88;
-		default: return 64;
-	}
-}
-/** Number of extra rows rendered above/below the viewport. */
-var OVERSCAN_COUNT = 8;
-/** Threshold in pixels from the bottom of the scroll area to trigger loading more. */
-var LOAD_MORE_THRESHOLD = 400;
 /** Stable empty array for when no list-view actions are available. */
 var EMPTY_LIST_VIEW_ACTIONS = [];
 /**
-* Walk up the DOM from `element` to find the nearest scrollable ancestor.
-*/
-function getScrollParent(element) {
-	let parent = element?.parentElement ?? null;
-	while (parent) {
-		const style = getComputedStyle(parent);
-		if (style.overflowY === "auto" || style.overflowY === "scroll" || style.overflow === "auto" || style.overflow === "scroll") return parent;
-		parent = parent.parentElement;
-	}
-	return document.documentElement;
-}
-/**
 * Returns true if a property type should NOT be rendered via
 * PropertyPreview in list row columns (because it would blow up height).
 */
@@ -14008,7 +13661,17 @@ function EntityCollectionListView({ collection, tableController, onEntityClick,
 			subtitleKey,
 			"id"
 		]);
-		allKeys.filter((k) => !usedKeys.has(k) && resolvedCollection.properties[k]).forEach((key) => {
+		allKeys.filter((k) => {
+			if (usedKeys.has(k)) return false;
+			const prop = resolvedCollection.properties[k];
+			if (!prop) return false;
+			if (prop.type === "string" && (prop.storage || prop.ui?.url === "image")) return false;
+			if (prop.type === "array" && prop.of && !Array.isArray(prop.of)) {
+				const inner = prop.of;
+				if (inner.type === "string" && (inner.storage || inner.ui?.url === "image")) return false;
+			}
+			return true;
+		}).forEach((key) => {
 			const prop = resolvedCollection.properties[key];
 			cols.push({
 				key,
@@ -14077,10 +13740,10 @@ function EntityCollectionListView({ collection, tableController, onEntityClick,
 	const handleSelectionChange = useCallback((entity, selected) => {
 		selectionController?.toggleEntitySelection(entity, selected);
 	}, [selectionController]);
-	const isEntitySelected = useCallback((entity) => {
+	useCallback((entity) => {
 		return selectionController?.isEntitySelected(entity) ?? false;
 	}, [selectionController]);
-	const isEntityHighlighted = useCallback((entity) => {
+	useCallback((entity) => {
 		return highlightedEntities?.some((e) => e.id === entity.id && e.path === entity.path) ?? false;
 	}, [highlightedEntities]);
 	const getListViewActions = useCallback((entity) => {
@@ -14095,158 +13758,70 @@ function EntityCollectionListView({ collection, tableController, onEntityClick,
 		customizationController.entityActions
 	]);
 	const rowClasses = getRowClasses(size);
-	const isInitialLoading = dataLoading && data.length === 0;
-	const isEmpty = !dataLoading && data.length === 0 && !dataLoadingError;
-	const estimatedRowHeight = getEstimatedRowHeight(size);
-	const [effectiveScrollTop, setEffectiveScrollTop] = useState(0);
-	const [viewportHeight, setViewportHeight] = useState(800);
-	const paginationStateRef = useRef({
-		paginationEnabled,
+	const selectedIds = useMemo(() => new Set(selectionController?.selectedEntities.map((e) => e.id)), [selectionController?.selectedEntities]);
+	const highlightedIds = useMemo(() => new Set(highlightedEntities?.map((e) => e.id)), [highlightedEntities]);
+	const handleRowSelectionChange = useCallback((entity, selected) => {
+		handleSelectionChange(entity, selected);
+	}, [handleSelectionChange]);
+	return /* @__PURE__ */ jsx(ListView, {
+		data,
+		dataLoading,
 		noMoreToLoad,
+		dataLoadingError,
 		itemCount,
-		pageSize
-	});
-	useEffect(() => {
-		paginationStateRef.current = {
-			paginationEnabled,
-			noMoreToLoad,
-			itemCount,
-			pageSize
-		};
-	}, [
+		setItemCount,
+		pageSize,
 		paginationEnabled,
-		noMoreToLoad,
-		itemCount,
-		pageSize
-	]);
-	useEffect(() => {
-		const el = containerRef.current;
-		if (!el) return;
-		const scrollEl = getScrollParent(el);
-		if (!scrollEl) return;
-		let rafId = null;
-		const update = () => {
-			rafId = null;
-			const scrollRect = scrollEl.getBoundingClientRect();
-			const listTopRelative = el.getBoundingClientRect().top - scrollRect.top;
-			setEffectiveScrollTop(Math.max(0, -listTopRelative));
-			setViewportHeight(scrollRect.height);
-			const { paginationEnabled: pe, noMoreToLoad: nm, itemCount: ic, pageSize: ps } = paginationStateRef.current;
-			if (pe && !nm && !isLoadingMore.current && scrollEl.scrollHeight - scrollEl.scrollTop - scrollEl.clientHeight < LOAD_MORE_THRESHOLD) {
-				isLoadingMore.current = true;
-				setItemCount?.((ic ?? ps) + ps);
-			}
-		};
-		const onScroll = () => {
-			if (rafId === null) rafId = requestAnimationFrame(update);
-		};
-		scrollEl.addEventListener("scroll", onScroll, { passive: true });
-		const ro = new ResizeObserver(() => update());
-		ro.observe(scrollEl);
-		update();
-		return () => {
-			scrollEl.removeEventListener("scroll", onScroll);
-			ro.disconnect();
-			if (rafId !== null) cancelAnimationFrame(rafId);
-		};
-	}, [setItemCount]);
-	const totalHeight = data.length * estimatedRowHeight;
-	const startIndex = Math.max(0, Math.floor(effectiveScrollTop / estimatedRowHeight) - OVERSCAN_COUNT);
-	const endIndex = Math.min(data.length, Math.ceil((effectiveScrollTop + viewportHeight) / estimatedRowHeight) + OVERSCAN_COUNT);
-	const visibleData = data.slice(startIndex, endIndex);
-	const offsetY = startIndex * estimatedRowHeight;
-	const footerHeight = dataLoading ? 48 : !dataLoading && noMoreToLoad && data.length > 0 ? 32 : 0;
-	return /* @__PURE__ */ jsx("div", {
-		ref: containerRef,
-		className: cls("w-full", selectedEntityId === void 0 && "rounded-lg overflow-hidden border " + defaultBorderMixin),
-		children: dataLoadingError && data.length === 0 ? /* @__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: "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__ */ jsxs("div", {
-			style: {
-				height: totalHeight + footerHeight,
-				position: "relative"
-			},
-			children: [
-				/* @__PURE__ */ jsx("div", {
-					style: {
-						position: "absolute",
-						top: offsetY,
-						left: 0,
-						right: 0
-					},
-					children: visibleData.map((entity, i) => {
-						const isLast = startIndex + i === data.length - 1;
-						return /* @__PURE__ */ jsx("div", {
-							style: { height: estimatedRowHeight },
-							className: cls(!isLast && "border-b", !isLast && defaultBorderMixin),
-							children: /* @__PURE__ */ jsx(ListRow, {
-								entity,
-								collection: resolvedCollection,
-								onClick: handleEntityClick,
-								selected: isEntitySelected(entity),
-								highlighted: isEntityHighlighted(entity),
-								onSelectionChange: handleSelectionChange,
-								selectionEnabled,
-								columns: visibleColumns,
-								slotKeys,
-								rowClasses,
-								showImage,
-								size,
-								isLast,
-								isActive: selectedEntityId !== void 0 && entity.id === selectedEntityId,
-								listViewActions: getListViewActions(entity),
-								context,
-								path,
-								selectionController,
-								openEntityMode
-							})
-						}, entity.id);
-					})
-				}),
-				dataLoading && /* @__PURE__ */ jsx("div", {
-					className: "flex items-center justify-center py-3",
-					style: {
-						position: "absolute",
-						top: totalHeight,
-						left: 0,
-						right: 0
-					},
-					children: /* @__PURE__ */ jsx(CircularProgress, { size: "small" })
-				}),
-				!dataLoading && noMoreToLoad && data.length > 0 && /* @__PURE__ */ jsx("div", {
-					className: "flex items-center justify-center py-2 dark:bg-surface-900",
-					style: {
-						position: "absolute",
-						top: totalHeight,
-						left: 0,
-						right: 0
-					},
-					children: /* @__PURE__ */ jsxs(Typography, {
-						variant: "caption",
-						color: "secondary",
-						children: [
-							"All ",
-							data.length,
-							" entries loaded"
-						]
-					})
+		onItemClick: handleEntityClick,
+		selectedIds,
+		highlightedIds,
+		selectionEnabled,
+		emptyComponent,
+		size,
+		selectedEntityId,
+		renderRow: useCallback(({ item: entity, style, className, selected, highlighted, isLast, onClick, onSelectionChange }) => {
+			return /* @__PURE__ */ jsx("div", {
+				style,
+				className,
+				children: /* @__PURE__ */ jsx(ListRow, {
+					entity,
+					collection: resolvedCollection,
+					onClick: handleEntityClick,
+					selected,
+					highlighted,
+					onSelectionChange: handleRowSelectionChange,
+					selectionEnabled,
+					columns: visibleColumns,
+					slotKeys,
+					rowClasses,
+					showImage,
+					size,
+					isLast,
+					isActive: selectedEntityId !== void 0 && entity.id === selectedEntityId,
+					listViewActions: getListViewActions(entity),
+					context,
+					path,
+					selectionController,
+					openEntityMode
 				})
-			]
-		})
+			}, entity.id);
+		}, [
+			resolvedCollection,
+			selectionEnabled,
+			visibleColumns,
+			slotKeys,
+			rowClasses,
+			showImage,
+			size,
+			selectedEntityId,
+			getListViewActions,
+			context,
+			path,
+			selectionController,
+			openEntityMode,
+			handleRowSelectionChange,
+			handleEntityClick
+		])
 	});
 }
 /**
@@ -14682,457 +14257,6 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/BoardSortableList.tsx
-function BoardSortableList({ columnId, items, ItemComponent, isDragging, isDragOverColumn, loading = false, hasMore = false, onLoadMore }) {
-	const { setNodeRef } = useDroppable({
-		id: columnId,
-		data: { type: "ITEM-LIST" }
-	});
-	const sentinelRef = useRef(null);
-	const isLoadingRef = useRef(false);
-	isLoadingRef.current = loading;
-	const lastLoadTimeRef = useRef(0);
-	useEffect(() => {
-		if (!sentinelRef.current || !hasMore || !onLoadMore) return;
-		const sentinel = sentinelRef.current;
-		const observer = new IntersectionObserver((entries) => {
-			const now = Date.now();
-			if (entries[0].isIntersecting && hasMore && !isLoadingRef.current && now - lastLoadTimeRef.current > 500) {
-				lastLoadTimeRef.current = now;
-				onLoadMore();
-			}
-		}, { threshold: .1 });
-		observer.observe(sentinel);
-		const rect = sentinel.getBoundingClientRect();
-		const containerRect = sentinel.parentElement?.getBoundingClientRect();
-		if (containerRect && rect.top < containerRect.bottom && rect.bottom > containerRect.top) {
-			const now = Date.now();
-			if (hasMore && !isLoadingRef.current && now - lastLoadTimeRef.current > 500) {
-				lastLoadTimeRef.current = now;
-				onLoadMore();
-			}
-		}
-		return () => observer.disconnect();
-	}, [hasMore, onLoadMore]);
-	return /* @__PURE__ */ jsx("div", {
-		ref: setNodeRef,
-		className: useMemo(() => cls("flex flex-col p-2 transition-opacity duration-100 transition-bg ease-linear w-full overflow-y-auto no-scrollbar flex-1 rounded-md", isDragging && isDragOverColumn ? "bg-surface-accent-200 dark:bg-surface-900" : isDragging ? "bg-surface-50 dark:bg-surface-900 hover:bg-surface-accent-100 dark:hover:bg-surface-800" : "bg-surface-50 dark:bg-surface-900"), [isDragging, isDragOverColumn]),
-		style: { minHeight: 80 },
-		children: /* @__PURE__ */ jsx(SortableContext, {
-			items: items.map((i) => i.id),
-			strategy: verticalListSortingStrategy,
-			children: items.length === 0 && !loading ? /* @__PURE__ */ jsx("div", {
-				className: "flex-1 flex items-center justify-center",
-				children: /* @__PURE__ */ jsx("span", {
-					className: "text-xs text-surface-400 dark:text-surface-500",
-					children: "No items"
-				})
-			}) : /* @__PURE__ */ jsxs(Fragment, { children: [items.map((item, index) => /* @__PURE__ */ jsx(SortableItem, {
-				item,
-				index,
-				columnId,
-				ItemComponent
-			}, item.id)), (loading || hasMore) && /* @__PURE__ */ jsx("div", {
-				ref: sentinelRef,
-				className: "flex items-center justify-center py-2 min-h-6",
-				children: loading && /* @__PURE__ */ jsx(CircularProgress, { size: "smallest" })
-			})] })
-		})
-	});
-}
-var SortableItem = memo(function SortableItem({ item, index, columnId, ItemComponent }) {
-	const { setNodeRef, attributes, listeners, isDragging: isItemBeingDragged, transform, transition } = useSortable({
-		id: item.id,
-		data: {
-			type: "ITEM",
-			columnId
-		}
-	});
-	return /* @__PURE__ */ jsx("div", {
-		ref: setNodeRef,
-		style: useMemo(() => ({
-			transform: CSS.Transform.toString(transform),
-			transition,
-			zIndex: isItemBeingDragged ? 2 : 1,
-			opacity: isItemBeingDragged ? 0 : 1
-		}), [
-			transform,
-			transition,
-			isItemBeingDragged
-		]),
-		...attributes,
-		...listeners,
-		children: /* @__PURE__ */ jsx(ItemComponent, {
-			item,
-			isDragging: isItemBeingDragged,
-			index
-		})
-	});
-});
-//#endregion
-//#region src/components/EntityCollectionView/BoardColumnTitle.tsx
-function BoardColumnTitle({ children, className, color, ...props }) {
-	const colorScheme = useMemo(() => {
-		if (!color) return void 0;
-		if (typeof color === "string") return getColorSchemeForKey(color);
-		return color;
-	}, [color]);
-	return /* @__PURE__ */ jsxs(Typography, {
-		variant: "subtitle2",
-		component: "h4",
-		className: cls("py-3 px-3 transition-colors duration-200 flex-grow select-none relative outline-none focus:outline focus:outline-2 focus:outline-offset-2 flex items-center gap-3", className),
-		...props,
-		children: [colorScheme && /* @__PURE__ */ jsx("div", {
-			className: "w-3 h-3 rounded-full flex-shrink-0",
-			style: { backgroundColor: colorScheme.darkColor ?? colorScheme.color }
-		}), children]
-	});
-}
-//#endregion
-//#region src/components/EntityCollectionView/BoardColumn.tsx
-var BoardColumn = memo(function BoardColumn({ id, title, items, ItemComponent, isDragging, isDragOverColumn, allowReorder = false, loading = false, hasMore = false, onLoadMore, onAddItem, totalCount, color, style }) {
-	const { setNodeRef, attributes, listeners, isDragging: isColumnBeingDragged, transform, transition } = useSortable({
-		id,
-		data: { type: "COLUMN" },
-		disabled: !allowReorder
-	});
-	const combinedStyle = useMemo(() => ({
-		...style,
-		transform: CSS.Translate.toString(transform),
-		transition,
-		zIndex: isColumnBeingDragged ? 2 : 1
-	}), [
-		style,
-		transform,
-		transition,
-		isColumnBeingDragged
-	]);
-	const dragListeners = allowReorder ? listeners : {};
-	const columnClassName = useMemo(() => cls("border h-full w-80 min-w-80 mx-2 flex flex-col rounded-md", defaultBorderMixin, isColumnBeingDragged ? "ring-2 ring-primary" : ""), [isColumnBeingDragged]);
-	const headerClassName = useMemo(() => cls("flex items-center justify-between px-2 rounded-t-md transition-colors duration-200 ease-in-out", isColumnBeingDragged ? "bg-surface-100 dark:bg-surface-700" : "bg-surface-50 hover:bg-surface-100 dark:bg-surface-800 dark:hover:bg-surface-700", allowReorder ? "cursor-grab" : ""), [isColumnBeingDragged, allowReorder]);
-	const itemIds = useMemo(() => items.map((i) => i.id), [items]);
-	return /* @__PURE__ */ jsxs("div", {
-		ref: setNodeRef,
-		style: combinedStyle,
-		...attributes,
-		className: columnClassName,
-		children: [/* @__PURE__ */ jsxs("div", {
-			...dragListeners,
-			className: headerClassName,
-			children: [/* @__PURE__ */ jsxs("div", {
-				className: "flex items-center gap-2",
-				children: [/* @__PURE__ */ jsx(BoardColumnTitle, {
-					"aria-label": `${title} item list`,
-					color,
-					children: title
-				}), totalCount !== void 0 && /* @__PURE__ */ jsx("span", {
-					className: "text-xs text-surface-500 dark:text-surface-400",
-					children: totalCount
-				})]
-			}), onAddItem && /* @__PURE__ */ jsx(IconButton, {
-				size: "small",
-				onClick: (e) => {
-					e.stopPropagation();
-					onAddItem();
-				},
-				className: "opacity-60 hover:opacity-100",
-				children: /* @__PURE__ */ jsx(PlusIcon, { size: iconSize.small })
-			})]
-		}), /* @__PURE__ */ jsx(SortableContext, {
-			items: itemIds,
-			strategy: verticalListSortingStrategy,
-			children: /* @__PURE__ */ jsx(BoardSortableList, {
-				columnId: id,
-				items,
-				ItemComponent,
-				isDragging,
-				isDragOverColumn,
-				loading,
-				hasMore,
-				onLoadMore
-			})
-		})]
-	});
-});
-//#endregion
-//#region src/components/EntityCollectionView/Board.tsx
-function Board({ data, columns: columnsProp, columnLabels, columnColors, className, assignColumn, allowColumnReorder = false, onColumnReorder, onItemsReorder, ItemComponent, columnLoadingState, onLoadMoreColumn, onAddItemToColumn, AddColumnComponent }) {
-	const [activeItem, setActiveItem] = useState(null);
-	const [activeColumn, setActiveColumn] = useState(null);
-	const [isDragging, setIsDragging] = useState(false);
-	const [dragOverColumnId, setDragOverColumnId] = useState(null);
-	const grabOffsetRef = useRef({
-		x: 0,
-		y: 0
-	});
-	const [overlayPos, setOverlayPos] = useState(null);
-	const handleMouseMove = useCallback((e) => {
-		setOverlayPos({
-			x: e.clientX - grabOffsetRef.current.x,
-			y: e.clientY - grabOffsetRef.current.y
-		});
-	}, []);
-	useEffect(() => {
-		return () => {
-			window.removeEventListener("mousemove", handleMouseMove);
-			window.removeEventListener("pointermove", handleMouseMove);
-		};
-	}, [handleMouseMove]);
-	const [itemMapState, setItemMapState] = useState(() => {
-		const dataColumnMap = data.reduce((prev, item) => ({
-			...prev,
-			[item.id]: assignColumn(item)
-		}), {});
-		return columnsProp.reduce((previous, column) => ({
-			...previous,
-			[column]: data.filter((item) => dataColumnMap[item.id] === column)
-		}), {});
-	});
-	const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 5 } }));
-	useEffect(() => {
-		if (isDragging) return;
-		const dataColumnMap = data.reduce((prev, item) => ({
-			...prev,
-			[item.id]: assignColumn(item)
-		}), {});
-		const newItemMap = columnsProp.reduce((previous, column) => ({
-			...previous,
-			[column]: data.filter((item) => dataColumnMap[item.id] === column)
-		}), {});
-		setItemMapState((prevMap) => {
-			let changed = false;
-			for (const col of columnsProp) {
-				const prevItems = prevMap[col] ?? [];
-				const newItems = newItemMap[col] ?? [];
-				if (prevItems.length !== newItems.length) {
-					changed = true;
-					continue;
-				}
-				for (let i = 0; i < prevItems.length; i++) if (prevItems[i].id !== newItems[i].id || prevItems[i].entity !== newItems[i].entity) {
-					changed = true;
-					break;
-				}
-			}
-			if (!changed) return prevMap;
-			const updated = {};
-			for (const col of columnsProp) {
-				const prevItems = prevMap[col] ?? [];
-				const newItems = newItemMap[col] ?? [];
-				const prevById = /* @__PURE__ */ new Map();
-				for (const item of prevItems) prevById.set(item.id, item);
-				updated[col] = newItems.map((newItem) => {
-					const prev = prevById.get(newItem.id);
-					if (prev && prev.entity === newItem.entity) return prev;
-					return newItem;
-				});
-			}
-			return updated;
-		});
-	}, [
-		data,
-		columnsProp,
-		assignColumn
-	]);
-	const findColumnByItemId = (id) => {
-		return Object.keys(itemMapState).find((col) => itemMapState[col]?.some((i) => i.id === id));
-	};
-	const handleDragStart = (event) => {
-		setIsDragging(true);
-		setDragOverColumnId(null);
-		const { active } = event;
-		const activatorEvt = event.activatorEvent;
-		if (activatorEvt) {
-			const target = activatorEvt.target;
-			const rect = (target.closest("[role='button']") ?? target).getBoundingClientRect();
-			grabOffsetRef.current = {
-				x: activatorEvt.clientX - rect.left,
-				y: activatorEvt.clientY - rect.top
-			};
-			setOverlayPos({
-				x: rect.left,
-				y: rect.top
-			});
-		}
-		window.addEventListener("mousemove", handleMouseMove);
-		window.addEventListener("pointermove", handleMouseMove);
-		if (active.data.current?.type === "COLUMN") {
-			const columnId = active.id;
-			const column = columnsProp.find((col) => String(col) === columnId);
-			if (column) setActiveColumn(column);
-		} else if (active.data.current?.type === "ITEM") {
-			const columnId = findColumnByItemId(active.id);
-			if (columnId) {
-				const item = itemMapState[columnId]?.find((i) => i.id === active.id);
-				setActiveItem(item || null);
-			}
-		}
-	};
-	const handleDragOver = (event) => {
-		const { active, over } = event;
-		if (!over) {
-			setDragOverColumnId(null);
-			return;
-		}
-		let currentHoveredColumnId = null;
-		const overId = over.id;
-		const overDataType = over.data.current?.type;
-		if (overDataType === "ITEM-LIST" || overDataType === "COLUMN") currentHoveredColumnId = overId;
-		else if (overDataType === "ITEM") currentHoveredColumnId = findColumnByItemId(overId) || null;
-		else if (columnsProp.includes(overId)) currentHoveredColumnId = overId;
-		setDragOverColumnId(currentHoveredColumnId);
-		if (active.data.current?.type !== "ITEM") return;
-		const activeId = active.id;
-		const activeColumn = findColumnByItemId(activeId);
-		let overColumnForMove = findColumnByItemId(overId);
-		if (!overColumnForMove && overDataType === "ITEM-LIST") overColumnForMove = overId;
-		if (!overColumnForMove && columnsProp.includes(overId)) overColumnForMove = overId;
-		if (!activeColumn || !overColumnForMove) return;
-		if (activeColumn === overColumnForMove) return;
-		if (itemMapState[overColumnForMove]?.some((i) => i.id === activeId)) return;
-		setItemMapState((currentMap) => {
-			const activeItems = [...currentMap[activeColumn] || []];
-			const overItems = [...currentMap[overColumnForMove] || []];
-			const activeIndex = activeItems.findIndex((i) => i.id === activeId);
-			if (activeIndex === -1) return currentMap;
-			let overIndex;
-			if (overDataType === "ITEM-LIST" || columnsProp.includes(overId) && !findColumnByItemId(overId)) overIndex = overItems.length;
-			else {
-				overIndex = overItems.findIndex((i) => i.id === overId);
-				if (overIndex !== -1) {
-					const modifier = (active.rect.current.translated?.top ?? 0) + (active.rect.current.translated?.height ?? 0) / 2 > (over?.rect.top ?? 0) + (over?.rect.height ?? 0) / 2 ? 1 : 0;
-					overIndex = overIndex >= 0 ? overIndex + modifier : overItems.length;
-				} else overIndex = overItems.length;
-			}
-			const newItemMap = { ...currentMap };
-			const [moved] = activeItems.splice(activeIndex, 1);
-			overItems.splice(overIndex, 0, moved);
-			newItemMap[activeColumn] = activeItems;
-			newItemMap[overColumnForMove] = overItems;
-			return newItemMap;
-		});
-	};
-	const handleDragEnd = (event) => {
-		const { active, over } = event;
-		window.removeEventListener("mousemove", handleMouseMove);
-		window.removeEventListener("pointermove", handleMouseMove);
-		setOverlayPos(null);
-		setIsDragging(false);
-		setActiveItem(null);
-		setActiveColumn(null);
-		setDragOverColumnId(null);
-		if (!over) return;
-		const activeId = active.id;
-		const overId = over.id;
-		if (active.data.current?.type === "COLUMN" && over.data.current?.type === "COLUMN" && activeId !== overId) {
-			const oldIndex = columnsProp.findIndex((col) => String(col) === activeId);
-			const newIndex = columnsProp.findIndex((col) => String(col) === overId);
-			if (oldIndex !== -1 && newIndex !== -1 && onColumnReorder && allowColumnReorder) onColumnReorder(arrayMove([...columnsProp], oldIndex, newIndex));
-		} else if (active.data.current?.type === "ITEM" && onItemsReorder) {
-			const originalColumn = data.find((item) => item.id === activeId) ? assignColumn(data.find((item) => item.id === activeId)) : void 0;
-			const currentColumn = findColumnByItemId(activeId);
-			const overColumn = findColumnByItemId(overId) || currentColumn;
-			const finalItemMapState = { ...itemMapState };
-			if (currentColumn && currentColumn === overColumn) {
-				const activeIndex = finalItemMapState[currentColumn].findIndex((i) => i.id === activeId);
-				let overIndex = finalItemMapState[overColumn].findIndex((i) => i.id === overId);
-				const overType = over.data.current?.type;
-				if (overIndex === -1 && (overType === "COLUMN" || overType === "ITEM-LIST")) if (originalColumn === currentColumn) overIndex = finalItemMapState[overColumn].length;
-				else overIndex = activeIndex;
-				else if (overIndex === -1 && typeof over.data.current?.sortable?.index === "number") overIndex = over.data.current.sortable.index;
-				if (activeIndex !== -1 && overIndex !== -1 && activeIndex !== overIndex) {
-					finalItemMapState[currentColumn] = arrayMove(finalItemMapState[currentColumn], activeIndex, overIndex);
-					setItemMapState(finalItemMapState);
-				}
-			}
-			if (originalColumn !== currentColumn && originalColumn && currentColumn) onItemsReorder(finalItemMapState[currentColumn], {
-				itemId: activeId,
-				sourceColumn: originalColumn,
-				targetColumn: currentColumn
-			});
-			else if (currentColumn) onItemsReorder(finalItemMapState[currentColumn], {
-				itemId: activeId,
-				sourceColumn: currentColumn,
-				targetColumn: currentColumn
-			});
-		}
-	};
-	const customCollisionDetection = (args) => {
-		const pointerCollisions = pointerWithin(args);
-		if (pointerCollisions.length > 0) return pointerCollisions;
-		return rectIntersection(args);
-	};
-	return /* @__PURE__ */ jsxs(DndContext, {
-		sensors,
-		collisionDetection: customCollisionDetection,
-		onDragStart: handleDragStart,
-		onDragOver: handleDragOver,
-		onDragEnd: handleDragEnd,
-		children: [
-			/* @__PURE__ */ jsx(DragOverlay, {
-				dropAnimation: null,
-				style: { opacity: 0 },
-				children: activeItem || activeColumn ? /* @__PURE__ */ jsx("div", { style: {
-					width: 1,
-					height: 1
-				} }) : null
-			}),
-			overlayPos && (activeItem || activeColumn) && createPortal(/* @__PURE__ */ jsx("div", {
-				className: document.documentElement.classList.contains("dark") ? "dark" : "",
-				style: {
-					position: "fixed",
-					top: overlayPos.y,
-					left: overlayPos.x,
-					zIndex: 9999,
-					pointerEvents: "none",
-					touchAction: "none"
-				},
-				children: activeItem ? /* @__PURE__ */ jsx(ItemComponent, {
-					item: activeItem,
-					isDragging: true,
-					index: -1,
-					style: {
-						boxShadow: "0 4px 16px rgba(0,0,0,0.15)",
-						opacity: .9,
-						width: "304px"
-					}
-				}) : activeColumn ? /* @__PURE__ */ jsx(BoardColumn, {
-					index: -1,
-					id: String(activeColumn),
-					title: columnLabels?.[activeColumn] ?? String(activeColumn),
-					items: itemMapState[String(activeColumn)] || [],
-					ItemComponent,
-					isDragging: true,
-					isDragOverColumn: false
-				}, String(activeColumn)) : null
-			}), document.body),
-			/* @__PURE__ */ jsx(SortableContext, {
-				items: columnsProp.map(String),
-				strategy: horizontalListSortingStrategy,
-				children: /* @__PURE__ */ jsxs("div", {
-					className: cls("p-2 md:p-3 lg:p-4 h-full min-w-full inline-flex", className),
-					children: [columnsProp.map((key, index) => /* @__PURE__ */ jsx(BoardColumn, {
-						index,
-						id: String(key),
-						title: columnLabels?.[key] ?? String(key),
-						color: columnColors?.[key],
-						items: itemMapState[String(key)] || [],
-						ItemComponent,
-						isDragging,
-						isDragOverColumn: String(key) === dragOverColumnId,
-						allowReorder: allowColumnReorder,
-						loading: columnLoadingState?.[String(key)]?.loading,
-						hasMore: columnLoadingState?.[String(key)]?.hasMore,
-						totalCount: columnLoadingState?.[String(key)]?.totalCount,
-						onLoadMore: onLoadMoreColumn ? () => onLoadMoreColumn(key) : void 0,
-						onAddItem: onAddItemToColumn ? () => onAddItemToColumn(key) : void 0,
-						style: { opacity: activeColumn === key ? 0 : 1 }
-					}, String(key))), AddColumnComponent]
-				})
-			})
-		]
-	});
-}
-//#endregion
 //#region src/components/EntityCollectionView/EntityBoardCard.tsx
 /**
 * Compact card component for displaying an entity in a Kanban board.
@@ -15143,7 +14267,7 @@ function Board({ data, columns: columnsProp, columnLabels, columnColors, classNa
 * layout clean while providing intuitive selection affordance.
 */
 function EntityBoardCardInner({ item, isDragging, isGroupedOver, style, collection, onClick, selected, onSelectionChange, selectionEnabled = false }) {
-	const entity = item.entity;
+	const entity = item.data;
 	const slotKeys = useCollectionSlotKeys(collection, useAuthController(), useCustomizationController().propertyConfigs);
 	const slots = useMemo(() => resolveEntitySlots(entity, collection, slotKeys), [
 		entity,
@@ -15405,18 +14529,10 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 			}));
 			return;
 		}
-		const whereMap = {};
-		if (currentFilterValues) Object.entries(currentFilterValues).forEach(([key, value]) => {
-			if (value && Array.isArray(value)) {
-				const [op, val] = value;
-				const postgrestOp = op === "==" ? "eq" : op === "!=" ? "neq" : op === ">" ? "gt" : op === ">=" ? "gte" : op === "<" ? "lt" : op === "<=" ? "lte" : op === "in" ? "in" : op === "not-in" ? "nin" : op === "array-contains" ? "cs" : op === "array-contains-any" ? "csa" : "eq";
-				let stringVal;
-				if (Array.isArray(val)) stringVal = `(${val.join(",")})`;
-				else stringVal = String(val);
-				whereMap[key] = `${postgrestOp}.${stringVal}`;
-			}
-		});
-		whereMap[currentColumnProperty] = `eq.${column}`;
+		const whereFilter = {
+			...currentFilterValues ?? {},
+			[currentColumnProperty]: ["==", column]
+		};
 		const orderByParam = currentOrderProperty ? `${currentOrderProperty}:asc` : void 0;
 		setColumnData((prev) => ({
 			...prev,
@@ -15525,13 +14641,13 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 		const accessor = currentDataClient.collection(currentResolvedPath);
 		if (accessor.listen) {
 			const unsubscribe = accessor.listen({
-				where: whereMap,
+				where: whereFilter,
 				limit: itemCount,
 				orderBy: orderByParam
 			}, (res) => onUpdate(res.data), onError);
 			unsubscribersRef.current[column] = unsubscribe;
 		} else accessor.find({
-			where: whereMap,
+			where: whereFilter,
 			limit: itemCount,
 			orderBy: orderByParam
 		}).then((res) => onUpdate(res.data)).catch(onError);
@@ -15560,19 +14676,11 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 				if (isColumnExcludedByFilter(column, currentFilterValues, currentColumnProperty)) return;
 				const accessor = currentDataClient.collection(currentResolvedPath);
 				if (accessor.count) {
-					const whereMap = {};
-					if (currentFilterValues) Object.entries(currentFilterValues).forEach(([key, value]) => {
-						if (value && Array.isArray(value)) {
-							const [op, val] = value;
-							const postgrestOp = op === "==" ? "eq" : op === "!=" ? "neq" : op === ">" ? "gt" : op === ">=" ? "gte" : op === "<" ? "lt" : op === "<=" ? "lte" : op === "in" ? "in" : op === "not-in" ? "nin" : op === "array-contains" ? "cs" : op === "array-contains-any" ? "csa" : "eq";
-							let stringVal;
-							if (Array.isArray(val)) stringVal = `(${val.join(",")})`;
-							else stringVal = String(val);
-							whereMap[key] = `${postgrestOp}.${stringVal}`;
-						}
-					});
-					whereMap[currentColumnProperty] = `eq.${column}`;
-					accessor.count({ where: whereMap }).then((count) => {
+					const whereFilter = {
+						...currentFilterValues ?? {},
+						[currentColumnProperty]: ["==", column]
+					};
+					accessor.count({ where: whereFilter }).then((count) => {
 						if (isCleaningUpRef.current) return;
 						setColumnData((prev) => ({
 							...prev,
@@ -15758,7 +14866,7 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 //#region src/components/EntityCollectionView/hooks/useKanbanDragAndDrop.ts
 function useKanbanDragAndDrop({ collection, fullPath, columnProperty, orderProperty, dataClient, context, boardDataController, analyticsController }) {
 	const handleItemsReorder = useCallback(async (items, moveInfo) => {
-		const entity = items.find((item) => item.id === moveInfo?.itemId)?.entity;
+		const entity = items.find((item) => item.id === moveInfo?.itemId)?.data;
 		if (!entity || !moveInfo) return;
 		analyticsController.onAnalyticsEvent?.("kanban_card_moved", {
 			path: fullPath,
@@ -15772,8 +14880,8 @@ function useKanbanDragAndDrop({ collection, fullPath, columnProperty, orderPrope
 		if (orderProperty) {
 			const targetColumnItems = items;
 			const movedIndex = targetColumnItems.findIndex((item) => item.id === moveInfo.itemId);
-			const prevKey = movedIndex > 0 ? targetColumnItems[movedIndex - 1].entity.values?.[orderProperty] ?? null : null;
-			const nextKey = movedIndex < targetColumnItems.length - 1 ? targetColumnItems[movedIndex + 1].entity.values?.[orderProperty] ?? null : null;
+			const prevKey = movedIndex > 0 ? targetColumnItems[movedIndex - 1].data.values?.[orderProperty] ?? null : null;
+			const nextKey = movedIndex < targetColumnItems.length - 1 ? targetColumnItems[movedIndex + 1].data.values?.[orderProperty] ?? null : null;
 			try {
 				const a = prevKey;
 				let b = nextKey;
@@ -15980,7 +15088,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 			completed++;
 			if (completed === 2) setMissingOrderCount(Math.max(0, totalCount - orderedCount));
 		}).catch((e) => console.warn("Failed to get total count:", e));
-		accessor.count({ where: { [orderProperty]: "neq.null" } }).then((count) => {
+		accessor.count({ where: { [orderProperty]: ["!=", null] } }).then((count) => {
 			orderedCount = count;
 			completed++;
 			if (completed === 2) setMissingOrderCount(Math.max(0, totalCount - orderedCount));
@@ -16012,7 +15120,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 	const boardItems = useMemo(() => {
 		return allEntities.map((entity) => ({
 			id: String(entity.id),
-			entity
+			data: entity
 		}));
 	}, [allEntities]);
 	const columnLoadingState = useMemo(() => {
@@ -16031,7 +15139,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 	const assignColumn = useCallback((item) => {
 		const column = entityColumnMap[item.id];
 		if (column) return column;
-		const value = item.entity.values?.[columnProperty];
+		const value = item.data.values?.[columnProperty];
 		if (value && columns.includes(String(value))) return String(value);
 		return columns[0] || "";
 	}, [
@@ -16125,7 +15233,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 			...props,
 			collection: collectionRef.current,
 			onClick: stableOnClick,
-			selected: isEntitySelectedRef.current(props.item.entity),
+			selected: isEntitySelectedRef.current(props.item.data),
 			onSelectionChange: stableOnSelectionChange,
 			selectionEnabled: selectionEnabledRef.current
 		});
@@ -16227,7 +15335,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 			}),
 			/* @__PURE__ */ jsx("div", {
 				className: "flex-1 overflow-auto no-scrollbar",
-				children: /* @__PURE__ */ jsx(Board, {
+				children: /* @__PURE__ */ jsx(KanbanView, {
 					data: boardItems,
 					columns,
 					columnLabels,
@@ -17269,7 +16377,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 	const collectionRegistry = useCollectionRegistryController();
 	const urlController = useUrlController();
 	const breadcrumbs = useBreadcrumbsController();
-	const path = pathProp ?? collectionProp.slug;
+	const path = pathProp ?? getCollectionDataPath(collectionProp);
 	const dataClient = useData();
 	const sideEntityController = useSideEntityController();
 	useAuthController();
@@ -17808,7 +16916,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 			collection,
 			tableController,
 			path,
-			relativePath: collection.slug,
+			relativePath: getCollectionDataPath(collection),
 			selectionController: usedSelectionController,
 			collectionEntitiesCount: docsCount ?? void 0,
 			resolvedProperties: resolvedCollection.properties,
@@ -17824,7 +16932,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 			onNewClick,
 			openNewDocument,
 			path,
-			relativePath: collection.slug,
+			relativePath: getCollectionDataPath(collection),
 			selectionController: usedSelectionController,
 			selectionEnabled: activeSelectionEnabled,
 			collectionEntitiesCount: docsCount ?? void 0,
@@ -18089,18 +17197,7 @@ function EntitiesCount({ path, collection, filter, sortBy, onCountChange }) {
 			return;
 		}
 		let cancelled = false;
-		const whereMap = {};
-		if (filter) Object.entries(filter).forEach(([key, value]) => {
-			if (value && Array.isArray(value)) {
-				const [op, val] = value;
-				const postgrestOp = op === "==" ? "eq" : op === "!=" ? "neq" : op === ">" ? "gt" : op === ">=" ? "gte" : op === "<" ? "lt" : op === "<=" ? "lte" : op === "in" ? "in" : op === "not-in" ? "nin" : op === "array-contains" ? "cs" : op === "array-contains-any" ? "csa" : "eq";
-				let stringVal;
-				if (Array.isArray(val)) stringVal = `(${val.join(",")})`;
-				else stringVal = String(val);
-				whereMap[key] = `${postgrestOp}.${stringVal}`;
-			}
-		});
-		const whereParams = Object.keys(whereMap).length > 0 ? whereMap : void 0;
+		const whereParams = filter && Object.keys(filter).length > 0 ? filter : void 0;
 		const orderByParams = sortByProperty ? `${String(sortByProperty)}:${currentSort}` : void 0;
 		const cacheKey = `${path}|${filterKey}|${sortByProperty ?? ""}|${currentSort ?? ""}`;
 		let countPromise = inflightCountRequests.get(cacheKey);
@@ -18733,7 +17830,7 @@ function DrawerNavigationGroup({ group, entries, collapsed, onToggleCollapsed, d
 				})
 			]
 		}), /* @__PURE__ */ jsx("div", {
-			className: cls("transition-all duration-200 ease-in-out", "overflow-hidden", !hideHeader && "dark:bg-transparent", !hideHeader ? drawerOpen ? "rounded-lg" : "rounded-lg" : "rounded-lg", !hideHeader && collapsed ? "max-h-0 opacity-0" : "max-h-[2000px] opacity-100"),
+			className: cls("transition-all duration-200 ease-in-out", "overflow-hidden", !hideHeader && "dark:bg-transparent", "rounded-lg", !hideHeader && collapsed ? "max-h-0 opacity-0" : "max-h-[2000px] opacity-100"),
 			children: entries.map((entry) => /* @__PURE__ */ jsx(ResolvedDrawerNavigationItem, {
 				icon: /* @__PURE__ */ jsx(IconForView, {
 					collectionOrView: entry.collection ?? entry.view,
@@ -18823,7 +17920,13 @@ function CMSNavigationContent() {
 	const registry = useRebaseRegistry();
 	const ResolvedDrawerNavigationGroup = useComponentOverride("Shell.DrawerNavigationGroup", DrawerNavigationGroup);
 	const allNavigationEntries = navigationState.topLevelNavigation?.navigationEntries ?? [];
-	const filteredEntries = adminModeController.mode === "studio" ? allNavigationEntries.filter((e) => e.type === "view" || e.type === "admin") : allNavigationEntries.filter((e) => e.type !== "view");
+	const studioViewSlugs = useMemo(() => {
+		const slugs = /* @__PURE__ */ new Set();
+		(registry.studioConfig?.devViews ?? []).forEach((v) => slugs.add(v.slug));
+		if (registry.studioConfig && registry.cmsConfig?.collectionEditor) slugs.add("schema");
+		return slugs;
+	}, [registry.studioConfig, registry.cmsConfig?.collectionEditor]);
+	const filteredEntries = adminModeController.mode === "studio" ? allNavigationEntries.filter((e) => e.type === "view" && studioViewSlugs.has(e.slug) || e.type === "admin") : allNavigationEntries.filter((e) => e.type !== "view" || !studioViewSlugs.has(e.slug));
 	const entryGroups = new Set(filteredEntries.map((e) => e.group).filter(Boolean));
 	const orderedGroups = navigationState.topLevelNavigation?.groups ?? [];
 	const groupsToRender = [...orderedGroups.filter((g) => entryGroups.has(g)), ...[...entryGroups].filter((g) => !orderedGroups.includes(g))];
@@ -19261,15 +18364,15 @@ function DrawerWrapper(props) {
 * is auto-wired as a native feature (slots, provider, Studio view) without
 * needing any external plugin.
 */
-function RebaseCMS({ collections, homePage, entityViews, entityActions, plugins, collectionEditor, navigationGroupMappings }) {
+function RebaseCMS({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings }) {
 	const dispatch = useRebaseRegistryDispatch();
 	useLayoutEffect(() => {
 		dispatch.registerCMS({
 			collections,
+			views,
 			homePage,
 			entityViews,
 			entityActions,
-			plugins,
 			collectionEditor,
 			navigationGroupMappings
 		});
@@ -19277,10 +18380,10 @@ function RebaseCMS({ collections, homePage, entityViews, entityActions, plugins,
 	}, [
 		dispatch,
 		collections,
+		views,
 		homePage,
 		entityViews,
 		entityActions,
-		plugins,
 		collectionEditor,
 		navigationGroupMappings
 	]);
@@ -19416,7 +18519,7 @@ function useLocalCollectionsConfigController(clientOrUrl, baseCollections = [],
 //#region src/components/RebaseNavigation.tsx
 var EMPTY_PLUGINS = [];
 var EMPTY_COLLECTIONS = [];
-var CollectionsStudioView = lazy(() => import("./CollectionsStudioView-B1mN33GB.js").then((n) => n.n).then((m) => ({ default: m.CollectionsStudioView })));
+var CollectionsStudioView = lazy(() => import("./RouterCollectionsStudioView-BQTIExjA.js").then((n) => n.n).then((m) => ({ default: m.RouterCollectionsStudioView })));
 /**
 * Navigation layer — builds and provides all CMS navigation controllers:
 * collection registry, URL controller, navigation state, side entity,
@@ -19449,7 +18552,19 @@ function RebaseNavigation({ children }) {
 	}, [collectionEditorConfig]);
 	const cmsCollections = registry.cmsConfig?.collections ?? EMPTY_COLLECTIONS;
 	const collectionsBuilder = useMemo(() => Array.isArray(cmsCollections) ? () => [...cmsCollections] : cmsCollections, [cmsCollections]);
-	const collectionRegistryController = useBuildCollectionRegistryController({ userConfigPersistence });
+	const dataSources = useDataSources();
+	const collectionRegistryController = useBuildCollectionRegistryController({
+		userConfigPersistence,
+		dataSources: dataSources.registry
+	});
+	const defaultData = useData();
+	const getCollectionRef = useRef(collectionRegistryController.getCollection);
+	getCollectionRef.current = collectionRegistryController.getCollection;
+	const routedData = useMemo(() => buildRoutedRebaseData({
+		defaultData,
+		sources: dataSources.sources,
+		resolveKey: (slugOrPath) => resolveDataSource(getCollectionRef.current(slugOrPath), dataSources.registry).key
+	}), [defaultData, dataSources]);
 	const urlController = useBuildUrlController({
 		basePath: "/",
 		baseCollectionPath: "/c",
@@ -19457,7 +18572,14 @@ function RebaseNavigation({ children }) {
 	});
 	const rebaseClient = useRebaseClient();
 	const authController = useAuthController();
-	const internalConfigController = useLocalCollectionsConfigController(rebaseClient, useMemo(() => Array.isArray(cmsCollections) ? cmsCollections : [], [cmsCollections]), collectionEditorEnabled ? {
+	const resolvedCollections = useMemo(() => Array.isArray(cmsCollections) ? cmsCollections : [], [cmsCollections]);
+	useEffect(() => {
+		if (process.env.NODE_ENV === "production") return;
+		const { registry, sources } = dataSources;
+		const missing = Object.values(registry).filter((d) => (d.transport === "direct" || d.transport === "custom") && !sources[d.key]).map((d) => d.key);
+		if (missing.length > 0) console.warn(`[Rebase] These data source(s) declare a direct/custom transport but have no client-side driver and will fall back to the default data source: ${missing.map((k) => `"${k}"`).join(", ")}. Provide a \`driver\` for them in \`dataSources\` on <Rebase>.`);
+	}, [dataSources]);
+	const internalConfigController = useLocalCollectionsConfigController(rebaseClient, resolvedCollections, collectionEditorEnabled ? {
 		readOnly: collectionEditorOptions?.readOnly ?? process.env.NODE_ENV === "production",
 		getAuthToken: collectionEditorOptions?.getAuthToken ?? authController?.getAuthToken
 	} : { readOnly: true });
@@ -19474,6 +18596,7 @@ function RebaseNavigation({ children }) {
 		return {
 			slug: "schema",
 			name: "Edit collections",
+			group: "Database",
 			icon: "LayoutList",
 			nestedRoutes: true,
 			view: /* @__PURE__ */ jsx(Suspense, {
@@ -19491,18 +18614,27 @@ function RebaseNavigation({ children }) {
 		if (schemaView) return [...base, schemaView];
 		return base;
 	}, [registry.studioConfig?.devViews, schemaView]);
+	const cmsViews = registry.cmsConfig?.views;
+	const mergedViews = useMemo(() => {
+		if (!cmsViews) return devViews;
+		if (Array.isArray(cmsViews) && cmsViews.length === 0) return devViews;
+		if (typeof cmsViews === "function") return async (params) => {
+			return [...await cmsViews(params) ?? [], ...devViews];
+		};
+		return [...cmsViews, ...devViews];
+	}, [cmsViews, devViews]);
+	const parentCustomizationController = useCustomizationController();
 	const navigationStateController = useBuildNavigationStateController({
-		plugins: registry.cmsConfig?.plugins ?? EMPTY_PLUGINS,
+		plugins: parentCustomizationController.plugins ?? EMPTY_PLUGINS,
 		collections: collectionsBuilder,
-		views: devViews,
+		views: mergedViews,
 		navigationGroupMappings: registry.cmsConfig?.navigationGroupMappings,
 		authController: context.authController,
-		data: context.data,
+		data: routedData,
 		collectionRegistryController,
 		urlController,
 		adminMode: adminModeController?.mode
 	});
-	const parentCustomizationController = useCustomizationController();
 	const enrichedCustomizationController = useMemo(() => {
 		const cmsEntityViews = registry.cmsConfig?.entityViews ?? [];
 		const cmsEntityActions = registry.cmsConfig?.entityActions ?? [];
@@ -19517,22 +18649,25 @@ function RebaseNavigation({ children }) {
 		registry.cmsConfig?.entityViews,
 		registry.cmsConfig?.entityActions
 	]);
-	const navigationContent = /* @__PURE__ */ jsx(CustomizationControllerContext.Provider, {
-		value: enrichedCustomizationController,
-		children: /* @__PURE__ */ jsx(StudioBridgeRegistryProvider, { children: /* @__PURE__ */ jsx(CollectionRegistryContext.Provider, {
-			value: collectionRegistryController,
-			children: /* @__PURE__ */ jsx(UrlContext.Provider, {
-				value: urlController,
-				children: /* @__PURE__ */ jsx(NavigationStateContext.Provider, {
-					value: navigationStateController,
-					children: /* @__PURE__ */ jsxs(SideEntityProvider, { children: [/* @__PURE__ */ jsx(BridgeAutoRegistrar, {
-						collectionRegistryController,
-						urlController,
-						navigationStateController
-					}), children] })
+	const navigationContent = /* @__PURE__ */ jsx(RebaseDataContext.Provider, {
+		value: routedData,
+		children: /* @__PURE__ */ jsx(CustomizationControllerContext.Provider, {
+			value: enrichedCustomizationController,
+			children: /* @__PURE__ */ jsx(StudioBridgeRegistryProvider, { children: /* @__PURE__ */ jsx(CollectionRegistryContext.Provider, {
+				value: collectionRegistryController,
+				children: /* @__PURE__ */ jsx(UrlContext.Provider, {
+					value: urlController,
+					children: /* @__PURE__ */ jsx(NavigationStateContext.Provider, {
+						value: navigationStateController,
+						children: /* @__PURE__ */ jsxs(SideEntityProvider, { children: [/* @__PURE__ */ jsx(BridgeAutoRegistrar, {
+							collectionRegistryController,
+							urlController,
+							navigationStateController
+						}), children] })
+					})
 				})
-			})
-		}) })
+			}) })
+		})
 	});
 	if (collectionEditorEnabled) return /* @__PURE__ */ jsx(ConfigControllerProvider, {
 		collectionConfigController: internalConfigController,
@@ -20317,10 +19452,20 @@ function ContentHomePage({ additionalActions, additionalChildrenStart, additiona
 		breadcrumbs.set({ breadcrumbs: [] });
 	}, [breadcrumbs.set]);
 	const { allowDragAndDrop = false, navigationEntries: unFilteredNavigationEntries = [], groups: unFilteredGroupOrder = [], onNavigationEntriesUpdate = () => {} } = navigationStateController.topLevelNavigation || {};
+	const studioViewSlugs = useMemo(() => {
+		const slugs = /* @__PURE__ */ new Set();
+		(registry.studioConfig?.devViews ?? []).forEach((v) => slugs.add(v.slug));
+		if (registry.studioConfig && registry.cmsConfig?.collectionEditor) slugs.add("schema");
+		return slugs;
+	}, [registry.studioConfig, registry.cmsConfig?.collectionEditor]);
 	const rawNavigationEntries = useMemo(() => {
-		if (adminModeController.mode === "studio") return unFilteredNavigationEntries.filter((e) => e.type === "view" || e.type === "admin");
-		return unFilteredNavigationEntries.filter((e) => e.type !== "view");
-	}, [unFilteredNavigationEntries, adminModeController.mode]);
+		if (adminModeController.mode === "studio") return unFilteredNavigationEntries.filter((e) => e.type === "view" && studioViewSlugs.has(e.slug) || e.type === "admin");
+		return unFilteredNavigationEntries.filter((e) => e.type !== "view" || !studioViewSlugs.has(e.slug));
+	}, [
+		unFilteredNavigationEntries,
+		adminModeController.mode,
+		studioViewSlugs
+	]);
 	const groupOrderFromNavController = useMemo(() => {
 		const entryGroups = new Set(rawNavigationEntries.map((e) => e.group).filter(Boolean));
 		return unFilteredGroupOrder.filter((g) => entryGroups.has(g));
@@ -20850,18 +19995,24 @@ function EntityFullScreenRoute({ pathname, navigationEntries, isNew, isCopy }) {
 function CustomViewRoute({ view }) {
 	const breadcrumbs = useBreadcrumbsController();
 	const urlController = useUrlController();
+	const breadcrumbsRef = useRef(breadcrumbs);
+	breadcrumbsRef.current = breadcrumbs;
 	useEffect(() => {
-		breadcrumbs.set({ breadcrumbs: [{
+		breadcrumbsRef.current.set({ breadcrumbs: [{
 			title: view.name,
 			url: urlController.buildAppUrlPath(view.slug)
 		}] });
 	}, [view.slug, urlController]);
-	return view.view;
+	if (typeof view.view === "function") {
+		const ViewComponent = view.view;
+		return /* @__PURE__ */ jsx(ViewComponent, {});
+	}
+	return /* @__PURE__ */ jsx(Fragment, { children: view.view });
 }
 //#endregion
 //#region src/components/CollectionEditorDialogs.tsx
-var CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-HNXGxXdO.js").then((n) => n.r).then((m) => ({ default: m.CollectionEditorDialog })));
-var PropertyFormDialog = lazy(() => import("./PropertyEditView-C2wp8kQ9.js").then((n) => n.t).then((m) => ({ default: m.PropertyFormDialog })));
+var CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-BO_aQ-Z4.js").then((n) => n.r).then((m) => ({ default: m.CollectionEditorDialog })));
+var PropertyFormDialog = lazy(() => import("./PropertyEditView-DKzOpMjR.js").then((n) => n.t).then((m) => ({ default: m.PropertyFormDialog })));
 /**
 * Renders the CollectionEditorDialog and PropertyFormDialog inside
 * the RebaseShell tree where CMS-internal contexts
@@ -21650,6 +20801,7 @@ var PropertyPreview = React.memo(function PropertyPreview(props) {
 			content = /* @__PURE__ */ jsx(StorageThumbnail, {
 				interactive,
 				storeUrl: property.storage?.storeUrl ?? false,
+				storageSourceKey: stringProperty.storage.storageSource,
 				size: props.size,
 				fill,
 				storagePathOrDownloadUrl: filePath
@@ -21677,19 +20829,6 @@ var PropertyPreview = React.memo(function PropertyPreview(props) {
 			propertyKey,
 			size: props.size
 		});
-		else if (stringProperty.reference) if (typeof stringProperty.reference.path === "string") content = /* @__PURE__ */ jsx(ReferencePreview, {
-			disabled: !stringProperty.reference.path,
-			previewProperties: stringProperty.reference?.ui?.previewProperties,
-			includeId: stringProperty.reference.includeId,
-			includeEntityLink: stringProperty.reference.includeEntityLink,
-			size: props.size,
-			reference: new EntityReference({
-				id: value,
-				path: stringProperty.reference.path
-			}),
-			textOnly: props.textOnly
-		});
-		else content = /* @__PURE__ */ jsx(EmptyValue, {});
 		else content = /* @__PURE__ */ jsx(StringPropertyPreview, {
 			...props,
 			property: stringProperty,
@@ -22185,7 +21324,7 @@ function LocalChangesMenu({ cachedData, formex, onClearLocalChanges, cacheKey, p
 	})] });
 }
 //#endregion
-//#region src/form/EntityForm.tsx
+//#region src/form/form_utils.ts
 function extractTouchedValues(values, touched) {
 	let acc = {};
 	if (!touched || typeof touched !== "object") return acc;
@@ -22201,7 +21340,7 @@ function extractTouchedValues(values, touched) {
 * from falsely triggering the unsaved local changes indicator.
 */
 /**
-* CheckIcon if a value is semantically empty (null, undefined, or empty string).
+* Check if a value is semantically empty (null, undefined, or empty string).
 */
 function isSemanticEmpty(v) {
 	return v === null || v === void 0 || v === "";
@@ -22245,23 +21384,51 @@ function getChanges(source, comparison) {
 	}
 	return changes;
 }
-function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode = "full_screen", formex: formexProp, disabled: disabledProp, Builder, EntityFormActionsComponent = EntityFormActions, showDefaultActions = true, showEntityPath = true, navigateBack: navigateBackProp, children }) {
-	const { t } = useTranslation();
-	const sideEntityController = useSideEntityController();
-	const collectionRegistryController = useCollectionRegistryController();
-	const navigateBack = useCallback(() => {
-		if (navigateBackProp) {
-			navigateBackProp();
-			return;
+function getInitialEntityValues(authController, collection, path, status, entity, propertyConfigs) {
+	const properties = collection.properties;
+	if ((status === "existing" || status === "copy") && entity) {
+		let values;
+		if (!collection.alwaysApplyDefaultValues) values = entity.values ?? getDefaultValuesFor(properties);
+		else values = mergeDeep(getDefaultValuesFor(properties), entity.values ?? {});
+		if (status === "copy") {
+			const result = { ...values };
+			for (const [key, property] of Object.entries(properties)) if (property && "isId" in property && property.isId) delete result[key];
+			return result;
 		}
-		if (openEntityMode === "side_panel" || openEntityMode === "dialog") sideEntityController.close();
-		else window.history.back();
-	}, [
-		navigateBackProp,
-		openEntityMode,
-		sideEntityController
-	]);
-	const authController = useAuthController();
+		return values;
+	} else if (status === "new") return getDefaultValuesFor(properties);
+	else {
+		console.error({
+			status,
+			entity
+		});
+		throw new Error("Form has not been initialised with the correct parameters");
+	}
+}
+function zodToFormErrors(zodError) {
+	let errors = {};
+	for (const issue of zodError.issues) {
+		const path = issue.path.join(".");
+		if (path && !getIn(errors, path)) errors = setIn(errors, path, issue.message);
+	}
+	return errors;
+}
+//#endregion
+//#region src/form/EntityForm.tsx
+/**
+* Headless entity form component.
+*
+* Renders a form for an entity collection without any CMS or backend dependencies.
+* All backend concerns (save, caching, analytics, plugin slots) are provided via
+* callback props. For CMS-connected usage, use {@link EntityFormBinding} instead.
+*
+* @group Components
+*/
+function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode = "full_screen", formex: formexProp, disabled: disabledProp, Builder, EntityFormActionsComponent = EntityFormActions, showDefaultActions = true, showEntityPath = true, navigateBack: navigateBackProp, children, onSubmit: onSubmitProp, onValuesChangeDeferred: onValuesChangeDeferredProp, onReset: onResetProp, uniqueFieldValidator: uniqueFieldValidatorProp, beforeFields, afterFields, pluginActions: pluginActionsProp, computedInitialValues, hasLocalChanges: hasLocalChangesProp, localChangesData, manualApplyLocalChanges, localChangesCacheKey, onClearLocalChanges }) {
+	const customizationController = useCustomizationController();
+	const navigateBack = useCallback(() => {
+		if (navigateBackProp) navigateBackProp();
+	}, [navigateBackProp]);
 	const [status, setStatus] = useState(initialStatus);
 	const updateStatus = (status) => {
 		setStatus(status);
@@ -22269,18 +21436,11 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 	};
 	const [valuesToBeSaved, setValuesToBeSaved] = useState(void 0);
 	useDebouncedCallback(valuesToBeSaved, () => {
-		if (valuesToBeSaved) saveEntity({
-			entityId: entityIdProp,
-			collection,
-			path,
-			values: valuesToBeSaved
-		});
+		if (valuesToBeSaved && onSubmitProp) {
+			setIsSavingAutoSave(true);
+			Promise.resolve(onSubmitProp(valuesToBeSaved, formex)).finally(() => setIsSavingAutoSave(false));
+		}
 	}, false, 2e3);
-	const dataClient = useData();
-	const snackbarController = useSnackbarController();
-	const customizationController = useCustomizationController();
-	const context = useCMSContext();
-	const analyticsController = useAnalyticsController();
 	const [underlyingChanges] = useState({});
 	const initialEntityId = useMemo(() => {
 		if (status === "new" || status === "copy") return;
@@ -22289,58 +21449,45 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 	const [entityId, setEntityId] = useState(initialEntityId);
 	const [entityIdError, setEntityIdError] = useState(false);
 	const [savingError, setSavingError] = useState();
+	const [isSavingAutoSave, setIsSavingAutoSave] = useState(false);
+	const [discardDialogOpen, setDiscardDialogOpen] = useState(false);
 	const autoSave = collection.formAutoSave;
-	const baseInitialValues = useMemo(() => getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs), [
-		authController,
-		collection,
-		path,
+	const baseInitialValues = useMemo(() => {
+		if (computedInitialValues !== void 0) return computedInitialValues;
+		if ((status === "existing" || status === "copy") && entity) return entity.values ?? getDefaultValuesFor(collection.properties);
+		return getDefaultValuesFor(collection.properties);
+	}, [
+		computedInitialValues,
+		collection.properties,
 		status,
-		entity,
-		customizationController.propertyConfigs
+		entity
 	]);
-	const localChangesDataRaw = useMemo(() => entityId ? getEntityFromCache(path + "/" + entityId) : getEntityFromCache(path + "#new"), [entityId, path]);
 	const [localChangesCleared, setLocalChangesCleared] = useState(false);
-	const localChangesBackup = getLocalChangesBackup(collection);
-	const autoApplyLocalChanges = localChangesBackup === "auto_apply";
-	const manualApplyLocalChanges = localChangesBackup === "manual_apply";
+	const hasLocalChanges = hasLocalChangesProp !== void 0 ? hasLocalChangesProp && !localChangesCleared : false;
 	const onSubmit = (values, formexController) => {
 		setSavingError(void 0);
 		setEntityIdError(false);
 		if (status === "existing") {
 			if (!entity?.id) throw Error("Form misconfiguration when saving, no id for existing entity");
 		} else if (status !== "new" && status !== "copy") throw Error("New FormType added, check EntityForm");
-		return save(values)?.then((savedEntity) => {
-			if (savedEntity) {
-				formexController.resetForm({
-					values: savedEntity.values || values,
-					submitCount: 0,
-					touched: {}
-				});
-				if (!autoSave) snackbarController.open({
-					type: "success",
-					message: `${collection.singularName ?? collection.name}: ${t("saved_correctly")}`
-				});
-			}
+		if (!onSubmitProp) {
+			console.warn("EntityForm: no onSubmit callback provided. Form submission has no effect.");
+			formexController.setSubmitting(false);
+			return;
+		}
+		return Promise.resolve(save(values))?.then((savedEntity) => {
+			if (savedEntity) formexController.resetForm({
+				values: savedEntity.values || values,
+				submitCount: 0,
+				touched: {}
+			});
 		}).finally(() => {
 			formexController.setSubmitting(false);
 		});
 	};
 	const [initialValues, initialDirty] = useMemo(() => {
-		const initialValuesWithLocalChanges = autoApplyLocalChanges && localChangesDataRaw ? mergeDeep(baseInitialValues, localChangesDataRaw) : baseInitialValues;
-		return [initialDirtyValues ? mergeDeep(initialValuesWithLocalChanges, initialDirtyValues) : initialValuesWithLocalChanges, Boolean(initialDirtyValues) && initialDirtyValues && Object.keys(initialDirtyValues).length > 0];
-	}, [
-		autoApplyLocalChanges,
-		localChangesDataRaw,
-		baseInitialValues,
-		initialDirtyValues
-	]);
-	const localChangesData = useMemo(() => {
-		if (!localChangesDataRaw) return;
-		const cleaned = removeEmptyContainers(getChanges(localChangesDataRaw, initialValues));
-		if (cleaned && typeof cleaned === "object" && Object.keys(cleaned).length === 0) return;
-		return cleaned;
-	}, [localChangesDataRaw, initialValues]);
-	const hasLocalChanges = !localChangesCleared && !!localChangesData && Object.keys(localChangesData).length > 0;
+		return [initialDirtyValues ? mergeDeep(baseInitialValues, initialDirtyValues) : baseInitialValues, Boolean(initialDirtyValues) && initialDirtyValues && Object.keys(initialDirtyValues).length > 0];
+	}, [baseInitialValues, initialDirtyValues]);
 	const internalFormex = useCreateFormex({
 		initialValues,
 		initialDirty,
@@ -22351,17 +21498,10 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		}), {}) : {},
 		onSubmit,
 		onReset: () => {
-			clearDirtyCache();
+			onResetProp?.();
 			onValuesModified?.(false, initialValues);
 		},
-		onValuesChangeDeferred: (values, controller) => {
-			const key = status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
-			if (controller.dirty) {
-				const touchedValues = removeEmptyContainers(extractTouchedValues(values, controller.touched));
-				if (touchedValues && Object.keys(touchedValues).length > 0) saveEntityToCache(key, touchedValues);
-				else removeEntityFromCache(key);
-			}
-		},
+		onValuesChangeDeferred: onValuesChangeDeferredProp,
 		validation: async (values) => {
 			if (!validationSchema) return {};
 			const result = await validationSchema.safeParseAsync(values);
@@ -22374,7 +21514,10 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		const handleKeyDown = (e) => {
 			const isUndo = (e.metaKey || e.ctrlKey) && !e.shiftKey && e.key.toLowerCase() === "z";
 			const isRedo = (e.metaKey || e.ctrlKey) && e.shiftKey && e.key.toLowerCase() === "z" || (e.metaKey || e.ctrlKey) && !e.shiftKey && e.key.toLowerCase() === "y";
-			if (isUndo && formex.canUndo) {
+			if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "s" && !disabled && formex.dirty) {
+				e.preventDefault();
+				formex.handleSubmit();
+			} else if (isUndo && formex.canUndo) {
 				e.preventDefault();
 				formex.undo();
 			} else if (isRedo && formex.canRedo) {
@@ -22385,31 +21528,8 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		window.addEventListener("keydown", handleKeyDown);
 		return () => window.removeEventListener("keydown", handleKeyDown);
 	}, [formex]);
-	useCallback((e) => {
-		snackbarController.open({
-			type: "error",
-			message: `${t("error_before_saving")}: ${e?.message}`
-		});
-		console.error(e);
-	}, [snackbarController]);
-	useCallback((e) => {
-		snackbarController.open({
-			type: "error",
-			message: `${t("error_after_saving")}: ${e?.message}`
-		});
-		console.error(e);
-	}, [snackbarController]);
-	function clearDirtyCache() {
-		if (status === "new" || status === "copy") {
-			removeEntityFromMemoryCache(path + "#new");
-			removeEntityFromCache(path + "#new");
-		} else {
-			removeEntityFromMemoryCache(path + "/" + entityId);
-			removeEntityFromCache(path + "/" + entityId);
-		}
-	}
 	const afterSave = (updatedEntity) => {
-		clearDirtyCache();
+		onResetProp?.();
 		onValuesModified?.(false, updatedEntity.values);
 		onEntityChange?.(updatedEntity);
 		updateStatus("existing");
@@ -22422,62 +21542,19 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 			collection
 		});
 	};
-	const afterSaveError = useCallback((e) => {
-		snackbarController.open({
-			type: "error",
-			title: t("error_saving_entity"),
-			message: e?.message
-		});
-		console.error("Error saving entity", path, entityId, e);
-		console.error(e);
-	}, [
-		entityId,
-		path,
-		snackbarController
-	]);
-	const saveEntity = ({ values, previousValues, entityId, collection, path }) => {
-		return saveEntityWithCallbacks({
-			path,
-			entityId,
-			values,
-			previousValues,
-			collection,
-			status,
-			data: dataClient,
-			context,
-			afterSave,
-			afterSaveError
-		});
-	};
-	const onSaveEntityRequest = async ({ collection, path, entityId, values, previousValues, autoSave }) => {
-		if (!status) return;
-		if (autoSave) {
-			setValuesToBeSaved(values);
-			return Promise.resolve();
-		} else return saveEntity({
-			collection,
-			path,
-			entityId,
-			values,
-			previousValues
-		});
-	};
 	const lastSavedValues = useRef(entity?.values);
 	const save = async (values) => {
 		const valuesToSave = status === "existing" ? getChanges(values, entity?.values || {}) : values;
 		if (status === "existing" && Object.keys(valuesToSave).length === 0 && entity) return Promise.resolve(entity);
 		lastSavedValues.current = values;
-		return onSaveEntityRequest({
-			collection,
-			path,
-			entityId,
-			values: valuesToSave,
-			previousValues: entity?.values,
-			autoSave: autoSave ?? false
-		}).then((savedEntity) => {
-			const eventName = status === "new" ? "new_entity_saved" : status === "copy" ? "entity_copied" : status === "existing" ? "entity_edited" : "unmapped_event";
-			analyticsController.onAnalyticsEvent?.(eventName, { path });
-			return savedEntity;
+		if (!onSubmitProp) return;
+		if (autoSave ?? false) {
+			setValuesToBeSaved(values);
+			return Promise.resolve();
+		}
+		return Promise.resolve(onSubmitProp(valuesToSave, formex)).then((result) => {
+			if (result) afterSave(result);
+			return result;
 		}).catch((e) => {
 			console.error(e);
 			setSavingError(e);
@@ -22508,44 +21585,18 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		path
 	]);
 	const actionsDisabled = disabled || formex.isSubmitting || status === "existing" && !formex.dirty || Boolean(disabledProp);
-	const formActionProps = {
-		entityId,
-		parentCollectionSlugs: collectionRegistryController.getParentCollectionSlugs(path),
-		parentEntityIds: collectionRegistryController.getParentEntityIds(path),
-		path,
-		status,
-		collection,
-		context,
-		formContext,
-		openEntityMode,
-		disabled: actionsDisabled
-	};
-	const pluginFormActions = useSlot("form.actions", formActionProps);
-	const pluginFormBefore = useSlot("form.before", formActionProps);
-	const pluginFormAfter = useSlot("form.after", formActionProps);
 	const titlePropertyKey = getEntityTitlePropertyKey(collection, customizationController.propertyConfigs);
 	const rawTitle = formex.values && titlePropertyKey ? getValueInPath(formex.values, titlePropertyKey) : void 0;
 	const title = rawTitle !== void 0 && rawTitle !== null ? resolveTitleToString(rawTitle) : collection.singularName ?? collection.name;
+	const modified = formex.dirty;
 	useEffect(() => {
 		if (!autoSave) onValuesModified?.(modified, formex.values);
 	}, [formex.dirty]);
-	const modified = formex.dirty;
-	const uniqueFieldValidator = useCallback(async ({ name, value }) => {
-		try {
-			const { data } = await dataClient.collection(path).find({
-				where: { [name]: `eq.${value}` },
-				limit: 2
-			});
-			return (entityId ? data.filter((e) => e.id !== entityId) : data).length === 0;
-		} catch (e) {
-			console.error("Error checking unique field", e);
-			return true;
-		}
-	}, [
-		dataClient,
-		path,
-		entityId
-	]);
+	const defaultUniqueFieldValidator = useCallback(async () => true, []);
+	const uniqueFieldValidator = useMemo(() => {
+		if (uniqueFieldValidatorProp) return uniqueFieldValidatorProp;
+		return defaultUniqueFieldValidator;
+	}, [uniqueFieldValidatorProp, defaultUniqueFieldValidator]);
 	const validationSchema = useMemo(() => getEntitySchema(entityId, collection.properties, uniqueFieldValidator), [
 		entityId,
 		collection.properties,
@@ -22577,6 +21628,8 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 			modifiedValues: formex.values,
 			formContext
 		});
+		const isNewEntity = status === "new" || status === "copy";
+		let firstFocusableIndex = -1;
 		return /* @__PURE__ */ jsx(FormLayout, { children: formFieldKeys.map((key) => {
 			const property = collection.properties?.[key];
 			if (property) {
@@ -22585,9 +21638,12 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 				const isIdAndAuto = (property.type === "string" || property.type === "number") && "isId" in property && typeof property.isId === "string" && property.isId !== "manual";
 				const disabled = disabledProp || !autoSave && formex.isSubmitting || isReadOnly(property) || Boolean(property.ui?.disabled) || !isNew && "isId" in property && Boolean(property.isId) || isNew && isIdAndAuto;
 				if (isHidden(property)) return null;
+				const widthPercentage = property.ui?.widthPercentage ?? 100;
+				const shouldAutoFocus = isNewEntity && !disabled && firstFocusableIndex === -1;
+				if (shouldAutoFocus) firstFocusableIndex = 0;
 				return /* @__PURE__ */ jsx(FormEntry, {
 					propertyKey: key,
-					widthPercentage: property.ui?.widthPercentage ?? 100,
+					widthPercentage,
 					children: /* @__PURE__ */ jsx(PropertyFieldBinding, {
 						propertyKey: key,
 						disabled,
@@ -22597,22 +21653,23 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 						context: formContext,
 						partOfArray: false,
 						minimalistView: false,
-						autoFocus: false
+						autoFocus: shouldAutoFocus
 					})
 				}, `field_${key}`);
 			}
 			const additionalField = collection.additionalFields?.find((f) => f.key === key);
 			if (additionalField && entity) {
-				const Builder = additionalField.Builder;
-				if (!Builder && !additionalField.value) throw new Error("When using additional fields you need to provide a Builder or a value");
-				const child = Builder ? /* @__PURE__ */ jsx(Builder, {
+				const AdditionalFieldBuilder = additionalField.Builder;
+				if (!AdditionalFieldBuilder && !additionalField.value) throw new Error("When using additional fields you need to provide a Builder or a value");
+				const additionalFieldContext = formContext;
+				const child = AdditionalFieldBuilder ? /* @__PURE__ */ jsx(AdditionalFieldBuilder, {
 					entity,
-					context
+					context: additionalFieldContext
 				}) : /* @__PURE__ */ jsx("div", {
 					className: "w-full",
 					children: additionalField.value?.({
 						entity,
-						context
+						context: additionalFieldContext
 					})?.toString()
 				});
 				return /* @__PURE__ */ jsxs("div", {
@@ -22633,8 +21690,9 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		}).filter(Boolean) });
 	};
 	const formRef = useRef(null);
+	const hasFormErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
 	const formView = /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
-		pluginFormBefore,
+		beforeFields,
 		!Builder && /* @__PURE__ */ jsxs("div", {
 			className: "w-full flex flex-col items-start my-4 lg:my-6",
 			children: [
@@ -22647,7 +21705,7 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 					color: "warning",
 					size: "small",
 					outerClassName: "w-full mb-4 text-xs",
-					children: t("entity_does_not_exist")
+					children: "This entity does not exist yet"
 				}),
 				showEntityPath && /* @__PURE__ */ jsx(Alert, {
 					color: "base",
@@ -22668,15 +21726,43 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		initialEntityId && !entity && initialStatus !== "new" && /* @__PURE__ */ jsx(Alert, {
 			color: "info",
 			size: "small",
-			children: t("entity_does_not_exist")
+			children: "This entity does not exist yet"
+		}),
+		hasFormErrors && /* @__PURE__ */ jsx(Alert, {
+			color: "error",
+			size: "small",
+			outerClassName: "w-full mt-2",
+			children: "Please fix the highlighted errors before saving."
 		}),
 		formContext && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", {
 			className: "mt-12 flex flex-col gap-8",
 			ref: formRef,
 			children: [formFields(), /* @__PURE__ */ jsx(ErrorFocus, { containerRef: formRef })]
 		}) }),
-		pluginFormAfter,
-		forceActionsAtTheBottom && /* @__PURE__ */ jsx("div", { className: "h-16" })
+		afterFields,
+		forceActionsAtTheBottom && /* @__PURE__ */ jsx("div", { className: "h-16" }),
+		/* @__PURE__ */ jsxs(Dialog, {
+			open: discardDialogOpen,
+			onOpenChange: setDiscardDialogOpen,
+			maxWidth: "sm",
+			children: [
+				/* @__PURE__ */ jsx(DialogTitle, { children: status === "existing" ? "Discard changes?" : "Clear form?" }),
+				/* @__PURE__ */ jsx(DialogContent, { children: /* @__PURE__ */ jsx(Typography, { children: status === "existing" ? "All unsaved changes will be lost. This cannot be undone." : "All entered values will be cleared. This cannot be undone." }) }),
+				/* @__PURE__ */ jsxs(DialogActions, { children: [/* @__PURE__ */ jsx(Button, {
+					variant: "text",
+					onClick: () => setDiscardDialogOpen(false),
+					children: "Cancel"
+				}), /* @__PURE__ */ jsx(Button, {
+					variant: "filled",
+					color: "error",
+					onClick: () => {
+						setDiscardDialogOpen(false);
+						formex.resetForm({ values: baseInitialValues });
+					},
+					children: status === "existing" ? "Discard" : "Clear"
+				})] })
+			]
+		})
 	] }) });
 	useEffect(() => {
 		if (entityId && onIdChange) onIdChange(entityId);
@@ -22691,7 +21777,7 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		formex,
 		disabled: actionsDisabled,
 		status,
-		pluginActions: pluginFormActions ?? [],
+		pluginActions: pluginActionsProp ?? [],
 		openEntityMode,
 		showDefaultActions,
 		navigateBack,
@@ -22701,7 +21787,11 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		value: formex,
 		children: /* @__PURE__ */ jsxs("form", {
 			onSubmit: formex.handleSubmit,
-			onReset: () => formex.resetForm({ values: baseInitialValues }),
+			onReset: (e) => {
+				e.preventDefault();
+				if (formex.dirty) setDiscardDialogOpen(true);
+				else formex.resetForm({ values: baseInitialValues });
+			},
 			noValidate: true,
 			className: cls("@container flex-1 flex flex-row w-full overflow-y-auto justify-center", className),
 			children: [/* @__PURE__ */ jsx("div", {
@@ -22710,15 +21800,29 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 				children: /* @__PURE__ */ jsxs("div", {
 					className: cls("flex flex-col w-full", openEntityMode === "dialog" ? "pt-4 pb-12 px-6 sm:px-8" : "pt-12 pb-16 px-4 sm:px-8 md:px-10"),
 					children: [/* @__PURE__ */ jsxs("div", {
-						className: "flex flex-row gap-4 self-end sticky top-4 z-10",
-						children: [manualApplyLocalChanges && hasLocalChanges && /* @__PURE__ */ jsx(LocalChangesMenu, {
-							cacheKey: status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId,
+						className: "flex flex-row gap-4 justify-end h-0 overflow-visible sticky top-4 z-10",
+						children: [manualApplyLocalChanges && hasLocalChanges && localChangesCacheKey && /* @__PURE__ */ jsx(LocalChangesMenu, {
+							cacheKey: localChangesCacheKey,
 							properties: collection.properties,
 							cachedData: localChangesData,
 							formex,
-							onClearLocalChanges: () => setLocalChangesCleared(true)
-						}), formex.dirty ? /* @__PURE__ */ jsx(Tooltip, {
-							title: t("form_modified"),
+							onClearLocalChanges: () => {
+								setLocalChangesCleared(true);
+								onClearLocalChanges?.();
+							}
+						}), isSavingAutoSave ? /* @__PURE__ */ jsx(Tooltip, {
+							title: "Saving…",
+							children: /* @__PURE__ */ jsx(Chip, {
+								size: "small",
+								className: "py-1",
+								colorScheme: "blueDarker",
+								children: /* @__PURE__ */ jsx(LoaderIcon, {
+									size: iconSize.smallest,
+									className: "animate-spin"
+								})
+							})
+						}) : formex.dirty ? /* @__PURE__ */ jsx(Tooltip, {
+							title: "Form has been modified",
 							children: /* @__PURE__ */ jsx(Chip, {
 								size: "small",
 								className: "py-1",
@@ -22726,7 +21830,7 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 								children: /* @__PURE__ */ jsx(PencilIcon, { size: iconSize.smallest })
 							})
 						}) : /* @__PURE__ */ jsx(Tooltip, {
-							title: t("form_in_sync"),
+							title: "Form is in sync",
 							children: /* @__PURE__ */ jsx(Chip, {
 								size: "small",
 								className: "py-1",
@@ -22739,40 +21843,401 @@ function EntityForm({ path, entityId: entityIdProp, collection, onValuesModified
 		})
 	});
 }
-function getInitialEntityValues(authController, collection, path, status, entity, propertyConfigs) {
-	const properties = collection.properties;
-	if ((status === "existing" || status === "copy") && entity) {
-		let values;
-		if (!collection.alwaysApplyDefaultValues) values = entity.values ?? getDefaultValuesFor(properties);
-		else values = mergeDeep(getDefaultValuesFor(properties), entity.values ?? {});
-		if (status === "copy") {
-			const result = { ...values };
-			for (const [key, property] of Object.entries(properties)) if (property && "isId" in property && property.isId) delete result[key];
-			return result;
-		}
-		return values;
-	} else if (status === "new") return getDefaultValuesFor(properties);
-	else {
-		console.error({
-			status,
-			entity
-		});
-		throw new Error("Form has not been initialised with the correct parameters");
+function useOnAutoSave(autoSave, formex, lastSavedValues, save) {
+	useEffect(() => {
+		if (!autoSave) return;
+		if (formex.values && !deepEqual(formex.values, lastSavedValues.current)) save(formex.values);
+	}, [autoSave, formex.values]);
+}
+//#endregion
+//#region src/form/EntityFormBinding.tsx
+/**
+* CMS-connected wrapper around EntityForm.
+*
+* Provides all backend concerns that the headless EntityForm delegates via callbacks:
+* - Save via the data layer (`saveEntityWithCallbacks`)
+* - Unique field validation via the data layer
+* - Entity caching (local changes backup/restore)
+* - Plugin slots (form.before, form.after, form.actions)
+* - Snackbar notifications on save success/error
+* - Analytics events
+* - Navigation via side entity controller
+*
+* Use this component inside the CMS (`<RebaseShell>`).
+* For headless usage outside the CMS, use `EntityForm` directly.
+*
+* @group Components
+*/
+function EntityFormBinding({ path, entityId: entityIdProp, collection, entity, initialStatus, onSaved, onValuesModified, onEntityChange, onStatusChange, openEntityMode = "full_screen", navigateBack: navigateBackProp, initialDirtyValues, ...restProps }) {
+	const { t } = useTranslation();
+	const sideEntityController = useSideEntityController();
+	const collectionRegistryController = useCollectionRegistryController();
+	const authController = useAuthController();
+	const dataClient = useData();
+	const snackbarController = useSnackbarController();
+	const customizationController = useCustomizationController();
+	const context = useCMSContext();
+	const analyticsController = useAnalyticsController();
+	const [status, setStatus] = useState(initialStatus);
+	const [entityId, setEntityId] = useState(() => {
+		if (status === "new" || status === "copy") return void 0;
+		return entityIdProp;
+	});
+	const baseInitialValues = useMemo(() => getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs), [
+		authController,
+		collection,
+		path,
+		status,
+		entity,
+		customizationController.propertyConfigs
+	]);
+	const localChangesBackup = getLocalChangesBackup(collection);
+	const autoApplyLocalChanges = localChangesBackup === "auto_apply";
+	const manualApplyLocalChanges = localChangesBackup === "manual_apply";
+	const localChangesDataRaw = useMemo(() => entityId ? getEntityFromCache(path + "/" + entityId) : getEntityFromCache(path + "#new"), [entityId, path]);
+	const [localChangesCleared, setLocalChangesCleared] = useState(false);
+	const computedInitialValues = useMemo(() => {
+		const withLocalChanges = autoApplyLocalChanges && localChangesDataRaw ? mergeDeep(baseInitialValues, localChangesDataRaw) : baseInitialValues;
+		return initialDirtyValues ? mergeDeep(withLocalChanges, initialDirtyValues) : withLocalChanges;
+	}, [
+		autoApplyLocalChanges,
+		localChangesDataRaw,
+		baseInitialValues,
+		initialDirtyValues
+	]);
+	const localChangesData = useMemo(() => {
+		if (!localChangesDataRaw) return void 0;
+		const cleaned = removeEmptyContainers(getChanges(localChangesDataRaw, computedInitialValues));
+		if (cleaned && typeof cleaned === "object" && Object.keys(cleaned).length === 0) return;
+		return cleaned;
+	}, [localChangesDataRaw, computedInitialValues]);
+	const hasLocalChanges = !localChangesCleared && !!localChangesData && Object.keys(localChangesData).length > 0;
+	const localChangesCacheKey = useMemo(() => {
+		return status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
+	}, [
+		status,
+		path,
+		entityId
+	]);
+	const navigateBack = useCallback(() => {
+		if (navigateBackProp) {
+			navigateBackProp();
+			return;
+		}
+		if (openEntityMode === "side_panel" || openEntityMode === "dialog") sideEntityController.close();
+		else window.history.back();
+	}, [
+		navigateBackProp,
+		openEntityMode,
+		sideEntityController
+	]);
+	const clearDirtyCache = useCallback(() => {
+		if (status === "new" || status === "copy") {
+			removeEntityFromMemoryCache(path + "#new");
+			removeEntityFromCache(path + "#new");
+		} else {
+			removeEntityFromMemoryCache(path + "/" + entityId);
+			removeEntityFromCache(path + "/" + entityId);
+		}
+	}, [
+		status,
+		path,
+		entityId
+	]);
+	const onReset = useCallback(() => {
+		clearDirtyCache();
+	}, [clearDirtyCache]);
+	const onValuesChangeDeferred = useCallback((values, controller) => {
+		const key = status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
+		if (controller.dirty) {
+			const touchedValues = removeEmptyContainers(extractTouchedValues(values, controller.touched));
+			if (touchedValues && Object.keys(touchedValues).length > 0) saveEntityToCache(key, touchedValues);
+			else removeEntityFromCache(key);
+		}
+	}, [
+		status,
+		path,
+		entityId
+	]);
+	const onSubmit = useCallback(async (values, formex) => {
+		try {
+			const savedEntity = await saveEntityWithCallbacks({
+				path,
+				entityId,
+				values,
+				previousValues: entity?.values,
+				collection,
+				status,
+				data: dataClient,
+				context,
+				afterSave: (updatedEntity) => {
+					clearDirtyCache();
+					onValuesModified?.(false, updatedEntity.values);
+					onEntityChange?.(updatedEntity);
+					setStatus("existing");
+					setEntityId(updatedEntity.id);
+					onStatusChange?.("existing");
+					if (onSaved) onSaved({
+						entity: updatedEntity,
+						status,
+						path,
+						entityId: updatedEntity.id,
+						collection
+					});
+				},
+				afterSaveError: (e) => {
+					snackbarController.open({
+						type: "error",
+						title: t("error_saving_entity"),
+						message: e?.message
+					});
+					console.error("Error saving entity", path, entityId, e);
+				}
+			});
+			if (!collection.formAutoSave) snackbarController.open({
+				type: "success",
+				message: `${collection.singularName ?? collection.name}: ${t("saved_correctly")}`
+			});
+			const eventName = status === "new" ? "new_entity_saved" : status === "copy" ? "entity_copied" : status === "existing" ? "entity_edited" : "unmapped_event";
+			analyticsController.onAnalyticsEvent?.(eventName, { path });
+			return savedEntity;
+		} catch (e) {
+			console.error(e);
+			throw e;
+		}
+	}, [
+		path,
+		entityId,
+		entity,
+		collection,
+		status,
+		dataClient,
+		context,
+		clearDirtyCache,
+		onValuesModified,
+		onEntityChange,
+		onSaved,
+		onStatusChange,
+		snackbarController,
+		analyticsController,
+		t
+	]);
+	const uniqueFieldValidator = useCallback(async ({ name, value }) => {
+		try {
+			const { data } = await dataClient.collection(path).find({
+				where: { [name]: ["==", value] },
+				limit: 2
+			});
+			return (entityId ? data.filter((e) => e.id !== entityId) : data).length === 0;
+		} catch (e) {
+			console.error("Error checking unique field", e);
+			return true;
+		}
+	}, [
+		dataClient,
+		path,
+		entityId
+	]);
+	const parentCollectionSlugs = collectionRegistryController.getParentCollectionSlugs(path);
+	const parentEntityIds = collectionRegistryController.getParentEntityIds(path);
+	const formActionProps = useMemo(() => ({
+		entityId,
+		parentCollectionSlugs,
+		parentEntityIds,
+		path,
+		status,
+		collection,
+		context,
+		formContext: void 0,
+		openEntityMode,
+		disabled: false
+	}), [
+		entityId,
+		parentCollectionSlugs,
+		parentEntityIds,
+		path,
+		status,
+		collection,
+		context,
+		openEntityMode
+	]);
+	const pluginFormActions = useSlot("form.actions", formActionProps);
+	const pluginFormBefore = useSlot("form.before", formActionProps);
+	const pluginFormAfter = useSlot("form.after", formActionProps);
+	return /* @__PURE__ */ jsx(EntityForm, {
+		...restProps,
+		path,
+		entityId: entityIdProp,
+		collection,
+		entity,
+		initialStatus,
+		initialDirtyValues,
+		onSaved,
+		onValuesModified,
+		onEntityChange,
+		onStatusChange,
+		openEntityMode,
+		navigateBack,
+		onSubmit,
+		onValuesChangeDeferred,
+		onReset,
+		uniqueFieldValidator,
+		beforeFields: pluginFormBefore,
+		afterFields: pluginFormAfter,
+		pluginActions: pluginFormActions ?? [],
+		computedInitialValues,
+		hasLocalChanges,
+		localChangesData,
+		manualApplyLocalChanges,
+		localChangesCacheKey,
+		onClearLocalChanges: () => setLocalChangesCleared(true)
+	});
+}
+//#endregion
+//#region src/util/propertyConfigMapper.ts
+/**
+* Map Rebase property types to headless-supported types.
+* `vector` and `binary` are not directly renderable, so we fall back to `string`.
+*/
+var TYPE_MAP = {
+	string: "string",
+	number: "number",
+	boolean: "boolean",
+	date: "date",
+	geopoint: "geopoint",
+	reference: "reference",
+	relation: "relation",
+	array: "array",
+	map: "map",
+	vector: "string",
+	binary: "string"
+};
+/**
+* Convert a single Property to a CollectionPropertyConfig.
+*/
+function mapPropertyToConfig(property) {
+	const base = {
+		type: TYPE_MAP[property.type] ?? "string",
+		name: property.name,
+		description: property.description,
+		columnWidth: property.ui?.columnWidth,
+		hideFromCollection: property.ui?.hideFromCollection
+	};
+	if (property.type === "string") {
+		if (property.enum) base.enum = mapEnumValues(property.enum);
+		if (property.ui?.multiline) base.multiline = true;
+		if (property.ui?.previewAsTag) base.previewAsTag = true;
+		if (property.ui?.url) base.url = property.ui.url;
+		if (property.ui?.markdown) base.markdown = true;
+		if (property.storage) base.storage = true;
+		if (property.email) base.email = true;
+	}
+	if (property.type === "number" && property.enum) base.enum = mapEnumValues(property.enum);
+	if (property.type === "array" && property.of && !Array.isArray(property.of)) base.of = mapPropertyToConfig(property.of);
+	if (property.type === "map" && property.properties) {
+		base.properties = mapPropertiesToConfigs(property.properties);
+		if (property.propertiesOrder) base.propertiesOrder = property.propertiesOrder;
 	}
+	if (property.type === "date" && property.mode) base.mode = property.mode;
+	if (property.ui?.Preview) {}
+	return base;
 }
-function zodToFormErrors(zodError) {
-	let errors = {};
-	for (const issue of zodError.issues) {
-		const path = issue.path.join(".");
-		if (path && !getIn(errors, path)) errors = setIn(errors, path, issue.message);
+/**
+* Convert a Properties record to a CollectionPropertyConfig record.
+*/
+function mapPropertiesToConfigs(properties) {
+	const result = {};
+	for (const [key, property] of Object.entries(properties)) result[key] = mapPropertyToConfig(property);
+	return result;
+}
+/**
+* Convert Rebase EnumValues to CollectionEnumValueConfig format.
+* Handles both array form (EnumValueConfig[]) and record form.
+*/
+function mapEnumValues(enumValues) {
+	if (!enumValues) return void 0;
+	if (Array.isArray(enumValues)) {
+		const result = {};
+		for (const item of enumValues) result[String(item.id)] = normalizeEnumValueConfig(item);
+		return result;
 	}
-	return errors;
+	const result = {};
+	for (const [key, value] of Object.entries(enumValues)) result[key] = typeof value === "string" ? value : normalizeEnumValueConfig(value);
+	return result;
 }
-function useOnAutoSave(autoSave, formex, lastSavedValues, save) {
-	useEffect(() => {
-		if (!autoSave) return;
-		if (formex.values && !deepEqual(formex.values, lastSavedValues.current)) save(formex.values);
-	}, [autoSave, formex.values]);
+function normalizeEnumValueConfig(config) {
+	return {
+		label: config.label,
+		color: typeof config.color === "string" ? config.color : void 0,
+		disabled: config.disabled
+	};
+}
+//#endregion
+//#region src/util/dataControllerAdapter.ts
+/**
+* Adapts an `EntityTableController<M>` (from @rebasepro/types) to a
+* `CollectionDataController<T>` (from @rebasepro/ui), bridging the
+* entity-aware data layer to the headless collection view.
+*/
+/**
+* Flatten Entity<M> objects to plain row objects.
+* The headless view works with flat `Record<string, unknown>` rows,
+* while the entity system uses `{ id, path, values: M }`.
+*
+* The flattened row includes `id` and `path` at the top level,
+* plus all values spread.
+*/
+function flattenEntities(entities) {
+	return entities.map((entity) => ({
+		id: entity.id,
+		path: entity.path,
+		...entity.values
+	}));
+}
+/**
+* React hook that adapts an EntityTableController to a CollectionDataController.
+*
+* Usage:
+* ```tsx
+* const tableController = useDataTableController({ path, collection });
+* const dataController = useCollectionDataController(tableController);
+*
+* <CollectionView dataController={dataController} ... />
+* ```
+*/
+function useCollectionDataController(tableController) {
+	const flatData = useMemo(() => flattenEntities(tableController.data), [tableController.data]);
+	return useMemo(() => ({
+		data: flatData,
+		loading: tableController.dataLoading,
+		noMoreToLoad: tableController.noMoreToLoad,
+		error: tableController.dataLoadingError,
+		filterValues: tableController.filterValues,
+		setFilterValues: tableController.setFilterValues,
+		sortBy: tableController.sortBy,
+		setSortBy: tableController.setSortBy,
+		searchString: tableController.searchString,
+		setSearchString: tableController.setSearchString,
+		clearFilter: tableController.clearFilter,
+		initialScroll: tableController.initialScroll,
+		onScroll: tableController.onScroll,
+		paginationEnabled: tableController.paginationEnabled,
+		pageSize: tableController.pageSize,
+		itemCount: tableController.itemCount,
+		setItemCount: tableController.setItemCount
+	}), [flatData, tableController]);
+}
+/**
+* Non-hook version for cases where you already have the data
+* and just need to build a static controller.
+*/
+function createStaticDataController(data, options) {
+	return {
+		data,
+		loading: options?.loading ?? false,
+		noMoreToLoad: true,
+		error: options?.error
+	};
 }
 //#endregion
 //#region src/data_import/import/ImportCollectionAction.tsx
@@ -23606,6 +23071,562 @@ var export_exports = /* @__PURE__ */ __exportAll({
 */
 var useCollectionsConfigController = () => useContext(ConfigControllerContext);
 //#endregion
+//#region src/collection_editor/serializable_utils.ts
+/**
+* Strip non-serializable fields from a `BaseUIConfig`.
+* Removes `Field` and `Preview` (ComponentRef).
+*/
+function toSerializableUIConfig(ui) {
+	if (!ui) return void 0;
+	const { Field, Preview, ...rest } = ui;
+	const result = {};
+	for (const [key, value] of Object.entries(rest)) if (key !== "Field" && key !== "Preview" && value !== void 0) result[key] = value;
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+/**
+* Convert a `StorageConfig` to its serializable form.
+* Drops function variants of `storagePath`, `fileName`, and all function fields.
+*/
+function toSerializableStorageConfig(storage) {
+	if (!storage) return void 0;
+	const storagePath = typeof storage.storagePath === "string" ? storage.storagePath : void 0;
+	if (!storagePath) return void 0;
+	const result = { storagePath };
+	if (storage.acceptedFiles) result.acceptedFiles = storage.acceptedFiles;
+	if (storage.imageResize) result.imageResize = storage.imageResize;
+	if (storage.metadata) result.metadata = storage.metadata;
+	if (typeof storage.fileName === "string") result.fileName = storage.fileName;
+	if (storage.includeBucketUrl !== void 0) result.includeBucketUrl = storage.includeBucketUrl;
+	if (storage.storeUrl !== void 0) result.storeUrl = storage.storeUrl;
+	if (storage.maxSize !== void 0) result.maxSize = storage.maxSize;
+	if (storage.storageSource !== void 0) result.storageSource = storage.storageSource;
+	return result;
+}
+/**
+* Convert a RegExp or string `matches` validation to a plain string.
+*/
+function serializeMatches(matches) {
+	if (matches === void 0) return void 0;
+	if (typeof matches === "string") return matches;
+	return matches.source;
+}
+/**
+* Resolve a relation target to a string slug.
+* Functions are called to extract the target; EntityCollection objects
+* use their slug.
+*/
+function resolveRelationTarget(target) {
+	if (!target) return void 0;
+	if (typeof target === "string") return target;
+	if (typeof target === "function") try {
+		const resolved = target();
+		if (typeof resolved === "string") return resolved;
+		if (resolved && typeof resolved === "object" && "slug" in resolved) return resolved.slug;
+	} catch {}
+}
+/**
+* Strip non-serializable base property fields.
+* Returns a clean object with only the common serializable fields from BaseProperty.
+* Validation is intentionally excluded — each property type handles its own.
+*/
+function toSerializableBaseFields(property) {
+	const result = { name: property.name };
+	if (property.description) result.description = property.description;
+	if (property.propertyConfig) result.propertyConfig = property.propertyConfig;
+	if (property.columnName) result.columnName = property.columnName;
+	if (property.defaultValue !== void 0) result.defaultValue = property.defaultValue;
+	if (property.conditions) result.conditions = property.conditions;
+	if (property.metadata) result.metadata = property.metadata;
+	const ui = toSerializableUIConfig(property.ui);
+	if (ui) result.ui = ui;
+	return result;
+}
+/**
+* Convert a single `Property` to its JSON-serializable form.
+* Strips functions, converts RegExp to string, Date to ISO string.
+*/
+function toSerializableProperty(property) {
+	const base = toSerializableBaseFields(property);
+	switch (property.type) {
+		case "string": {
+			const sp = property;
+			const result = {
+				...base,
+				type: "string"
+			};
+			if (sp.columnType) result.columnType = sp.columnType;
+			if (sp.isId !== void 0) result.isId = sp.isId;
+			if (sp.enum) result.enum = sp.enum;
+			if (sp.userSelect) result.userSelect = sp.userSelect;
+			if (sp.email) result.email = sp.email;
+			if (sp.validation) {
+				const { matches, ...restValidation } = sp.validation;
+				const serializedValidation = { ...restValidation };
+				const matchStr = serializeMatches(matches);
+				if (matchStr !== void 0) serializedValidation.matches = matchStr;
+				result.validation = serializedValidation;
+			}
+			const storage = toSerializableStorageConfig(sp.storage);
+			if (storage) result.storage = storage;
+			return result;
+		}
+		case "number": {
+			const np = property;
+			const result = {
+				...base,
+				type: "number"
+			};
+			if (np.columnType) result.columnType = np.columnType;
+			if (np.validation) result.validation = np.validation;
+			if (np.isId !== void 0) result.isId = np.isId;
+			if (np.enum) result.enum = np.enum;
+			return result;
+		}
+		case "boolean": {
+			const bp = property;
+			const result = {
+				...base,
+				type: "boolean"
+			};
+			if (bp.validation) result.validation = bp.validation;
+			return result;
+		}
+		case "date": {
+			const dp = property;
+			const result = {
+				...base,
+				type: "date"
+			};
+			if (dp.columnType) result.columnType = dp.columnType;
+			if (dp.mode) result.mode = dp.mode;
+			if (dp.timezone) result.timezone = dp.timezone;
+			if (dp.autoValue) result.autoValue = dp.autoValue;
+			if (dp.validation) {
+				const serializedValidation = {};
+				if (dp.validation.required !== void 0) serializedValidation.required = dp.validation.required;
+				if (dp.validation.requiredMessage) serializedValidation.requiredMessage = dp.validation.requiredMessage;
+				if (dp.validation.unique) serializedValidation.unique = dp.validation.unique;
+				if (dp.validation.uniqueInArray) serializedValidation.uniqueInArray = dp.validation.uniqueInArray;
+				if (dp.validation.min instanceof Date) serializedValidation.min = dp.validation.min.toISOString();
+				else if (typeof dp.validation.min === "string") serializedValidation.min = dp.validation.min;
+				if (dp.validation.max instanceof Date) serializedValidation.max = dp.validation.max.toISOString();
+				else if (typeof dp.validation.max === "string") serializedValidation.max = dp.validation.max;
+				result.validation = serializedValidation;
+			}
+			return result;
+		}
+		case "geopoint": {
+			const gp = property;
+			const result = {
+				...base,
+				type: "geopoint"
+			};
+			if (gp.validation) result.validation = gp.validation;
+			return result;
+		}
+		case "reference": {
+			const rp = property;
+			const result = {
+				...base,
+				type: "reference"
+			};
+			if (rp.isId !== void 0) result.isId = rp.isId;
+			if (rp.path) result.path = rp.path;
+			if (rp.fixedFilter) result.fixedFilter = rp.fixedFilter;
+			if (rp.includeId !== void 0) result.includeId = rp.includeId;
+			if (rp.includeEntityLink !== void 0) result.includeEntityLink = rp.includeEntityLink;
+			return result;
+		}
+		case "relation": {
+			const rl = property;
+			const result = {
+				...base,
+				type: "relation"
+			};
+			if (rl.isId !== void 0) result.isId = rl.isId;
+			const target = resolveRelationTarget(rl.target);
+			if (target) result.target = target;
+			if (rl.cardinality) result.cardinality = rl.cardinality;
+			if (rl.direction) result.direction = rl.direction;
+			if (rl.inverseRelationName) result.inverseRelationName = rl.inverseRelationName;
+			if (rl.localKey) result.localKey = rl.localKey;
+			if (rl.foreignKeyOnTarget) result.foreignKeyOnTarget = rl.foreignKeyOnTarget;
+			if (rl.through) result.through = rl.through;
+			if (rl.joinPath) result.joinPath = rl.joinPath;
+			if (rl.onUpdate) result.onUpdate = rl.onUpdate;
+			if (rl.onDelete) result.onDelete = rl.onDelete;
+			if (rl.relationName) result.relationName = rl.relationName;
+			if (rl.fixedFilter) result.fixedFilter = rl.fixedFilter;
+			if (rl.includeId !== void 0) result.includeId = rl.includeId;
+			if (rl.includeEntityLink !== void 0) result.includeEntityLink = rl.includeEntityLink;
+			if (rl.widget) result.widget = rl.widget;
+			return result;
+		}
+		case "array": {
+			const ap = property;
+			const result = {
+				...base,
+				type: "array"
+			};
+			if (ap.columnType) result.columnType = ap.columnType;
+			if (ap.validation) result.validation = ap.validation;
+			if (ap.sortable !== void 0) result.sortable = ap.sortable;
+			if (ap.canAddElements !== void 0) result.canAddElements = ap.canAddElements;
+			if (ap.of) if (Array.isArray(ap.of)) result.of = ap.of.map(toSerializableProperty);
+			else result.of = toSerializableProperty(ap.of);
+			if (ap.oneOf) {
+				result.oneOf = { properties: toSerializableProperties(ap.oneOf.properties) };
+				if (ap.oneOf.propertiesOrder) result.oneOf.propertiesOrder = ap.oneOf.propertiesOrder;
+				if (ap.oneOf.typeField) result.oneOf.typeField = ap.oneOf.typeField;
+				if (ap.oneOf.valueField) result.oneOf.valueField = ap.oneOf.valueField;
+			}
+			return result;
+		}
+		case "map": {
+			const mp = property;
+			const result = {
+				...base,
+				type: "map"
+			};
+			if (mp.columnType) result.columnType = mp.columnType;
+			if (mp.validation) result.validation = mp.validation;
+			if (mp.propertiesOrder) result.propertiesOrder = mp.propertiesOrder;
+			if (mp.previewProperties) result.previewProperties = mp.previewProperties;
+			if (mp.keyValue) result.keyValue = mp.keyValue;
+			if (mp.properties) result.properties = toSerializableProperties(mp.properties);
+			return result;
+		}
+		case "vector": {
+			const vp = property;
+			const result = {
+				...base,
+				type: "vector",
+				dimensions: vp.dimensions
+			};
+			if (vp.validation) result.validation = vp.validation;
+			return result;
+		}
+		case "binary": {
+			const bp = property;
+			const result = {
+				...base,
+				type: "binary"
+			};
+			if (bp.validation) result.validation = bp.validation;
+			return result;
+		}
+		default: return base;
+	}
+}
+/**
+* Convert a `Properties` record to its serializable form.
+*/
+function toSerializableProperties(properties) {
+	const result = {};
+	for (const [key, property] of Object.entries(properties)) result[key] = toSerializableProperty(property);
+	return result;
+}
+/**
+* Convert an `EntityCollection` to its JSON-serializable form.
+*
+* Strips all non-serializable fields (functions, React nodes, class instances)
+* while preserving the structural schema that the collection editor works with.
+*
+* The result is safe for `JSON.stringify()` and database storage.
+*/
+function toSerializableCollection(collection) {
+	const result = {
+		slug: collection.slug,
+		name: collection.name,
+		properties: toSerializableProperties(collection.properties)
+	};
+	if (collection.singularName) result.singularName = collection.singularName;
+	if (collection.description) result.description = collection.description;
+	if (collection.group) result.group = collection.group;
+	if (collection.engine) result.engine = collection.engine;
+	if (collection.dataSource) result.dataSource = collection.dataSource;
+	if (collection.databaseId) result.databaseId = collection.databaseId;
+	if (collection.titleProperty) result.titleProperty = collection.titleProperty;
+	if (collection.ownerId) result.ownerId = collection.ownerId;
+	if (collection.metadata) result.metadata = collection.metadata;
+	if (collection.table) result.table = collection.table;
+	if ("schema" in collection && collection.schema) result.schema = collection.schema;
+	if (collection.orderProperty) result.orderProperty = collection.orderProperty;
+	if (typeof collection.icon === "string") result.icon = collection.icon;
+	if (collection.propertiesOrder) result.propertiesOrder = collection.propertiesOrder;
+	if (collection.previewProperties) result.previewProperties = collection.previewProperties;
+	if (collection.listProperties) result.listProperties = collection.listProperties;
+	if (collection.enabledViews) result.enabledViews = collection.enabledViews;
+	if (collection.disableDefaultActions) result.disableDefaultActions = collection.disableDefaultActions;
+	if (collection.securityRules) result.securityRules = collection.securityRules;
+	if (collection.openEntityMode) result.openEntityMode = collection.openEntityMode;
+	if (collection.defaultEntityAction) result.defaultEntityAction = collection.defaultEntityAction;
+	if (collection.defaultViewMode) result.defaultViewMode = collection.defaultViewMode;
+	if (collection.defaultSize) result.defaultSize = collection.defaultSize;
+	if (collection.localChangesBackup !== void 0) result.localChangesBackup = collection.localChangesBackup;
+	if (collection.kanban) result.kanban = collection.kanban;
+	if (collection.fixedFilter) result.fixedFilter = collection.fixedFilter;
+	if (collection.defaultFilter) result.defaultFilter = collection.defaultFilter;
+	if (collection.filterPresets) result.filterPresets = collection.filterPresets;
+	if (collection.sort) result.sort = collection.sort;
+	if (collection.pagination !== void 0) result.pagination = collection.pagination;
+	if (collection.selectionEnabled !== void 0) result.selectionEnabled = collection.selectionEnabled;
+	if (collection.inlineEditing !== void 0) result.inlineEditing = collection.inlineEditing;
+	if (collection.hideFromNavigation !== void 0) result.hideFromNavigation = collection.hideFromNavigation;
+	if (collection.hideIdFromForm !== void 0) result.hideIdFromForm = collection.hideIdFromForm;
+	if (collection.hideIdFromCollection !== void 0) result.hideIdFromCollection = collection.hideIdFromCollection;
+	if (collection.formAutoSave !== void 0) result.formAutoSave = collection.formAutoSave;
+	if (collection.alwaysApplyDefaultValues !== void 0) result.alwaysApplyDefaultValues = collection.alwaysApplyDefaultValues;
+	if (collection.includeJsonView !== void 0) result.includeJsonView = collection.includeJsonView;
+	if (collection.history !== void 0) result.history = collection.history;
+	if (collection.sideDialogWidth !== void 0) result.sideDialogWidth = collection.sideDialogWidth;
+	if (typeof collection.exportable === "boolean") result.exportable = collection.exportable;
+	if (typeof collection.auth === "boolean") result.auth = collection.auth;
+	if (typeof collection.defaultSelectedView === "string") result.defaultSelectedView = collection.defaultSelectedView;
+	return result;
+}
+/**
+* Convert a serializable property back to the original `Property` type.
+*
+* This is a mostly pass-through operation since serializable properties
+* are a subset of the original types. The main conversions are:
+* - `validation.matches` (string) stays as string (compatible with Property)
+* - `validation.min/max` on dates: ISO strings → Date objects
+*/
+function fromSerializableProperty(serialized) {
+	switch (serialized.type) {
+		case "date": {
+			const { validation: dateValidation, ...dateRest } = serialized;
+			const result = {
+				...dateRest,
+				type: "date"
+			};
+			if (dateValidation) {
+				const convertedValidation = { ...dateValidation };
+				if (typeof dateValidation.min === "string") convertedValidation.min = new Date(dateValidation.min);
+				if (typeof dateValidation.max === "string") convertedValidation.max = new Date(dateValidation.max);
+				result.validation = convertedValidation;
+			}
+			return result;
+		}
+		case "array": {
+			const sp = serialized;
+			const result = { ...sp };
+			if (sp.of) if (Array.isArray(sp.of)) result.of = sp.of.map(fromSerializableProperty);
+			else result.of = fromSerializableProperty(sp.of);
+			if (sp.oneOf) result.oneOf = {
+				...sp.oneOf,
+				properties: fromSerializableProperties(sp.oneOf.properties)
+			};
+			return result;
+		}
+		case "map": {
+			const sp = serialized;
+			const result = { ...sp };
+			if (sp.properties) result.properties = fromSerializableProperties(sp.properties);
+			return result;
+		}
+		case "string": return { ...serialized };
+		default: return serialized;
+	}
+}
+/**
+* Convert a `SerializableProperties` record back to `Properties`.
+*/
+function fromSerializableProperties(serialized) {
+	const result = {};
+	for (const [key, property] of Object.entries(serialized)) result[key] = fromSerializableProperty(property);
+	return result;
+}
+/**
+* Convert a `SerializableCollection` back to an `EntityCollection`.
+*
+* The result will NOT contain any of the non-serializable fields
+* (callbacks, entityActions, etc.) — those must be re-attached by the
+* consumer if needed.
+*/
+function fromSerializableCollection(serialized) {
+	const { properties, ...rest } = serialized;
+	return {
+		...rest,
+		properties: fromSerializableProperties(properties)
+	};
+}
+//#endregion
+//#region src/collection_editor/useJsonCollectionsConfigController.tsx
+/**
+* A `CollectionsConfigController` implementation that persists collection
+* configurations as JSON via a pluggable `JsonCollectionStore` adapter.
+*
+* Use this when you want to store collection schemas in a database, API,
+* localStorage, or any other JSON-compatible backend — as opposed to the
+* default code-based persistence.
+*
+* @example
+* ```tsx
+* const store: JsonCollectionStore = {
+*     load: async () => { const res = await fetch('/api/schemas'); return res.json(); },
+*     save: async (slug, data) => { await fetch(`/api/schemas/${slug}`, { method: 'PUT', body: JSON.stringify(data) }); },
+*     delete: async (slug) => { await fetch(`/api/schemas/${slug}`, { method: 'DELETE' }); },
+* };
+*
+* const configController = useJsonCollectionsConfigController({ store });
+* ```
+*/
+function useJsonCollectionsConfigController({ store, readOnly = false, autoLoad = true }) {
+	const [collections, setCollections] = useState([]);
+	const [loading, setLoading] = useState(autoLoad);
+	const [navigationEntries, setNavigationEntries] = useState([]);
+	const storeRef = useRef(store);
+	storeRef.current = store;
+	useEffect(() => {
+		if (!autoLoad) return;
+		let cancelled = false;
+		(async () => {
+			try {
+				const [serialized, navEntries] = await Promise.all([storeRef.current.load(), storeRef.current.loadNavigationEntries?.() ?? Promise.resolve([])]);
+				if (cancelled) return;
+				setCollections(serialized.map(fromSerializableCollection));
+				setNavigationEntries(navEntries);
+			} catch (e) {
+				console.error("useJsonCollectionsConfigController: failed to load collections", e);
+			} finally {
+				if (!cancelled) setLoading(false);
+			}
+		})();
+		return () => {
+			cancelled = true;
+		};
+	}, [autoLoad]);
+	/**
+	* Update local state and persist a collection to the store.
+	*/
+	const persistCollection = useCallback(async (collection) => {
+		const serializable = toSerializableCollection(collection);
+		await storeRef.current.save(collection.slug, serializable);
+	}, []);
+	/**
+	* Find collection by id (slug).
+	*/
+	const getCollection = useCallback((id) => {
+		const found = collections.find((c) => c.slug === id);
+		if (found) return found;
+		throw new Error(`Collection "${id}" not found`);
+	}, [collections]);
+	const saveCollection = useCallback(async ({ id, collectionData }) => {
+		const collection = collectionData;
+		await persistCollection(collection);
+		setCollections((prev) => {
+			const idx = prev.findIndex((c) => c.slug === id);
+			if (idx >= 0) {
+				const next = [...prev];
+				next[idx] = collection;
+				return next;
+			}
+			return [...prev, collection];
+		});
+	}, [persistCollection]);
+	const updateCollection = useCallback(async ({ id, collectionData, previousId }) => {
+		setCollections((prev) => {
+			const lookupId = previousId ?? id;
+			const idx = prev.findIndex((c) => c.slug === lookupId);
+			if (idx < 0) return prev;
+			const merged = {
+				...prev[idx],
+				...collectionData
+			};
+			const next = [...prev];
+			next[idx] = merged;
+			persistCollection(merged).catch((e) => console.error("useJsonCollectionsConfigController: failed to update collection", e));
+			if (previousId && previousId !== id) storeRef.current.delete(previousId).catch((e) => console.error("useJsonCollectionsConfigController: failed to delete old slug", e));
+			return next;
+		});
+	}, [persistCollection]);
+	const deleteCollection = useCallback(async ({ id }) => {
+		await storeRef.current.delete(id);
+		setCollections((prev) => prev.filter((c) => c.slug !== id));
+	}, []);
+	const saveProperty = useCallback(async ({ path, propertyKey, property, newPropertiesOrder }) => {
+		setCollections((prev) => {
+			const idx = prev.findIndex((c) => c.slug === path);
+			if (idx < 0) return prev;
+			const collection = { ...prev[idx] };
+			collection.properties = {
+				...collection.properties,
+				[propertyKey]: property
+			};
+			if (newPropertiesOrder) collection.propertiesOrder = newPropertiesOrder;
+			const next = [...prev];
+			next[idx] = collection;
+			persistCollection(next[idx]).catch((e) => console.error("useJsonCollectionsConfigController: failed to save property", e));
+			return next;
+		});
+	}, [persistCollection]);
+	const deleteProperty = useCallback(async ({ path, propertyKey, newPropertiesOrder }) => {
+		setCollections((prev) => {
+			const idx = prev.findIndex((c) => c.slug === path);
+			if (idx < 0) return prev;
+			const collection = { ...prev[idx] };
+			const { [propertyKey]: _removed, ...remaining } = collection.properties;
+			collection.properties = remaining;
+			if (newPropertiesOrder) collection.propertiesOrder = newPropertiesOrder;
+			const next = [...prev];
+			next[idx] = collection;
+			persistCollection(next[idx]).catch((e) => console.error("useJsonCollectionsConfigController: failed to delete property", e));
+			return next;
+		});
+	}, [persistCollection]);
+	const updatePropertiesOrder = useCallback(async ({ collection, newPropertiesOrder }) => {
+		const updated = {
+			...collection,
+			propertiesOrder: newPropertiesOrder
+		};
+		setCollections((prev) => {
+			const idx = prev.findIndex((c) => c.slug === collection.slug);
+			if (idx < 0) return prev;
+			const next = [...prev];
+			next[idx] = updated;
+			return next;
+		});
+		await persistCollection(updated);
+	}, [persistCollection]);
+	const updateKanbanColumnsOrder = useCallback(async ({ collection, kanbanColumnProperty, newColumnsOrder }) => {}, []);
+	const saveNavigationEntriesHandler = useCallback(async (entries) => {
+		setNavigationEntries(entries);
+		if (storeRef.current.saveNavigationEntries) await storeRef.current.saveNavigationEntries(entries);
+	}, []);
+	return useMemo(() => ({
+		loading,
+		readOnly,
+		readOnlyReason: readOnly ? "Configuration is read-only." : void 0,
+		collections,
+		getCollection,
+		saveCollection,
+		updateCollection,
+		deleteCollection,
+		saveProperty,
+		deleteProperty,
+		updatePropertiesOrder,
+		updateKanbanColumnsOrder,
+		navigationEntries,
+		saveNavigationEntries: saveNavigationEntriesHandler
+	}), [
+		loading,
+		readOnly,
+		collections,
+		getCollection,
+		saveCollection,
+		updateCollection,
+		deleteCollection,
+		saveProperty,
+		deleteProperty,
+		updatePropertiesOrder,
+		updateKanbanColumnsOrder,
+		navigationEntries,
+		saveNavigationEntriesHandler
+	]);
+}
+//#endregion
 //#region src/collection_editor/validateCollectionJson.ts
 /**
 * Valid dataType values for properties
@@ -24006,6 +24027,6 @@ function getFullIdPath(propertyKey, propertyNamespace) {
 	return idToPropertiesPath(propertyNamespace ? `${propertyNamespace}.${propertyKey}` : propertyKey);
 }
 //#endregion
-export { useApp as $, getBracketNotation as $n, SideDialogs as $t, KeyValuePreview as A, useSideDialogsController as An, RepeatFieldBinding as At, RebaseRouteDefs as B, SelectableTableContext as Bn, ArrayContainer as Bt, zodToFormErrors as C, useCMSContext as Cn, getFieldConfig as Ct, NumberPropertyPreview as D, useNavigationStateController as Dn, SwitchFieldBinding as Dt, UserPreview as E, NavigationStateContext as En, TextFieldBinding as Et, ArrayEnumPreview as F, useSelectionController as Fn, MapFieldBinding as Ft, useLocalCollectionsConfigController as G, resolveEntityAction as Gn, FormEntry as Gt, RebaseRoute as H, useSideEntityController as Hn, PropertyFieldBinding as Ht, ArrayOfStorageComponentsPreview as I, EntityCollectionTable as In, KeyValueFieldBinding as It, Scaffold as J, ArrayOfReferencesPreview as Jn, LabelWithIcon as Jt, RebaseAuthGate as K, resolveEntityView as Kn, LabelWithIconAndTooltip as Kt, RelationPreview as L, SelectableTable as Ln, DateTimeFieldBinding as Lt, ArrayOneOfPreview as M, getEntityViewWidth as Mn, ReferenceAsStringFieldBinding as Mt, ArrayOfStringsPreview as N, useBuildSideEntityController as Nn, MultiSelectFieldBinding as Nt, BooleanPreview as O, CollectionRegistryContext as On, StorageUploadFieldBinding as Ot, ArrayPropertyEnumPreview as P, mergeEntityActions as Pn, MarkdownEditorFieldBinding as Pt, AppBar as Q, getEntityTitlePropertyKey as Qn, EntitySelectionTable as Qt, CollectionPanel as R, EntityCollectionRowActions as Rn, BlockFieldBinding as Rt, EntityForm as S, useResolvedNavigationFrom as Sn, getDefaultFieldId as St, PropertyPreview as T, useUrlController as Tn, VectorFieldBinding as Tt, RebaseLayout as U, useEntitySelectionDialog as Un, ReadOnlyFieldBinding as Ut, CustomViewRoute as V, SideEntityControllerContext as Vn, ArrayCustomShapedFieldBinding as Vt, RebaseNavigation as W, VirtualTableInput as Wn, FormLayout as Wt, DefaultDrawer as X, EntityPreview as Xn, SearchIconsView as Xt, Drawer as Y, ReferencePreview as Yn, FieldHelperText as Yt, DrawerFooterActions as Z, getEntityPreviewKeys as Zn, FieldCaption as Zt, getEntityCSVExportableData as _, removeTrailingSlash as _n, renderSkeletonText as _r, convertFileToJson as _t, namespaceToPropertiesPath as a, useResolvedCollections as an, getResolvedPropertyInPath as ar, EntityCard as at, ImportDataPreview as b, useEntityHistory as bn, ImagePreview as br, DEFAULT_FIELD_CONFIGS as bt, DEFAULT_COLLECTION_GENERATION_ENDPOINT as c, editEntityAction as cn, ArrayPropertyPreview as cr, ImportNewPropertyFieldPreview as ct, useCollectionsConfigController as d, addInitialSlash as dn, StorageThumbnail as dr, flattenEntry as dt, useBreadcrumbsController as en, getDefaultPropertiesOrder as er, AdminModeSyncer as et, ExportCollectionAction as f, getCollectionBySlugWithin as fn, StorageThumbnailInternal as fr, processValueMapping as ft, downloadEntitiesExport as g, removeInitialSlash as gn, renderSkeletonImageThumbnail as gr, ImportFileUpload as gt, downloadDataAsCsv as h, removeInitialAndTrailingSlashes$1 as hn, renderSkeletonIcon as hr, ImportSaveInProgress as ht, namespaceToPropertiesOrderPath as i, useResolvedViews as in, getPropertyInPath as ir, EntityCollectionCardView as it, MapPropertyPreview as j, buildSidePanelsFromUrl as jn, ReferenceFieldBinding as jt, DatePreview as k, useCollectionRegistryController as kn, SelectFieldBinding as kt, buildCollectionGenerationCallback as l, resetPasswordAction as ln, StringPropertyPreview as lr, DataNewPropertiesMapping as lt, downloadBlob as m, getLastSegment$1 as mn, renderSkeletonCaptionText as mr, useImportConfig as mt, getFullIdPath as n, useBuildNavigationStateController as nn, getIconForWidget as nr, ReferenceWidget as nt, MissingReferenceWidget as o, copyEntityAction as on, isReferenceProperty as or, EntityCollectionViewActions as ot, BasicExportAction as p, getCollectionPathsCombinations as pn, SkeletonPropertyComponent as pr, getInferenceType as pt, RebaseCMS as q, EntityView as qn, PropertyIdCopyTooltip as qt, idToPropertiesPath as r, useTopLevelNavigation as rn, getPropertiesWithPropertiesOrder as rr, EntityCollectionView as rt, CollectionGenerationApiError as s, deleteEntityAction as sn, isRelationProperty as sr, useCollectionEditorController as st, getFullId as t, useBuildUrlController as tn, getIconForProperty as tr, SideEntityProvider as tt, validateCollectionJson as u, CreationResultDialog as un, EnumValuesChip as ur, convertDataToEntity as ut, getEntityJsonExportableData as v, resolveCollectionPathIds$1 as vn, UrlComponentPreview as vr, unflattenObject as vt, ArrayOfMapsPreview as w, UrlContext as wn, getFieldId as wt, PropertySelectEntry as x, resolveNavigationFrom as xn, EmptyValue as xr, getDefaultFieldConfig as xt, ImportCollectionAction as y, useBuildCollectionRegistryController as yn, sanitizeUrl as yr, PropertyConfigBadge as yt, RebaseShell as z, useClearRestoreValue as zn, ArrayOfReferencesFieldBinding as zt };
+export { RelationPreview as $, SelectableTable as $n, BlockFieldBinding as $t, useCollectionDataController as A, removeInitialAndTrailingSlashes$1 as An, renderSkeletonIcon as Ar, useImportConfig as At, ArrayOfMapsPreview as B, useUrlController as Bn, getFieldId as Bt, downloadEntitiesExport as C, editEntityAction as Cn, ArrayPropertyPreview as Cr, useCollectionEditorController as Ct, ImportDataPreview as D, getCollectionBySlugWithin as Dn, StorageThumbnailInternal as Dr, flattenEntry as Dt, ImportCollectionAction as E, addInitialSlash as En, StorageThumbnail as Er, convertDataToEntity as Et, extractTouchedValues as F, useEntityHistory as Fn, ImagePreview as Fr, PropertyConfigBadge as Ft, DatePreview as G, useSideDialogsController as Gn, SelectFieldBinding as Gt, UserPreview as H, useNavigationStateController as Hn, TextFieldBinding as Ht, getChanges as I, resolveNavigationFrom as In, EmptyValue as Ir, DEFAULT_FIELD_CONFIGS as It, ArrayOneOfPreview as J, useBuildSideEntityController as Jn, MultiSelectFieldBinding as Jt, KeyValuePreview as K, buildSidePanelsFromUrl as Kn, RepeatFieldBinding as Kt, getInitialEntityValues as L, useResolvedNavigationFrom as Ln, getDefaultFieldConfig as Lt, mapPropertyToConfig as M, removeTrailingSlash as Mn, renderSkeletonText as Mr, ImportFileUpload as Mt, EntityFormBinding as N, resolveCollectionPathIds$1 as Nn, UrlComponentPreview as Nr, convertFileToJson as Nt, PropertySelectEntry as O, getCollectionPathsCombinations as On, SkeletonPropertyComponent as Or, processValueMapping as Ot, EntityForm as P, useBuildCollectionRegistryController as Pn, sanitizeUrl as Pr, unflattenObject as Pt, ArrayOfStorageComponentsPreview as Q, EntityCollectionTable as Qn, DateTimeFieldBinding as Qt, removeEmptyContainers as R, useCMSContext as Rn, getDefaultFieldId as Rt, downloadDataAsCsv as S, deleteEntityAction as Sn, isRelationProperty as Sr, EntityCollectionViewActions as St, getEntityJsonExportableData as T, CreationResultDialog as Tn, EnumValuesChip as Tr, DataNewPropertiesMapping as Tt, NumberPropertyPreview as U, CollectionRegistryContext as Un, SwitchFieldBinding as Ut, PropertyPreview as V, NavigationStateContext as Vn, VectorFieldBinding as Vt, BooleanPreview as W, useCollectionRegistryController as Wn, StorageUploadFieldBinding as Wt, ArrayPropertyEnumPreview as X, useSelectionController as Xn, MapFieldBinding as Xt, ArrayOfStringsPreview as Y, mergeEntityActions as Yn, MarkdownEditorFieldBinding as Yt, ArrayEnumPreview as Z, VirtualTableInput$1 as Zn, KeyValueFieldBinding as Zt, toSerializableProperty as _, useBuildNavigationStateController as _n, getIconForWidget as _r, SideEntityProvider as _t, namespaceToPropertiesPath as a, FormLayout as an, useEntitySelectionDialog as ar, RebaseLayout as at, BasicExportAction as b, useResolvedCollections as bn, getResolvedPropertyInPath as br, EntityCollectionCardView as bt, DEFAULT_COLLECTION_GENERATION_ENDPOINT as c, PropertyIdCopyTooltip as cn, EntityView as cr, RebaseAuthGate as ct, useJsonCollectionsConfigController as d, SearchIconsView as dn, EntityPreview as dr, Drawer as dt, ArrayOfReferencesFieldBinding as en, EntityCollectionRowActions as er, CollectionPanel as et, fromSerializableCollection as f, FieldCaption as fn, getEntityPreviewKeys as fr, DefaultDrawer as ft, toSerializableProperties as g, useBuildUrlController as gn, getIconForProperty as gr, AdminModeSyncer as gt, toSerializableCollection as h, useBreadcrumbsController as hn, getDefaultPropertiesOrder as hr, useApp as ht, namespaceToPropertiesOrderPath as i, ReadOnlyFieldBinding as in, useSideEntityController as ir, RebaseRoute as it, mapPropertiesToConfigs as j, removeInitialSlash as jn, renderSkeletonImageThumbnail as jr, ImportSaveInProgress as jt, createStaticDataController as k, getLastSegment$1 as kn, renderSkeletonCaptionText as kr, getInferenceType as kt, buildCollectionGenerationCallback as l, LabelWithIcon as ln, ArrayOfReferencesPreview as lr, RebaseCMS as lt, fromSerializableProperty as m, SideDialogs as mn, getBracketNotation as mr, AppBar as mt, getFullIdPath as n, ArrayCustomShapedFieldBinding as nn, SelectableTableContext as nr, RebaseRouteDefs as nt, MissingReferenceWidget as o, FormEntry as on, resolveEntityAction as or, RebaseNavigation as ot, fromSerializableProperties as p, EntitySelectionTable as pn, getEntityTitlePropertyKey as pr, DrawerFooterActions as pt, MapPropertyPreview as q, getEntityViewWidth as qn, ReferenceFieldBinding as qt, idToPropertiesPath as r, PropertyFieldBinding as rn, SideEntityControllerContext as rr, CustomViewRoute as rt, CollectionGenerationApiError as s, LabelWithIconAndTooltip as sn, resolveEntityView as sr, useLocalCollectionsConfigController as st, getFullId as t, ArrayContainer as tn, useClearRestoreValue as tr, RebaseShell as tt, validateCollectionJson as u, FieldHelperText as un, ReferencePreview as ur, Scaffold as ut, useCollectionsConfigController as v, useTopLevelNavigation as vn, getPropertiesWithPropertiesOrder as vr, ReferenceWidget as vt, getEntityCSVExportableData as w, resetPasswordAction as wn, StringPropertyPreview as wr, ImportNewPropertyFieldPreview as wt, downloadBlob as x, copyEntityAction as xn, isReferenceProperty as xr, EntityCard as xt, ExportCollectionAction as y, useResolvedViews as yn, getPropertyInPath as yr, EntityCollectionView as yt, zodToFormErrors as z, UrlContext as zn, getFieldConfig as zt };
 
-//# sourceMappingURL=src-BYniefVu.js.map
+//# sourceMappingURL=src-cxV1ODRG.js.map