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

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

@@ -1,21 +1,20 @@
-
-import type { AdditionalFieldDelegate, EntityCollection } from "@rebasepro/types";
-import type { EntityAction, Property } from "@rebasepro/types";
+import type { AdditionalFieldDelegate, EntityAction, CollectionConfig, Property } from "@rebasepro/types";
+import {
+    CollectionSize,
+    Entity,
+    EntityReference,
+    EntityTableController,
+    FilterValues,
+    getCollectionDataPath,
+    PartialCollectionConfig,
+    ViewMode
+} from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 
 import { deepEqual as equal } from "fast-equals"
-
-
-const EMPTY_ARRAY: never[] = [];
-const DEFAULT_ENTITY_OPEN_MODE = "split";
-
-import { CollectionSize, Entity, EntityReference, EntityTableController, FilterValues, getCollectionDataPath, PartialEntityCollection, ViewMode } from "@rebasepro/types";
-import {
-    EntityCollectionRowActions,
-    EntityCollectionTable
-} from "../EntityCollectionTable";
-import { CollectionTableToolbar } from "../EntityCollectionTable/internal/CollectionTableToolbar";
+import { CollectionRowActions, CollectionTableBinding } from "../CollectionTableBinding";
+import { CollectionTableToolbar } from "../CollectionTableBinding/internal/CollectionTableToolbar";
 import { getSubcollections } from "@rebasepro/common";
 import { useCollectionInlineEditor } from "./hooks/useCollectionInlineEditor";
 import { navigateToEntity } from "../../util/navigation_utils";
@@ -24,47 +23,63 @@ import { resolveEntityAction } from "../../util/resolutions";
 import { getPropertyInPath } from "../../util/property_utils";
 import { ReferencePreview } from "../../preview";
 import {
+    CollectionScopeProvider,
+    OnColumnResizeParams,
+    useAnalyticsController,
     useAuthController,
+    useColumnIds,
+    useComponentOverride,
     useCustomizationController,
     useData,
     useDataTableController,
     useLargeLayout,
     usePermissions,
-    useTranslation,
+    useScrollRestoration,
     useSlot,
-    IconForView,
-    useComponentOverride,
-    CollectionComponentOverrideProvider
-} from "@rebasepro/core";
-import { useUserConfigurationPersistence } from "@rebasepro/core";
-import { EntityCollectionViewActions } from "./EntityCollectionViewActions";
-import { EntityCollectionCardView } from "./EntityCollectionCardView";
-import { EntityCollectionListView } from "./EntityCollectionListView";
+    useTranslation,
+    useUserConfigurationPersistence
+} from "@rebasepro/app";
+import { CollectionViewActions } from "./CollectionViewActions";
+import { CollectionCardViewBinding } from "./CollectionCardViewBinding";
+import { CollectionListViewBinding } from "./CollectionListViewBinding";
 import { SplitListView } from "./SplitListView";
-import { EntityCollectionBoardView } from "./EntityCollectionBoardView";
-import { ViewModeToggle, KanbanPropertyOption } from "./ViewModeToggle";
-import { Button, cls, focusedDisabled, IconButton, Markdown, Popover, Skeleton, TextField, Tooltip, Typography, VirtualTableColumn, iconSize } from "@rebasepro/ui";
-import { ArrowRightToLineIcon, ErrorBoundary, PlusIcon, SearchIcon } from "@rebasepro/ui";
-import { setIn } from "@rebasepro/formex";
-import { getSubcollectionColumnId } from "../EntityCollectionTable/internal/common";
+import { CollectionBoardViewBinding } from "./CollectionBoardViewBinding";
+import { KanbanPropertyOption, ViewModeToggle } from "./ViewModeToggle";
 import {
-    copyEntityAction,
-    deleteEntityAction,
-    editEntityAction
-} from "../common/default_entity_actions";
-import { OnCellValueChange, OnColumnResizeParams, UniqueFieldValidator } from "@rebasepro/core";
-import { useColumnIds } from "@rebasepro/core";
-import { PopupFormField } from "../EntityCollectionTable/internal/popup_field/PopupFormField";
-import { GetPropertyForProps } from "../EntityCollectionTable/EntityCollectionTableProps";
+    ArrowRightToLineIcon,
+    Button,
+    cls,
+    ErrorBoundary,
+    focusedDisabled,
+    IconButton,
+    iconSize,
+    PlusIcon,
+    Popover,
+    SearchIcon,
+    TextField,
+    Tooltip,
+    Typography,
+    VirtualTableColumn
+} from "@rebasepro/ui";
+import { getSubcollectionColumnId } from "../CollectionTableBinding/internal/common";
+import { copyEntityAction, deleteEntityAction, editEntityAction } from "../common/default_entity_actions";
+import { PopupFormField } from "../CollectionTableBinding/internal/popup_field/PopupFormField";
+import { GetPropertyForProps } from "../CollectionTableBinding/CollectionTableBindingProps";
 import { DeleteEntityDialog } from "../DeleteEntityDialog";
