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

package/src/hooks/{useEntitySelectionDialog.tsx → useSelectionDialog.tsx}

@@ -1,5 +1,5 @@
-import { EntitySelectionProps, EntitySelectionTable } from "../components";
-import type { EntityCollection } from "@rebasepro/types";
+import { SelectionProps, SelectionTableBinding } from "../components";
+import type { CollectionConfig } from "@rebasepro/types";
 import { useCallback, useMemo } from "react";
 import { useSideDialogsController } from "../index";
 import { useCollectionRegistryController } from "../index";
@@ -14,7 +14,7 @@ import { useCollectionRegistryController } from "../index";
  * This is the same hook used internally when a reference property is defined.
  * @group Hooks and utilities
  */
-export function useEntitySelectionDialog<M extends Record<string, unknown>>(referenceDialogProps: Omit<EntitySelectionProps<M>, "path"> & {
+export function useSelectionDialog<M extends Record<string, unknown>>(referenceDialogProps: Omit<SelectionProps<M>, "path"> & {
     path?: string | false;
     onClose?: () => void;
 }): { open: () => void; close: () => void } {
@@ -26,15 +26,15 @@ export function useEntitySelectionDialog<M extends Record<string, unknown>>(refe
         if (referenceDialogProps.path) {
             let usedCollection = referenceDialogProps.collection;
             if (!usedCollection)
-                usedCollection = navigation.getCollection(referenceDialogProps.path) as EntityCollection<M> | undefined;
+                usedCollection = navigation.getCollection(referenceDialogProps.path) as CollectionConfig<M> | undefined;
             if (!usedCollection)
-                throw Error("Not able to resolve the collection in useEntitySelectionDialog. Make sure a collection is registered in path " + referenceDialogProps.path);
+                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:
-                    <EntitySelectionTable
+                    <SelectionTableBinding
                         collection={usedCollection}
-                        {...referenceDialogProps as EntitySelectionProps<M>}/>,
+                        {...referenceDialogProps as SelectionProps<M>}/>,
                 width: "90vw",
                 onClose: () => {
                     referenceDialogProps.onClose?.();

package/src/hooks/useSideDialogsController.tsx

@@ -8,7 +8,7 @@ import { useContext } from "react";
  * This hook allows you to open and close side dialogs. This is the mechanism
  * used when open a side entity dialog, or when selecting a reference.
  *
- * If you want to open a side entity dialog, you can use the {@link useSideEntityController}
+ * If you want to open a side entity dialog, you can use the {@link useSidePanel}
  * hook.
  *
  * If you want to select a reference, you can use the {@link useReferenceDialog}

package/src/hooks/useSidePanel.tsx

@@ -0,0 +1,13 @@
+import type { SidePanelController } from "@rebasepro/types";
+import React, { useContext } from "react";
+
+export const SidePanelControllerContext = React.createContext<SidePanelController>({} as SidePanelController);
+
+/**
+ * Use this hook to retrieve a entity controller that allows you to open
+ * a side dialog to edit a entity.
+ *
+ * @see SidePanelController
+ * @group Hooks and utilities
+ */
+export const useSidePanel = (): SidePanelController => useContext(SidePanelControllerContext);

package/src/index.ts

@@ -9,26 +9,26 @@ export * from "./routes";
 
 // Components — explicitly listed to avoid conflicts with ./types re-exports
 export {
-    EntityView,
-    EntitySelectionTable,
+    EntityViewBinding,
+    SelectionTableBinding,
     SelectableTable,
     SelectableTableContext,
-    EntityCollectionView,
-    EntityCollectionViewActions,
-    EntityCollectionCardView,
-    EntityCard,
+    CollectionViewBinding,
+    CollectionViewActions,
+    CollectionCardViewBinding,
+    EntityCardBinding,
     useSelectionController,
     PropertyConfigBadge,
     PropertyIdCopyTooltip,
-    EntityCollectionTable,
-    EntityCollectionRowActions,
+    CollectionTableBinding,
+    CollectionRowActions,
     VirtualTableInput,
     ArrayContainer,
     type ArrayEntryParams,
     ReferenceWidget,
     SearchIconsView,
     FieldCaption,
-    EntityPreview,
+    EntityPreviewBinding,
     getFieldConfig,
     getFieldId,
     getDefaultFieldConfig,
@@ -38,7 +38,7 @@ export {
     copyEntityAction,
     deleteEntityAction,
     resetPasswordAction,
-    SideEntityProvider,
+    SidePanelProvider,
     Scaffold,
     AppBar,
     Drawer,
@@ -46,7 +46,7 @@ export {
     DrawerFooterActions,
     AdminModeSyncer,
     // ContentHomePage is lazy-loaded — not re-exported here
-    RebaseCMS,
+    RebaseAdmin,
     RebaseShell,
     RebaseAuthGate,
     RebaseNavigation,
@@ -57,8 +57,8 @@ export {
     CollectionPanel
 } from "./components";
 export type {
-    EntityViewProps,
-    EntitySelectionProps,
+    EntityViewBindingProps,
+    SelectionProps,
     SelectableTableProps,
     CollectionPanelProps
 } from "./components";
@@ -77,7 +77,7 @@ export {
     mergeEntityActions,
     resolveEntityAction,
     resolveEntityView,
-    // Property utilities (moved from @rebasepro/core — property-aware logic belongs in CMS)
+    // Property utilities (moved from @rebasepro/app — property-aware logic belongs in CMS)
     isReferenceProperty,
     isRelationProperty,
     getIconForWidget,
@@ -87,7 +87,7 @@ export {
     getBracketNotation,
     getPropertiesWithPropertiesOrder,
     getDefaultPropertiesOrder,
-    // Preview utilities (moved from @rebasepro/core — property-aware logic belongs in CMS)
+    // Preview utilities (moved from @rebasepro/app — property-aware logic belongs in CMS)
     getEntityPreviewKeys,
     getEntityTitlePropertyKey
 } from "./util";

package/src/preview/PropertyPreview.tsx

@@ -5,7 +5,7 @@ import { deepEqual as equal } from "fast-equals"
 import { EntityReference, EntityRelation } from "@rebasepro/types";
 import type { PropertyPreviewProps } from "../types/components/PropertyPreviewProps";
 import { resolveProperty, normalizeToEntityRelation } from "@rebasepro/common";
-import { useAuthController, useCustomizationController, resolveComponentRef } from "@rebasepro/core";
+import { useAuthController, useCustomizationController, resolveComponentRef } from "@rebasepro/app";
 import { EmptyValue } from "./components/EmptyValue";
 import { UrlComponentPreview } from "./components/UrlComponentPreview";
 import { StorageThumbnail } from "./components/StorageThumbnail";
@@ -23,7 +23,7 @@ import { ReferencePreview } from "./components/ReferencePreview";
 import { DatePreview } from "./components/DatePreview";
 import { BooleanPreview } from "./components/BooleanPreview";
 import { NumberPropertyPreview } from "./property_previews/NumberPropertyPreview";
-import { ErrorView } from "@rebasepro/core";
+import { ErrorView } from "@rebasepro/app";
 import { RelationPreview } from "./components/RelationPreview";
 import { UserPreview } from "./components/UserPreview";
 

package/src/preview/components/DatePreview.tsx

@@ -2,7 +2,7 @@ import React from "react";
 
 import { format } from "date-fns";
 import * as locales from "date-fns/locale";
-import { useCustomizationController } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
 import { defaultDateFormat } from "@rebasepro/utils";
 
 export interface DatePreviewProps {

package/src/preview/components/EnumValuesChip.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Chip } from "@rebasepro/ui";
 import { EnumValues } from "@rebasepro/types";
 import { enumToObjectEntries, getLabelOrConfigFrom } from "@rebasepro/common";
-import { buildEnumLabel, getColorScheme } from "@rebasepro/core";
+import { buildEnumLabel, getColorScheme } from "@rebasepro/app";
 
 export interface EnumValuesChipProps {
     enumValues?: EnumValues;

package/src/preview/components/ImagePreview.tsx

@@ -2,7 +2,7 @@ import { CopyIcon, ExternalLinkIcon, ImageOffIcon } from "@rebasepro/ui";
 import React, { CSSProperties, useMemo, useState, useEffect } from "react";import { IconButton, Tooltip } from "@rebasepro/ui";
 import { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { getThumbnailMeasure } from "../util";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { sanitizeUrl } from "./UrlComponentPreview";
 
 /**

package/src/preview/components/ReferencePreview.tsx

@@ -1,13 +1,13 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import * as React from "react";
 
 import { Entity, EntityReference } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
-import { useCustomizationController, useEntityFetch, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
+import { useCustomizationController, useFetch, useComponentOverride, CollectionScopeProvider } from "@rebasepro/app";
 import { Skeleton } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
-import { ErrorView } from "@rebasepro/core";
-import { EntityPreview, EntityPreviewContainer } from "../../components/EntityPreview";
+import { ErrorView } from "@rebasepro/app";
+import { EntityPreviewBinding, EntityPreviewContainer } from "../../components/EntityPreviewBinding";
 import { useCollectionRegistryController } from "../../index";
 import { getEntityTitlePropertyKey } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
@@ -59,7 +59,7 @@ function ReferencePreviewInternalInner({
     includeId = true,
     textOnly,
     collection
-}: ReferencePreviewProps & { collection?: EntityCollection }) {
+}: ReferencePreviewProps & { collection?: CollectionConfig }) {
     const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference);
 
     if (!collection) {
@@ -102,11 +102,11 @@ function ReferencePreviewInternal(props: ReferencePreviewProps) {
         />
     );
 
-    if (collection?.components) {
+    if (collection) {
         return (
-            <CollectionComponentOverrideProvider overrides={collection.components}>
+            <CollectionScopeProvider collection={collection}>
                 {content}
-            </CollectionComponentOverrideProvider>
+            </CollectionScopeProvider>
         );
     }
     return content;
@@ -124,17 +124,17 @@ function ReferencePreviewExisting<M extends Record<string, unknown> = Record<str
     hover,
     textOnly
 }: ReferencePreviewProps & {
-    collection: EntityCollection<M>
+    collection: CollectionConfig<M>
 }) {
 
-    const ResolvedEntityPreview = useComponentOverride("Entity.Preview", EntityPreview);
+    const ResolvedEntityPreview = useComponentOverride("EntityPreview", EntityPreviewBinding);
     const customizationController = useCustomizationController();
 
     const {
         entity,
         dataLoading,
         dataLoadingError
-    } = useEntityFetch({
+    } = useFetch({
         path: reference.path,
         entityId: reference.id,
         collection,

package/src/preview/components/RelationPreview.tsx

@@ -1,11 +1,11 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import * as React from "react";
 
 import { Entity, EntityRelation } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
-import { useCustomizationController, useEntityFetch, ErrorView, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
+import { useCustomizationController, useFetch, ErrorView, useComponentOverride, CollectionScopeProvider } from "@rebasepro/app";
 import { Skeleton } from "@rebasepro/ui";
-import { EntityPreview, EntityPreviewContainer } from "../../components";
+import { EntityPreviewBinding, EntityPreviewContainer } from "../../components";
 import { useCollectionRegistryController } from "../../index";
 import { getEntityTitlePropertyKey } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
@@ -31,7 +31,7 @@ function extractDisplayFromPlainObject(obj: unknown): string {
     if (!obj || typeof obj !== "object") return "—";
     const record = obj as Record<string, unknown>;
 
-    // Try data.values.{name,title,...} (EntityRelation.data is an Entity with .values)
+    // Try data.values.{name,title,...} (EntityRelation.data is a Entity with .values)
     const data = record.data;
     if (data && typeof data === "object") {
         const dataRecord = data as Record<string, unknown>;
@@ -92,7 +92,7 @@ function RelationPreviewInternalInner({
     includeId = true,
     textOnly,
     collection
-}: RelationPreviewProps & { collection?: EntityCollection }) {
+}: RelationPreviewProps & { collection?: CollectionConfig }) {
     const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference);
 
     if (!collection) {
@@ -132,11 +132,11 @@ function RelationPreviewInternal(props: RelationPreviewProps) {
         />
     );
 
-    if (collection?.components) {
+    if (collection) {
         return (
-            <CollectionComponentOverrideProvider overrides={collection.components}>
+            <CollectionScopeProvider collection={collection}>
                 {content}
-            </CollectionComponentOverrideProvider>
+            </CollectionScopeProvider>
         );
     }
     return content;
@@ -154,18 +154,19 @@ function RelationPreviewExisting<M extends Record<string, unknown> = Record<stri
     hover,
     textOnly
 }: RelationPreviewProps & {
-    collection: EntityCollection<M>
+    collection: CollectionConfig<M>
 }) {
 
-    const passedEntity = relation.data;
-    const ResolvedEntityPreview = useComponentOverride("Entity.Preview", EntityPreview);
+    // CMS wire format embeds relation data as { id, path, values }
+    const passedEntity = relation.data as Entity<M> | undefined;
+    const ResolvedEntityPreview = useComponentOverride("EntityPreview", EntityPreviewBinding);
     const customizationController = useCustomizationController();
 
     const {
         entity,
         dataLoading,
         dataLoadingError
-    } = useEntityFetch({
+    } = useFetch({
         path: relation.path,
         entityId: passedEntity ? undefined : relation.id,
         collection,

package/src/preview/components/StorageThumbnail.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
 
 import { renderSkeletonImageThumbnail } from "../property_previews/SkeletonPropertyComponent";
 import { UrlComponentPreview } from "./UrlComponentPreview";
-import { ErrorView, useStorageSource, useStorageSources } from "@rebasepro/core";
+import { ErrorView, useStorageSource, useStorageSources } from "@rebasepro/app";
 import { resolveStorageSource } from "@rebasepro/common";
 import { DownloadConfig, FileType } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";

package/src/preview/property_previews/ArrayOfStorageComponentsPreview.tsx

@@ -2,7 +2,7 @@ import type { ArrayProperty, Property } from "@rebasepro/types";
 import React from "react";
 
 import type { PropertyPreviewProps, PreviewSize } from "../../types/components/PropertyPreviewProps";
-import { useAuthController, useCustomizationController } from "@rebasepro/core";
+import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { PropertyPreview } from "../PropertyPreview";
 import { ErrorBoundary } from "@rebasepro/ui";
 

package/src/preview/property_previews/ArrayOneOfPreview.tsx

@@ -1,7 +1,7 @@
 import type { ArrayProperty, Property } from "@rebasepro/types";
 import React from "react";
 import type { PropertyPreviewProps, PreviewSize } from "../../types/components/PropertyPreviewProps";
-import { useAuthController, useCustomizationController } from "@rebasepro/core";
+import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { PropertyPreview } from "../PropertyPreview";
 import { cls, defaultBorderMixin } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";

package/src/preview/property_previews/ArrayPropertyPreview.tsx

@@ -2,7 +2,7 @@ import type { ArrayProperty, Property } from "@rebasepro/types";
 import React from "react";
 
 import type { PropertyPreviewProps, PreviewSize } from "../../types/components/PropertyPreviewProps";
-import { useAuthController, useCustomizationController } from "@rebasepro/core";
+import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { PropertyPreview } from "../PropertyPreview";
 import { cls, defaultBorderMixin } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";

package/src/routes/RebaseRoute.tsx

@@ -1,12 +1,12 @@
-import type { EntityCollection, ViewMode } from "@rebasepro/types";
+import type { CollectionConfig, ViewMode } from "@rebasepro/types";
 import { Blocker, useBlocker, useLocation } from "react-router-dom";
-import { EntityEditView } from "../components/EntityEditView";
-import { EntityDetailView } from "../components/EntityDetailView";
+import { EditViewBinding } from "../components/EditViewBinding";
+import { DetailViewBinding } from "../components/DetailViewBinding";
 import { useEffect, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { EntityCollectionView } from "../components";
-import { NotFoundPage, useUserConfigurationPersistence, useComponentOverride } from "@rebasepro/core";
-import { UnsavedChangesDialog } from "@rebasepro/core";
+import { CollectionViewBinding } from "../components";
+import { NotFoundPage, useUserConfigurationPersistence, useComponentOverride } from "@rebasepro/app";
+import { UnsavedChangesDialog } from "@rebasepro/app";
 import { CircularProgressCenter } from "@rebasepro/ui";
 import { getNavigationEntriesFromPath, NavigationViewCollectionInternal, NavigationViewEntityCustomInternal, NavigationViewInternal } from "@rebasepro/common";
 import { toArray } from "@rebasepro/utils";
@@ -20,7 +20,7 @@ export 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");
@@ -82,7 +82,7 @@ export function RebaseRoute() {
     }
 
     if (navigationEntries.length === 1 && navigationEntries[0].type === "collection") {
-        let collection: EntityCollection<any> | undefined;
+        let collection: CollectionConfig<any> | undefined;
         collection = collectionRegistry.getCollection(navigationEntries[0].id);
         if (!collection)
             collection = collectionRegistry.getCollection(navigationEntries[0].slug);
@@ -104,7 +104,7 @@ export function RebaseRoute() {
     if (isSidePanel) {
         const lastCollectionEntry = [...navigationEntries].reverse().find((entry) => entry.type === "collection");
         if (lastCollectionEntry) {
-            let collection: EntityCollection<any> | undefined;
+            let collection: CollectionConfig<any> | undefined;
             const firstEntry = navigationEntries[0] as NavigationViewCollectionInternal<any>;
             collection = collectionRegistry.getCollection(firstEntry.id);
             if (!collection)
@@ -140,7 +140,7 @@ export function RebaseRoute() {
         lastEntityEntry?.type === "entity" &&
         (navigationEntries.length === 2 || navigationEntries.length === 3)
     ) {
-        let collection: EntityCollection<any> | undefined;
+        let collection: CollectionConfig<any> | undefined;
         collection = collectionRegistry.getCollection(firstCollectionEntry.id);
         if (!collection)
             collection = collectionRegistry.getCollection(firstCollectionEntry.slug);
@@ -345,7 +345,7 @@ function EntityFullScreenRoute({
 
     if (isDetailMode) {
         return <>
-            <EntityDetailView
+            <DetailViewBinding
                 key={collection.slug + "_view_" + entityId}
                 entityId={entityId}
                 collection={collection}
@@ -372,7 +372,7 @@ function EntityFullScreenRoute({
     }
 
     return <>
-        <EntityEditView
+        <EditViewBinding
             key={collection.slug + "_" + (isNew ? "new" : (isCopy ? entityId + "_copy" : entityId))}
             entityId={isNew ? undefined : entityId}
             collection={collection}

package/src/types/components/EntityFormActionsProps.tsx

@@ -1,11 +1,11 @@
 import { Entity } from "@rebasepro/types";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { FormContext } from "../fields";
 import { FormexController } from "./formex";
 
 export interface EntityFormActionsProps {
     path: string;
-    collection: EntityCollection;
+    collection: CollectionConfig;
     entity?: Entity;
     layout: "bottom" | "side" | "responsive";
     savingError?: Error;

package/src/types/components/EntityFormProps.tsx

@@ -1,5 +1,5 @@
 import { Entity, EntityStatus } from "@rebasepro/types";
-import { EntityCollection, EntityCustomViewParams } from "@rebasepro/types";
+import { CollectionConfig, EntityCustomViewParams } from "@rebasepro/types";
 import { FormContext } from "../fields";
 import { FormexController } from "./formex";
 import { EntityFormActionsProps } from "./EntityFormActionsProps";
@@ -12,7 +12,7 @@ import { EntityFormActionsProps } from "./EntityFormActionsProps";
 export type EntityFormProps<M extends Record<string, unknown>> = {
     path: string;
     fullIdPath?: string;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     entityId?: string | number;
     entity?: Entity<M>;
     databaseId?: string;
@@ -120,5 +120,5 @@ export type OnUpdateParams = {
     path: string,
     entityId?: string | number;
     selectedTab?: string;
-    collection: EntityCollection<Record<string, unknown>>
+    collection: CollectionConfig<Record<string, unknown>>
 };

package/src/types/components/formex.tsx

@@ -1,2 +1,2 @@
-export type { FormexController, FormexResetProps } from "@rebasepro/formex";
+export type { FormexController, FormexResetProps } from "@rebasepro/forms";
 

package/src/types/fields.tsx

@@ -1,7 +1,7 @@
 import { InferPropertyType } from "@rebasepro/types";
 import { Entity } from "@rebasepro/types";
 import { FormexController } from "./components/formex";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { Property } from "@rebasepro/types";
 
 export type DefaultFieldConfig =
@@ -190,7 +190,7 @@ export interface FormContext<M extends Record<string, unknown> = Record<string,
     /**
      * Collection of the entity being modified
      */
-    collection?: EntityCollection<M>;
+    collection?: CollectionConfig<M>;
 
     /**
      * Entity id, it can be undefined if it's a new entity

package/src/util/dataControllerAdapter.ts

@@ -9,25 +9,19 @@ import type { Entity, EntityTableController } from "@rebasepro/types";
 import type { CollectionDataController } from "@rebasepro/ui";
 
 /**
- * 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<M extends Record<string, unknown>>(
     entities: Entity<M>[]
-): Array<M & { id: string | number; path: string }> {
-    return entities.map(entity => ({
-        id: entity.id,
-        path: entity.path,
-        ...entity.values
-    }));
+): M[] {
+    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
@@ -39,13 +33,13 @@ function flattenEntities<M extends Record<string, unknown>>(
  */
 export function useCollectionDataController<M extends Record<string, unknown>>(
     tableController: EntityTableController<M>
-): CollectionDataController<M & { id: string | number; path: string }> {
+): CollectionDataController<M> {
     const flatData = useMemo(
         () => flattenEntities(tableController.data),
         [tableController.data]
     );
 
-    return useMemo((): CollectionDataController<M & { id: string | number; path: string }> => ({
+    return useMemo((): CollectionDataController<M> => ({
         data: flatData,
         loading: tableController.dataLoading,
         noMoreToLoad: tableController.noMoreToLoad,

package/src/util/navigation_utils.ts

@@ -1,4 +1,4 @@
-import type { EntityCollection, UrlController, SideEntityController, NavigateOptions } from "@rebasepro/types";
+import type { CollectionConfig, UrlController, SidePanelController, NavigateOptions } from "@rebasepro/types";
 
 // Canonical path utilities — single source of truth in @rebasepro/common
 export {
@@ -13,7 +13,7 @@ export {
 } from "@rebasepro/common";
 
 /**
- * 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).
  */
 export function navigateToEntity({
@@ -24,7 +24,7 @@ export function navigateToEntity({
     path,
     selectedTab,
     defaultValues,
-    sideEntityController,
+    sidePanelController,
     onClose,
     navigation,
     replace
@@ -32,7 +32,7 @@ export function navigateToEntity({
 
     {
         openEntityMode?: "side_panel" | "full_screen" | "split" | "dialog";
-        collection?: EntityCollection;
+        collection?: CollectionConfig;
         entityId?: string | number;
         selectedTab?: string;
         copy?: boolean;
@@ -40,13 +40,13 @@ export function navigateToEntity({
          * Pre-populate the new entity form with these values.
          * Only applied when entityId is not set (i.e. "new" mode).
          *
-         * Side panel: passed through EntitySidePanelProps → EntityEditView.
+         * Side panel: passed through SidePanelBindingProps → EditViewBinding.
          * Full screen: carried via React Router location.state so the route
          * component can read it on mount without polluting the URL.
          */
         defaultValues?: Record<string, unknown>;
         path: string;
-        sideEntityController: SideEntityController;
+        sidePanelController: SidePanelController;
         onClose?: () => void;
         navigation: UrlController;
         replace?: boolean;
@@ -55,7 +55,7 @@ export function navigateToEntity({
     if (openEntityMode === "side_panel" || openEntityMode === "dialog") {
 
 
-        sideEntityController.open({
+        sidePanelController.open({
             entityId,
             path: path,
             copy,