@rebasepro/admin 0.8.0 → 0.9.1-canary.09aaf62

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

@@ -3,9 +3,9 @@ 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, 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 { 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, resolveFilterOperators, resolveProperty, resolveRelationProperty, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource } from "@rebasepro/common";
+import { ADDITIONAL_TAB_WIDTH, CONTAINER_FULL_WIDTH, CollectionResolverRegistrationContext, CollectionScopeProvider, 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, getRelationIncludeParams, getRowHeight, iconsSearch, removeEntityFromCache, removeEntityFromMemoryCache, resolveComponentRef, saveEntityToCache, saveEntityToMemoryCache, saveEntityWithCallbacks, useAdminModeController, useAnalyticsController, useApiConfig, useAuthController, useBridgeRegistration, useBuildLocalConfigurationPersistence, useCollapsedGroups, useCollectionScope, useColumnIds, useComponentOverride, useCustomizationController, useData, useDataSources, useDataTableController, useFetch, useLargeLayout, useModeController, usePermissions, useRebaseClient, useRebaseContext, useRebaseRegistry, useRebaseRegistryDispatch, useRelationSelector, useResolvedComponent, useRestoreScroll, useScrollRestoration, useSlot, useSnackbarController, useStorageSource, useStorageSources, useStorageUploadController, useTranslation, useUnsavedChangesDialog, useUserConfigurationPersistence } from "@rebasepro/app";
+import { Field, Formex, getIn, setIn, useCreateFormex, useFormex } from "@rebasepro/forms";
 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";