-import { useAnalyticsController } from "@rebasepro/core";
 import { useSelectionController } from "./useSelectionController";
-import { EntityCollectionViewStartActions } from "./EntityCollectionViewStartActions";
+import { CollectionViewStartActions } from "./CollectionViewStartActions";
 import { addRecentId, getRecentIds } from "./utils";
-import { useScrollRestoration } from "@rebasepro/core";
 import { mergeDeep } from "@rebasepro/utils";
-import { useCollectionRegistryController, useUrlController, useSideEntityController, useCMSContext } from "../../index";
-import { useBreadcrumbsController } from "../../index";
+import {
+    useBreadcrumbsController,
+    useCMSContext,
+    useCollectionRegistryController,
+    useSidePanel,
+    useUrlController
+} from "../../index";
+
+const EMPTY_ARRAY: never[] = [];
+const DEFAULT_ENTITY_OPEN_MODE = "split";
 
 function getOpenEntityMode(
     viewMode: ViewMode,
@@ -80,7 +95,7 @@ function getOpenEntityMode(
 /**
  * @group Components
  */
-export type EntityCollectionViewProps<M extends Record<string, unknown>> = {
+export type CollectionViewBindingProps<M extends Record<string, unknown>> = {
     /**
      * Complete path where this collection is located.
      * It defaults to the collection path if not provided.
@@ -118,23 +133,23 @@ export type EntityCollectionViewProps<M extends Record<string, unknown>> = {
      */
     selectedTab?: string;
 
-} & EntityCollection<M>;
+} & CollectionConfig<M>;
 
 /**
- * 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}
@@ -144,8 +159,8 @@ export type EntityCollectionViewProps<M extends Record<string, unknown>> = {
 
  * @group Components
  */
-const EntityCollectionViewInner = React.memo(
-    function EntityCollectionViewInner<M extends Record<string, unknown>>({
+const CollectionViewBindingInner = React.memo(
+    function CollectionViewBindingInner<M extends Record<string, unknown>>({
         path: pathProp,
 
         parentCollectionSlugs, parentEntityIds,
@@ -155,7 +170,7 @@ const EntityCollectionViewInner = React.memo(
         selectedEntityId: selectedEntityIdProp,
         selectedTab: selectedTabProp,
         ...collectionProp
-    }: EntityCollectionViewProps<M>
+    }: CollectionViewBindingProps<M>
     ) {
 
         const { t } = useTranslation();
@@ -165,7 +180,7 @@ const EntityCollectionViewInner = React.memo(
         const breadcrumbs = useBreadcrumbsController();
         const path = pathProp ?? getCollectionDataPath(collectionProp);
         const dataClient = useData();
-        const sideEntityController = useSideEntityController();
+        const sidePanelController = useSidePanel();
         const authController = useAuthController();
         const userConfigPersistence = useUserConfigurationPersistence();
         const analyticsController = useAnalyticsController();
@@ -179,7 +194,7 @@ const EntityCollectionViewInner = React.memo(
         const collection = useMemo(() => {
             const registryCollection = collectionRegistry.getCollection(path) || collectionProp;
             const userOverride = userConfigPersistence?.getCollectionConfig<M>(path);
-            return (userOverride ? mergeDeep(registryCollection, userOverride) : registryCollection) as EntityCollection<M>;
+            return (userOverride ? mergeDeep(registryCollection, userOverride) : registryCollection) as CollectionConfig<M>;
         }, [collectionProp, path, userConfigPersistence, collectionRegistry]);
 
         const collectionRef = React.useRef(collection);
@@ -346,14 +361,14 @@ const EntityCollectionViewInner = React.memo(
             navigateToEntity({
                 navigation: urlController,
                 path: entityPath,
-                sideEntityController,
+                sidePanelController,
                 openEntityMode,
                 collection,
                 entityId: clickedEntity.id,
                 replace: openEntityMode === "split" && selectedEntityIdProp !== undefined
             });
 
-        }, [sideEntityController, openEntityMode, selectedEntityIdProp, path, urlController, analyticsController]);
+        }, [sidePanelController, openEntityMode, selectedEntityIdProp, path, urlController, analyticsController]);
 
         const onNewClick = useCallback(() => {
             const collection = collectionRef.current;
@@ -365,11 +380,11 @@ const EntityCollectionViewInner = React.memo(
                 collection,
                 entityId: undefined,
                 path: path,
-                sideEntityController,
+                sidePanelController,
                 navigation: urlController,
                 onClose: unselectNavigatedEntity
             })
-        }, [path, sideEntityController]);
+        }, [path, sidePanelController]);
 
         const openNewDocument = useCallback((defaultValues?: Record<string, unknown>) => {
             const collection = collectionRef.current;
@@ -382,11 +397,11 @@ const EntityCollectionViewInner = React.memo(
                 entityId: undefined,
                 defaultValues,
                 path: path,
-                sideEntityController,
+                sidePanelController,
                 navigation: urlController,
                 onClose: unselectNavigatedEntity
             });
-        }, [path, sideEntityController, openEntityMode, urlController, unselectNavigatedEntity]);
+        }, [path, sidePanelController, openEntityMode, urlController, unselectNavigatedEntity]);
 
         const onMultipleDeleteClick = () => {
             analyticsController.onAnalyticsEvent?.("multiple_delete_dialog_open", {
@@ -447,7 +462,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
             collection
         });
 
-        const onCollectionModifiedForUser = useCallback((path: string, partialCollection: PartialEntityCollection<M>) => {
+        const onCollectionModifiedForUser = useCallback((path: string, partialCollection: PartialCollectionConfig<M>) => {
             if (userConfigPersistence) {
                 const currentStoredConfig = userConfigPersistence.getCollectionConfig(path);
                 const updatedConfig = mergeDeep(currentStoredConfig, partialCollection);
@@ -463,7 +478,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
             const collection = collectionRef.current;
             // Only for property columns
             if (!getPropertyInPath(collection.properties, key)) return;
-            const localCollection = buildPropertyWidthOverwrite(key, width) as PartialEntityCollection<M>;
+            const localCollection = buildPropertyWidthOverwrite(key, width) as PartialCollectionConfig<M>;
             onCollectionModifiedForUser(path, localCollection);
         }, [onCollectionModifiedForUser, path]);
 
@@ -489,7 +504,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
             setViewMode(mode);
             // Save to local persistence for next visit
             if (userConfigPersistence) {
-                onCollectionModifiedForUser(path, { defaultViewMode: mode } as PartialEntityCollection<M>);
+                onCollectionModifiedForUser(path, { defaultViewMode: mode } as PartialCollectionConfig<M>);
             }
         }, [setViewMode, userConfigPersistence, onCollectionModifiedForUser, path, analyticsController, viewMode]);
 
@@ -583,7 +598,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
             setSelectedKanbanProperty(property);
             // Save to local persistence
             if (userConfigPersistence) {
-                onCollectionModifiedForUser(path, { kanbanColumnProperty: property } as PartialEntityCollection<M>);
+                onCollectionModifiedForUser(path, { kanbanColumnProperty: property } as PartialCollectionConfig<M>);
             }
         }, [userConfigPersistence, onCollectionModifiedForUser, path, analyticsController]);
 
