@rebasepro/admin 0.8.0 → 0.9.0

package/src/components/{EntityCollectionView/EntityCard.tsx → CollectionViewBinding/EntityCardBinding.tsx}

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { useMemo } from "react";
 import { CollectionSize, Entity } from "@rebasepro/types";
 import {
@@ -15,11 +15,11 @@ import {
 } from "@rebasepro/core";
 import { useAnalyticsController } from "@rebasepro/core";
 import { IconForView } from "@rebasepro/core";
-import { useCollectionSlotKeys, resolveEntitySlots } from "./useEntityPreviewSlots";
+import { useCollectionSlotKeys, resolveEntitySlots } from "./usePreviewSlots";
 
-export type EntityCardProps<M extends Record<string, unknown> = Record<string, unknown>> = {
+export type EntityCardBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
     entity: Entity<M>;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     highlighted?: boolean;
@@ -32,10 +32,10 @@ export type EntityCardProps<M extends Record<string, unknown> = Record<string, u
 };
 
 /**
- * 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.
  */
-export function EntityCard<M extends Record<string, unknown> = Record<string, unknown>>({
+export function EntityCardBinding<M extends Record<string, unknown> = Record<string, unknown>>({
     entity,
     collection,
     onClick,
@@ -44,13 +44,13 @@ export function EntityCard<M extends Record<string, unknown> = Record<string, un
     onSelectionChange,
     selectionEnabled,
     size = "m"
-}: EntityCardProps<M>) {
+}: EntityCardBindingProps<M>) {
     const authController = useAuthController();
     const analyticsController = useAnalyticsController();
     const customizationController = useCustomizationController();
 
     const slotKeys = useCollectionSlotKeys(
-        collection as EntityCollection<Record<string, unknown>>,
+        collection as CollectionConfig<Record<string, unknown>>,
         authController,
         customizationController.propertyConfigs
     );
@@ -58,7 +58,7 @@ export function EntityCard<M extends Record<string, unknown> = Record<string, un
     const slots = useMemo(
         () => resolveEntitySlots(
             entity as Entity<Record<string, unknown>>,
-            collection as EntityCollection<Record<string, unknown>>,
+            collection as CollectionConfig<Record<string, unknown>>,
             slotKeys
         ),
         [entity, collection, slotKeys]

package/src/components/{EntityCollectionView → CollectionViewBinding}/FiltersDialog.tsx

@@ -4,12 +4,9 @@ import React, { useCallback, useMemo, useState } from "react";
 import { FilterValues, WhereFilterOp } from "@rebasepro/types";
 import { Button, cls, defaultBorderMixin, Dialog, DialogActions, DialogContent, DialogTitle, Typography } from "@rebasepro/ui";
 import { FilterIcon, VirtualTableWhereFilterOp } from "@rebasepro/ui";
-import { StringNumberFilterField } from "../SelectableTable/filters/StringNumberFilterField";
-import { BooleanFilterField } from "../SelectableTable/filters/BooleanFilterField";
-import { DateTimeFilterField } from "../SelectableTable/filters/DateTimeFilterField";
-import { ReferenceFilterField } from "../SelectableTable/filters/ReferenceFilterField";
-import { enumToObjectEntries } from "@rebasepro/common";
-import { useTranslation } from "@rebasepro/core";
+import { resolveFilterOperators } from "@rebasepro/common";
+import { useCollectionScope, useTranslation } from "@rebasepro/core";
+import { FilterFieldBinding } from "../SelectableTable/filters/FilterFieldBinding";
 
 export interface FiltersDialogProps {
     open: boolean;
@@ -33,6 +30,9 @@ export function FiltersDialog({
     fixedFilter
 }: FiltersDialogProps) {
     const { t } = useTranslation();
+    // Engine of the collection this dialog filters — read from the
+    // surrounding CollectionScopeProvider mounted by the collection view.
+    const engine = useCollectionScope()?.engine;
     // Local state for filters being edited
     const [localFilters, setLocalFilters] = useState<FilterValues<any>>(filterValues ?? {});
 
@@ -52,12 +52,17 @@ export function FiltersDialog({
             if (!property) return false;
             // Force filter properties should not be editable
             if (fixedFilter && key in fixedFilter) return false;
-            // Check if property type is filterable
-            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 : undefined;
+            const baseProperty = isArray ? (Array.isArray(ofProp) ? ofProp[0] : ofProp) as Property | undefined : property;
+            if (!baseProperty) return false;
+            // A property is filterable when it has a custom filter field, or
+            // when at least one operator survives the engine ∩ type ∩
+            // property-narrowing resolution.
+            if (baseProperty.ui?.Filter) return true;
+            return resolveFilterOperators({ property: baseProperty, isArray, engine }).length > 0;
         });
-    }, [properties, fixedFilter]);
+    }, [properties, fixedFilter, engine]);
 
     const handleFilterChange = useCallback((propertyKey: string, value?: [VirtualTableWhereFilterOp, any]) => {
         setLocalFilters(prev => {
@@ -94,67 +99,21 @@ export function FiltersDialog({
     const activeFilterCount = Object.keys(localFilters).length;
 
     const renderFilterField = useCallback((propertyKey: string, property: Property) => {
-        const isArray = property.type === "array";
-        const ofProp = isArray && "of" in property ? property.of : undefined;
-        const baseProperty: Property | undefined = isArray ? (Array.isArray(ofProp) ? ofProp[0] : ofProp) as Property | undefined : property;
-
-        if (!baseProperty) return null;
-
-        const filterValue = localFilters[propertyKey] as [VirtualTableWhereFilterOp, any] | undefined;
-        const setValue = (value?: [VirtualTableWhereFilterOp, any]) => handleFilterChange(propertyKey, value);
-
-        if (baseProperty.type === "reference") {
-            return (
-                <ReferenceFilterField
-                    value={filterValue}
-                    setValue={setValue}
-                    name={propertyKey}
-                    isArray={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) : undefined;
-            return (
-                <StringNumberFilterField
-                    value={filterValue}
-                    setValue={setValue}
-                    name={propertyKey}
-                    type={baseProperty.type}
-                    isArray={isArray}
-                    enumValues={enumValues}
-                    title={property.name}
-                />
-            );
-        } else if (baseProperty.type === "boolean") {
-            return (
-                <BooleanFilterField
-                    value={filterValue}
-                    setValue={setValue}
-                    name={propertyKey}
-                    title={property.name}
-                />
-            );
-        } else if (baseProperty.type === "date") {
-            return (
-                <DateTimeFilterField
-                    value={filterValue}
-                    setValue={setValue}
-                    name={propertyKey}
-                    mode={baseProperty.mode}
-                    isArray={isArray}
-                    title={property.name}
-                />
-            );
-        }
-
-        return null;
-    }, [localFilters, handleFilterChange, hiddenFields, setHiddenForField]);
+        const filterValue = localFilters[propertyKey] as [WhereFilterOp, any] | undefined;
+        const setValue = (value?: [WhereFilterOp, any]) => handleFilterChange(propertyKey, value as [VirtualTableWhereFilterOp, any] | undefined);
+
+        return (
+            <FilterFieldBinding
+                propertyKey={propertyKey}
+                property={property}
+                engine={engine}
+                value={filterValue}
+                setValue={setValue}
+                hidden={hiddenFields[propertyKey] ?? false}
+                setHidden={(hidden) => setHiddenForField(propertyKey, hidden)}
+            />
+        );
+    }, [localFilters, handleFilterChange, hiddenFields, setHiddenForField, engine]);
 
     return (
         <Dialog

package/src/components/{EntityCollectionView → CollectionViewBinding}/SplitListView.tsx

@@ -1,8 +1,8 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { CollectionSize, Entity, EntityTableController, SelectionController } from "@rebasepro/types";
-import { EntityEditView } from "../EntityEditView";
-import { EntityDetailView } from "../EntityDetailView";
+import { EditViewBinding } from "../EditViewBinding";
+import { DetailViewBinding } from "../DetailViewBinding";
 import {
     cls,
     defaultBorderMixin,
@@ -15,7 +15,7 @@ import { useUrlController } from "../../index";
 import { ErrorBoundary } from "@rebasepro/ui";
 
 export type SplitListViewProps<M extends Record<string, unknown> = Record<string, unknown>> = {
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     tableController: EntityTableController<M>;
     onEntityClick?: (entity: Entity<M>) => void;
     onNewClick?: () => void;
@@ -84,7 +84,7 @@ function savePanelSize(path: string, size: number) {
  * 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.
  */
 export function SplitListView<M extends Record<string, unknown> = Record<string, unknown>>({
@@ -292,10 +292,10 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
         >
             <ErrorBoundary>
                 {collection.defaultEntityAction === "view" && !isEditMode
-                    ? <EntityDetailView
+                    ? <DetailViewBinding
                         key={String(renderedEntityId)}
                         path={path}
-                        collection={collection as EntityCollection<Record<string, unknown>>}
+                        collection={collection as CollectionConfig<Record<string, unknown>>}
                         entityId={renderedEntityId}
                         parentCollectionSlugs={usedParentCollectionIds}
                         parentEntityIds={usedParentEntityIds}
@@ -323,10 +323,10 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
                             navigate(entityUrl);
                         }}
                     />
-                    : <EntityEditView
+                    : <EditViewBinding
                         key={String(renderedEntityId)}
                         path={path}
-                        collection={collection as EntityCollection<Record<string, unknown>>}
+                        collection={collection as CollectionConfig<Record<string, unknown>>}
                         entityId={renderedEntityId}
                         parentCollectionSlugs={usedParentCollectionIds}
                         parentEntityIds={usedParentEntityIds}

package/src/components/{EntityCollectionView → CollectionViewBinding}/hooks/useCollectionInlineEditor.ts

@@ -1,11 +1,11 @@
 import { useCallback, useMemo } from "react";
 import { setIn } from "@rebasepro/formex";
-import { EntityCollection, SaveEntityProps, RebaseData, RebaseContext } from "@rebasepro/types";
-import { OnCellValueChange, saveEntityWithCallbacks, UniqueFieldValidator } from "@rebasepro/core";
+import { CollectionConfig, RebaseData, RebaseContext } from "@rebasepro/types";
+import { OnCellValueChange, saveEntityWithCallbacks, SaveEntityWithCallbacksProps, UniqueFieldValidator } from "@rebasepro/core";
 
 export interface UseCollectionInlineEditorParams<M extends Record<string, unknown>> {
     path: string;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     dataClient: RebaseData;
     context: RebaseContext;
 }
@@ -17,7 +17,7 @@ export function useCollectionInlineEditor<M extends Record<string, unknown>>({
     context
 }: UseCollectionInlineEditorParams<M>) {
 
-    // Unique field validator (ported from EntityCollectionView)
+    // Unique field validator (ported from CollectionViewBinding)
     const uniqueFieldValidator: UniqueFieldValidator = useCallback(
         async ({ name, value, property, entityId }: Parameters<UniqueFieldValidator>[0]) => {
             const accessor = dataClient.collection(path);
@@ -46,7 +46,7 @@ export function useCollectionInlineEditor<M extends Record<string, unknown>>({
 
         const updatedValues = setIn({}, propertyKey, value) as Partial<Record<string, unknown>>;
 
-        const saveProps: SaveEntityProps = {
+        const saveProps: SaveEntityWithCallbacksProps<Record<string, unknown>> = {
             path: entity.path ?? path,
             entityId: entity.id,
             values: updatedValues,

package/src/components/{EntityCollectionView → CollectionViewBinding}/hooks/useKanbanDragAndDrop.ts

@@ -1,13 +1,13 @@
 import { useCallback, useMemo } from "react";
 import { setIn } from "@rebasepro/formex";
-import { EntityCollection, SaveEntityProps, RebaseData, RebaseContext, AnalyticsController, Entity } from "@rebasepro/types";
-import { saveEntityWithCallbacks } from "@rebasepro/core";
+import { CollectionConfig, RebaseData, RebaseContext, AnalyticsController, Entity } from "@rebasepro/types";
+import { saveEntityWithCallbacks, SaveEntityWithCallbacksProps } from "@rebasepro/core";
 import { BoardItem } from "@rebasepro/ui";
 import { BoardDataController } from "../useBoardDataController";
 import { generateKeyBetween } from "fractional-indexing";
 
 export interface UseKanbanDragAndDropParams<M extends Record<string, unknown>> {
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     fullPath: string;
     columnProperty: string;
     orderProperty?: string;
@@ -106,7 +106,7 @@ export function useKanbanDragAndDrop<M extends Record<string, unknown>>({
             );
         }
 
-        const saveProps: SaveEntityProps = {
+        const saveProps: SaveEntityWithCallbacksProps<Record<string, unknown>> = {
             path: entity.path,
             entityId: entity.id,
             values: updatedValues as M,

package/src/components/{EntityCollectionView → CollectionViewBinding}/useBoardDataController.tsx

@@ -1,6 +1,6 @@
-import type { EntityCollection } from "@rebasepro/types";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { CollectionConfig } from "@rebasepro/types";
 import { Entity, FilterValues } from "@rebasepro/types";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useData, useRebaseContext } from "@rebasepro/core";
 
 const DEFAULT_PAGE_SIZE = 20;
@@ -67,7 +67,7 @@ export interface UseBoardDataControllerProps<M extends Record<string, unknown> =
     /** Full path to the collection */
     fullPath: string;
     /** The entity collection configuration */
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     /** Property key used for column assignment */
     columnProperty: string;
     /** Array of column values (enum values from columnProperty) */
@@ -244,7 +244,7 @@ export function useBoardDataController<M extends Record<string, unknown> = any,
             [currentColumnProperty]: ["==", column]
         };
 
-        const orderByParam = currentOrderProperty ? `${currentOrderProperty}:asc` : undefined;
+        const orderByParam: [string, "asc" | "desc"] | undefined = currentOrderProperty ? [currentOrderProperty, "asc"] : undefined;
 
         // Mark column as loading
         setColumnData(prev => ({
@@ -326,18 +326,24 @@ values: { ...e.values,
                 });
             }
 
-            // Apply afterRead callbacks if any
+            // Apply afterRead callbacks if any.
+            // afterRead operates on flat rows; unwrap the Entity view-model
+            // before invoking and re-wrap the processed row after.
             if (currentCollection.callbacks?.afterRead) {
                 try {
                     processed = await Promise.all(
-                        processed.map(entity =>
-                            currentCollection.callbacks!.afterRead!({
+                        processed.map(async (entity) => {
+                            const processedRow = await currentCollection.callbacks!.afterRead!({
                                 collection: currentCollection,
                                 path: currentResolvedPath,
-                                entity,
+                                row: { id: entity.id, ...entity.values },
                                 context: currentContext
-                            })
-                        )
+                            });
+                            return {
+                                ...entity,
+                                values: processedRow as M
+                            };
+                        })
                     );
                 } catch (e) {
                     console.error("Error in afterRead callback:", e);

package/src/components/{EntityCollectionView/useEntityPreviewSlots.ts → CollectionViewBinding/usePreviewSlots.ts}

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import type { EntityCollection, Property, RelationProperty } from "@rebasepro/types";
+import type { CollectionConfig, Property, RelationProperty } from "@rebasepro/types";
 import type { Entity, PropertyConfig, EntityRelation } from "@rebasepro/types";
 import { getEntityImagePreviewPropertyKey } from "@rebasepro/common";
 import { getEntityFromCache } from "@rebasepro/core";
@@ -13,7 +13,7 @@ import { ChipColorScheme, CHIP_COLORS } from "@rebasepro/ui";
 
 /**
  * A resolved "slot" containing the property definition, key, and the
- * concrete value extracted from an entity.
+ * concrete value extracted from a entity.
  */
 export interface PreviewSlot {
     property: Property;
@@ -102,7 +102,7 @@ export interface CollectionSlotKeys {
  * Pure function — call inside `useMemo`.
  */
 export function resolveCollectionSlotKeys(
-    collection: EntityCollection<Record<string, unknown>>,
+    collection: CollectionConfig<Record<string, unknown>>,
     authController: AuthController,
     propertyConfigs: Record<string, PropertyConfig>
 ): CollectionSlotKeys {
@@ -216,7 +216,7 @@ dateKey };
  * and value is the first element (for arrays) or the raw value.
  */
 function resolveImageSlot(
-    collection: EntityCollection<Record<string, unknown>>,
+    collection: CollectionConfig<Record<string, unknown>>,
     imageKey: string,
     entity: Entity<Record<string, unknown>>
 ): PreviewSlot | undefined {
@@ -277,7 +277,7 @@ function formatDateValue(value: unknown): string {
  * `resolveEntitySlots` for each entity row.
  */
 export function useCollectionSlotKeys(
-    collection: EntityCollection<Record<string, unknown>>,
+    collection: CollectionConfig<Record<string, unknown>>,
     authController: AuthController,
     propertyConfigs: Record<string, PropertyConfig>
 ): CollectionSlotKeys {
@@ -296,7 +296,7 @@ export function useCollectionSlotKeys(
  */
 export function resolveEntitySlots(
     entity: Entity<Record<string, unknown>>,
-    collection: EntityCollection<Record<string, unknown>>,
+    collection: CollectionConfig<Record<string, unknown>>,
     slotKeys: CollectionSlotKeys
 ): EntityPreviewSlots {
     const { titleKey, imageKey, subtitleKey, relationKeys, statusKey, dateKey } = slotKeys;
@@ -441,11 +441,11 @@ function resolveRelationDisplayName(
     const data = "data" in relation ? (relation as EntityRelation).data : undefined;
 
     // Resolve target collection from either `prop.relation.target()` or `prop.target()` (inline API)
-    let targetCollection: EntityCollection | undefined;
+    let targetCollection: CollectionConfig | undefined;
     try {
         const resolved = prop.relation?.target?.() ?? (typeof prop.target === "function" ? prop.target() : undefined);
         if (resolved && typeof resolved === "object") {
-            targetCollection = resolved as EntityCollection;
+            targetCollection = resolved as CollectionConfig;
         }
     } catch {
         // Target collection may not be resolvable

package/src/components/DeleteEntityDialog.tsx

@@ -1,5 +1,5 @@
-import type { EntityCollection } from "@rebasepro/types";
-import { Entity, EntityCallbacks } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
+import { Entity, CollectionCallbacks } from "@rebasepro/types";
 import React, { useCallback, useMemo, useState } from "react";
 import { Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogTitle } from "@rebasepro/ui";
 import {
@@ -11,15 +11,15 @@ import {
     useTranslation
 } from "@rebasepro/core";
 import { useCMSContext } from "../hooks";
-import { EntityView } from "./EntityView";
+import { EntityViewBinding } from "./EntityViewBinding";
 
 export interface DeleteEntityDialogProps<M extends Record<string, unknown>> {
     entityOrEntitiesToDelete?: Entity<M> | Entity<M>[],
     path: string,
-    collection: EntityCollection<M>
+    collection: CollectionConfig<M>
     open: boolean;
     onClose: () => void;
-    callbacks?: EntityCallbacks<M>,
+    callbacks?: CollectionCallbacks<M>,
 
     onEntityDelete?(path: string, entity: Entity<M>): void;
 
@@ -135,7 +135,7 @@ export function DeleteEntityDialog<M extends Record<string, unknown>>({
     } else {
         const entity = entityOrEntities as Entity<M> | undefined;
         content = entity
-            ? <EntityView
+            ? <EntityViewBinding
                 entity={entity}
                 collection={collection}
                 path={path}/>

package/src/components/{EntityDetailView.tsx → DetailViewBinding.tsx}

@@ -1,11 +1,11 @@
-import type { ComponentRef, EntityCollection, EntityCustomViewParams, FormViewConfig } from "@rebasepro/types";
+import type { ComponentRef, CollectionConfig, EntityCustomViewParams, FormViewConfig } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
 import type { PluginFormActionProps } from "@rebasepro/types";
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Entity, EntityStatus, getCollectionDataPath, Property } from "@rebasepro/types";
-import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
+import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionScopeProvider } from "@rebasepro/core";
 
-import { EntityCollectionView, EntityView } from "../components";
+import { CollectionViewBinding, EntityViewBinding } from "../components";
 import { CircularProgressCenter, iconSize } from "@rebasepro/ui";
 import {
     Alert,
@@ -34,7 +34,7 @@ import {
 import { resolvedSelectedEntityView } from "../util/resolutions";
 import {
     useCustomizationController,
-    useEntityFetch,
+    useFetch,
     useRebaseContext,
     useLargeLayout,
     useSlot
@@ -43,11 +43,11 @@ import { useUrlController, useCollectionRegistryController } from "../index";
 import { useNavigate } from "react-router-dom";
 import { getValueInPath } from "@rebasepro/utils";
 import { getEntityTitlePropertyKey, resolveTitleToString } from "../util/previews";
-import { EntityJsonPreview } from "../components/EntityJsonPreview";
+import { JsonPreviewBinding } from "../components/JsonPreviewBinding";
 
 const EntityHistoryView = lazy(() => import("../components/history").then(m => ({ default: m.EntityHistoryView })));
 
-import { MAIN_TAB_VALUE, JSON_TAB_VALUE, HISTORY_TAB_VALUE } from "../util/entity_view_constants";
+import { MAIN_TAB_VALUE, JSON_TAB_VALUE, HISTORY_TAB_VALUE } from "../util/view_constants";
 
 export type BarActionsParams = {
     values: object,
@@ -60,12 +60,12 @@ export type OnTabChangeParams<M extends Record<string, unknown>> = {
     path: string;
     entityId?: string | number;
     selectedTab?: string;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
 };
 
-export interface EntityDetailViewProps<M extends Record<string, unknown> = Record<string, unknown>> {
+export interface DetailViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> {
     path: string;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     entityId: string | number;
     selectedTab?: string;
     parentCollectionSlugs: string[];
@@ -76,16 +76,16 @@ export interface EntityDetailViewProps<M extends Record<string, unknown> = Recor
     barActions?: (params: BarActionsParams) => React.ReactNode;
 }
 
-export function EntityDetailView<M extends Record<string, unknown>>({
+export function DetailViewBinding<M extends Record<string, unknown>>({
     entityId,
     ...props
-}: EntityDetailViewProps<M>) {
+}: DetailViewBindingProps<M>) {
 
     const {
         entity,
         dataLoading,
         dataLoadingError
-    } = useEntityFetch<M>({
+    } = useFetch<M>({
         path: props.path,
         entityId: entityId,
         collection: props.collection,
@@ -105,7 +105,7 @@ export function EntityDetailView<M extends Record<string, unknown>>({
     }
 
     const content = (
-        <EntityDetailViewInner<M>
+        <DetailViewBindingInner<M>
             {...props}
             entityId={entityId}
             entity={entity}
@@ -113,17 +113,14 @@ export function EntityDetailView<M extends Record<string, unknown>>({
         />
     );
 
-    if (props.collection.components) {
-        return (
-            <CollectionComponentOverrideProvider overrides={props.collection.components}>
-                {content}
-            </CollectionComponentOverrideProvider>
-        );
-    }
-    return content;
+    return (
+        <CollectionScopeProvider collection={props.collection}>
+            {content}
+        </CollectionScopeProvider>
+    );
 }
 
-function EntityDetailViewInner<M extends Record<string, unknown>>({
+function DetailViewBindingInner<M extends Record<string, unknown>>({
     path,
     entityId,
     selectedTab: selectedTabProp,
@@ -136,11 +133,11 @@ function EntityDetailViewInner<M extends Record<string, unknown>>({
     dataLoading,
     layout = "full_screen",
     barActions
-}: EntityDetailViewProps<M> & {
+}: DetailViewBindingProps<M> & {
     entity?: Entity<M>,
     dataLoading: boolean,
 }) {
-    const ResolvedCollectionView = useComponentOverride("Collection.View", EntityCollectionView);
+    const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
     const { t } = useTranslation();
     const context = useRebaseContext();
     const urlController = useUrlController();
@@ -166,7 +163,7 @@ entityId }
     ), [collection, entityId]);
 
     // Track whether the user has explicitly clicked a tab in this component
-    // instance. See EntityEditViewInner for full explanation.
+    // instance. See EditViewBindingInner for full explanation.
     const userHasChangedTab = useRef(false);
 
     const [selectedTab, setSelectedTab] = useState<string>(() => {
@@ -264,7 +261,7 @@ entityId }
     const pluginActionsTop = useSlot("form.actions.top", formActionTopProps);
 
     // Resolve formView.Builder if provided
-    const formViewConfig = (collection as EntityCollection<M> & { formView?: FormViewConfig<M> }).formView;
+    const formViewConfig = (collection as CollectionConfig<M> & { formView?: FormViewConfig<M> }).formView;
     const FormViewBuilder = formViewConfig?.Builder ? resolveComponentRef<EntityCustomViewParams>(formViewConfig.Builder as ComponentRef<EntityCustomViewParams>) : null;
 
     // Title resolution
@@ -323,7 +320,7 @@ entityId }
         key={"json_view"}
         role="tabpanel">
         <ErrorBoundary>
-            <EntityJsonPreview values={usedEntity?.values ?? {}} />
+            <JsonPreviewBinding values={usedEntity?.values ?? {}} />
         </ErrorBoundary>
     </div> : null;
 
@@ -405,7 +402,7 @@ entityId }
 
         return (
             <>
-                {usedEntity && <EntityView
+                {usedEntity && <EntityViewBinding
                     entity={usedEntity}
                     collection={collection}
                     path={path}
@@ -639,7 +636,7 @@ entityId }
     return result;
 }
 
-function DetailViewSkeleton({ collection }: { collection: EntityCollection<Record<string, unknown>> }) {
+function DetailViewSkeleton({ collection }: { collection: CollectionConfig<Record<string, unknown>> }) {
     return (
         <div className="flex-1 flex flex-row w-full overflow-y-auto justify-center">
             <div className="relative flex flex-row max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-6xl w-full h-fit">