@@ -20,7 +20,7 @@ import { restrictToVerticalAxis, restrictToWindowEdges } from "@dnd-kit/modifier
 import { SortableContext, arrayMove, defaultAnimateLayoutChanges, horizontalListSortingStrategy, rectSortingStrategy, sortableKeyboardCoordinates, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import ExcelJS from "exceljs";
-import { buildEntityPropertiesFromData, inferTypeFromValue } from "@rebasepro/schema-inference";
+import { buildEntityPropertiesFromData, inferTypeFromValue } from "@rebasepro/inference";
 import { generateKeyBetween, generateNKeysBetween } from "fractional-indexing";
 import Fuse from "fuse.js";
 import { format } from "date-fns";
@@ -350,7 +350,7 @@ function buildBottomActions$1({ savingError, entity, path, formActions, collecti
 							path: path ?? getCollectionDataPath(collection),
 							collection,
 							context: void 0,
-							sideEntityController: void 0,
+							sidePanelController: void 0,
 							openEntityMode,
 							navigateBack,
 							formContext
@@ -1100,7 +1100,7 @@ function getEntityTitlePropertyKey(collection, propertyConfigs) {
 		if (property && !isPropertyBuilder(property)) {
 			const prop = property;
 			if (prop && typeof prop === "object" && "isId" in prop && Boolean(prop.isId) || key === "id" || isHiddenProperty(prop)) continue;
-			if (prop.type === "relation" || prop.type === "string") return key;
+			if (prop.type === "relation" || prop.type === "string" && !isStorageProperty$1(prop)) return key;
 		}
 	}
 	let firstStringCandidate;
@@ -1160,15 +1160,15 @@ function resolveTitleToString(title) {
 	}
 }
 //#endregion
-//#region src/components/EntityPreview.tsx
+//#region src/components/EntityPreviewBinding.tsx
 /**
-* This component contains the main logic and content for displaying an entity preview,
-* without any container wrapper. Used internally by EntityPreview.
+* This component contains the main logic and content for displaying a entity preview,
+* without any container wrapper. Used internally by EntityPreviewBinding.
 */
-function EntityPreviewData({ actions, collection: collectionProp, previewKeys, size = "medium", includeId = true, onSideEntityClick, includeTitle = true, includeEntityLink = true, includeImage = true, entity }) {
+function EntityPreviewBindingData({ actions, collection: collectionProp, previewKeys, size = "medium", includeId = true, onSidePanelClick, includeTitle = true, includeEntityLink = true, includeImage = true, entity }) {
 	const authController = useAuthController();
 	const analyticsController = useAnalyticsController();
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	const customizationController = useCustomizationController();
 	const collectionRegistryController = useCollectionRegistryController();
 	const collection = collectionProp ?? collectionRegistryController.getCollection(entity.path);
@@ -1265,12 +1265,12 @@ function EntityPreviewData({ actions, collection: collectionProp, previewKeys, s
 					onClick: (e) => {
 						e.stopPropagation();
 						e.preventDefault();
-						onSideEntityClick?.(entity);
+						onSidePanelClick?.(entity);
 						analyticsController.onAnalyticsEvent?.("entity_click_from_reference", {
 							path: entity.path,
 							entityId: entity.id
 						});
-						sideEntityController.open({
+						sidePanelController.open({
 							entityId: entity.id,
 							path: entity.path,
 							collection,
@@ -1288,15 +1288,15 @@ function EntityPreviewData({ actions, collection: collectionProp, previewKeys, s
 	] });
 }
 /**
-* This view is used to display a preview of an entity.
+* This view is used to display a preview of a entity.
 * It is used by default in reference fields and whenever a reference is displayed.
 */
-function EntityPreview({ actions, disabled, hover, collection, previewKeys, onClick, size = "medium", includeId = true, includeTitle = true, includeEntityLink = true, includeImage = true, onSideEntityClick, entity }) {
+function EntityPreviewBinding({ actions, disabled, hover, collection, previewKeys, onClick, size = "medium", includeId = true, includeTitle = true, includeEntityLink = true, includeImage = true, onSidePanelClick, entity }) {
 	return /* @__PURE__ */ jsx(EntityPreviewContainer, {
 		onClick: disabled ? void 0 : onClick,
 		hover: disabled ? void 0 : hover,
 		size,
-		children: /* @__PURE__ */ jsx(EntityPreviewData, {
+		children: /* @__PURE__ */ jsx(EntityPreviewBindingData, {
 			actions,
 			collection,
 			previewKeys,
@@ -1305,7 +1305,7 @@ function EntityPreview({ actions, disabled, hover, collection, previewKeys, onCl
 			includeTitle,
 			includeEntityLink,
 			includeImage,
-			onSideEntityClick,
+			onSidePanelClick,
 			entity
 		})
 	});
@@ -1389,16 +1389,16 @@ function ReferencePreviewInternal(props) {
 		...props,
 		collection
 	});
-	if (collection?.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: collection.components,
+	if (collection) return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection,
 		children: content
 	});
 	return content;
 }
 function ReferencePreviewExisting({ reference, collection, previewProperties, size, disabled, includeEntityLink, includeId, onClick, hover, textOnly }) {
-	const ResolvedEntityPreview = useComponentOverride("Entity.Preview", EntityPreview);
+	const ResolvedEntityPreview = useComponentOverride("EntityPreview", EntityPreviewBinding);
 	const customizationController = useCustomizationController();
-	const { entity, dataLoading, dataLoadingError } = useEntityFetch({
+	const { entity, dataLoading, dataLoadingError } = useFetch({
 		path: reference.path,
 		entityId: reference.id,
 		collection,
@@ -1488,8 +1488,8 @@ function ArrayOfReferencesPreview({ propertyKey, value, property, size }) {
 	});
 }
 //#endregion
-//#region src/components/EntityView.tsx
-function EntityView({ entity, collection, path, className }) {
+//#region src/components/EntityViewBinding.tsx
+function EntityViewBinding({ entity, collection, path, className }) {
 	const customizationController = useCustomizationController();
 	const properties = collection.properties;
 	return /* @__PURE__ */ jsx("div", {
@@ -1560,8 +1560,8 @@ function resolvedSelectedEntityView(customViews, customizationController, select
 	};
 }
 //#endregion
-//#region src/components/EntityJsonPreview.tsx
-function EntityJsonPreview({ values }) {
+//#region src/components/JsonPreviewBinding.tsx
+function JsonPreviewBinding({ values }) {
 	const code = JSON.stringify(values, null, "	");
 	const { mode } = useModeController();
 	const preRef = useRef(null);
@@ -1588,17 +1588,17 @@ function EntityJsonPreview({ values }) {
 	});
 }
 //#endregion
-//#region src/util/entity_view_constants.ts
+//#region src/util/view_constants.ts
 /**
-* Shared tab value constants used by EntityEditView and EntityDetailView.
+* Shared tab value constants used by EditViewBinding and DetailViewBinding.
 */
 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-B3cqBzEV.js").then((m) => ({ default: m.EntityHistoryView })));
-function EntityDetailView({ entityId, ...props }) {
-	const { entity, dataLoading, dataLoadingError } = useEntityFetch({
+//#region src/components/DetailViewBinding.tsx
+var EntityHistoryView$1 = lazy(() => import("./history-GSa4BgDt.js").then((m) => ({ default: m.EntityHistoryView })));
+function DetailViewBinding({ entityId, ...props }) {
+	const { entity, dataLoading, dataLoadingError } = useFetch({
 		path: props.path,
 		entityId,
 		collection: props.collection,
@@ -1609,20 +1609,19 @@ function EntityDetailView({ entityId, ...props }) {
 		variant: "label",
 		children: "Entity not found"
 	}) });
-	const content = /* @__PURE__ */ jsx(EntityDetailViewInner, {
+	const content = /* @__PURE__ */ jsx(DetailViewBindingInner, {
 		...props,
 		entityId,
 		entity,
 		dataLoading
 	});
-	if (props.collection.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: props.collection.components,
+	return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection: props.collection,
 		children: content
 	});
-	return content;
 }
-function EntityDetailViewInner({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionSlugs, parentEntityIds, onTabChange, onEditClick, entity, dataLoading, layout = "full_screen", barActions }) {
-	const ResolvedCollectionView = useComponentOverride("Collection.View", EntityCollectionView);
+function DetailViewBindingInner({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionSlugs, parentEntityIds, onTabChange, onEditClick, entity, dataLoading, layout = "full_screen", barActions }) {
+	const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
 	const { t } = useTranslation();
 	const context = useRebaseContext();
 	const urlController = useUrlController();
@@ -1771,7 +1770,7 @@ function EntityDetailViewInner({ path, entityId, selectedTab: selectedTabProp, c
 	const jsonView = activeTab === "__json" || jsonTabMounted ? /* @__PURE__ */ jsx("div", {
 		className: cls("relative flex-1 h-full overflow-auto w-full", { "hidden": activeTab !== JSON_TAB_VALUE }),
 		role: "tabpanel",
-		children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityJsonPreview, { values: usedEntity?.values ?? {} }) })
+		children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(JsonPreviewBinding, { values: usedEntity?.values ?? {} }) })
 	}, "json_view") : null;
 	const historyView = includeHistoryView && activeTab === "__rebase_history" ? /* @__PURE__ */ jsx("div", {
 		className: "relative flex-1 h-full overflow-auto w-full",
@@ -1836,7 +1835,7 @@ function EntityDetailViewInner({ path, entityId, selectedTab: selectedTabProp, c
 				formContext: readOnlyFormContext
 			})
 		}) });
-		return /* @__PURE__ */ jsx(Fragment, { children: usedEntity && /* @__PURE__ */ jsx(EntityView, {
+		return /* @__PURE__ */ jsx(Fragment, { children: usedEntity && /* @__PURE__ */ jsx(EntityViewBinding, {
 			entity: usedEntity,
 			collection,
 			path
@@ -2092,16 +2091,16 @@ function useCellSelected(store, propertyKey, entityPath, entityId) {
 		entityPath,
 		entityId
 	};
-	const getSnapshot = useCallback(() => {
-		const cell = store.getSnapshot();
+	const getEntity = useCallback(() => {
+		const cell = store.getEntity();
 		if (!cell) return false;
 		const s = selectorRef.current;
 		return cell.propertyKey === s.propertyKey && cell.entityPath === s.entityPath && cell.entityId === s.entityId;
 	}, [store]);
-	return useSyncExternalStore(store.subscribe, getSnapshot, getSnapshot);
+	return useSyncExternalStore(store.subscribe, getEntity, getEntity);
 }
 //#endregion
-//#region src/components/EntityCollectionTable/fields/VirtualTableSelect.tsx
+//#region src/components/CollectionTableBinding/fields/VirtualTableSelect.tsx
 function VirtualTableSelect(props) {
 	const { enumValues, internalValue, disabled, small, focused, updateValue, multiple, valueType } = props;
 	const validValue = Array.isArray(internalValue) && multiple || !Array.isArray(internalValue) && !multiple;
@@ -2489,7 +2488,7 @@ var UserSelector = React$1.forwardRef(({ value, size = "medium", onValueChange,
 });
 UserSelector.displayName = "UserSelector";
 //#endregion
-//#region src/components/EntityCollectionTable/fields/VirtualTableUserSelect.tsx
+//#region src/components/CollectionTableBinding/fields/VirtualTableUserSelect.tsx
 function VirtualTableUserSelect(props) {
 	const { internalValue, disabled, small, focused, updateValue, multiple } = props;
 	return /* @__PURE__ */ jsx(UserSelector, {
@@ -2571,7 +2570,7 @@ function StorageUploadProgress({ storagePath, entry, metadata, onFileUploadCompl
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionTable/internal/EntityTableCellActions.tsx
+//#region src/components/CollectionTableBinding/internal/EntityTableCellActions.tsx
 function EntityTableCellActions({ showError, disabled, showExpandIcon, selected, openPopup, children }) {
 	const ref = useRef(null);
 	const doOpenPopup = useCallback(() => {
@@ -2621,7 +2620,7 @@ function EntityTableCellActions({ showError, disabled, showExpandIcon, selected,
 	}) });
 }
 //#endregion
-//#region src/components/EntityCollectionTable/fields/TableStorageUpload.tsx
+//#region src/components/CollectionTableBinding/fields/TableStorageUpload.tsx
 var dropZoneClasses$1 = "max-w-full box-border relative pt-[2px] items-center border border-transparent outline-hidden rounded-md duration-200 ease-[cubic-bezier(0.4,0,0.2,1)] focus:border-primary-solid";
 var activeDropClasses$1 = "pt-0 border-2 border-solid";
 var acceptDropClasses$1 = "transition-colors duration-200 ease-[cubic-bezier(0,0,0.2,1)] border-2 border-solid border-green-500 bg-green-50 dark:bg-green-900";
@@ -2777,7 +2776,7 @@ function TableStorageItemPreview({ propertyKey, property, value, size, entity })
 	});
 }
 //#endregion
-//#region src/hooks/useEntitySelectionDialog.tsx
+//#region src/hooks/useSelectionDialog.tsx
 /**
 * This hook is used to open a side dialog that allows the selection
 * of entities under a given path.
@@ -2788,17 +2787,17 @@ function TableStorageItemPreview({ propertyKey, property, value, size, entity })
 * This is the same hook used internally when a reference property is defined.
 * @group Hooks and utilities
 */
-function useEntitySelectionDialog(referenceDialogProps) {
+function useSelectionDialog(referenceDialogProps) {
 	const navigation = useCollectionRegistryController();
 	const sideDialogsController = useSideDialogsController();
 	const open = useCallback(() => {
 		if (referenceDialogProps.path) {
 			let usedCollection = referenceDialogProps.collection;
 			if (!usedCollection) usedCollection = navigation.getCollection(referenceDialogProps.path);
-			if (!usedCollection) throw Error("Not able to resolve the collection in useEntitySelectionDialog. Make sure a collection is registered in path " + referenceDialogProps.path);
+			if (!usedCollection) throw Error("Not able to resolve the collection in useSelectionDialog. Make sure a collection is registered in path " + referenceDialogProps.path);
 			sideDialogsController.open({
 				key: `reference_${referenceDialogProps.path}`,
-				component: /* @__PURE__ */ jsx(EntitySelectionTable, {
+				component: /* @__PURE__ */ jsx(SelectionTableBinding, {
 					collection: usedCollection,
 					...referenceDialogProps
 				}),
@@ -2822,7 +2821,7 @@ function useEntitySelectionDialog(referenceDialogProps) {
 	}), [open, close]);
 }
 //#endregion
-//#region src/components/EntityCollectionTable/fields/TableReferenceField.tsx
+//#region src/components/CollectionTableBinding/fields/TableReferenceField.tsx
 var DefaultMissingReference$1 = () => null;
 function TableReferenceFieldResolver(props) {
 	const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference$1);
@@ -2842,8 +2841,8 @@ function TableReferenceField(props) {
 		...props,
 		collection
 	});
-	if (collection?.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: collection.components,
+	if (collection) return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection,
 		children: content
 	});
 	return content;
@@ -2853,7 +2852,7 @@ var TableReferenceFieldInternal = React.memo(function TableReferenceFieldInterna
 	const onSingleEntitySelected = useCallback((entity) => {
 		updateValue(entity ? getReferenceFrom(entity) : null);
 	}, [updateValue]);
-	const referenceDialogController = useEntitySelectionDialog({
+	const referenceDialogController = useSelectionDialog({
 		multiselect,
 		path,
 		collection,
@@ -2921,7 +2920,7 @@ var TableReferenceFieldInternal = React.memo(function TableReferenceFieldInterna
 	});
 }, deepEqual);
 //#endregion
-//#region src/components/EntityCollectionTable/fields/TableMultipleRelationField.tsx
+//#region src/components/CollectionTableBinding/fields/TableMultipleRelationField.tsx
 function TableMultipleRelationField(props) {
 	const collection = props.relation.target();
 	return /* @__PURE__ */ jsx(TableMultipleRelationFieldInternal, {
@@ -2936,7 +2935,7 @@ var TableMultipleRelationFieldInternal = React.memo(function TableMultipleRelati
 		updateValue(entities.map((e) => getRelationFrom(e)));
 	}, [updateValue]);
 	const selectedEntityIds = value.map((ref) => ref.id);
-	const relationDialogController = useEntitySelectionDialog({
+	const relationDialogController = useSelectionDialog({
 		multiselect: true,
 		path: getCollectionDataPath(collection),
 		collection,
@@ -2980,7 +2979,7 @@ var TableMultipleRelationFieldInternal = React.memo(function TableMultipleRelati
 	});
 }, deepEqual);
 //#endregion
-//#region src/components/EntityCollectionTable/fields/TableRelationField.tsx
+//#region src/components/CollectionTableBinding/fields/TableRelationField.tsx
 function TableRelationField(props) {
 	const collection = props.relation.target();
 	if (props.relation?.cardinality === "many") return /* @__PURE__ */ jsx(TableMultipleRelationField, {
@@ -3010,7 +3009,7 @@ var TableRelationFieldInternal = React.memo(function TableRelationFieldInternal(
 		updateValue(entities.map((e) => getRelationFrom(e)));
 	}, [updateValue]);
 	const selectedEntityIds = internalValue ? Array.isArray(internalValue) ? internalValue.map((ref) => ref.id) : internalValue.id ? [internalValue.id] : [] : [];
-	const relationDialogController = useEntitySelectionDialog({
+	const relationDialogController = useSelectionDialog({
 		multiselect,
 		path: getCollectionDataPath(collection),
 		collection,
@@ -3075,22 +3074,22 @@ var TableRelationFieldInternal = React.memo(function TableRelationFieldInternal(
 	});
 }, deepEqual);
 //#endregion
-//#region src/hooks/useSideEntityController.tsx
-var SideEntityControllerContext = React.createContext({});
+//#region src/hooks/useSidePanel.tsx
+var SidePanelControllerContext = React.createContext({});
 /**
-* Use this hook to retrieve an entity controller that allows you to open
-* a side dialog to edit an entity.
+* Use this hook to retrieve a entity controller that allows you to open
+* a side dialog to edit a entity.
 *
-* @see SideEntityController
+* @see SidePanelController
 * @group Hooks and utilities
 */
-var useSideEntityController = () => useContext(SideEntityControllerContext);
+var useSidePanel = () => useContext(SidePanelControllerContext);
 //#endregion
 //#region src/components/RelationSelector.tsx
 var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChange, invisible, disabled, placeholder, useChips = true, className, relation, fixedFilter, pageSize, emptyPlaceholder, searchPlaceholder = "Search...", noResultsText = "No relations found.", loadingText = "Loading..." }, ref) => {
 	const collection = relation.target();
 	const dataClient = useData();
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	const multiple = relation.cardinality === "many";
 	const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 	const isPopoverOpenRef = useRef(false);
@@ -3374,12 +3373,12 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 						children: selectedItems.map((item) => {
 							if (!useChips || !multiple) return /* @__PURE__ */ jsx("div", {
 								className: "flex flex-row items-center gap-1 truncate",
-								children: item.data ? /* @__PURE__ */ jsx(EntityPreviewData, {
+								children: item.data ? /* @__PURE__ */ jsx(EntityPreviewBindingData, {
 									size: "medium",
 									entity: item.data,
 									includeEntityLink: false,
 									includeId: false,
-									onSideEntityClick: closePopover
+									onSidePanelClick: closePopover
 								}) : /* @__PURE__ */ jsx("span", {
 									className: "text-sm truncate",
 									children: item.label
@@ -3388,7 +3387,7 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 							return /* @__PURE__ */ jsxs(Chip, {
 								size: "small",
 								className: cls("flex flex-row items-center gap-1 truncate"),
-								children: [item.data ? /* @__PURE__ */ jsx(EntityPreviewData, {
+								children: [item.data ? /* @__PURE__ */ jsx(EntityPreviewBindingData, {
 									size: "smallest",
 									entity: item.data,
 									includeEntityLink: false,
@@ -3422,7 +3421,7 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 									e.preventDefault();
 									const entity = selectedItems[0].data;
 									setIsPopoverOpen(false);
-									sideEntityController.open({
+									sidePanelController.open({
 										entityId: entity.id,
 										path: entity.path,
 										collection,
@@ -3524,7 +3523,7 @@ var RelationSelector = React$1.forwardRef(({ value, size = "medium", onValueChan
 											className: cls("flex flex-row items-center gap-1.5 m-1 p-1 rounded-xs cursor-pointer ring-offset-transparent", isSelected && "bg-surface-accent-200 dark:bg-surface-accent-950", "aria-selected:outline-hidden aria-selected:ring-2 aria-selected:ring-primary/75 aria-selected:ring-offset-2 aria-selected:bg-surface-accent-100 dark:aria-selected:bg-surface-accent-900"),
 											children: [multiple && /* @__PURE__ */ jsx(InnerCheckBox, { checked: isSelected }), item.data ? /* @__PURE__ */ jsx("div", {
 												className: "flex flex-row items-center gap-2 min-w-0 w-full",
-												children: /* @__PURE__ */ jsx(EntityPreviewData, {
+												children: /* @__PURE__ */ jsx(EntityPreviewBindingData, {
 													size: multiple ? "smallest" : "medium",
 													entity: item.data,
 													includeId: false,
@@ -3574,7 +3573,7 @@ function InnerCheckBox({ checked }) {
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionTable/fields/TableRelationSelectorField.tsx
+//#region src/components/CollectionTableBinding/fields/TableRelationSelectorField.tsx
 /** Thin wrapper around RelationSelector for table cells */
 function TableRelationSelectorField({ disabled = false, internalValue, updateValue, relation, fixedFilter, size = "medium" }) {
 	return /* @__PURE__ */ jsx(RelationSelector, {
@@ -3587,7 +3586,7 @@ function TableRelationSelectorField({ disabled = false, internalValue, updateVal
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionTable/table_bindings.tsx
+//#region src/components/CollectionTableBinding/table_bindings.tsx
 function isStorageProperty(property) {
 	if (property.type === "string" && property.ui?.markdown) return false;
 	if (property.type === "string" && property.storage) return true;
@@ -3820,7 +3819,7 @@ function RelationSelectorBindingComponent({ propertyKey, internalValue, updateVa
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionTable/internal/EntityTableCell.tsx
+//#region src/components/CollectionTableBinding/internal/EntityTableCell.tsx
 var TableCellInner = ({ justifyContent, scrollable, faded, fullHeight, children }) => {
 	return /* @__PURE__ */ jsx("div", {
 		className: cls("flex flex-col max-h-full w-full", { "items-start": faded || scrollable }),
@@ -3981,7 +3980,7 @@ function useClearRestoreValue({ property, value, setValue }) {
 	}, [property]);
 }
 //#endregion
-//#region src/components/EntityCollectionTable/PropertyTableCell.tsx
+//#region src/components/CollectionTableBinding/PropertyTableCell.tsx
 var PropertyTableCell = React.memo(function PropertyTableCell({ propertyKey, customFieldValidator, value, property, align, width, height, path, entity, readonly, disabled: disabledProp, enablePopupIcon = true, sortableNodeRef, sortableStyle, sortableAttributes, isDragging, isDraggable, frozen }) {
 	const { onValueChange, size, selectionStore, select, setPopupCell } = useSelectableTableController();
 	const dummySelectionStore = useMemo(() => createSelectionStore(), []);
@@ -4197,7 +4196,7 @@ function areEqual(prevProps, nextProps) {
 	return prevProps.height === nextProps.height && prevProps.propertyKey === nextProps.propertyKey && prevProps.align === nextProps.align && prevProps.width === nextProps.width && deepEqual(prevProps.property, nextProps.property) && deepEqual(prevProps.value, nextProps.value) && prevProps.entity.id === nextProps.entity.id && prevProps.entity.path === nextProps.entity.path && prevProps.isDragging === nextProps.isDragging && prevProps.isDraggable === nextProps.isDraggable && prevProps.frozen === nextProps.frozen;
 }
 //#endregion
-//#region src/components/EntityCollectionTable/EntityCollectionRowActions.tsx
+//#region src/components/CollectionTableBinding/CollectionRowActions.tsx
 /**
 *
 * @param entity
@@ -4211,9 +4210,9 @@ function areEqual(prevProps, nextProps) {
 *
 * @group Collection components
 */
-var EntityCollectionRowActions = function EntityCollectionRowActions({ entity, collection, path, width, frozen, isSelected, selectionEnabled, size, highlightEntity, onCollectionChange, unhighlightEntity, actions = [], hideId, selectionController, openEntityMode, sortableNodeRef, sortableStyle, sortableAttributes, isDragging, isDraggable }) {
+var CollectionRowActions = function CollectionRowActions({ entity, collection, path, width, frozen, isSelected, selectionEnabled, size, highlightEntity, onCollectionChange, unhighlightEntity, actions = [], hideId, selectionController, openEntityMode, sortableNodeRef, sortableStyle, sortableAttributes, isDragging, isDraggable }) {
 	const context = useCMSContext();
-	const sideEntityCtrl = context.sideEntityController;
+	const sidePanelCtrl = context.sidePanelController;
 	const { t } = useTranslation();
 	const onCheckedChange = useCallback((checked) => {
 		selectionController?.toggleEntitySelection(entity, checked);
@@ -4250,7 +4249,7 @@ var EntityCollectionRowActions = function EntityCollectionRowActions({ entity, c
 								path,
 								collection,
 								context,
-								sideEntityController: sideEntityCtrl,
+								sidePanelController: sidePanelCtrl,
 								selectionController,
 								highlightEntity,
 								unhighlightEntity,
@@ -4285,7 +4284,7 @@ var EntityCollectionRowActions = function EntityCollectionRowActions({ entity, c
 								path,
 								collection,
 								context,
-								sideEntityController: sideEntityCtrl,
+								sidePanelController: sidePanelCtrl,
 								selectionController,
 								highlightEntity,
 								unhighlightEntity,
@@ -4329,7 +4328,7 @@ var EntityCollectionRowActions = function EntityCollectionRowActions({ entity, c
 	return content;
 };
 //#endregion
-//#region src/components/EntityCollectionTable/internal/CollectionTableToolbar.tsx
+//#region src/components/CollectionTableBinding/internal/CollectionTableToolbar.tsx
 function CollectionTableToolbar({ actions, actionsStart, loading, onTextSearch, title, viewModeToggle, initialSearchText, compact = false }) {
 	const largeLayout = useLargeLayout();
 	const { t } = useTranslation();
@@ -4372,7 +4371,7 @@ function CollectionTableToolbar({ actions, actionsStart, loading, onTextSearch,
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionTable/internal/common.tsx
+//#region src/components/CollectionTableBinding/internal/common.tsx
 function getTableCellAlignment(property) {
 	if (property.type === "boolean") return "center";
 	else if (property.type === "number") {
@@ -4409,7 +4408,7 @@ function getSubcollectionColumnId(collection) {
 	return `subcollection:${collection.slug}`;
 }
 //#endregion
-//#region src/components/EntityCollectionTable/column_utils.tsx
+//#region src/components/CollectionTableBinding/column_utils.tsx
 function propertiesToColumns({ properties, sortable, fixedFilter, AdditionalHeaderWidget }) {
 	const disabledFilter = Boolean(fixedFilter);
 	return Object.entries(properties).flatMap(([key, property]) => getColumnKeysForProperty(property, key)).map(({ key, disabled }) => {
@@ -4458,140 +4457,8 @@ function filterableProperty(property, partOfArray = false) {
 	].includes(property.type);
 }
 //#endregion
-//#region src/components/SelectableTable/filters/ReferenceFilterField.tsx
-var operationLabels$3 = {
-	"==": "==",
-	"!=": "!=",
-	">": ">",
-	"<": "<",
-	">=": ">=",
-	"<=": "<=",
-	in: "In",
-	"not-in": "Not in",
-	"array-contains": "Contains",
-	"array-contains-any": "Contains Any"
-};
-var multipleSelectOperations$3 = [
-	"array-contains-any",
-	"in",
-	"not-in"
-];
-function ReferenceFilterField({ value, setValue, isArray, path, includeId = true, previewProperties, setHidden }) {
-	const { t } = useTranslation();
-	const possibleOperations = isArray ? ["array-contains"] : [
-		"==",
-		"!=",
-		">",
-		"<",
-		">=",
-		"<="
-	];
-	if (isArray) possibleOperations.push("array-contains-any");
-	else possibleOperations.push("in", "not-in");
-	const [fieldOperation, fieldValue] = value || [possibleOperations[0], void 0];
-	const [operation, setOperation] = useState(fieldOperation);
-	const [internalValue, setInternalValue] = useState(fieldValue);
-	const selectedEntityIds = internalValue ? Array.isArray(internalValue) ? internalValue.map((ref) => {
-		if (!(ref?.isEntityReference && ref?.isEntityReference())) return null;
-		return ref.id;
-	}).filter(Boolean) : [internalValue.id] : [];
-	function updateFilter(op, val) {
-		const prevOpIsArray = multipleSelectOperations$3.includes(operation);
-		const newOpIsArray = multipleSelectOperations$3.includes(op);
-		let newValue = val;
-		if (prevOpIsArray !== newOpIsArray) newValue = newOpIsArray ? newValue && !Array.isArray(newValue) && newValue.isEntityReference?.() ? [newValue] : [] : void 0;
-		setOperation(op);
-		setInternalValue(newValue);
-		const hasNewValue = newValue !== null && Array.isArray(newValue) ? newValue.length > 0 : newValue !== void 0;
-		if (op && hasNewValue) setValue([op, newValue]);
-		else setValue(void 0);
-	}
-	const collectionRegistryController = useCollectionRegistryController();
-	const collection = useMemo(() => {
-		return path ? collectionRegistryController.getCollection(path) : void 0;
-	}, [path]);
-	const onSingleEntitySelected = (entity) => {
-		updateFilter(operation, getReferenceFrom(entity));
-	};
-	const onMultipleEntitiesSelected = (entities) => {
-		updateFilter(operation, entities.map((e) => getReferenceFrom(e)));
-	};
-	const multiple = multipleSelectOperations$3.includes(operation);
-	const referenceDialogController = useEntitySelectionDialog({
-		multiselect: multiple,
-		path,
-		collection,
-		onSingleEntitySelected,
-		onMultipleEntitiesSelected,
-		selectedEntityIds,
-		onClose: () => {
-			setHidden(false);
-		}
-	});
-	const doOpenDialog = () => {
-		setHidden(true);
-		referenceDialogController.open();
-	};
-	const buildEntry = (reference) => {
-		return /* @__PURE__ */ jsx(ReferencePreview, {
-			disabled: !path,
-			previewProperties,
-			size: "medium",
-			onClick: doOpenDialog,
-			reference,
-			hover: true,
-			includeId,
-			includeEntityLink: false
-		});
-	};
-	return /* @__PURE__ */ jsxs("div", {
-		className: "flex w-full flex-row",
-		children: [/* @__PURE__ */ jsx("div", {
-			className: "w-[100px]",
-			children: /* @__PURE__ */ jsx(Select, {
-				value: operation,
-				size: "medium",
-				fullWidth: true,
-				onValueChange: (value) => {
-					updateFilter(value, internalValue);
-				},
-				renderValue: (op) => operationLabels$3[op],
-				children: possibleOperations.map((op) => /* @__PURE__ */ jsx(SelectItem, {
-					value: op,
-					children: operationLabels$3[op]
-				}, op))
-			})
-		}), /* @__PURE__ */ jsxs("div", {
-			className: "grow ml-2 h-full gap-2 flex flex-col",
-			children: [
-				internalValue && Array.isArray(internalValue) && /* @__PURE__ */ jsx("div", { children: internalValue.map((ref, index) => buildEntry(ref)) }),
-				internalValue && !Array.isArray(internalValue) && /* @__PURE__ */ jsx("div", { children: buildEntry(internalValue) }),
-				(!internalValue || Array.isArray(internalValue) && internalValue.length === 0) && /* @__PURE__ */ jsx(Button, {
-					onClick: doOpenDialog,
-					size: "medium",
-					className: "h-full w-full",
-					children: multiple ? t("select_references") : t("select_reference")
-				}),
-				!isArray && /* @__PURE__ */ jsxs(Label, {
-					className: "border cursor-pointer rounded-md p-2 flex items-center gap-2 bg-surface-50 dark:bg-surface-900 hover:bg-surface-100 dark:hover:bg-surface-800",
-					htmlFor: "null-filter",
-					children: [/* @__PURE__ */ jsx(Checkbox, {
-						id: "null-filter",
-						checked: internalValue === null,
-						size: "small",
-						onCheckedChange: (checked) => {
-							if (internalValue !== null) updateFilter(operation, null);
-							else updateFilter(operation, void 0);
-						}
-					}), t("filter_for_null_values")]
-				})
-			]
-		})]
-	});
-}
-//#endregion
 //#region src/components/SelectableTable/filters/StringNumberFilterField.tsx
-var operationLabels$2 = {
+var operationLabels$3 = {
 	"==": "==",
 	"!=": "!=",
 	">": ">",
@@ -4602,40 +4469,62 @@ var operationLabels$2 = {
 	"not-in": "Not in",
 	"array-contains": "Contains",
 	"array-contains-any": "Any",
-	"is-null": "Is null"
+	"ilike": "Contains",
+	"not-ilike": "Not contains",
+	"is-null": "Is null",
+	"is-not-null": "Is not null"
 };
-var multipleSelectOperations$2 = [
+var multipleSelectOperations$3 = [
 	"array-contains-any",
 	"in",
 	"not-in"
 ];
-function StringNumberFilterField({ name, value, setValue, type, isArray, enumValues, title }) {
+/** Operators that match a substring, wrapped in SQL wildcards (`%value%`). */
+var containsOperations = ["ilike", "not-ilike"];
+/** Strip the surrounding `%` wildcards a contains-filter adds, for display. */
+function unwrapContains(value) {
+	if (typeof value !== "string") return "";
+	return value.replace(/^%/, "").replace(/%$/, "");
+}
+function StringNumberFilterField({ name, value, setValue, type, isArray, enumValues, title, operators }) {
 	const { t } = useTranslation();
-	const possibleOperations = isArray ? ["array-contains"] : [
+	let possibleOperations = isArray ? ["array-contains"] : [
 		"==",
 		"!=",
 		">",
 		"<",
 		">=",
 		"<=",
-		"is-null"
+		"is-null",
+		"is-not-null"
 	];
+	if (!isArray && !enumValues && type === "string") possibleOperations.push("ilike", "not-ilike");
 	if (enumValues) if (isArray) possibleOperations.push("array-contains-any");
 	else possibleOperations.push("in", "not-in");
+	if (operators) possibleOperations = possibleOperations.filter((op) => operators.includes(op));
 	const [fieldOperation, fieldValue] = value || [possibleOperations[0], void 0];
-	const [operation, setOperation] = useState(fieldOperation === "==" && fieldValue === null ? "is-null" : fieldOperation);
-	const [internalValue, setInternalValue] = useState(fieldValue);
-	const isNullOperation = operation === "is-null";
+	const [operation, setOperation] = useState(fieldOperation === "==" && fieldValue === null ? "is-null" : fieldOperation === "!=" && fieldValue === null ? "is-not-null" : fieldOperation);
+	const [internalValue, setInternalValue] = useState(containsOperations.includes(fieldOperation) ? unwrapContains(fieldValue) : fieldValue);
+	const isNullOperation = operation === "is-null" || operation === "is-not-null";
+	if (possibleOperations.length === 0) return null;
 	function updateFilter(op, val) {
-		if (op === "is-null") {
+		if (op === "is-null" || op === "is-not-null") {
 			setOperation(op);
 			setInternalValue(null);
-			setValue(["==", null]);
+			setValue([op, null]);
+			return;
+		}
+		if (op === "ilike" || op === "not-ilike") {
+			const raw = typeof val === "string" ? val : "";
+			setOperation(op);
+			setInternalValue(raw);
+			if (raw.length > 0) setValue([op, `%${raw}%`]);
+			else setValue(void 0);
 			return;
 		}
 		let newValue = val;
-		const prevOpIsArray = multipleSelectOperations$2.includes(operation);
-		const newOpIsArray = multipleSelectOperations$2.includes(op);
+		const prevOpIsArray = multipleSelectOperations$3.includes(operation);
+		const newOpIsArray = multipleSelectOperations$3.includes(op);
 		if (prevOpIsArray !== newOpIsArray) if (newOpIsArray) if (typeof val === "string") newValue = [val];
 		else if (typeof val === "number") newValue = [val];
 		else newValue = [];
@@ -4647,7 +4536,7 @@ function StringNumberFilterField({ name, value, setValue, type, isArray, enumVal
 		if (op && hasNewValue) setValue([op, newValue]);
 		else setValue(void 0);
 	}
-	const multiple = multipleSelectOperations$2.includes(operation);
+	const multiple = multipleSelectOperations$3.includes(operation);
 	return /* @__PURE__ */ jsxs("div", {
 		className: "flex w-full",
 		children: [/* @__PURE__ */ jsx("div", {
@@ -4660,10 +4549,10 @@ function StringNumberFilterField({ name, value, setValue, type, isArray, enumVal
 				onValueChange: (value) => {
 					updateFilter(value, internalValue);
 				},
-				renderValue: (op) => operationLabels$2[op],
+				renderValue: (op) => operationLabels$3[op],
 				children: possibleOperations.map((op) => /* @__PURE__ */ jsx(SelectItem, {
 					value: op,
-					children: operationLabels$2[op]
+					children: operationLabels$3[op]
 				}, op))
 			})
 		}), /* @__PURE__ */ jsxs("div", {
@@ -4743,8 +4632,9 @@ function StringNumberFilterField({ name, value, setValue, type, isArray, enumVal
 }
 //#endregion
 //#region src/components/SelectableTable/filters/BooleanFilterField.tsx
-function BooleanFilterField({ name, title, value, setValue }) {
+function BooleanFilterField({ name, title, value, setValue, operators }) {
 	const { t } = useTranslation();
+	if (operators && !operators.includes("==")) return null;
 	function updateFilter(val) {
 		if (val !== void 0) setValue(["==", val]);
 		else setValue(void 0);
@@ -4763,7 +4653,7 @@ function BooleanFilterField({ name, title, value, setValue }) {
 }
 //#endregion
 //#region src/components/SelectableTable/filters/DateTimeFilterField.tsx
-var operationLabels$1 = {
+var operationLabels$2 = {
 	"==": "==",
 	"!=": "!=",
 	">": ">",
@@ -4774,34 +4664,38 @@ var operationLabels$1 = {
 	in: "in",
 	"array-contains": "Contains",
 	"array-contains-any": "Any",
-	"is-null": "Is null"
+	"is-null": "Is null",
+	"is-not-null": "Is not null"
 };
-var multipleSelectOperations$1 = ["array-contains-any", "in"];
-function DateTimeFilterField({ name, isArray, mode, value, setValue, title, timezone }) {
+var multipleSelectOperations$2 = ["array-contains-any", "in"];
+function DateTimeFilterField({ name, isArray, mode, value, setValue, title, timezone, operators }) {
 	const { locale } = useCustomizationController();
-	const possibleOperations = isArray ? ["array-contains"] : [
+	let possibleOperations = isArray ? ["array-contains"] : [
 		"==",
 		"!=",
 		">",
 		"<",
 		">=",
 		"<=",
-		"is-null"
+		"is-null",
+		"is-not-null"
 	];
+	if (operators) possibleOperations = possibleOperations.filter((op) => operators.includes(op));
 	const [fieldOperation, fieldValue] = value || [possibleOperations[0], void 0];
-	const [operation, setOperation] = useState(fieldOperation === "==" && fieldValue === null ? "is-null" : fieldOperation);
+	const [operation, setOperation] = useState(fieldOperation === "==" && fieldValue === null ? "is-null" : fieldOperation === "!=" && fieldValue === null ? "is-not-null" : fieldOperation);
 	const [internalValue, setInternalValue] = useState(fieldValue);
-	const isNullOperation = operation === "is-null";
+	const isNullOperation = operation === "is-null" || operation === "is-not-null";
+	if (possibleOperations.length === 0) return null;
 	function updateFilter(op, val) {
-		if (op === "is-null") {
+		if (op === "is-null" || op === "is-not-null") {
 			setOperation(op);
 			setInternalValue(null);
-			setValue(["==", null]);
+			setValue([op, null]);
 			return;
 		}
 		let newValue = val;
-		const prevOpIsArray = multipleSelectOperations$1.includes(operation);
-		const newOpIsArray = multipleSelectOperations$1.includes(op);
+		const prevOpIsArray = multipleSelectOperations$2.includes(operation);
+		const newOpIsArray = multipleSelectOperations$2.includes(op);
 		if (prevOpIsArray !== newOpIsArray) newValue = newOpIsArray ? val ? [val] : [] : void 0;
 		setOperation(op);
 		setInternalValue(Array.isArray(newValue) ? newValue[0] ?? null : newValue);
@@ -4820,10 +4714,10 @@ function DateTimeFilterField({ name, isArray, mode, value, setValue, title, time
 				onValueChange: (value) => {
 					updateFilter(value, internalValue);
 				},
-				renderValue: (op) => operationLabels$1[op],
+				renderValue: (op) => operationLabels$2[op],
 				children: possibleOperations.map((op) => /* @__PURE__ */ jsx(SelectItem, {
 					value: op,
-					children: operationLabels$1[op]
+					children: operationLabels$2[op]
 				}, op))
 			})
 		}), /* @__PURE__ */ jsx("div", {
@@ -4844,6 +4738,140 @@ function DateTimeFilterField({ name, isArray, mode, value, setValue, title, time
 	});
 }
 //#endregion
+//#region src/components/SelectableTable/filters/ReferenceFilterField.tsx
+var operationLabels$1 = {
+	"==": "==",
+	"!=": "!=",
+	">": ">",
+	"<": "<",
+	">=": ">=",
+	"<=": "<=",
+	in: "In",
+	"not-in": "Not in",
+	"array-contains": "Contains",
+	"array-contains-any": "Contains Any"
+};
+var multipleSelectOperations$1 = [
+	"array-contains-any",
+	"in",
+	"not-in"
+];
+function ReferenceFilterField({ value, setValue, isArray, path, includeId = true, previewProperties, setHidden, operators }) {
+	const { t } = useTranslation();
+	let possibleOperations = isArray ? ["array-contains"] : [
+		"==",
+		"!=",
+		">",
+		"<",
+		">=",
+		"<="
+	];
+	if (isArray) possibleOperations.push("array-contains-any");
+	else possibleOperations.push("in", "not-in");
+	if (operators) possibleOperations = possibleOperations.filter((op) => operators.includes(op));
+	const [fieldOperation, fieldValue] = value || [possibleOperations[0], void 0];
+	const [operation, setOperation] = useState(fieldOperation);
+	const [internalValue, setInternalValue] = useState(fieldValue);
+	const selectedEntityIds = internalValue ? Array.isArray(internalValue) ? internalValue.map((ref) => {
+		if (!(ref?.isEntityReference && ref?.isEntityReference())) return null;
+		return ref.id;
+	}).filter(Boolean) : [internalValue.id] : [];
+	function updateFilter(op, val) {
+		const prevOpIsArray = multipleSelectOperations$1.includes(operation);
+		const newOpIsArray = multipleSelectOperations$1.includes(op);
+		let newValue = val;
+		if (prevOpIsArray !== newOpIsArray) newValue = newOpIsArray ? newValue && !Array.isArray(newValue) && newValue.isEntityReference?.() ? [newValue] : [] : void 0;
+		setOperation(op);
+		setInternalValue(newValue);
+		const hasNewValue = newValue !== null && Array.isArray(newValue) ? newValue.length > 0 : newValue !== void 0;
+		if (op && hasNewValue) setValue([op, newValue]);
+		else setValue(void 0);
+	}
+	const collectionRegistryController = useCollectionRegistryController();
+	const collection = useMemo(() => {
+		return path ? collectionRegistryController.getCollection(path) : void 0;
+	}, [path]);
+	const onSingleEntitySelected = (entity) => {
+		updateFilter(operation, getReferenceFrom(entity));
+	};
+	const onMultipleEntitiesSelected = (entities) => {
+		updateFilter(operation, entities.map((e) => getReferenceFrom(e)));
+	};
+	const multiple = multipleSelectOperations$1.includes(operation);
+	const referenceDialogController = useSelectionDialog({
+		multiselect: multiple,
+		path,
+		collection,
+		onSingleEntitySelected,
+		onMultipleEntitiesSelected,
+		selectedEntityIds,
+		onClose: () => {
+			setHidden(false);
+		}
+	});
+	const doOpenDialog = () => {
+		setHidden(true);
+		referenceDialogController.open();
+	};
+	const buildEntry = (reference) => {
+		return /* @__PURE__ */ jsx(ReferencePreview, {
+			disabled: !path,
+			previewProperties,
+			size: "medium",
+			onClick: doOpenDialog,
+			reference,
+			hover: true,
+			includeId,
+			includeEntityLink: false
+		});
+	};
+	if (possibleOperations.length === 0) return null;
+	return /* @__PURE__ */ jsxs("div", {
+		className: "flex w-full flex-row",
+		children: [/* @__PURE__ */ jsx("div", {
+			className: "w-[100px]",
+			children: /* @__PURE__ */ jsx(Select, {
+				value: operation,
+				size: "medium",
+				fullWidth: true,
+				onValueChange: (value) => {
+					updateFilter(value, internalValue);
+				},
+				renderValue: (op) => operationLabels$1[op],
+				children: possibleOperations.map((op) => /* @__PURE__ */ jsx(SelectItem, {
+					value: op,
+					children: operationLabels$1[op]
+				}, op))
+			})
+		}), /* @__PURE__ */ jsxs("div", {
+			className: "grow ml-2 h-full gap-2 flex flex-col",
+			children: [
+				internalValue && Array.isArray(internalValue) && /* @__PURE__ */ jsx("div", { children: internalValue.map((ref, index) => buildEntry(ref)) }),
+				internalValue && !Array.isArray(internalValue) && /* @__PURE__ */ jsx("div", { children: buildEntry(internalValue) }),
+				(!internalValue || Array.isArray(internalValue) && internalValue.length === 0) && /* @__PURE__ */ jsx(Button, {
+					onClick: doOpenDialog,
+					size: "medium",
+					className: "h-full w-full",
+					children: multiple ? t("select_references") : t("select_reference")
+				}),
+				!isArray && /* @__PURE__ */ jsxs(Label, {
+					className: "border cursor-pointer rounded-md p-2 flex items-center gap-2 bg-surface-50 dark:bg-surface-900 hover:bg-surface-100 dark:hover:bg-surface-800",
+					htmlFor: "null-filter",
+					children: [/* @__PURE__ */ jsx(Checkbox, {
+						id: "null-filter",
+						checked: internalValue === null,
+						size: "small",
+						onCheckedChange: (checked) => {
+							if (internalValue !== null) updateFilter(operation, null);
+							else updateFilter(operation, void 0);
+						}
+					}), t("filter_for_null_values")]
+				})
+			]
+		})]
+	});
+}
+//#endregion
 //#region src/components/SelectableTable/filters/RelationFilterField.tsx
 var operationLabels = {
 	"==": "==",
@@ -4862,9 +4890,9 @@ var multipleSelectOperations = [
 	"in",
 	"not-in"
 ];
-function RelationFilterField({ value, setValue, relation, name: _name, hidden: _hidden, setHidden: _setHidden }) {
+function RelationFilterField({ value, setValue, relation, name: _name, hidden: _hidden, setHidden: _setHidden, operators }) {
 	const manyRelation = relation.cardinality === "many";
-	const possibleOperations = manyRelation ? ["array-contains", "array-contains-any"] : [
+	let possibleOperations = manyRelation ? ["array-contains", "array-contains-any"] : [
 		"==",
 		"!=",
 		">",
@@ -4874,6 +4902,7 @@ function RelationFilterField({ value, setValue, relation, name: _name, hidden: _
 		"in",
 		"not-in"
 	];
+	if (operators) possibleOperations = possibleOperations.filter((op) => operators.includes(op));
 	const [fieldOperation, fieldValue] = value || [possibleOperations[0], void 0];
 	const [operation, setOperation] = useState(fieldOperation);
 	const [internalValue, setInternalValue] = useState(fieldValue);
@@ -4905,6 +4934,7 @@ function RelationFilterField({ value, setValue, relation, name: _name, hidden: _
 		}
 		updateFilter(operation, newVal);
 	};
+	if (possibleOperations.length === 0) return null;
 	return /* @__PURE__ */ jsxs("div", {
 		className: "flex flex-row",
 		children: [/* @__PURE__ */ jsx("div", {
@@ -4946,28 +4976,146 @@ function RelationFilterField({ value, setValue, relation, name: _name, hidden: _
 	});
 }
 //#endregion
+//#region src/components/SelectableTable/filters/FilterFieldBinding.tsx
+/**
+* The single entry point for rendering a collection filter field.
+* Used by both the table header filters ({@link SelectableTable}) and the
+* Filters dialog.
+*
+* Resolution order:
+* 1. `property.ui.Filter` — per-property replacement (rendered even when the
+*    resolved operator list is empty; the component owns filterability).
+* 2. `components["Collection.FilterField"]` — collection-level or app-level
+*    override (wrap mode supported via `OriginalComponent`).
+* 3. Built-in field dispatched by property type.
+*
+* The operators handed to the field are the intersection of the engine's
+* capabilities, the property-type defaults, and `property.ui.filterOperators`
+* (see `resolveFilterOperators`). When that intersection is empty and no
+* per-property `Filter` is set, nothing is rendered.
+*
+* @group Components
+*/
+function FilterFieldBinding({ propertyKey, property, engine, value, setValue, hidden, setHidden }) {
+	const isArray = property.type === "array";
+	const ofVal = isArray ? property.of : void 0;
+	const baseProperty = isArray ? Array.isArray(ofVal) ? ofVal[0] : ofVal : property;
+	const scopeCollection = useCollectionScope();
+	const ResolvedFilterField = useComponentOverride("Collection.FilterField", DefaultFilterField);
+	const PropertyFilter = useResolvedComponent(baseProperty?.ui?.Filter);
+	if (!baseProperty) return null;
+	const operators = resolveFilterOperators({
+		property: baseProperty,
+		isArray,
+		engine: engine ?? scopeCollection?.engine
+	});
+	const bindingProps = {
+		propertyKey,
+		property: baseProperty,
+		isArray,
+		operators,
+		value,
+		setValue,
+		title: property.name,
+		hidden,
+		setHidden
+	};
+	if (PropertyFilter) return /* @__PURE__ */ jsx(Suspense, {
+		fallback: null,
+		children: /* @__PURE__ */ jsx(PropertyFilter, { ...bindingProps })
+	});
+	if (operators.length === 0) return null;
+	return /* @__PURE__ */ jsx(ResolvedFilterField, { ...bindingProps });
+}
+/**
+* Built-in filter field dispatch by property type. This is the
+* `OriginalComponent` received by `"Collection.FilterField"` overrides in
+* wrap mode.
+*/
+function DefaultFilterField({ propertyKey, property, isArray, operators, value, setValue, title, hidden, setHidden }) {
+	if (property.type === "reference") {
+		const referenceProperty = property;
+		return /* @__PURE__ */ jsx(ReferenceFilterField, {
+			value,
+			setValue,
+			name: propertyKey,
+			isArray,
+			operators,
+			path: referenceProperty.path,
+			title,
+			includeId: referenceProperty.includeId,
+			previewProperties: referenceProperty.ui?.previewProperties,
+			hidden: hidden ?? false,
+			setHidden: setHidden ?? (() => void 0)
+		});
+	}
+	if (property.type === "relation") {
+		const relation = property.relation;
+		if (!relation) return null;
+		return /* @__PURE__ */ jsx(RelationFilterField, {
+			value,
+			setValue,
+			name: propertyKey,
+			operators,
+			relation,
+			hidden: hidden ?? false,
+			setHidden: setHidden ?? (() => void 0)
+		});
+	}
+	if (property.type === "number" || property.type === "string") {
+		const enumValues = property.enum ? enumToObjectEntries(property.enum) : void 0;
+		return /* @__PURE__ */ jsx(StringNumberFilterField, {
+			value,
+			setValue,
+			name: propertyKey,
+			type: property.type,
+			isArray,
+			operators,
+			enumValues,
+			title
+		});
+	}
+	if (property.type === "boolean") return /* @__PURE__ */ jsx(BooleanFilterField, {
+		value,
+		setValue,
+		name: propertyKey,
+		operators,
+		title
+	});
+	if (property.type === "date") return /* @__PURE__ */ jsx(DateTimeFilterField, {
+		value,
+		setValue,
+		name: propertyKey,
+		mode: property.mode,
+		isArray,
+		operators,
+		title
+	});
+	return null;
+}
+//#endregion
 //#region src/components/SelectableTable/SelectableTable.tsx
 /**
 * This component is in charge of rendering a collection table with a high
 * degree of customization.
 *
-* This component is used internally by {@link EntityCollectionView} and
+* This component is used internally by {@link CollectionViewBinding} and
 * {@link useReferenceDialog}
 *
 * Please note that you only need to use this component if you are building
 * a custom view. If you just need to create a default view you can do it
 * exclusively with config options.
 *
-* If you want to bind a {@link EntityCollection} to a table with the default
+* If you want to bind a {@link CollectionConfig} to a table with the default
 * options you see in collections in the top level navigation, you can
-* check {@link EntityCollectionView}.
+* check {@link CollectionViewBinding}.
 *
 * The data displayed in the table is managed by a {@link EntityTableController}.
 * You can build the default, bound to a path in the driver, by using the hook
 * {@link useDataTableController}
 *
-* @see EntityCollectionTableProps
-* @see EntityCollectionView
+* @see CollectionTableBindingProps
+* @see CollectionViewBinding
 * @see VirtualTable
 * @group Components
 */
@@ -4998,7 +5146,7 @@ var SelectableTable = function SelectableTable({ onValueChange, cellRenderer, on
 		if (cell) selectionStore.select({
 			...cell,
 			columnKey: cell.propertyKey,
-			rowId: cell.entityId
+			id: cell.entityId
 		});
 		else selectionStore.select(void 0);
 	}, [selectionStore]);
@@ -5037,6 +5185,19 @@ var SelectableTable = function SelectableTable({ onValueChange, cellRenderer, on
 		size,
 		selectionStore
 	]);
+	const createFilterField = useCallback(({ id, filterValue, setFilterValue, column, hidden, setHidden }) => {
+		if (!column.custom) return null;
+		const { resolvedProperty } = column.custom;
+		if (!resolvedProperty) return null;
+		return /* @__PURE__ */ jsx(FilterFieldBinding, {
+			propertyKey: id,
+			property: resolvedProperty,
+			value: filterValue,
+			setValue: setFilterValue,
+			hidden,
+			setHidden
+		});
+	}, []);
 	return /* @__PURE__ */ jsx(SelectableTableContext.Provider, {
 		value: contextValue,
 		children: /* @__PURE__ */ jsx("div", {
@@ -5075,93 +5236,33 @@ var SelectableTable = function SelectableTable({ onValueChange, cellRenderer, on
 		})
 	});
 };
-function createFilterField({ id, filterValue, setFilterValue, column, hidden, setHidden }) {
-	if (!column.custom) return null;
-	const { resolvedProperty } = column.custom;
-	const isArray = resolvedProperty?.type === "array";
-	const ofVal = isArray && resolvedProperty ? resolvedProperty.of : void 0;
-	const baseProperty = isArray ? Array.isArray(ofVal) ? ofVal[0] : ofVal : resolvedProperty;
-	if (!baseProperty) return null;
-	if (baseProperty.type === "reference") return /* @__PURE__ */ jsx(ReferenceFilterField, {
-		value: filterValue,
-		setValue: setFilterValue,
-		name: id,
-		isArray,
-		path: baseProperty.path,
-		title: resolvedProperty?.name,
-		includeId: baseProperty.includeId,
-		previewProperties: baseProperty?.ui?.previewProperties,
-		hidden,
-		setHidden
-	});
-	else if (baseProperty.type === "relation" && baseProperty.relation) return /* @__PURE__ */ jsx(RelationFilterField, {
-		value: filterValue,
-		setValue: setFilterValue,
-		name: id,
-		relation: baseProperty.relation,
-		hidden,
-		setHidden
-	});
-	else if (baseProperty.type === "number" || baseProperty.type === "string") {
-		const name = baseProperty.name;
-		const enumValues = baseProperty.enum ? enumToObjectEntries(baseProperty.enum) : void 0;
-		return /* @__PURE__ */ jsx(StringNumberFilterField, {
-			value: filterValue,
-			setValue: setFilterValue,
-			name: id,
-			type: baseProperty.type,
-			isArray,
-			enumValues,
-			title: name
-		});
-	} else if (baseProperty.type === "boolean") {
-		const name = baseProperty.name;
-		return /* @__PURE__ */ jsx(BooleanFilterField, {
-			value: filterValue,
-			setValue: setFilterValue,
-			name: id,
-			title: name
-		});
-	} else if (baseProperty.type === "date") {
-		const title = baseProperty.name;
-		return /* @__PURE__ */ jsx(DateTimeFilterField, {
-			value: filterValue,
-			setValue: setFilterValue,
-			name: id,
-			mode: baseProperty.mode,
-			isArray,
-			title
-		});
-	}
-	return /* @__PURE__ */ jsx("div", { children: `Currently the filter field ${resolvedProperty?.type} is not supported` });
-}
 //#endregion
-//#region src/components/EntityCollectionTable/EntityCollectionTable.tsx
+//#region src/components/CollectionTableBinding/CollectionTableBinding.tsx
 /**
 * This component is in charge of rendering a collection table with a high
 * degree of customization.
 *
-* This component is used internally by {@link EntityCollectionView} and
+* This component is used internally by {@link CollectionViewBinding} and
 * {@link useReferenceDialog}
 *
 * Please note that you only need to use this component if you are building
 * a custom view. If you just need to create a default view you can do it
 * exclusively with config options.
 *
-* If you want to bind a {@link EntityCollection} to a table with the default
+* If you want to bind a {@link CollectionConfig} to a table with the default
 * options you see in collections in the top level navigation, you can
-* check {@link EntityCollectionView}.
+* check {@link CollectionViewBinding}.
 *
 * The data displayed in the table is managed by a {@link EntityTableController}.
 * You can build the default, bound to a path in the driver, by using the hook
 * {@link useDataTableController}
 *
-* @see EntityCollectionTableProps
-* @see EntityCollectionView
+* @see CollectionTableBindingProps
+* @see CollectionViewBinding
 * @see VirtualTable
 * @group Components
 */
-var EntityCollectionTable = function EntityCollectionTable({ className, style, fixedFilter, actionsStart, actions, viewModeToggle, title, tableRowActionsBuilder, uniqueFieldValidator, getPropertyFor, onValueChange, selectionController, highlightedEntities, onEntityClick, onColumnResize, initialScroll, onScroll, onSizeChanged, hoverRow = true, inlineEditing = false, additionalFields, displayedColumnIds, defaultSize, properties, tableController, filterable = true, sortable = true, endAdornment, AddColumnComponent, AdditionalHeaderWidget, additionalIDHeaderWidget, emptyComponent, getIdColumnWidth, enablePopupIcon, openEntityMode = "side_panel", onColumnsOrderChange, hideToolbar = false }) {
+var CollectionTableBinding = function CollectionTableBinding({ className, style, fixedFilter, actionsStart, actions, viewModeToggle, title, tableRowActionsBuilder, uniqueFieldValidator, getPropertyFor, onValueChange, selectionController, highlightedEntities, onEntityClick, onColumnResize, initialScroll, onScroll, onSizeChanged, hoverRow = true, inlineEditing = false, additionalFields, displayedColumnIds, defaultSize, properties, tableController, filterable = true, sortable = true, endAdornment, AddColumnComponent, AdditionalHeaderWidget, additionalIDHeaderWidget, emptyComponent, getIdColumnWidth, enablePopupIcon, openEntityMode = "side_panel", onColumnsOrderChange, hideToolbar = false }) {
 	const ref = useRef(null);
 	const largeLayout = useLargeLayout();
 	const selectedEntities = useMemo(() => {
@@ -5314,7 +5415,7 @@ var EntityCollectionTable = function EntityCollectionTable({ className, style, f
 				width: column.width,
 				frozen: column.frozen
 			});
-			else return /* @__PURE__ */ jsx(EntityCollectionRowActions, {
+			else return /* @__PURE__ */ jsx(CollectionRowActions, {
 				entity: props.rowData,
 				width: column.width,
 				frozen: column.frozen,
@@ -5389,7 +5490,7 @@ var EntityCollectionTable = function EntityCollectionTable({ className, style, f
 	});
 };
 //#endregion
-//#region src/components/EntityCollectionView/useSelectionController.tsx
+//#region src/components/CollectionViewBinding/useSelectionController.tsx
 function useSelectionController(onSelectionChange) {
 	const [selectedEntities, setSelectedEntities] = useState([]);
 	const onSelectionChangeRef = useRef(onSelectionChange);
@@ -5448,11 +5549,11 @@ function mergeEntityActions(currentActions, newActions) {
 	return updatedActions;
 }
 //#endregion
-//#region src/components/EntityEditViewFormActions.tsx
-function EntityEditViewFormActions({ collection, path, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode, showDefaultActions = true, navigateBack, formContext }) {
+//#region src/components/EditFormActions.tsx
+function EditFormActions({ collection, path, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode, showDefaultActions = true, navigateBack, formContext }) {
 	const { canCreate, canDelete } = usePermissions();
 	const context = useCMSContext();
-	const sideEntityController = context.sideEntityController;
+	const sidePanelController = context.sidePanelController;
 	const sideDialogContext = useSideDialogContext();
 	const customizationController = useCustomizationController();
 	const { t } = useTranslation();
@@ -5482,7 +5583,7 @@ function EntityEditViewFormActions({ collection, path, entity, layout, savingErr
 		formActions,
 		collection,
 		context,
-		sideEntityController,
+		sidePanelController,
 		disabled,
 		status,
 		sideDialogContext,
@@ -5500,7 +5601,7 @@ function EntityEditViewFormActions({ collection, path, entity, layout, savingErr
 		formActions,
 		collection,
 		context,
-		sideEntityController,
+		sidePanelController,
 		sideDialogContext,
 		disabled,
 		status,
@@ -5515,7 +5616,7 @@ function EntityEditViewFormActions({ collection, path, entity, layout, savingErr
 	if (layout === "responsive") return /* @__PURE__ */ jsxs(Fragment, { children: [bottomActions, sideActions] });
 	return layout === "bottom" ? bottomActions : sideActions;
 }
-function buildBottomActions({ savingError, entity, formActions, collection, context, sideEntityController, disabled, status, sideDialogContext, pluginActions, openEntityMode, navigateBack, formContext, formex, t, className }) {
+function buildBottomActions({ savingError, entity, formActions, collection, context, sidePanelController, disabled, status, sideDialogContext, pluginActions, openEntityMode, navigateBack, formContext, formex, t, className }) {
 	const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
 	const canClose = openEntityMode === "side_panel" || openEntityMode === "dialog";
 	return /* @__PURE__ */ jsxs(DialogActions, {
@@ -5538,7 +5639,7 @@ function buildBottomActions({ savingError, entity, formActions, collection, cont
 						path: getCollectionDataPath(collection),
 						collection,
 						context,
-						sideEntityController,
+						sidePanelController,
 						openEntityMode,
 						navigateBack,
 						formContext
@@ -5607,7 +5708,7 @@ function buildBottomActions({ savingError, entity, formActions, collection, cont
 		]
 	});
 }
-function buildSideActions({ savingError, entity, formActions, collection, context, sideEntityController, disabled, status, sideDialogContext, pluginActions, openEntityMode, navigateBack, formContext, formex, t, className }) {
+function buildSideActions({ savingError, entity, formActions, collection, context, sidePanelController, disabled, status, sideDialogContext, pluginActions, openEntityMode, navigateBack, formContext, formex, t, 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),
@@ -5656,7 +5757,7 @@ function buildSideActions({ savingError, entity, formActions, collection, contex
 						path: getCollectionDataPath(collection),
 						collection,
 						context,
-						sideEntityController,
+						sidePanelController,
 						openEntityMode,
 						navigateBack,
 						formContext
@@ -5719,14 +5820,14 @@ function EntityActionButton({ action, enabled, props }) {
 	});
 }
 //#endregion
-//#region src/components/EntityEditView.tsx
-var EntityHistoryView = lazy(() => import("./history-B3cqBzEV.js").then((m) => ({ default: m.EntityHistoryView })));
+//#region src/components/EditViewBinding.tsx
+var EntityHistoryView = lazy(() => import("./history-GSa4BgDt.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.
+* a record is opened.
 */
-function EntityEditView({ entityId, ...props }) {
-	const { entity, dataLoading, dataLoadingError } = useEntityFetch({
+function EditViewBinding({ entityId, ...props }) {
+	const { entity, dataLoading, dataLoadingError } = useFetch({
 		path: props.path,
 		entityId,
 		collection: props.collection,
@@ -5754,7 +5855,7 @@ function EntityEditView({ entityId, ...props }) {
 			children: "Entity not found"
 		}) });
 	}
-	const content = /* @__PURE__ */ jsx(EntityEditViewInner, {
+	const content = /* @__PURE__ */ jsx(EditViewBindingInner, {
 		...props,
 		entityId,
 		entity,
@@ -5764,16 +5865,15 @@ function EntityEditView({ entityId, ...props }) {
 		setStatus,
 		canEdit
 	});
-	if (props.collection.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: props.collection.components,
+	return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection: props.collection,
 		children: content
 	});
-	return content;
 }
-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);
+function EditViewBindingInner({ 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("EditView.FormActions", EditFormActions);
 	const ResolvedEntityForm = useComponentOverride("Entity.Form", EntityFormBinding);
-	const ResolvedCollectionView = useComponentOverride("Collection.View", EntityCollectionView);
+	const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
 	const context = useRebaseContext();
 	const urlController = useUrlController();
 	const navigate = useNavigate();
@@ -5921,7 +6021,7 @@ function EntityEditViewInner({ path, entityId, selectedTab: selectedTabProp, col
 	const jsonView = activeTab === "__json" || jsonTabMounted ? /* @__PURE__ */ jsx("div", {
 		className: cls("relative flex-1 h-full overflow-auto w-full", { "hidden": activeTab !== JSON_TAB_VALUE }),
 		role: "tabpanel",
-		children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityJsonPreview, { values: formContext?.values ?? entity?.values ?? {} }) })
+		children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(JsonPreviewBinding, { values: formContext?.values ?? entity?.values ?? {} }) })
 	}, "json_view") : null;
 	const historyView = includeHistoryView && activeTab === "__rebase_history" ? /* @__PURE__ */ jsx("div", {
 		className: "relative flex-1 h-full overflow-auto w-full",
@@ -5998,7 +6098,7 @@ function EntityEditViewInner({ path, entityId, selectedTab: selectedTabProp, col
 						modifiedValues: usedEntity?.values,
 						formContext: readOnlyFormContext
 					})
-				}) }) : /* @__PURE__ */ jsx(EntityView, {
+				}) }) : /* @__PURE__ */ jsx(EntityViewBinding, {
 					className: "px-8 h-full overflow-auto",
 					entity,
 					path,
@@ -6247,21 +6347,21 @@ function EntityFormSkeleton({ collection }) {
 	});
 }
 //#endregion
-//#region src/components/EntitySidePanel.tsx
+//#region src/components/SidePanelBinding.tsx
 /**
 * This is the component in charge of rendering the side dialog used
-* for editing entities. Use the {@link useSideEntityController} to open
+* for editing entities. Use the {@link useSidePanel} to open
 * and control the dialogs.
 * This component needs a parent {@link Rebase}
-* {@link useSideEntityController}
+* {@link useSidePanel}
 * @group Components
 */
-function EntitySidePanel(props) {
+function SidePanelBinding(props) {
 	const { allowFullScreen = true, path, entityId, selectedTab, formProps } = props;
-	const ResolvedDetailView = useComponentOverride("Entity.DetailView", EntityDetailView);
+	const ResolvedDetailView = useComponentOverride("DetailView", DetailViewBinding);
 	const { blocked, setBlocked, setBlockedNavigationMessage, close } = useSideDialogContext();
 	const navigate = useNavigate();
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	const collectionRegistryController = useCollectionRegistryController();
 	const sideDialogsController = useSideDialogContext();
 	const urlController = useUrlController();
@@ -6273,7 +6373,7 @@ function EntitySidePanel(props) {
 	const onUpdate = (params) => {
 		if (props.onUpdate) props.onUpdate(params);
 		setShowEditInPanel(false);
-		if (params.status !== "existing") sideEntityController.replace({
+		if (params.status !== "existing") sidePanelController.replace({
 			path: params.path,
 			entityId: params.entityId,
 			selectedTab: params.selectedTab,
@@ -6311,7 +6411,7 @@ function EntitySidePanel(props) {
 		});
 		if (effectiveDefault && effectiveDefault !== "edit") {
 			hasCorrectedDefaultView.current = true;
-			sideEntityController.replace({
+			sidePanelController.replace({
 				path,
 				entityId,
 				selectedTab: effectiveDefault,
@@ -6324,7 +6424,7 @@ function EntitySidePanel(props) {
 		entityId,
 		collection,
 		path,
-		sideEntityController
+		sidePanelController
 	]);
 	const onValuesModified = useCallback((modified) => {
 		setBlockedNavigationMessage(modified ? /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -6365,7 +6465,7 @@ function EntitySidePanel(props) {
 		}),
 		onTabChange: ({ entityId: tabEntityId, selectedTab, collection: paramCollection }) => {
 			if (collection?.openEntityMode === "dialog" || paramCollection?.openEntityMode === "dialog") return;
-			if (tabEntityId) sideEntityController.replace({
+			if (tabEntityId) sidePanelController.replace({
 				path,
 				entityId: tabEntityId,
 				selectedTab,
@@ -6373,7 +6473,7 @@ function EntitySidePanel(props) {
 				collection: paramCollection ?? collection
 			});
 		}
-	}) : /* @__PURE__ */ jsx(EntityEditView, {
+	}) : /* @__PURE__ */ jsx(EditViewBinding, {
 		...props,
 		layout: collection?.openEntityMode === "dialog" ? "dialog" : "side_panel",
 		collection,
@@ -6404,7 +6504,7 @@ function EntitySidePanel(props) {
 		}),
 		onTabChange: ({ entityId: tabEntityId, selectedTab, collection: paramCollection }) => {
 			if (collection?.openEntityMode === "dialog" || paramCollection?.openEntityMode === "dialog") return;
-			if (tabEntityId) sideEntityController.replace({
+			if (tabEntityId) sidePanelController.replace({
 				path,
 				entityId: tabEntityId,
 				selectedTab,
@@ -6416,22 +6516,22 @@ function EntitySidePanel(props) {
 	}) }) });
 }
 //#endregion
-//#region src/hooks/useBuildSideEntityController.tsx
+//#region src/hooks/useBuildSidePanel.tsx
 /**
 * Thin wrapper that resolves the Entity.SidePanel component override.
 * Because the JSX is created inside `propsToSidePanel` (a plain function,
 * not a React component), we need this wrapper so the hook is called at the
 * top level of a React component per the Rules of Hooks.
 */
-function ResolvedEntitySidePanelInner(props) {
-	return /* @__PURE__ */ jsx(useComponentOverride("Entity.SidePanel", EntitySidePanel), { ...props });
+function ResolvedSidePanelBindingInner(props) {
+	return /* @__PURE__ */ jsx(useComponentOverride("Entity.SidePanel", SidePanelBinding), { ...props });
 }
-function ResolvedEntitySidePanel(props) {
-	if (props.collection?.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: props.collection.components,
-		children: /* @__PURE__ */ jsx(ResolvedEntitySidePanelInner, { ...props })
+function ResolvedSidePanelBinding(props) {
+	if (props.collection) return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection: props.collection,
+		children: /* @__PURE__ */ jsx(ResolvedSidePanelBindingInner, { ...props })
 	});
-	return /* @__PURE__ */ jsx(ResolvedEntitySidePanelInner, { ...props });
+	return /* @__PURE__ */ jsx(ResolvedSidePanelBindingInner, { ...props });
 }
 var NEW_URL_HASH = "new_side";
 var SIDE_URL_HASH = "side";
@@ -6469,7 +6569,7 @@ function getNestedPropertiesDepth(property, accumulator = 0) {
 	else return getNestedPropertiesDepth(property.of, accumulator + 1);
 	else return accumulator + 1;
 }
-var useBuildSideEntityController = (collectionRegistryController, urlController, navigationStateController, sideDialogsController, authController) => {
+var useBuildSidePanel = (collectionRegistryController, urlController, navigationStateController, sideDialogsController, authController) => {
 	const location = useLocation();
 	const initialised = useRef(false);
 	const currentPanelKeysRef = useRef([]);
@@ -6522,7 +6622,7 @@ var useBuildSideEntityController = (collectionRegistryController, urlController,
 		sideDialogsController.close();
 	}, [sideDialogsController]);
 	const open = useCallback((props) => {
-		if (props.copy && !props.entityId) throw Error("If you want to copy an entity you need to provide an entityId");
+		if (props.copy && !props.entityId) throw Error("If you want to copy a entity you need to provide a entityId");
 		const defaultSelectedView = resolveDefaultSelectedView(props.collection ? props.collection.defaultSelectedView : void 0, {
 			status: props.copy ? "copy" : props.entityId ? "existing" : "new",
 			entityId: props.entityId
@@ -6540,7 +6640,7 @@ var useBuildSideEntityController = (collectionRegistryController, urlController,
 		location.search
 	]);
 	const replace = useCallback((props) => {
-		if (props.copy && !props.entityId) throw Error("If you want to copy an entity you need to provide an entityId");
+		if (props.copy && !props.entityId) throw Error("If you want to copy a entity you need to provide a entityId");
 		sideDialogsController.replace(propsToSidePanel(props, urlController.buildUrlCollectionPath, urlController.resolveDatabasePathsFrom, smallLayout, customizationController, authController, location.search));
 	}, [
 		urlController.buildUrlCollectionPath,
@@ -6616,7 +6716,7 @@ var propsToSidePanel = (props, buildUrlCollectionPath, resolveIdsFrom, smallLayo
 	const entityViewWidth = getEntityViewWidth(props, smallLayout, customizationController);
 	return {
 		key: `${props.path}/${props.entityId}`,
-		component: /* @__PURE__ */ jsx(ResolvedEntitySidePanel, { ...resolvedPanelProps }),
+		component: /* @__PURE__ */ jsx(ResolvedSidePanelBinding, { ...resolvedPanelProps }),
 		urlPath,
 		parentUrlPath,
 		width: entityViewWidth,
@@ -6689,21 +6789,21 @@ function useUrlController() {
 */
 function useCMSContext() {
 	const baseContext = useRebaseContext();
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	const sideDialogsController = useSideDialogsController();
 	const urlController = useUrlController();
 	const navigationStateController = useNavigationStateController();
 	const collectionRegistryController = useCollectionRegistryController();
 	return useMemo(() => ({
 		...baseContext,
-		sideEntityController,
+		sidePanelController,
 		sideDialogsController,
 		urlController,
 		navigationStateController,
 		collectionRegistryController
 	}), [
 		baseContext,
-		sideEntityController,
+		sidePanelController,
 		sideDialogsController,
 		urlController,
 		navigationStateController,
@@ -6734,8 +6834,13 @@ function resolveNavigationFrom({ path, context }) {
 		if (entry.type === "collection") return Promise.resolve(entry);
 		else if (entry.type === "entity") {
 			if (!collectionRegistryController.getCollection(entry.slug)) throw Error(`No collection defined in the navigation for the entity with path ${entry.slug}`);
-			return data.collection(entry.slug).findById(entry.entityId).then((entity) => {
-				if (!entity) return void 0;
+			return data.collection(entry.slug).findById(entry.entityId).then((row) => {
+				if (!row) return void 0;
+				const entity = {
+					id: entry.entityId,
+					path: entry.slug,
+					values: row
+				};
 				return {
 					...entry,
 					entity
@@ -6783,12 +6888,12 @@ function useResolvedNavigationFrom({ path }) {
 	]);
 }
 //#endregion
-//#region src/hooks/useEntityHistory.ts
+//#region src/hooks/useHistory.ts
 /**
 * Hook to fetch entity history from the backend REST API.
 * Replaces the old subcollection-based approach with a proper API call.
 */
-function useEntityHistory(params) {
+function useHistory(params) {
 	const { slug, entityId, enabled = true, pageSize = 10 } = params;
 	const apiConfig = useApiConfig();
 	const [entries, setEntries] = useState([]);
@@ -7123,7 +7228,7 @@ function DeleteEntityDialog({ entityOrEntitiesToDelete, collection, onClose, ope
 	if (entityOrEntities && multipleEntities) content = /* @__PURE__ */ jsx(Fragment, { children: t("multiple_entities") });
 	else {
 		const entity = entityOrEntities;
-		content = entity ? /* @__PURE__ */ jsx(EntityView, {
+		content = entity ? /* @__PURE__ */ jsx(EntityViewBinding, {
 			entity,
 			collection,
 			path
@@ -7171,7 +7276,7 @@ function DeleteEntityDialog({ entityOrEntitiesToDelete, collection, onClose, ope
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/utils.ts
+//#region src/components/CollectionViewBinding/utils.ts
 function addRecentId(collectionId, id) {
 	const newRecentIds = [id, ...getRecentIds(collectionId).filter((i) => i !== id)];
 	if (newRecentIds.length > 5) newRecentIds.pop();
@@ -7189,11 +7294,11 @@ function getRecentIds(collectionId) {
 //#endregion
 //#region src/util/navigation_utils.ts
 /**
-* Navigate to an entity using either a side panel or full-screen mode.
+* Navigate to a entity using either a side panel or full-screen mode.
 * This is an admin-specific UI concern and lives here (not in common).
 */
-function navigateToEntity({ openEntityMode, collection, entityId, copy, path, selectedTab, defaultValues, sideEntityController, onClose, navigation, replace }) {
-	if (openEntityMode === "side_panel" || openEntityMode === "dialog") sideEntityController.open({
+function navigateToEntity({ openEntityMode, collection, entityId, copy, path, selectedTab, defaultValues, sidePanelController, onClose, navigation, replace }) {
+	if (openEntityMode === "side_panel" || openEntityMode === "dialog") sidePanelController.open({
 		entityId,
 		path,
 		copy,
@@ -7288,7 +7393,7 @@ function CreationResultDialog({ result, onClose }) {
 						color: "warning",
 						children: /* @__PURE__ */ jsx(Typography, {
 							variant: "body2",
-							children: t("temporary_password_description") ?? "Email is not configured. Share this temporary password with the user securely. It will not be shown again."
+							children: result.emailDeliveryFailed ? t("temporary_password_email_failed_description") ?? "The email could not be delivered. Share this temporary password with the user securely. It will not be shown again." : t("temporary_password_description") ?? "Email is not configured. Share this temporary password with the user securely. It will not be shown again."
 						})
 					}),
 					/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx(Typography, {
@@ -7335,9 +7440,9 @@ var editEntityAction = {
 	name: "Edit",
 	collapsed: false,
 	isEnabled: ({ entity }) => Boolean(entity),
-	onClick({ entity, collection, path, context, sideEntityController, highlightEntity, unhighlightEntity, openEntityMode }) {
+	onClick({ entity, collection, path, context, sidePanelController, highlightEntity, unhighlightEntity, openEntityMode }) {
 		if (!entity) throw new Error("INTERNAL: editEntityAction: Entity is undefined");
-		if (!sideEntityController) throw new Error("INTERNAL: editEntityAction: sideEntityController is undefined");
+		if (!sidePanelController) throw new Error("INTERNAL: editEntityAction: sidePanelController is undefined");
 		highlightEntity?.(entity);
 		context?.analyticsController?.onAnalyticsEvent?.("entity_click", {
 			path: entity.path,
@@ -7355,7 +7460,7 @@ var editEntityAction = {
 			collection,
 			entityId: entity.id,
 			path: newFullIdPath,
-			sideEntityController,
+			sidePanelController,
 			onClose: () => unhighlightEntity?.(entity),
 			navigation: context.urlController,
 			selectedTab: defaultSelectedView
@@ -7368,9 +7473,9 @@ var copyEntityAction = {
 	name: "Copy",
 	key: "copy",
 	isEnabled: ({ entity }) => Boolean(entity),
-	onClick({ entity, collection, context, path, sideEntityController, highlightEntity, unhighlightEntity, openEntityMode }) {
+	onClick({ entity, collection, context, path, sidePanelController, highlightEntity, unhighlightEntity, openEntityMode }) {
 		if (!entity) throw new Error("INTERNAL: copyEntityAction: Entity is undefined");
-		if (!sideEntityController) throw new Error("INTERNAL: copyEntityAction: sideEntityController is undefined");
+		if (!sidePanelController) throw new Error("INTERNAL: copyEntityAction: sidePanelController is undefined");
 		highlightEntity?.(entity);
 		context?.analyticsController?.onAnalyticsEvent?.("copy_entity_click", {
 			path: entity.path,
@@ -7384,7 +7489,7 @@ var copyEntityAction = {
 			entityId: entity.id,
 			path: usedPath,
 			copy: true,
-			sideEntityController,
+			sidePanelController,
 			onClose: () => unhighlightEntity?.(entity),
 			navigation: context.urlController
 		});
@@ -7432,8 +7537,19 @@ function ResetPasswordActionDialog({ user, open, onClose }) {
 	const { t } = useTranslation();
 	const [loading, setLoading] = useState(false);
 	const [creationResult, setCreationResult] = useState(null);
+	const [mode, setMode] = useState("email");
+	const [password, setPassword] = useState("");
+	const [confirmPassword, setConfirmPassword] = useState("");
+	const [error, setError] = useState(null);
+	const passwordsMatch = password === confirmPassword;
+	const canSubmit = mode === "email" || password.length > 0 && passwordsMatch;
 	const handleConfirm = async () => {
+		if (mode === "manual" && !passwordsMatch) {
+			setError(t("passwords_dont_match") || "Passwords don't match");
+			return;
+		}
 		setLoading(true);
+		setError(null);
 		try {
 			const baseUrl = client?.baseUrl || "";
 			const token = await getAuthToken?.();
@@ -7442,28 +7558,27 @@ function ResetPasswordActionDialog({ user, open, onClose }) {
 				headers: {
 					"Content-Type": "application/json",
 					...token ? { "Authorization": `Bearer ${token}` } : {}
-				}
+				},
+				body: JSON.stringify(mode === "manual" ? { password } : {})
 			});
 			if (!response.ok) {
-				const error = await response.json().catch(() => ({}));
-				throw new Error(error.message || "Failed to reset password");
+				const errorBody = await response.json().catch(() => ({}));
+				throw new Error(errorBody.error?.message || errorBody.message || "Failed to reset password");
 			}
 			const data = await response.json();
-			setCreationResult({
-				user,
-				invitationSent: data.invitationSent ?? false,
-				temporaryPassword: data.temporaryPassword
-			});
 			snackbarController.open({
 				type: "success",
 				message: t("reset_password_success") || "Password reset successfully"
 			});
-		} catch (error) {
-			snackbarController.open({
-				type: "error",
-				message: error instanceof Error ? error.message : t("error_resetting_password") || "Error resetting password"
+			if (data.invitationSent || data.temporaryPassword) setCreationResult({
+				user,
+				invitationSent: data.invitationSent ?? false,
+				temporaryPassword: data.temporaryPassword,
+				emailDeliveryFailed: data.emailDeliveryFailed ?? false
 			});
-			onClose();
+			else onClose();
+		} catch (e) {
+			setError(e instanceof Error ? e.message : t("error_resetting_password") || "Error resetting password");
 		} finally {
 			setLoading(false);
 		}
@@ -7475,13 +7590,101 @@ function ResetPasswordActionDialog({ user, open, onClose }) {
 			onClose();
 		}
 	});
-	return /* @__PURE__ */ jsx(ConfirmationDialog, {
+	return /* @__PURE__ */ jsxs(Dialog, {
 		open,
-		loading,
-		onAccept: handleConfirm,
-		onCancel: onClose,
-		title: /* @__PURE__ */ jsx(Fragment, { children: t("reset_password") || "Reset Password" }),
-		body: /* @__PURE__ */ jsx(Fragment, { children: t("reset_password_confirmation") || "Are you sure you want to reset this user's password?" })
+		onOpenChange: (o) => !o ? onClose() : void 0,
+		maxWidth: "xl",
+		children: [
+			/* @__PURE__ */ jsx(DialogTitle, {
+				variant: "h5",
+				gutterBottom: false,
+				children: t("reset_password") || "Reset Password"
+			}),
+			/* @__PURE__ */ jsx(DialogContent, { children: /* @__PURE__ */ jsxs("div", {
+				className: "flex flex-col gap-4 py-2",
+				children: [
+					/* @__PURE__ */ jsx(Typography, {
+						variant: "body2",
+						color: "secondary",
+						children: user.email
+					}),
+					/* @__PURE__ */ jsxs(RadioGroup, {
+						value: mode,
+						onValueChange: (v) => {
+							setMode(v);
+							setError(null);
+						},
+						children: [/* @__PURE__ */ jsxs("div", {
+							className: "flex items-center gap-2",
+							children: [/* @__PURE__ */ jsx(RadioGroupItem, {
+								value: "email",
+								id: "reset-password-mode-email"
+							}), /* @__PURE__ */ jsx(Label, {
+								htmlFor: "reset-password-mode-email",
+								children: t("reset_password_send_email") || "Send a password reset email"
+							})]
+						}), /* @__PURE__ */ jsxs("div", {
+							className: "flex items-center gap-2",
+							children: [/* @__PURE__ */ jsx(RadioGroupItem, {
+								value: "manual",
+								id: "reset-password-mode-manual"
+							}), /* @__PURE__ */ jsx(Label, {
+								htmlFor: "reset-password-mode-manual",
+								children: t("reset_password_set_manually") || "Set a password manually"
+							})]
+						})]
+					}),
+					mode === "manual" && /* @__PURE__ */ jsxs(Fragment, { children: [
+						/* @__PURE__ */ jsx(TextField, {
+							type: "password",
+							value: password,
+							autoFocus: true,
+							autoComplete: "new-password",
+							label: t("new_password") || "New password",
+							onChange: (e) => {
+								setPassword(e.target.value);
+								setError(null);
+							}
+						}),
+						/* @__PURE__ */ jsx(TextField, {
+							type: "password",
+							value: confirmPassword,
+							autoComplete: "new-password",
+							error: confirmPassword.length > 0 && !passwordsMatch,
+							label: t("confirm_password") || "Confirm password",
+							onChange: (e) => {
+								setConfirmPassword(e.target.value);
+								setError(null);
+							}
+						}),
+						/* @__PURE__ */ jsx(Typography, {
+							variant: "caption",
+							color: "secondary",
+							children: t("reset_password_set_manually_description") || "The password is updated immediately and no email is sent. Share it with the user securely."
+						})
+					] }),
+					error && /* @__PURE__ */ jsx(Alert, {
+						color: "error",
+						children: /* @__PURE__ */ jsx(Typography, {
+							variant: "body2",
+							children: error
+						})
+					})
+				]
+			}) }),
+			/* @__PURE__ */ jsxs(DialogActions, { children: [/* @__PURE__ */ jsx(Button, {
+				variant: "text",
+				onClick: onClose,
+				disabled: loading,
+				children: t("cancel")
+			}), /* @__PURE__ */ jsx(LoadingButton, {
+				variant: "filled",
+				onClick: handleConfirm,
+				loading,
+				disabled: !canSubmit,
+				children: t("reset_password") || "Reset Password"
+			})] })
+		]
 	});
 }
 var resetPasswordAction = {
@@ -7547,13 +7750,17 @@ function applyPluginModifyCollection(resolvedCollections, modifyCollection) {
 * with `auth: true` or `auth: { enabled: true }`.
 *
 * Injections:
-* 1. **resetPasswordAction** — adds the entity action unless explicitly disabled
+* 1. **resetPasswordAction** — adds the entity action unless explicitly disabled,
+*    or unless the auth adapter reports no `adminPasswordReset` support. Custom
+*    adapters mount their own admin routes and may not implement
+*    `POST /admin/users/:userId/reset-password`; injecting the action anyway
+*    would show a button that can only ever 404.
 * 2. **afterSave callback** — shows the `CreationResultDialog` when a new user
 *    is created with `invitationSent` or `temporaryPassword` in the response
 *
 * Skips injection if the collection already has the action/callback present.
 */
-function injectAuthCollectionConfig(collections) {
+function injectAuthCollectionConfig(collections, adminPasswordResetSupported) {
 	return collections.map((collection) => {
 		const authProp = collection.auth;
 		if (!authProp) return collection;
@@ -7564,6 +7771,7 @@ function injectAuthCollectionConfig(collections) {
 		let actionToInject;
 		if (resetPref === false) actionToInject = void 0;
 		else if (typeof resetPref === "object") actionToInject = resetPref;
+		else if (!adminPasswordResetSupported) actionToInject = void 0;
 		else actionToInject = resetPasswordAction;
 		if (actionToInject) {
 			const injectedAction = actionToInject;
@@ -7586,7 +7794,7 @@ function injectAuthCollectionConfig(collections) {
 					const { dialogsController } = context;
 					const creationResult = {
 						user: {
-							uid: String(props.entityId),
+							uid: String(props.id),
 							email: typeof values.email === "string" ? values.email : "",
 							displayName: typeof values.displayName === "string" ? values.displayName : "",
 							roles: Array.isArray(values.roles) ? values.roles : [],
@@ -7595,7 +7803,8 @@ function injectAuthCollectionConfig(collections) {
 							isAnonymous: false
 						},
 						invitationSent: !!values.invitationSent,
-						temporaryPassword: typeof values.temporaryPassword === "string" ? values.temporaryPassword : void 0
+						temporaryPassword: typeof values.temporaryPassword === "string" ? values.temporaryPassword : void 0,
+						emailDeliveryFailed: !!values.emailDeliveryFailed
 					};
 					const { closeDialog } = dialogsController.open({
 						key: "user_creation_result",
@@ -7622,7 +7831,7 @@ async function resolveCollections(collections, authController, data, plugins) {
 		if (plugin.hooks?.modifyCollection) resolvedCollections = applyPluginModifyCollection(resolvedCollections, plugin.hooks.modifyCollection);
 		if (plugin.hooks?.injectCollections) resolvedCollections = plugin.hooks.injectCollections(resolvedCollections);
 	}
-	resolvedCollections = injectAuthCollectionConfig(resolvedCollections);
+	resolvedCollections = injectAuthCollectionConfig(resolvedCollections, authController.capabilities?.adminPasswordReset ?? true);
 	resolvedCollections = filterOutNotAllowedCollections(resolvedCollections, authController);
 	return resolvedCollections;
 }
@@ -7831,7 +8040,7 @@ function useAsyncResolver({ resolver, initialValue, isEqual, deps, disabled }) {
 //#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.
+* into concrete CollectionConfig[], 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
@@ -8314,7 +8523,7 @@ var SideDialogContext = React.createContext({
 var useSideDialogContext = () => useContext(SideDialogContext);
 /**
 * This is the component in charge of rendering the side dialogs used
-* for editing entities. Use the {@link useSideEntityController} to open
+* for editing entities. Use the {@link useSidePanel} to open
 * and control the dialogs.
 * This component needs a parent {@link Rebase}
 * {@link useSideDialogsController}
@@ -8432,22 +8641,22 @@ function SideDialogView({ offsetPosition, panel, panelIndex, isTopPanel }) {
 	});
 }
 //#endregion
-//#region src/components/ReferenceTable/EntitySelectionTable.tsx
+//#region src/components/ReferenceTable/SelectionTableBinding.tsx
 /**
 * This component allows to select entities from a given collection.
-* You probably want to open this dialog as a side view using {@link useEntitySelectionTable}
+* You probably want to open this dialog as a side view using {@link useSelectionTableBinding}
 * @group Components
 */
-function EntitySelectionTable(props) {
+function SelectionTableBinding(props) {
 	if (!props.collection) return /* @__PURE__ */ jsx(ErrorView, { error: "Could not find collection" });
-	return /* @__PURE__ */ jsx(EntitySelectionTableInternal, {
+	return /* @__PURE__ */ jsx(SelectionTableBindingInternal, {
 		...props,
 		collection: props.collection
 	});
 }
-function EntitySelectionTableInternal({ onSingleEntitySelected, onMultipleEntitiesSelected, multiselect, collection, path: pathInput, selectedEntityIds: selectedEntityIdsProp, description, fixedFilter, maxSelection }) {
+function SelectionTableBindingInternal({ onSingleEntitySelected, onMultipleEntitiesSelected, multiselect, collection, path: pathInput, selectedEntityIds: selectedEntityIdsProp, description, fixedFilter, maxSelection }) {
 	const sideDialogContext = useSideDialogContext();
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	const urlController = useUrlController();
 	const analyticsController = useAnalyticsController();
 	const path = urlController.resolveDatabasePathsFrom(pathInput);
@@ -8524,7 +8733,7 @@ function EntitySelectionTableInternal({ onSingleEntitySelected, onMultipleEntiti
 	]);
 	const onNewClick = () => {
 		analyticsController.onAnalyticsEvent?.("reference_selection_new_entity", { path });
-		sideEntityController.open({
+		sidePanelController.open({
 			path,
 			collection,
 			updateUrl: true,
@@ -8537,7 +8746,7 @@ function EntitySelectionTableInternal({ onSingleEntitySelected, onMultipleEntiti
 	};
 	const tableRowActionsBuilder = ({ entity, size, width, frozen }) => {
 		const selectedEntities = selectionController.selectedEntities;
-		return /* @__PURE__ */ jsx(EntityCollectionRowActions, {
+		return /* @__PURE__ */ jsx(CollectionRowActions, {
 			width,
 			frozen,
 			entity,
@@ -8562,51 +8771,54 @@ function EntitySelectionTableInternal({ onSingleEntitySelected, onMultipleEntiti
 		fixedFilter,
 		updateUrl: false
 	});
-	return /* @__PURE__ */ jsxs("div", {
-		className: "flex flex-col h-full",
-		children: [/* @__PURE__ */ jsx("div", {
-			className: "grow",
-			children: entitiesDisplayedFirst && /* @__PURE__ */ jsx(EntityCollectionTable, {
-				additionalFields: collection.additionalFields,
-				displayedColumnIds,
-				onEntityClick,
-				tableController,
-				enablePopupIcon: false,
-				tableRowActionsBuilder,
-				openEntityMode: "side_panel",
-				title: /* @__PURE__ */ jsxs(Typography, {
-					variant: "subtitle2",
-					className: "flex flex-row gap-2",
-					children: [/* @__PURE__ */ jsx(IconForView, {
-						size: "small",
-						collectionOrView: collection,
-						className: "text-surface-300 dark:text-surface-600"
-					}), collection.singularName ? `Select ${collection.singularName}` : `Select from ${collection.name}`]
-				}),
-				defaultSize: collection.defaultSize,
-				properties: collection.properties,
-				fixedFilter,
-				inlineEditing: false,
-				selectionController,
-				actions: /* @__PURE__ */ jsx(EntitySelectionDialogActions, {
-					collection,
-					path,
-					onNewClick,
-					onClear
+	return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection,
+		children: /* @__PURE__ */ jsxs("div", {
+			className: "flex flex-col h-full",
+			children: [/* @__PURE__ */ jsx("div", {
+				className: "grow",
+				children: entitiesDisplayedFirst && /* @__PURE__ */ jsx(CollectionTableBinding, {
+					additionalFields: collection.additionalFields,
+					displayedColumnIds,
+					onEntityClick,
+					tableController,
+					enablePopupIcon: false,
+					tableRowActionsBuilder,
+					openEntityMode: "side_panel",
+					title: /* @__PURE__ */ jsxs(Typography, {
+						variant: "subtitle2",
+						className: "flex flex-row gap-2",
+						children: [/* @__PURE__ */ jsx(IconForView, {
+							size: "small",
+							collectionOrView: collection,
+							className: "text-surface-300 dark:text-surface-600"
+						}), collection.singularName ? `Select ${collection.singularName}` : `Select from ${collection.name}`]
+					}),
+					defaultSize: collection.defaultSize,
+					properties: collection.properties,
+					fixedFilter,
+					inlineEditing: false,
+					selectionController,
+					actions: /* @__PURE__ */ jsx(EntitySelectionDialogActions, {
+						collection,
+						path,
+						onNewClick,
+						onClear
+					})
 				})
-			})
-		}), /* @__PURE__ */ jsxs(DialogActions, {
-			translucent: false,
-			children: [description && /* @__PURE__ */ jsx(Typography, {
-				variant: "body2",
-				className: "grow text-left",
-				children: description
-			}), /* @__PURE__ */ jsx(Button, {
-				onClick: onDone,
-				variant: "filled",
-				children: "Done"
+			}), /* @__PURE__ */ jsxs(DialogActions, {
+				translucent: false,
+				children: [description && /* @__PURE__ */ jsx(Typography, {
+					variant: "body2",
+					className: "grow text-left",
+					children: description
+				}), /* @__PURE__ */ jsx(Button, {
+					onClick: onDone,
+					variant: "filled",
+					children: "Done"
+				})]
 			})]
-		})]
+		})
 	});
 }
 function EntitySelectionDialogActions({ collection, path, onClear, onNewClick }) {
@@ -8631,7 +8843,7 @@ function EntitySelectionDialogActions({ collection, path, onClear, onNewClick })
 	}), addButton] });
 }
 //#endregion
-//#region src/components/EntityCollectionView/hooks/useCollectionInlineEditor.ts
+//#region src/components/CollectionViewBinding/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]: ["==", value] } })).data;
@@ -8922,7 +9134,7 @@ function ReadOnlyFieldBinding({ propertyKey, value, error, showError, minimalist
 *
 * Please note that if you build a custom field in a component, the
 * **validation** passed in the property will have no effect. You need to set
-* the validation in the `EntityCollection` definition.
+* the validation in the `CollectionConfig` definition.
 *
 * @param propertyKey You can use nested names such as `address.street` or `friends[2]`
 * @param property
@@ -9505,7 +9717,7 @@ function ArrayOfReferencesFieldBinding({ propertyKey, value, error, showError, d
 	const onMultipleEntitiesSelected = useCallback((entities) => {
 		setValue(entities.map((e) => getReferenceFrom(e)));
 	}, [setValue]);
-	const referenceDialogController = useEntitySelectionDialog({
+	const referenceDialogController = useSelectionDialog({
 		multiselect: true,
 		path: ofProperty.path,
 		collection,
@@ -9854,13 +10066,13 @@ function MapEditView({ value, initialValue, setValue, fieldName, disabled }) {
 		});
 		setInternalState(newRowIds);
 	}, [value]);
-	const updatetype = (rowId, type) => {
-		if (!rowId) {
+	const updatetype = (id, type) => {
+		if (!id) {
 			console.warn("No key selected for data type update");
 			return;
 		}
 		setInternalState(internalState.map((row) => {
-			if (row[0] === rowId) return [row[0], {
+			if (row[0] === id) return [row[0], {
 				key: row[1].key,
 				type
 			}];
@@ -9868,20 +10080,20 @@ function MapEditView({ value, initialValue, setValue, fieldName, disabled }) {
 		}));
 		setValue({
 			...value ?? {},
-			[internalState.find((row) => row[0] === rowId)?.[1].key ?? ""]: getDefaultValueFortype(type)
+			[internalState.find((row) => row[0] === id)?.[1].key ?? ""]: getDefaultValueFortype(type)
 		});
 	};
 	return /* @__PURE__ */ jsxs("div", {
 		className: "py-1 flex flex-col gap-1",
-		children: [internalState.map(([rowId, { key: fieldKey, type }], index) => {
+		children: [internalState.map(([id, { key: fieldKey, type }], index) => {
 			const entryValue = fieldKey ? value?.[fieldKey] : "";
 			const onFieldKeyChange = (newKey) => {
-				setInternalState(internalState.map((currentRowId) => {
-					if (currentRowId[0] === rowId) return [rowId, {
+				setInternalState(internalState.map((currentId) => {
+					if (currentId[0] === id) return [id, {
 						key: newKey ?? "",
-						type: currentRowId[1].type
+						type: currentId[1].type
 					}];
-					return currentRowId;
+					return currentId;
 				}));
 				if (typeof value === "object" && newKey in value) return;
 				const newValue = { ...value ?? {} };
@@ -9893,14 +10105,14 @@ function MapEditView({ value, initialValue, setValue, fieldName, disabled }) {
 				});
 			};
 			return /* @__PURE__ */ jsx(MapKeyValueRow, {
-				rowId,
+				id,
 				fieldKey,
 				value: value ?? {},
 				onDeleteClick: () => {
 					const newValue = { ...value ?? {} };
 					if (initialValue && fieldKey in initialValue) newValue[fieldKey] = void 0;
 					else delete newValue[fieldKey];
-					setInternalState(internalState.filter((currentRowId) => currentRowId[0] !== rowId));
+					setInternalState(internalState.filter((currentId) => currentId[0] !== id));
 					setValue({ ...newValue });
 				},
 				onFieldKeyChange,
@@ -9909,7 +10121,7 @@ function MapEditView({ value, initialValue, setValue, fieldName, disabled }) {
 				type,
 				disabled,
 				updatetype
-			}, rowId);
+			}, id);
 		}), /* @__PURE__ */ jsx(Button, {
 			variant: "text",
 			size: "small",
@@ -9931,7 +10143,7 @@ function MapEditView({ value, initialValue, setValue, fieldName, disabled }) {
 		})]
 	});
 }
-function MapKeyValueRow({ rowId, fieldKey, value, onFieldKeyChange, onDeleteClick, setValue, entryValue, type, updatetype, disabled }) {
+function MapKeyValueRow({ id, fieldKey, value, onFieldKeyChange, onDeleteClick, setValue, entryValue, type, updatetype, disabled }) {
 	const { locale } = useCustomizationController();
 	const { t } = useTranslation();
 	function buildInput(entryValue, fieldKey, type) {
@@ -9993,7 +10205,7 @@ function MapKeyValueRow({ rowId, fieldKey, value, onFieldKeyChange, onDeleteClic
 				children: /* @__PURE__ */ jsx(ArrayContainer, {
 					value: arrayValue,
 					newDefaultEntry: "",
-					droppableId: rowId.toString(),
+					droppableId: id.toString(),
 					addLabel: fieldKey ? t("add_to_field", { fieldName: fieldKey }) : t("add"),
 					size: "small",
 					disabled: disabled || !fieldKey,
@@ -10041,7 +10253,7 @@ function MapKeyValueRow({ rowId, fieldKey, value, onFieldKeyChange, onDeleteClic
 		});
 	}
 	function doUpdatetype(type) {
-		updatetype(rowId, type);
+		updatetype(id, type);
 	}
 	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs(Typography, {
 		component: "div",
@@ -10110,7 +10322,7 @@ function MapKeyValueRow({ rowId, fieldKey, value, onFieldKeyChange, onDeleteClic
 				})]
 			})
 		]
-	}, rowId.toString()), (type === "map" || type === "array") && buildInput(entryValue, fieldKey, type)] });
+	}, id.toString()), (type === "map" || type === "array") && buildInput(entryValue, fieldKey, type)] });
 }
 function ArrayKeyValueRow({ id, index, value, setValue }) {
 	const { locale } = useCustomizationController();
@@ -10582,7 +10794,7 @@ function ReferenceFieldBindingInternal({ propertyKey, value, setValue, error, sh
 	const onSingleEntitySelected = useCallback((e) => {
 		setValue(e ? getReferenceFrom(e) : null);
 	}, [setValue, propertyKey]);
-	const referenceDialogController = useEntitySelectionDialog({
+	const referenceDialogController = useSelectionDialog({
 		multiselect: false,
 		path: property.path,
 		collection,
@@ -11402,7 +11614,7 @@ function MultipleRelationFieldBinding({ propertyKey, value: valueProp, error, sh
 	const onMultipleEntitiesSelected = useCallback((entities) => {
 		setValue(entities.map((e) => getRelationFrom(e)));
 	}, [setValue]);
-	const referenceDialogController = useEntitySelectionDialog({
+	const referenceDialogController = useSelectionDialog({
 		multiselect: true,
 		path: getCollectionDataPath(collection),
 		collection,
@@ -11548,7 +11760,7 @@ function SingleRelationFieldBinding({ propertyKey, value, size, error, showError
 	const onSingleEntitySelected = useCallback((e) => {
 		setValue(e ? getRelationFrom(e) : null);
 	}, [setValue]);
-	const referenceDialogController = useEntitySelectionDialog({
+	const referenceDialogController = useSelectionDialog({
 		multiselect: false,
 		path: getCollectionDataPath(collection),
 		collection,
@@ -11749,7 +11961,7 @@ var DEFAULT_FIELD_CONFIGS = {
 	},
 	user_select: {
 		key: "user_select",
-		name: "UserIcon select",
+		name: "User select",
 		description: "Select a user from the user management system. Store the user ID.",
 		Icon: UserIcon,
 		property: {
@@ -12877,10 +13089,10 @@ function EditorCollectionAction({ path, parentCollectionSlugs, parentEntityIds,
 	}) });
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityCollectionViewActions.tsx
+//#region src/components/CollectionViewBinding/CollectionViewActions.tsx
 var ImportCollectionAction$1 = lazy(() => Promise.resolve().then(() => import_exports).then((m) => ({ default: m.ImportCollectionAction })));
 var ExportCollectionAction$1 = lazy(() => Promise.resolve().then(() => export_exports).then((m) => ({ default: m.ExportCollectionAction })));
-function EntityCollectionViewActions({ collection, relativePath, parentCollectionSlugs, parentEntityIds, onNewClick, onMultipleDeleteClick, selectionEnabled, path, selectionController, tableController, collectionEntitiesCount, compact, children, openNewDocument }) {
+function CollectionViewActions({ collection, relativePath, parentCollectionSlugs, parentEntityIds, onNewClick, onMultipleDeleteClick, selectionEnabled, path, selectionController, tableController, collectionEntitiesCount, compact, children, openNewDocument }) {
 	const context = useCMSContext();
 	const { canCreate, canDelete } = usePermissions();
 	const largeLayout = useLargeLayout();
@@ -12985,7 +13197,7 @@ function EntityCollectionViewActions({ collection, relativePath, parentCollectio
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/useEntityPreviewSlots.ts
+//#region src/components/CollectionViewBinding/usePreviewSlots.ts
 /**
 * Resolve which property key fills each slot for a given collection.
 * Pure function — call inside `useMemo`.
@@ -13280,12 +13492,12 @@ function resolveRelationDisplayName(relation, prop) {
 	return id !== void 0 ? String(id) : void 0;
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityCard.tsx
+//#region src/components/CollectionViewBinding/EntityCardBinding.tsx
 /**
-* Card component for displaying an entity in a grid view.
+* Card component for displaying a entity in a grid view.
 * Shows thumbnail, title, and preview properties via the shared slot system.
 */
-function EntityCard({ entity, collection, onClick, selected, highlighted, onSelectionChange, selectionEnabled, size = "m" }) {
+function EntityCardBinding({ entity, collection, onClick, selected, highlighted, onSelectionChange, selectionEnabled, size = "m" }) {
 	const authController = useAuthController();
 	const analyticsController = useAnalyticsController();
 	const slotKeys = useCollectionSlotKeys(collection, authController, useCustomizationController().propertyConfigs);
@@ -13404,13 +13616,13 @@ function EntityCard({ entity, collection, onClick, selected, highlighted, onSele
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityCollectionCardView.tsx
+//#region src/components/CollectionViewBinding/CollectionCardViewBinding.tsx
 /**
 * Card grid view for displaying entities with infinite scroll.
-* Alternative to the EntityCollectionTable for visual browsing.
+* Alternative to the CollectionTableBinding for visual browsing.
 */
-function EntityCollectionCardView({ collection, tableController, onEntityClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, onScroll, initialScroll, size = "m" }) {
-	const ResolvedEntityCard = useComponentOverride("Collection.Card", EntityCard);
+function CollectionCardViewBinding({ collection, tableController, onEntityClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, onScroll, initialScroll, size = "m" }) {
+	const ResolvedEntityCard = useComponentOverride("Collection.Card", EntityCardBinding);
 	const { data, dataLoading, noMoreToLoad, dataLoadingError, itemCount, setItemCount, pageSize = 50, paginationEnabled } = tableController;
 	const handleEntityClick = useCallback((entity) => {
 		onEntityClick?.(entity);
@@ -13460,7 +13672,7 @@ function EntityCollectionCardView({ collection, tableController, onEntityClick,
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityCollectionListView.tsx
+//#region src/components/CollectionViewBinding/CollectionListViewBinding.tsx
 /**
 * Get row padding/spacing classes based on size
 */
@@ -13581,7 +13793,7 @@ function formatDateValue(value) {
 * - Column-sortable headers
 * - Infinite scroll
 */
-function EntityCollectionListView({ collection, tableController, onEntityClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, size = "m", selectedEntityId, getActionsForEntity, path, openEntityMode }) {
+function CollectionListViewBinding({ collection, tableController, onEntityClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, size = "m", selectedEntityId, getActionsForEntity, path, openEntityMode }) {
 	const authController = useAuthController();
 	const customizationController = useCustomizationController();
 	const analyticsController = useAnalyticsController();
@@ -14024,7 +14236,7 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 								path,
 								collection,
 								context,
-								sideEntityController: context?.sideEntityController,
+								sidePanelController: context?.sidePanelController,
 								selectionController,
 								openEntityMode: openEntityMode ?? collection?.openEntityMode ?? "full_screen"
 							});
@@ -14037,7 +14249,7 @@ var ListRow = React.memo(function ListRow({ entity, collection, onClick, selecte
 	});
 });
 //#endregion
-//#region src/components/EntityCollectionView/SplitListView.tsx
+//#region src/components/CollectionViewBinding/SplitListView.tsx
 var PANEL_SIZE_KEY = "rebase_split_list_panel_size";
 function getSavedPanelSize(path) {
 	try {
@@ -14066,7 +14278,7 @@ function savePanelSize(path, size) {
 * State management:
 * - The selected entity is driven by the URL path (e.g. /c/authors/14).
 *   `selectedEntityId` comes from props via RebaseRoute, NOT from internal state.
-* - Clicking an entity navigates to /c/authors/{id} via the standard onEntityClick handler.
+* - Clicking a entity navigates to /c/authors/{id} via the standard onEntityClick handler.
 * - Closing the detail navigates back to /c/authors.
 */
 function SplitListView({ collection, tableController, onEntityClick: externalOnEntityClick, onNewClick: externalOnNewClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, onScroll, initialScroll, size = "m", path, parentCollectionSlugs, parentEntityIds, selectedEntityId, selectedTab, toolbar, children }) {
@@ -14196,7 +14408,7 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 	const detailPanel = renderedEntityId !== void 0 ? /* @__PURE__ */ jsx("div", {
 		className: cls("flex-1 flex flex-col min-w-0 h-full transition-all ease-out w-full", animationPhase === "entered" ? "opacity-100 translate-x-0" : largeLayout ? "opacity-0 translate-x-8" : "opacity-0 translate-x-1/3"),
 		style: { transitionDuration: `${TRANSITION_DURATION}ms` },
-		children: /* @__PURE__ */ jsx(ErrorBoundary, { children: collection.defaultEntityAction === "view" && !isEditMode ? /* @__PURE__ */ jsx(EntityDetailView, {
+		children: /* @__PURE__ */ jsx(ErrorBoundary, { children: collection.defaultEntityAction === "view" && !isEditMode ? /* @__PURE__ */ jsx(DetailViewBinding, {
 			path,
 			collection,
 			entityId: renderedEntityId,
@@ -14217,7 +14429,7 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 				if (currentViewParam) entityUrl += `${entityUrl.includes("?") ? "&" : "?"}__view=${currentViewParam}`;
 				navigate(entityUrl);
 			}
-		}, String(renderedEntityId)) : /* @__PURE__ */ jsx(EntityEditView, {
+		}, String(renderedEntityId)) : /* @__PURE__ */ jsx(EditViewBinding, {
 			path,
 			collection,
 			entityId: renderedEntityId,
@@ -14257,16 +14469,16 @@ function SplitListView({ collection, tableController, onEntityClick: externalOnE
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityBoardCard.tsx
+//#region src/components/CollectionViewBinding/BoardCardBinding.tsx
 /**
-* Compact card component for displaying an entity in a Kanban board.
+* Compact card component for displaying a entity in a Kanban board.
 * Uses the shared slot system for consistent preview rendering.
 *
 * Selection UX: The checkbox overlays on top of the image/icon thumbnail area,
 * revealed on card hover or when the card is selected. This keeps the card
 * layout clean while providing intuitive selection affordance.
 */
-function EntityBoardCardInner({ item, isDragging, isGroupedOver, style, collection, onClick, selected, onSelectionChange, selectionEnabled = false }) {
+function BoardCardBindingInner({ item, isDragging, isGroupedOver, style, collection, onClick, selected, onSelectionChange, selectionEnabled = false }) {
 	const entity = item.data;
 	const slotKeys = useCollectionSlotKeys(collection, useAuthController(), useCustomizationController().propertyConfigs);
 	const slots = useMemo(() => resolveEntitySlots(entity, collection, slotKeys), [
@@ -14403,9 +14615,9 @@ function EntityBoardCardInner({ item, isDragging, isGroupedOver, style, collecti
 		})
 	});
 }
-var EntityBoardCard = memo(EntityBoardCardInner);
+var BoardCardBinding = memo(BoardCardBindingInner);
 //#endregion
-//#region src/components/EntityCollectionView/useBoardDataController.tsx
+//#region src/components/CollectionViewBinding/useBoardDataController.tsx
 var DEFAULT_PAGE_SIZE$1 = 20;
 /**
 * Shallow equality for entity value records.
@@ -14533,7 +14745,7 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 			...currentFilterValues ?? {},
 			[currentColumnProperty]: ["==", column]
 		};
-		const orderByParam = currentOrderProperty ? `${currentOrderProperty}:asc` : void 0;
+		const orderByParam = currentOrderProperty ? [currentOrderProperty, "asc"] : void 0;
 		setColumnData((prev) => ({
 			...prev,
 			[column]: {
@@ -14584,12 +14796,21 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 				return valA < valB ? -1 : valA > valB ? 1 : 0;
 			});
 			if (currentCollection.callbacks?.afterRead) try {
-				processed = await Promise.all(processed.map((entity) => currentCollection.callbacks.afterRead({
-					collection: currentCollection,
-					path: currentResolvedPath,
-					entity,
-					context: currentContext
-				})));
+				processed = await Promise.all(processed.map(async (entity) => {
+					const processedRow = await currentCollection.callbacks.afterRead({
+						collection: currentCollection,
+						path: currentResolvedPath,
+						row: {
+							id: entity.id,
+							...entity.values
+						},
+						context: currentContext
+					});
+					return {
+						...entity,
+						values: processedRow
+					};
+				}));
 			} catch (e) {
 				console.error("Error in afterRead callback:", e);
 			}
@@ -14639,17 +14860,20 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 			}));
 		};
 		const accessor = currentDataClient.collection(currentResolvedPath);
+		const includeParams = getRelationIncludeParams(currentCollection);
 		if (accessor.listen) {
 			const unsubscribe = accessor.listen({
 				where: whereFilter,
 				limit: itemCount,
-				orderBy: orderByParam
+				orderBy: orderByParam,
+				include: includeParams
 			}, (res) => onUpdate(res.data), onError);
 			unsubscribersRef.current[column] = unsubscribe;
 		} else accessor.find({
 			where: whereFilter,
 			limit: itemCount,
-			orderBy: orderByParam
+			orderBy: orderByParam,
+			include: includeParams
 		}).then((res) => onUpdate(res.data)).catch(onError);
 	}, []);
 	useEffect(() => {
@@ -14863,7 +15087,7 @@ function useBoardDataController({ fullPath, collection, columnProperty, columns,
 	]);
 }
 //#endregion
-//#region src/components/EntityCollectionView/hooks/useKanbanDragAndDrop.ts
+//#region src/components/CollectionViewBinding/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)?.data;
@@ -14936,15 +15160,15 @@ function useKanbanDragAndDrop({ collection, fullPath, columnProperty, orderPrope
 	return useMemo(() => ({ handleItemsReorder }), [handleItemsReorder]);
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityCollectionBoardView.tsx
+//#region src/components/CollectionViewBinding/CollectionBoardViewBinding.tsx
 /**
 * Kanban board view for displaying entities grouped by a string enum property.
 */
-function EntityCollectionBoardView({ collection, tableController, fullPath, parentCollectionSlugs = [], parentEntityIds = [], columnProperty, onEntityClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, deletedEntities }) {
+function CollectionBoardViewBinding({ collection, tableController, fullPath, parentCollectionSlugs = [], parentEntityIds = [], columnProperty, onEntityClick, selectionController, selectionEnabled = true, highlightedEntities, emptyComponent, deletedEntities }) {
 	const customizationController = useCustomizationController();
 	const context = useRebaseContext();
 	const dataClient = useData();
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	const analyticsController = useAnalyticsController();
 	const { t } = useTranslation();
 	const plugins = customizationController.plugins ?? [];
@@ -15229,7 +15453,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 		handleSelectionChangeRef.current(entity, sel);
 	}, []);
 	const ItemComponent = useMemo(() => {
-		const Comp = (props) => /* @__PURE__ */ jsx(EntityBoardCard, {
+		const Comp = (props) => /* @__PURE__ */ jsx(BoardCardBinding, {
 			...props,
 			collection: collectionRef.current,
 			onClick: stableOnClick,
@@ -15352,7 +15576,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 							path: fullPath,
 							column
 						});
-						sideEntityController.open({
+						sidePanelController.open({
 							path: fullPath,
 							collection,
 							entityId: void 0,
@@ -15395,7 +15619,7 @@ function EntityCollectionBoardView({ collection, tableController, fullPath, pare
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/ViewModeToggle.tsx
+//#region src/components/CollectionViewBinding/ViewModeToggle.tsx
 var ALL_VIEW_MODES = [
 	"list",
 	"table",
@@ -15520,7 +15744,7 @@ function ViewModeToggle({ viewMode = "table", onViewModeChange, enabledViews = A
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionTable/internal/popup_field/useDraggable.tsx
+//#region src/components/CollectionTableBinding/internal/popup_field/useDraggable.tsx
 /** Tracks events originating inside the inner (non-draggable) area. */
 var innerClicked = /* @__PURE__ */ new WeakSet();
 function useDraggable({ containerRef, innerRef, x, y, onMove }) {
@@ -15584,7 +15808,7 @@ function useDraggable({ containerRef, innerRef, x, y, onMove }) {
 	]);
 }
 //#endregion
-//#region src/components/EntityCollectionTable/internal/popup_field/useWindowSize.tsx
+//#region src/components/CollectionTableBinding/internal/popup_field/useWindowSize.tsx
 function useWindowSize() {
 	const [size, setSize] = useState({
 		width: 0,
@@ -15604,7 +15828,7 @@ function useWindowSize() {
 	return size;
 }
 //#endregion
-//#region src/components/EntityCollectionTable/internal/popup_field/PopupFormField.tsx
+//#region src/components/CollectionTableBinding/internal/popup_field/PopupFormField.tsx
 function PopupFormField(props) {
 	if (!props.open) return null;
 	return /* @__PURE__ */ jsx(PopupFormFieldLoading, { ...props });
@@ -15884,13 +16108,14 @@ function ClearFilterSortButton({ tableController, enabled }) {
 	return null;
 }
 //#endregion
-//#region src/components/EntityCollectionView/FiltersDialog.tsx
+//#region src/components/CollectionViewBinding/FiltersDialog.tsx
 /**
 * Dialog that displays all filterable properties from a collection
 * and allows setting filter values for each.
 */
 function FiltersDialog({ open, onOpenChange, properties, filterValues, setFilterValues, fixedFilter }) {
 	const { t } = useTranslation();
+	const engine = useCollectionScope()?.engine;
 	const [localFilters, setLocalFilters] = useState(filterValues ?? {});
 	const [hiddenFields, setHiddenFields] = useState({});
 	React.useEffect(() => {
@@ -15900,17 +16125,22 @@ function FiltersDialog({ open, onOpenChange, properties, filterValues, setFilter
 		return Object.entries(properties).filter(([key, property]) => {
 			if (!property) return false;
 			if (fixedFilter && key in fixedFilter) return false;
-			const baseProperty = property.type === "array" ? property.of : property;
-			if (!baseProperty || Array.isArray(baseProperty)) return false;
-			return [
-				"string",
-				"number",
-				"boolean",
-				"date",
-				"reference"
-			].includes(baseProperty.type);
+			const isArray = property.type === "array";
+			const ofProp = isArray && "of" in property ? property.of : void 0;
+			const baseProperty = isArray ? Array.isArray(ofProp) ? ofProp[0] : ofProp : property;
+			if (!baseProperty) return false;
+			if (baseProperty.ui?.Filter) return true;
+			return resolveFilterOperators({
+				property: baseProperty,
+				isArray,
+				engine
+			}).length > 0;
 		});
-	}, [properties, fixedFilter]);
+	}, [
+		properties,
+		fixedFilter,
+		engine
+	]);
 	const handleFilterChange = useCallback((propertyKey, value) => {
 		setLocalFilters((prev) => {
 			const newFilters = { ...prev };
@@ -15943,55 +16173,23 @@ function FiltersDialog({ open, onOpenChange, properties, filterValues, setFilter
 	const isAnyFieldHidden = Object.values(hiddenFields).some((hidden) => hidden);
 	const activeFilterCount = Object.keys(localFilters).length;
 	const renderFilterField = useCallback((propertyKey, property) => {
-		const isArray = property.type === "array";
-		const ofProp = isArray && "of" in property ? property.of : void 0;
-		const baseProperty = isArray ? Array.isArray(ofProp) ? ofProp[0] : ofProp : property;
-		if (!baseProperty) return null;
 		const filterValue = localFilters[propertyKey];
 		const setValue = (value) => handleFilterChange(propertyKey, value);
-		if (baseProperty.type === "reference") return /* @__PURE__ */ jsx(ReferenceFilterField, {
+		return /* @__PURE__ */ jsx(FilterFieldBinding, {
+			propertyKey,
+			property,
+			engine,
 			value: filterValue,
 			setValue,
-			name: propertyKey,
-			isArray,
-			path: baseProperty.path,
-			title: property.name,
-			includeId: baseProperty.includeId,
-			previewProperties: baseProperty.ui?.previewProperties,
 			hidden: hiddenFields[propertyKey] ?? false,
 			setHidden: (hidden) => setHiddenForField(propertyKey, hidden)
 		});
-		else if (baseProperty.type === "number" || baseProperty.type === "string") {
-			const enumValues = baseProperty.enum ? enumToObjectEntries(baseProperty.enum) : void 0;
-			return /* @__PURE__ */ jsx(StringNumberFilterField, {
-				value: filterValue,
-				setValue,
-				name: propertyKey,
-				type: baseProperty.type,
-				isArray,
-				enumValues,
-				title: property.name
-			});
-		} else if (baseProperty.type === "boolean") return /* @__PURE__ */ jsx(BooleanFilterField, {
-			value: filterValue,
-			setValue,
-			name: propertyKey,
-			title: property.name
-		});
-		else if (baseProperty.type === "date") return /* @__PURE__ */ jsx(DateTimeFilterField, {
-			value: filterValue,
-			setValue,
-			name: propertyKey,
-			mode: baseProperty.mode,
-			isArray,
-			title: property.name
-		});
-		return null;
 	}, [
 		localFilters,
 		handleFilterChange,
 		hiddenFields,
-		setHiddenForField
+		setHiddenForField,
+		engine
 	]);
 	return /* @__PURE__ */ jsxs(Dialog, {
 		open,
@@ -16055,7 +16253,7 @@ function FiltersDialog({ open, onOpenChange, properties, filterValues, setFilter
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/FilterPresetsButton.tsx
+//#region src/components/CollectionViewBinding/FilterPresetsButton.tsx
 /**
 * Maximum number of presets shown as inline toggle chips before the
 * rest are collapsed into an overflow menu.
@@ -16248,8 +16446,8 @@ function FilterPresetsButton({ filterPresets, tableController, compact }) {
 	});
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityCollectionViewStartActions.tsx
-function EntityCollectionViewStartActions({ collection, relativePath, parentCollectionSlugs, parentEntityIds, path, selectionController, tableController, collectionEntitiesCount, resolvedProperties, compact, openNewDocument }) {
+//#region src/components/CollectionViewBinding/CollectionViewStartActions.tsx
+function CollectionViewStartActions({ collection, relativePath, parentCollectionSlugs, parentEntityIds, path, selectionController, tableController, collectionEntitiesCount, resolvedProperties, compact, openNewDocument }) {
 	const context = useCMSContext();
 	const largeLayout = useLargeLayout();
 	const { t } = useTranslation();
@@ -16338,7 +16536,7 @@ function EntityCollectionViewStartActions({ collection, relativePath, parentColl
 	] });
 }
 //#endregion
-//#region src/components/EntityCollectionView/EntityCollectionView.tsx
+//#region src/components/CollectionViewBinding/CollectionViewBinding.tsx
 var EMPTY_ARRAY = [];
 var DEFAULT_ENTITY_OPEN_MODE = "split";
 function getOpenEntityMode(viewMode, configuredMode) {
@@ -16348,20 +16546,20 @@ function getOpenEntityMode(viewMode, configuredMode) {
 	return "split";
 }
 /**
-* This component is in charge of binding a driver path with an {@link EntityCollection}
+* This component is in charge of binding a driver path with an {@link CollectionConfig}
 * where it's configuration is defined. It includes an infinite scrolling table
 * and a 'Add' new entities button,
 *
 * This component is the default one used for displaying entity collections
 * and is in charge of generating all the specific actions and customization
-* of the lower level {@link EntityCollectionTable}
+* of the lower level {@link CollectionTableBinding}
 *
 * Please **note** that you only need to use this component if you are building
 * a custom view. If you just need to create a default view you can do it
 * exclusively with config options.
 *
 * If you need a lower level implementation with more granular options, you
-* can use {@link EntityCollectionTable}.
+* can use {@link CollectionTableBinding}.
 *
 * If you need a generic table that is not bound to the driver or entities and
 * properties at all, you can check {@link VirtualTable}
@@ -16371,7 +16569,7 @@ function getOpenEntityMode(viewMode, configuredMode) {
 
 * @group Components
 */
-var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({ path: pathProp, parentCollectionSlugs, parentEntityIds, isSubCollection, className, updateUrl, selectedEntityId: selectedEntityIdProp, selectedTab: selectedTabProp, ...collectionProp }) {
+var CollectionViewBindingInner = React.memo(function CollectionViewBindingInner({ path: pathProp, parentCollectionSlugs, parentEntityIds, isSubCollection, className, updateUrl, selectedEntityId: selectedEntityIdProp, selectedTab: selectedTabProp, ...collectionProp }) {
 	const { t } = useTranslation();
 	const context = useCMSContext();
 	const collectionRegistry = useCollectionRegistryController();
@@ -16379,7 +16577,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 	const breadcrumbs = useBreadcrumbsController();
 	const path = pathProp ?? getCollectionDataPath(collectionProp);
 	const dataClient = useData();
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	useAuthController();
 	const userConfigPersistence = useUserConfigurationPersistence();
 	const analyticsController = useAnalyticsController();
@@ -16500,14 +16698,14 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 		navigateToEntity({
 			navigation: urlController,
 			path: path ?? clickedEntity.path,
-			sideEntityController,
+			sidePanelController,
 			openEntityMode,
 			collection,
 			entityId: clickedEntity.id,
 			replace: openEntityMode === "split" && selectedEntityIdProp !== void 0
 		});
 	}, [
-		sideEntityController,
+		sidePanelController,
 		openEntityMode,
 		selectedEntityIdProp,
 		path,
@@ -16522,11 +16720,11 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 			collection,
 			entityId: void 0,
 			path,
-			sideEntityController,
+			sidePanelController,
 			navigation: urlController,
 			onClose: unselectNavigatedEntity
 		});
-	}, [path, sideEntityController]);
+	}, [path, sidePanelController]);
 	const openNewDocument = useCallback((defaultValues) => {
 		const collection = collectionRef.current;
 		analyticsController.onAnalyticsEvent?.("new_entity_click", { path });
@@ -16536,13 +16734,13 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 			entityId: void 0,
 			defaultValues,
 			path,
-			sideEntityController,
+			sidePanelController,
 			navigation: urlController,
 			onClose: unselectNavigatedEntity
 		});
 	}, [
 		path,
-		sideEntityController,
+		sidePanelController,
 		openEntityMode,
 		urlController,
 		unselectNavigatedEntity
@@ -16741,7 +16939,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 							selectedTab: subcollection.slug,
 							path,
 							navigation: urlController,
-							sideEntityController
+							sidePanelController
 						});
 					},
 					children: subcollection.name
@@ -16752,7 +16950,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 	}, [
 		collection,
 		path,
-		sideEntityController
+		sidePanelController
 	]);
 	const updateLastDeleteTimestamp = useCallback(() => {
 		setLastDeleteTimestamp(Date.now());
@@ -16783,7 +16981,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 		return (largeLayout ? 80 + actionsWidth : 70 + actionsWidth) + (collapsedActions.length > 0 ? largeLayout ? 40 : 30 : 0);
 	}, [getActionsForEntity, largeLayout]);
 	const tableRowActionsBuilder = useCallback(({ entity, size, width, frozen }) => {
-		return /* @__PURE__ */ jsx(EntityCollectionRowActions, {
+		return /* @__PURE__ */ jsx(CollectionRowActions, {
 			entity,
 			width,
 			frozen,
@@ -16896,8 +17094,8 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 	const isSearching = !!tableController.searchString;
 	const isFilteredOrSorted = tableController.filterValues !== void 0 || tableController.sortBy !== void 0 || isSearching;
 	const ResolvedEmptyState = useComponentOverride("Collection.EmptyState", DefaultCollectionEmptyState);
-	const ResolvedCollectionActions = useComponentOverride("Collection.Actions", EntityCollectionViewActions);
-	const ResolvedCollectionTable = useComponentOverride("Collection.Table", EntityCollectionTable);
+	const ResolvedCollectionActions = useComponentOverride("Collection.Actions", CollectionViewActions);
+	const ResolvedCollectionTable = useComponentOverride("Collection.Table", CollectionTableBinding);
 	const emptyComponent = pluginEmptyStates.length > 0 ? /* @__PURE__ */ jsx(Fragment, { children: pluginEmptyStates }) : /* @__PURE__ */ jsx(ResolvedEmptyState, {
 		canCreate: canCreateEntities && !isFilteredOrSorted,
 		onNewClick,
@@ -16910,7 +17108,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 		onTextSearch: tableController.setSearchString,
 		initialSearchText: tableController.searchString,
 		viewModeToggle: viewModeToggleElement,
-		actionsStart: /* @__PURE__ */ jsx(EntityCollectionViewStartActions, {
+		actionsStart: /* @__PURE__ */ jsx(CollectionViewStartActions, {
 			parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY,
 			parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
 			collection,
@@ -16940,7 +17138,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 			children: pluginToolbarWidgets
 		})
 	});
-	const innerView = viewMode === "kanban" ? /* @__PURE__ */ jsx(EntityCollectionBoardView, {
+	const innerView = viewMode === "kanban" ? /* @__PURE__ */ jsx(CollectionBoardViewBinding, {
 		collection,
 		tableController,
 		fullPath: path,
@@ -16953,7 +17151,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 		highlightedEntities: highlightedEntity ? [highlightedEntity] : [],
 		deletedEntities,
 		emptyComponent
-	}, `kanban-view-${path}-${selectedKanbanProperty}`) : viewMode === "cards" ? /* @__PURE__ */ jsx(EntityCollectionCardView, {
+	}, `kanban-view-${path}-${selectedKanbanProperty}`) : viewMode === "cards" ? /* @__PURE__ */ jsx(CollectionCardViewBinding, {
 		collection,
 		tableController,
 		onEntityClick,
@@ -16964,7 +17162,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 		initialScroll: tableController.initialScroll,
 		size: cardSize,
 		emptyComponent
-	}, `cards-view-${path}`) : viewMode === "list" ? /* @__PURE__ */ jsx(EntityCollectionListView, {
+	}, `cards-view-${path}`) : viewMode === "list" ? /* @__PURE__ */ jsx(CollectionListViewBinding, {
 		collection,
 		tableController,
 		onEntityClick,
@@ -17067,7 +17265,7 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 								children: pluginInsights
 							})
 						}),
-						/* @__PURE__ */ jsx(EntityCollectionListView, {
+						/* @__PURE__ */ jsx(CollectionListViewBinding, {
 							collection,
 							tableController,
 							onEntityClick,
@@ -17140,13 +17338,13 @@ var EntityCollectionViewInner = React.memo(function EntityCollectionViewInner({
 }, (a, b) => {
 	return deepEqual(a.path, b.path) && deepEqual(a.parentCollectionSlugs, b.parentCollectionSlugs) && deepEqual(a.parentEntityIds, b.parentEntityIds) && deepEqual(a.isSubCollection, b.isSubCollection) && deepEqual(a.className, b.className) && deepEqual(a.properties, b.properties) && deepEqual(a.propertiesOrder, b.propertiesOrder) && deepEqual(a.hideIdFromCollection, b.hideIdFromCollection) && deepEqual(a.inlineEditing, b.inlineEditing) && deepEqual(a.selectionEnabled, b.selectionEnabled) && deepEqual(a.selectionController, b.selectionController) && deepEqual(a.Actions, b.Actions) && deepEqual(a.defaultSize, b.defaultSize) && deepEqual(a.includeJsonView, b.includeJsonView) && deepEqual(a.additionalFields, b.additionalFields) && deepEqual(a.sideDialogWidth, b.sideDialogWidth) && deepEqual(a.openEntityMode, b.openEntityMode) && deepEqual(a.exportable, b.exportable) && deepEqual(a.history, b.history) && deepEqual(a.fixedFilter, b.fixedFilter) && deepEqual(a.selectedEntityId, b.selectedEntityId) && deepEqual(a.selectedTab, b.selectedTab);
 });
-var EntityCollectionView = React.memo(function EntityCollectionView(props) {
+var CollectionViewBinding = React.memo(function CollectionViewBinding(props) {
 	const collectionRegistry = useCollectionRegistryController();
 	const path = props.path ?? props.slug;
 	const collection = collectionRegistry.getCollection(path) ?? props;
-	const content = /* @__PURE__ */ jsx(EntityCollectionViewInner, { ...props });
-	if (collection?.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: collection.components,
+	const content = /* @__PURE__ */ jsx(CollectionViewBindingInner, { ...props });
+	if (collection) return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection,
 		children: content
 	});
 	return content;
@@ -17198,7 +17396,7 @@ function EntitiesCount({ path, collection, filter, sortBy, onCountChange }) {
 		}
 		let cancelled = false;
 		const whereParams = filter && Object.keys(filter).length > 0 ? filter : void 0;
-		const orderByParams = sortByProperty ? `${String(sortByProperty)}:${currentSort}` : void 0;
+		const orderByParams = sortByProperty && currentSort ? [String(sortByProperty), currentSort] : void 0;
 		const cacheKey = `${path}|${filterKey}|${sortByProperty ?? ""}|${currentSort ?? ""}`;
 		let countPromise = inflightCountRequests.get(cacheKey);
 		if (!countPromise) {
@@ -17239,7 +17437,7 @@ function EntityIdHeaderWidget({ collection, path, idPath }) {
 	const [openPopup, setOpenPopup] = React.useState(false);
 	const [searchString, setSearchString] = React.useState("");
 	const [recentIds, setRecentIds] = React.useState(getRecentIds(collection.slug).map(String));
-	const sideEntityController = useSideEntityController();
+	const sidePanelController = useSidePanel();
 	const openEntityMode = collection?.openEntityMode ?? DEFAULT_ENTITY_OPEN_MODE;
 	return /* @__PURE__ */ jsx(Tooltip, {
 		title: !openPopup ? t("find_by_id") : void 0,
@@ -17269,7 +17467,7 @@ function EntityIdHeaderWidget({ collection, path, idPath }) {
 							collection,
 							entityId,
 							path,
-							sideEntityController,
+							sidePanelController,
 							navigation: urlController
 						});
 					},
@@ -17308,7 +17506,7 @@ function EntityIdHeaderWidget({ collection, path, idPath }) {
 								collection,
 								entityId: id,
 								path,
-								sideEntityController,
+								sidePanelController,
 								navigation: urlController
 							});
 						},
@@ -17347,7 +17545,7 @@ function ReferenceWidget({ name, multiselect = false, path, disabled, value, onR
 			entities
 		});
 	}, [disabled, onReferenceSelected]);
-	const referenceDialogController = useEntitySelectionDialog({
+	const referenceDialogController = useSelectionDialog({
 		multiselect,
 		path,
 		collection,
@@ -17491,15 +17689,15 @@ function useBuildSideDialogsController() {
 	]);
 }
 //#endregion
-//#region src/components/SideEntityProvider.tsx
+//#region src/components/SidePanelProvider.tsx
 /**
-* Provider that builds the SideEntityController and makes it available
-* via the SideEntityControllerContext from @rebasepro/core.
+* Provider that builds the SidePanelController and makes it available
+* via the SidePanelControllerContext from @rebasepro/app.
 *
-* After the CMS extraction refactor, `useBuildSideEntityController` lives
+* After the CMS extraction refactor, `useBuildSidePanel` lives
 * in the CMS package while the context it feeds into lives in core.
 * This provider bridges the two: place it inside the `<Rebase>` tree and
-* above any component that calls `useSideEntityController()`.
+* above any component that calls `useSidePanel()`.
 *
 * Also auto-registers the side entity controller and breadcrumbs into the
 * self-assembling Studio bridge (when a StudioBridgeRegistryProvider is
@@ -17509,28 +17707,28 @@ function useBuildSideDialogsController() {
 * ```tsx
 * <Rebase ...>
 *   {({ loading }) => (
-*     <SideEntityProvider>
+*     <SidePanelProvider>
 *       <RebaseRoutes>
 *         ...
 *       </RebaseRoutes>
-*     </SideEntityProvider>
+*     </SidePanelProvider>
 *   )}
 * </Rebase>
 * ```
 *
 * @group Components
 */
-function SideEntityProvider({ children }) {
+function SidePanelProvider({ children }) {
 	const collectionRegistryController = useCollectionRegistryController();
 	const urlController = useUrlController();
 	const navigationStateController = useNavigationStateController();
 	const sideDialogsController = useBuildSideDialogsController();
-	const sideEntityController = useBuildSideEntityController(collectionRegistryController, urlController, navigationStateController, sideDialogsController, useAuthController());
+	const sidePanelController = useBuildSidePanel(collectionRegistryController, urlController, navigationStateController, sideDialogsController, useAuthController());
 	return /* @__PURE__ */ jsx(BreadcrumbsProvider, { children: /* @__PURE__ */ jsx(SideDialogsControllerContext.Provider, {
 		value: sideDialogsController,
-		children: /* @__PURE__ */ jsxs(SideEntityControllerContext.Provider, {
-			value: sideEntityController,
-			children: [/* @__PURE__ */ jsx(BridgeAutoRegistrar$1, { sideEntityController }), children]
+		children: /* @__PURE__ */ jsxs(SidePanelControllerContext.Provider, {
+			value: sidePanelController,
+			children: [/* @__PURE__ */ jsx(BridgeAutoRegistrar$1, { sidePanelController }), children]
 		})
 	}) });
 }
@@ -17538,9 +17736,9 @@ function SideEntityProvider({ children }) {
 * Internal component that auto-registers side entity and breadcrumbs
 * into the Studio bridge. Must be a child of BreadcrumbsProvider.
 */
-function BridgeAutoRegistrar$1({ sideEntityController }) {
+function BridgeAutoRegistrar$1({ sidePanelController }) {
 	const breadcrumbs = useBreadcrumbsController();
-	useBridgeRegistration("sideEntityController", sideEntityController);
+	useBridgeRegistration("sidePanelController", sidePanelController);
 	useBridgeRegistration("breadcrumbs", breadcrumbs);
 	return null;
 }
@@ -18291,8 +18489,9 @@ var Scaffold = React.memo(function Scaffold(props) {
 					className: "flex flex-col grow overflow-auto",
 					children: [hasAppBar && /* @__PURE__ */ jsx(DrawerHeader, {}), /* @__PURE__ */ jsx("div", {
 						className: cls(defaultBorderMixin, "bg-surface-50 dark:bg-surface-800", "grow overflow-auto m-0", {
-							"lg:mt-4": !hasAppBar,
 							"mt-1 lg:m-0 lg:mx-2 lg:mb-2 lg:rounded-lg lg:border-t lg:border-x lg:border-solid": padding,
+							"lg:mt-2": !hasAppBar && padding,
+							"lg:mt-4": !hasAppBar && !padding,
 							"border-t": hasAppBar && !padding
 						}),
 						children: /* @__PURE__ */ jsx(ErrorBoundary, { children: otherChildren })
@@ -18355,7 +18554,7 @@ function DrawerWrapper(props) {
 	});
 }
 //#endregion
-//#region src/components/RebaseCMS.tsx
+//#region src/components/RebaseAdmin.tsx
 /**
 * Declarative component to configure the CMS in Rebase.
 * Renders nothing — purely registers config into the RebaseRegistry.
@@ -18364,7 +18563,7 @@ function DrawerWrapper(props) {
 * is auto-wired as a native feature (slots, provider, Studio view) without
 * needing any external plugin.
 */
-function RebaseCMS({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings }) {
+function RebaseAdmin({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings, basePath }) {
 	const dispatch = useRebaseRegistryDispatch();
 	useLayoutEffect(() => {
 		dispatch.registerCMS({
@@ -18374,7 +18573,8 @@ function RebaseCMS({ collections, views, homePage, entityViews, entityActions, c
 			entityViews,
 			entityActions,
 			collectionEditor,
-			navigationGroupMappings
+			navigationGroupMappings,
+			basePath
 		});
 		return () => dispatch.unregisterCMS();
 	}, [
@@ -18385,7 +18585,8 @@ function RebaseCMS({ collections, views, homePage, entityViews, entityActions, c
 		entityViews,
 		entityActions,
 		collectionEditor,
-		navigationGroupMappings
+		navigationGroupMappings,
+		basePath
 	]);
 	return null;
 }
@@ -18519,7 +18720,7 @@ function useLocalCollectionsConfigController(clientOrUrl, baseCollections = [],
 //#region src/components/RebaseNavigation.tsx
 var EMPTY_PLUGINS = [];
 var EMPTY_COLLECTIONS = [];
-var CollectionsStudioView = lazy(() => import("./RouterCollectionsStudioView-BQTIExjA.js").then((n) => n.n).then((m) => ({ default: m.RouterCollectionsStudioView })));
+var CollectionsStudioView = lazy(() => import("./RouterCollectionsStudioView-C6XQ7Il5.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,
@@ -18534,7 +18735,7 @@ var CollectionsStudioView = lazy(() => import("./RouterCollectionsStudioView-BQT
 * ```tsx
 * <RebaseNavigation>
 *   <MyCustomLayout>
-*     <EntityCollectionView ... />
+*     <CollectionViewBinding ... />
 *   </MyCustomLayout>
 * </RebaseNavigation>
 * ```
@@ -18560,13 +18761,19 @@ function RebaseNavigation({ children }) {
 	const defaultData = useData();
 	const getCollectionRef = useRef(collectionRegistryController.getCollection);
 	getCollectionRef.current = collectionRegistryController.getCollection;
+	useContext(CollectionResolverRegistrationContext)(useCallback((slug) => getCollectionRef.current(slug), []));
 	const routedData = useMemo(() => buildRoutedRebaseData({
 		defaultData,
 		sources: dataSources.sources,
 		resolveKey: (slugOrPath) => resolveDataSource(getCollectionRef.current(slugOrPath), dataSources.registry).key
 	}), [defaultData, dataSources]);
 	const urlController = useBuildUrlController({
-		basePath: "/",
+		basePath: useMemo(() => {
+			const raw = registry.cmsConfig?.basePath;
+			if (!raw || raw === "/") return "/";
+			const trimmed = raw.replace(/^\/+/, "").replace(/\/+$/, "");
+			return trimmed ? `/${trimmed}` : "/";
+		}, [registry.cmsConfig?.basePath]),
 		baseCollectionPath: "/c",
 		collectionRegistryController
 	});
@@ -18659,7 +18866,7 @@ function RebaseNavigation({ children }) {
 					value: urlController,
 					children: /* @__PURE__ */ jsx(NavigationStateContext.Provider, {
 						value: navigationStateController,
-						children: /* @__PURE__ */ jsxs(SideEntityProvider, { children: [/* @__PURE__ */ jsx(BridgeAutoRegistrar, {
+						children: /* @__PURE__ */ jsxs(SidePanelProvider, { children: [/* @__PURE__ */ jsx(BridgeAutoRegistrar, {
 							collectionRegistryController,
 							urlController,
 							navigationStateController
@@ -18690,17 +18897,18 @@ function BridgeAutoRegistrar({ collectionRegistryController, urlController, navi
 //#endregion
 //#region src/components/RebaseLayout.tsx
 /**
-* Layout layer — provides the Scaffold, AppBar, Drawer, and SideDialogs.
+* Layout layer — provides the Scaffold, Drawer, and SideDialogs.
 *
 * Wraps the route outlet with the standard Rebase admin layout.
-* Override individual pieces (appBar, drawer) via props.
+* Override the drawer via props; pass `appBar` to add a top bar (there is
+* none by default — the drawer owns navigation and user actions).
 *
 * **Independently usable**: Use this when you want the Rebase layout
 * without its default route definitions.
 *
 * @example
 * ```tsx
-* <RebaseLayout title="My Admin">
+* <RebaseLayout title="My Admin" appBar={<AppBar/>}>
 *   <Route path="/" element={<MyHomePage />} />
 *   <Route path="/custom" element={<CustomView />} />
 * </RebaseLayout>
@@ -18709,13 +18917,7 @@ function BridgeAutoRegistrar({ collectionRegistryController, urlController, navi
 function RebaseLayout(props) {
 	const { title = "Rebase", appBar, drawer, autoOpenDrawer = false, devViews = [] } = props;
 	const adminModeController = useAdminModeController();
-	const ResolvedAppBar = useComponentOverride("Shell.AppBar", AppBar);
 	const ResolvedDrawer = useComponentOverride("Shell.Drawer", Drawer);
-	const ActiveAppBar = appBar ?? /* @__PURE__ */ jsx(ResolvedAppBar, {
-		includeLanguageToggle: false,
-		includeModeToggle: false,
-		includeUserMenu: false
-	});
 	const ActiveDrawer = drawer ?? /* @__PURE__ */ jsx(ResolvedDrawer, {
 		title,
 		logoDestination: adminModeController.mode === "studio" ? "/s" : "/"
@@ -18724,7 +18926,7 @@ function RebaseLayout(props) {
 		autoOpenDrawer,
 		children: [
 			/* @__PURE__ */ jsx(AdminModeSyncer, { devViews }),
-			ActiveAppBar,
+			appBar,
 			ActiveDrawer,
 			/* @__PURE__ */ jsx(Outlet, {}),
 			/* @__PURE__ */ jsx(SideDialogs, {})
@@ -19742,7 +19944,7 @@ function RebaseRoute() {
 	const urlController = useUrlController();
 	const breadcrumbs = useBreadcrumbsController();
 	const userConfigPersistence = useUserConfigurationPersistence();
-	const ResolvedCollectionView = useComponentOverride("Collection.View", EntityCollectionView);
+	const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
 	const hash = location.hash;
 	const isSidePanel = hash.includes("#side");
 	const isNew = hash.includes("#new") || hash.includes("#new_side");
@@ -19937,7 +20139,7 @@ function EntityFullScreenRoute({ pathname, navigationEntries, isNew, isCopy }) {
 	const fullIdPath = isNew ? lastCollectionEntry.slug : lastEntityEntry.slug;
 	const collectionPath = urlController.resolveDatabasePathsFrom(fullIdPath);
 	const isEditRoute = pathname.endsWith("/edit") || pathname.split("/").pop() === "edit";
-	if (collection.defaultEntityAction === "view" && !isNew && !isCopy && entityId && !isEditRoute) return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(EntityDetailView, {
+	if (collection.defaultEntityAction === "view" && !isNew && !isCopy && entityId && !isEditRoute) return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(DetailViewBinding, {
 		entityId,
 		collection,
 		layout: "full_screen",
@@ -19955,7 +20157,7 @@ function EntityFullScreenRoute({ pathname, navigationEntries, isNew, isCopy }) {
 		parentCollectionSlugs,
 		parentEntityIds
 	}, collection.slug + "_view_" + entityId) });
-	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(EntityEditView, {
+	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(EditViewBinding, {
 		entityId: isNew ? void 0 : entityId,
 		collection,
 		layout: "full_screen",
@@ -20011,8 +20213,8 @@ function CustomViewRoute({ view }) {
 }
 //#endregion
 //#region src/components/CollectionEditorDialogs.tsx
-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 })));
+var CollectionEditorDialog = lazy(() => import("./CollectionEditorDialog-DbPpDDwb.js").then((n) => n.r).then((m) => ({ default: m.CollectionEditorDialog })));
+var PropertyFormDialog = lazy(() => import("./PropertyEditView-DfJbZ67t.js").then((n) => n.t).then((m) => ({ default: m.PropertyFormDialog })));
 /**
 * Renders the CollectionEditorDialog and PropertyFormDialog inside
 * the RebaseShell tree where CMS-internal contexts
@@ -20206,7 +20408,7 @@ function RebaseShell(props) {
 * @group Components
 */
 function CollectionPanelInner({ mergedCollection, path, title, updateUrl, className }) {
-	const ResolvedCollectionView = useComponentOverride("Collection.View", EntityCollectionView);
+	const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
 	return /* @__PURE__ */ jsxs("div", {
 		className,
 		children: [title !== false && /* @__PURE__ */ jsx(Typography, {
@@ -20255,15 +20457,13 @@ function CollectionPanel(props) {
 			]
 		})
 	});
-	const content = /* @__PURE__ */ jsx(CollectionPanelInner, {
-		...props,
-		mergedCollection
-	});
-	if (mergedCollection.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: mergedCollection.components,
-		children: content
+	return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection: mergedCollection,
+		children: /* @__PURE__ */ jsx(CollectionPanelInner, {
+			...props,
+			mergedCollection
+		})
 	});
-	return content;
 }
 //#endregion
 //#region src/preview/components/RelationPreview.tsx
@@ -20358,17 +20558,17 @@ function RelationPreviewInternal(props) {
 		...props,
 		collection
 	});
-	if (collection?.components) return /* @__PURE__ */ jsx(CollectionComponentOverrideProvider, {
-		overrides: collection.components,
+	if (collection) return /* @__PURE__ */ jsx(CollectionScopeProvider, {
+		collection,
 		children: content
 	});
 	return content;
 }
 function RelationPreviewExisting({ relation, collection, previewProperties, size, disabled, includeEntityLink, includeId, onClick, hover, textOnly }) {
 	const passedEntity = relation.data;
-	const ResolvedEntityPreview = useComponentOverride("Entity.Preview", EntityPreview);
+	const ResolvedEntityPreview = useComponentOverride("EntityPreview", EntityPreviewBinding);
 	const customizationController = useCustomizationController();
-	const { entity, dataLoading, dataLoadingError } = useEntityFetch({
+	const { entity, dataLoading, dataLoadingError } = useFetch({
 		path: relation.path,
 		entityId: passedEntity ? void 0 : relation.id,
 		collection,
@@ -21418,7 +21618,7 @@ function zodToFormErrors(zodError) {
 /**
 * Headless entity form component.
 *
-* Renders a form for an entity collection without any CMS or backend dependencies.
+* Renders a form for a 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.
 *
@@ -21870,7 +22070,7 @@ function useOnAutoSave(autoSave, formex, lastSavedValues, save) {
 */
 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 sidePanelController = useSidePanel();
 	const collectionRegistryController = useCollectionRegistryController();
 	const authController = useAuthController();
 	const dataClient = useData();
@@ -21924,12 +22124,12 @@ function EntityFormBinding({ path, entityId: entityIdProp, collection, entity, i
 			navigateBackProp();
 			return;
 		}
-		if (openEntityMode === "side_panel" || openEntityMode === "dialog") sideEntityController.close();
+		if (openEntityMode === "side_panel" || openEntityMode === "dialog") sidePanelController.close();
 		else window.history.back();
 	}, [
 		navigateBackProp,
 		openEntityMode,
-		sideEntityController
+		sidePanelController
 	]);
 	const clearDirtyCache = useCallback(() => {
 		if (status === "new" || status === "copy") {
@@ -22180,22 +22380,16 @@ function normalizeEnumValueConfig(config) {
 * 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.
+* Unwrap `Entity<M>` objects to flat rows for the headless view.
+* The entity system uses `{ id, path, values: M }`; `values` is already the
+* flat row `M` carrying its real primary key, so unwrapping is just `.values` —
+* no `id`/`path` merge (those are view-model metadata, not row columns).
 */
 function flattenEntities(entities) {
-	return entities.map((entity) => ({
-		id: entity.id,
-		path: entity.path,
-		...entity.values
-	}));
+	return entities.map((entity) => entity.values);
 }
 /**
-* React hook that adapts an EntityTableController to a CollectionDataController.
+* React hook that adapts a EntityTableController to a CollectionDataController.
 *
 * Usage:
 * ```tsx
@@ -22503,7 +22697,7 @@ function ImportDataPreview({ importConfig, properties, propertiesOrder }) {
 		importConfig.setEntities(mappedData);
 	}, []);
 	const selectionController = useSelectionController();
-	return /* @__PURE__ */ jsx(EntityCollectionTable, {
+	return /* @__PURE__ */ jsx(CollectionTableBinding, {
 		title: /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx(Typography, {
 			variant: "subtitle2",
 			children: "Imported data preview"
@@ -23112,7 +23306,7 @@ function serializeMatches(matches) {
 }
 /**
 * Resolve a relation target to a string slug.
-* Functions are called to extract the target; EntityCollection objects
+* Functions are called to extract the target; CollectionConfig objects
 * use their slug.
 */
 function resolveRelationTarget(target) {
@@ -23327,14 +23521,14 @@ function toSerializableProperties(properties) {
 	return result;
 }
 /**
-* Convert an `EntityCollection` to its JSON-serializable form.
+* Convert an `CollectionConfig` 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) {
+function toSerializableCollectionConfig(collection) {
 	const result = {
 		slug: collection.slug,
 		name: collection.name,
@@ -23439,13 +23633,13 @@ function fromSerializableProperties(serialized) {
 	return result;
 }
 /**
-* Convert a `SerializableCollection` back to an `EntityCollection`.
+* Convert a `SerializableCollectionConfig` back to an `CollectionConfig`.
 *
 * 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) {
+function fromSerializableCollectionConfig(serialized) {
 	const { properties, ...rest } = serialized;
 	return {
 		...rest,
@@ -23486,7 +23680,7 @@ function useJsonCollectionsConfigController({ store, readOnly = false, autoLoad
 			try {
 				const [serialized, navEntries] = await Promise.all([storeRef.current.load(), storeRef.current.loadNavigationEntries?.() ?? Promise.resolve([])]);
 				if (cancelled) return;
-				setCollections(serialized.map(fromSerializableCollection));
+				setCollections(serialized.map(fromSerializableCollectionConfig));
 				setNavigationEntries(navEntries);
 			} catch (e) {
 				console.error("useJsonCollectionsConfigController: failed to load collections", e);
@@ -23502,7 +23696,7 @@ function useJsonCollectionsConfigController({ store, readOnly = false, autoLoad
 	* Update local state and persist a collection to the store.
 	*/
 	const persistCollection = useCallback(async (collection) => {
-		const serializable = toSerializableCollection(collection);
+		const serializable = toSerializableCollectionConfig(collection);
 		await storeRef.current.save(collection.slug, serializable);
 	}, []);
 	/**
@@ -23938,15 +24132,15 @@ var DEFAULT_COLLECTION_GENERATION_ENDPOINT = "https://api.rebase.pro/collections
 *
 * @example
 * ```tsx
-* import { RebaseCMS } from "@rebasepro/admin";
+* import { RebaseAdmin } from "@rebasepro/admin";
 * import { buildCollectionGenerationCallback } from "@rebasepro/admin/collection_editor";
-* import { useFirebaseAuthController } from "@rebasepro/client-firebase";
+* import { useFirebaseAuthController } from "@rebasepro/firebase";
 *
 * const authController = useFirebaseAuthController({ firebaseApp });
 *
 * export function App() {
 *     return (
-*         <RebaseCMS
+*         <RebaseAdmin
 *             collectionEditor={{
 *                 generateCollection: buildCollectionGenerationCallback({
 *                     getAuthToken: authController.getAuthToken
@@ -24027,6 +24221,6 @@ function getFullIdPath(propertyKey, propertyNamespace) {
 	return idToPropertiesPath(propertyNamespace ? `${propertyNamespace}.${propertyKey}` : propertyKey);
 }
 //#endregion
-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 };
+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, useHistory 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, useBuildSidePanel 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, CollectionTableBinding as Qn, DateTimeFieldBinding as Qt, removeEmptyContainers as R, useCMSContext as Rn, getDefaultFieldId as Rt, downloadDataAsCsv as S, deleteEntityAction as Sn, isRelationProperty as Sr, CollectionViewActions 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, SidePanelProvider as _t, namespaceToPropertiesPath as a, FormLayout as an, useSelectionDialog as ar, RebaseLayout as at, BasicExportAction as b, useResolvedCollections as bn, getResolvedPropertyInPath as br, CollectionCardViewBinding as bt, DEFAULT_COLLECTION_GENERATION_ENDPOINT as c, PropertyIdCopyTooltip as cn, EntityViewBinding as cr, RebaseAuthGate as ct, useJsonCollectionsConfigController as d, SearchIconsView as dn, EntityPreviewBinding as dr, Drawer as dt, ArrayOfReferencesFieldBinding as en, CollectionRowActions as er, CollectionPanel as et, fromSerializableCollectionConfig as f, FieldCaption as fn, getEntityPreviewKeys as fr, DefaultDrawer as ft, toSerializableProperties as g, useBuildUrlController as gn, getIconForProperty as gr, AdminModeSyncer as gt, toSerializableCollectionConfig as h, useBreadcrumbsController as hn, getDefaultPropertiesOrder as hr, useApp as ht, namespaceToPropertiesOrderPath as i, ReadOnlyFieldBinding as in, useSidePanel 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, RebaseAdmin 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, SelectionTableBinding as pn, getEntityTitlePropertyKey as pr, DrawerFooterActions as pt, MapPropertyPreview as q, getEntityViewWidth as qn, ReferenceFieldBinding as qt, idToPropertiesPath as r, PropertyFieldBinding as rn, SidePanelControllerContext 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, EntityCardBinding as xt, ExportCollectionAction as y, useResolvedViews as yn, getPropertyInPath as yr, CollectionViewBinding as yt, zodToFormErrors as z, UrlContext as zn, getFieldConfig as zt };
 
-//# sourceMappingURL=src-cxV1ODRG.js.map
+//# sourceMappingURL=src-B8WuGSPZ.js.map