@@ -620,7 +635,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
         const additionalFields = useMemo(() => {
             // v4: use getSubcollections helper to access subcollections
             const subcollectionsList = getSubcollections(collection);
-            const subcollectionColumns: AdditionalFieldDelegate<M, any>[] = subcollectionsList.map((subcollection: EntityCollection) => {
+            const subcollectionColumns: AdditionalFieldDelegate<M, any>[] = subcollectionsList.map((subcollection: CollectionConfig) => {
                 return {
                     key: getSubcollectionColumnId(subcollection),
                     name: subcollection.name,
@@ -639,7 +654,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
                                     selectedTab: subcollection.slug,
                                     path: path,
                                     navigation: urlController,
-                                    sideEntityController
+                                    sidePanelController
                                 })
                             }}>
                             {subcollection.name}
@@ -652,7 +667,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
                 ...(collection.additionalFields ?? EMPTY_ARRAY),
                 ...subcollectionColumns
             ];
-        }, [collection, path, sideEntityController]);
+        }, [collection, path, sidePanelController]);
 
         const updateLastDeleteTimestamp = useCallback(() => {
             setLastDeleteTimestamp(Date.now());
@@ -717,7 +732,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
             });
 
             return (
-                <EntityCollectionRowActions
+                <CollectionRowActions
                     entity={entity}
                     width={width}
                     frozen={frozen}
@@ -776,7 +791,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
                 propertyKey,
                 onHover,
                 path,
-                collection: collection as EntityCollection,
+                collection: collection as CollectionConfig,
                 tableController: tableController as EntityTableController,
                 parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY,
 parentEntityIds: parentEntityIds ?? EMPTY_ARRAY
@@ -832,7 +847,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY
 
             // Save to user configuration persistence (local storage)
             if (userConfigPersistence) {
-                onCollectionModifiedForUser(path, { propertiesOrder: newPropertiesOrder } as PartialEntityCollection<M>);
+                onCollectionModifiedForUser(path, { propertiesOrder: newPropertiesOrder } as PartialCollectionConfig<M>);
             }
         }, [collection, setLocalPropertiesOrder, customizationController, path, parentCollectionSlugs, parentEntityIds, userConfigPersistence, onCollectionModifiedForUser]);
 
@@ -871,8 +886,8 @@ parentEntityIds,
         const isSearching = !!tableController.searchString;
         const isFilteredOrSorted = tableController.filterValues !== undefined || tableController.sortBy !== undefined || isSearching;
         const ResolvedEmptyState = useComponentOverride("Collection.EmptyState", DefaultCollectionEmptyState);
-        const ResolvedCollectionActions = useComponentOverride("Collection.Actions", EntityCollectionViewActions);
-        const ResolvedCollectionTable = useComponentOverride("Collection.Table", EntityCollectionTable) as typeof EntityCollectionTable;
+        const ResolvedCollectionActions = useComponentOverride("Collection.Actions", CollectionViewActions);
+        const ResolvedCollectionTable = useComponentOverride("Collection.Table", CollectionTableBinding) as typeof CollectionTableBinding;
         const emptyComponent = pluginEmptyStates.length > 0
             ? <>{pluginEmptyStates}</>
             : <ResolvedEmptyState
@@ -889,7 +904,7 @@ parentEntityIds,
                 onTextSearch={tableController.setSearchString}
                 initialSearchText={tableController.searchString}
                 viewModeToggle={viewModeToggleElement}
-                actionsStart={<EntityCollectionViewStartActions
+                actionsStart={<CollectionViewStartActions
                     parentCollectionSlugs={parentCollectionSlugs ?? EMPTY_ARRAY} parentEntityIds={parentEntityIds ?? EMPTY_ARRAY}
                     collection={collection}
                     tableController={tableController}
@@ -920,7 +935,7 @@ parentEntityIds,
                 }
             />
         ); const innerView = viewMode === "kanban" ? (
-            <EntityCollectionBoardView
+            <CollectionBoardViewBinding
                 key={`kanban-view-${path}-${selectedKanbanProperty}`}
                 collection={collection}
                 tableController={tableController}
@@ -935,7 +950,7 @@ parentEntityIds,
                 emptyComponent={emptyComponent}
             />
         ) : viewMode === "cards" ? (
-            <EntityCollectionCardView
+            <CollectionCardViewBinding
                 key={`cards-view-${path}`}
                 collection={collection}
                 tableController={tableController}
@@ -949,7 +964,7 @@ parentEntityIds,
                 emptyComponent={emptyComponent}
             />
         ) : viewMode === "list" ? (
-            <EntityCollectionListView
+            <CollectionListViewBinding
                 key={`list-view-${path}`}
                 collection={collection}
                 tableController={tableController}
@@ -1080,7 +1095,7 @@ parentEntityIds,
                                         </div>
                                     </div>
                                 )}
-                                <EntityCollectionListView
+                                <CollectionListViewBinding
                                     key={`list-view-${path}`}
                                     collection={collection}
                                     tableController={tableController}
@@ -1195,26 +1210,26 @@ parentEntityIds,
             equal(a.fixedFilter, b.fixedFilter) &&
             equal(a.selectedEntityId, b.selectedEntityId) &&
             equal(a.selectedTab, b.selectedTab);
-    }) as React.FunctionComponent<EntityCollectionViewProps<any>>;
+    }) as React.FunctionComponent<CollectionViewBindingProps<any>>;
 
-export const EntityCollectionView = React.memo(
-    function EntityCollectionView<M extends Record<string, unknown>>(props: EntityCollectionViewProps<M>) {
+export const CollectionViewBinding = React.memo(
+    function CollectionViewBinding<M extends Record<string, unknown>>(props: CollectionViewBindingProps<M>) {
         const collectionRegistry = useCollectionRegistryController();
         const path = props.path ?? props.slug;
         const collection = collectionRegistry.getCollection(path) ?? props;
 
-        const content = <EntityCollectionViewInner {...props} />;
+        const content = <CollectionViewBindingInner {...props} />;
 
-        if (collection?.components) {
+        if (collection) {
             return (
-                <CollectionComponentOverrideProvider overrides={collection.components}>
+                <CollectionScopeProvider collection={collection as CollectionConfig}>
                     {content}
-                </CollectionComponentOverrideProvider>
+                </CollectionScopeProvider>
             );
         }
         return content;
     }
-) as React.FunctionComponent<EntityCollectionViewProps<any>>;
+) as React.FunctionComponent<CollectionViewBindingProps<any>>;
 
 /**
  * Default empty state shown when a collection has no entities.
@@ -1272,7 +1287,7 @@ function EntitiesCount({
     onCountChange
 }: {
     path: string,
-    collection: EntityCollection,
+    collection: CollectionConfig,
     filter?: FilterValues<any>,
     sortBy?: [string, "asc" | "desc"],
     onCountChange?: (count: number | null | undefined) => void,
@@ -1303,7 +1318,7 @@ function EntitiesCount({
 
         // filterValues is already FilterValues — pass directly
         const whereParams = filter && Object.keys(filter).length > 0 ? filter : undefined;
-        const orderByParams = sortByProperty ? `${String(sortByProperty)}:${currentSort}` : undefined;
+        const orderByParams: [string, "asc" | "desc"] | undefined = sortByProperty && currentSort ? [String(sortByProperty), currentSort] : undefined;
 
         // Deduplicate inflight count requests (e.g. React StrictMode double-mount)
         const cacheKey = `${path}|${filterKey}|${sortByProperty ?? ""}|${currentSort ?? ""}`;
@@ -1332,12 +1347,12 @@ function EntitiesCount({
     return null;
 }
 
-function buildPropertyWidthOverwrite(key: string, width: number): PartialEntityCollection {
+function buildPropertyWidthOverwrite(key: string, width: number): PartialCollectionConfig {
     if (key.includes(".")) {
         const [parentKey, ...childKey] = key.split(".");
-        return { properties: { [parentKey]: buildPropertyWidthOverwrite(childKey.join("."), width) } } as PartialEntityCollection;
+        return { properties: { [parentKey]: buildPropertyWidthOverwrite(childKey.join("."), width) } } as PartialCollectionConfig;
     }
-    return { properties: { [key]: { ui: { columnWidth: width } } } } as PartialEntityCollection;
+    return { properties: { [key]: { ui: { columnWidth: width } } } } as PartialCollectionConfig;
 }
 
 function EntityIdHeaderWidget({
@@ -1345,7 +1360,7 @@ function EntityIdHeaderWidget({
     path,
     idPath
 }: {
-    collection: EntityCollection,
+    collection: CollectionConfig,
     path: string,
     idPath: string
 }) {
@@ -1355,7 +1370,7 @@ function EntityIdHeaderWidget({
     const [openPopup, setOpenPopup] = React.useState(false);
     const [searchString, setSearchString] = React.useState("");
     const [recentIds, setRecentIds] = React.useState<string[]>(getRecentIds(collection.slug).map(String));
-    const sideEntityController = useSideEntityController();
+    const sidePanelController = useSidePanel();
 
     const openEntityMode = collection?.openEntityMode ?? DEFAULT_ENTITY_OPEN_MODE;
 
@@ -1387,7 +1402,7 @@ function EntityIdHeaderWidget({
                                 entityId,
                                 path,
 
-                                sideEntityController,
+                                sidePanelController,
                                 navigation: urlController
                             })
                         }}
@@ -1425,7 +1440,7 @@ path })}
                                         entityId: id,
                                         path,
 
-                                        sideEntityController,
+                                        sidePanelController,
                                         navigation: urlController
                                     })
                                 }}

package/src/components/{EntityCollectionView/EntityCollectionViewStartActions.tsx → CollectionViewBinding/CollectionViewStartActions.tsx}

@@ -1,7 +1,7 @@
 import type { Properties } from "@rebasepro/types";
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { useState, useCallback } from "react";
-import { useAuthController, useLargeLayout, useTranslation, useSlot } from "@rebasepro/core";
+import { useAuthController, useLargeLayout, useTranslation, useSlot } from "@rebasepro/app";
 import { CollectionActionsProps, EntityTableController, SelectionController } from "@rebasepro/types";
 import { ErrorBoundary, iconSize } from "@rebasepro/ui";
 import { ArrowLeftIcon, Badge, Button, cls, FilterIcon, IconButton, Tooltip } from "@rebasepro/ui";
@@ -12,8 +12,8 @@ import { toArray } from "@rebasepro/utils";
 import { useNavigate } from "react-router-dom";
 import { useUrlController, useCMSContext } from "../../index";
 
-export type EntityCollectionViewStartActionsProps<M extends Record<string, unknown>> = {
-    collection: EntityCollection<M>;
+export type CollectionViewStartActionsProps<M extends Record<string, unknown>> = {
+    collection: CollectionConfig<M>;
     path: string;
     relativePath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];
@@ -28,7 +28,7 @@ export type EntityCollectionViewStartActionsProps<M extends Record<string, unkno
     openNewDocument: (defaultValues?: Record<string, unknown>) => void;
 }
 
-export function EntityCollectionViewStartActions<M extends Record<string, unknown>>({
+export function CollectionViewStartActions<M extends Record<string, unknown>>({
     collection,
     relativePath,
     parentCollectionSlugs, parentEntityIds,
@@ -39,7 +39,7 @@ export function EntityCollectionViewStartActions<M extends Record<string, unknow
     resolvedProperties,
     compact,
     openNewDocument
-}: EntityCollectionViewStartActionsProps<M>) {
+}: CollectionViewStartActionsProps<M>) {
 
     const context = useCMSContext();
     const largeLayout = useLargeLayout();

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 {
@@ -12,14 +12,14 @@ import { PropertyPreview } from "../../preview";
 import {
     useAuthController,
     useCustomizationController
-} from "@rebasepro/core";
-import { useAnalyticsController } from "@rebasepro/core";
-import { IconForView } from "@rebasepro/core";
-import { useCollectionSlotKeys, resolveEntitySlots } from "./useEntityPreviewSlots";
+} from "@rebasepro/app";
+import { useAnalyticsController } from "@rebasepro/app";
+import { IconForView } from "@rebasepro/app";
+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]