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

package/src/hooks/navigation/useBuildCollectionRegistryController.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection, DataSourceDefinition } from "@rebasepro/types";
+import type { CollectionConfig, DataSourceDefinition } from "@rebasepro/types";
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
 import { CollectionRegistry, getParentReferencesFromPath as commonGetParentReferencesFromPath, removeInitialAndTrailingSlashes, getSubcollections } from "@rebasepro/common";
 import { EntityReference, UserConfigurationPersistence, CollectionRegistryController } from "@rebasepro/types";
@@ -21,7 +21,7 @@ export function useBuildCollectionRegistryController(props: {
     const getCollection = useCallback((
         slugOrPath: string,
         includeUserOverride = false
-    ): EntityCollection | undefined => {
+    ): CollectionConfig | undefined => {
 
         const registry = collectionRegistryRef.current;
 
@@ -31,14 +31,14 @@ export function useBuildCollectionRegistryController(props: {
         const pathSegments = cleanedPath.split("/");
 
         let collectionPath = pathSegments.join("/");
-        // If the path has an even number of segments, it points to an entity, so we get the parent collection
+        // If the path has an even number of segments, it points to a entity, so we get the parent collection
         if (pathSegments.length > 0 && pathSegments.length % 2 === 0) {
             collectionPath = pathSegments.slice(0, -1).join("/");
         }
 
         if (!collectionPath) return undefined;
 
-        let collection: EntityCollection | undefined;
+        let collection: CollectionConfig | undefined;
         try {
             collection = registry.resolvePathToCollections(collectionPath).finalCollection;
         } catch (e) {
@@ -56,7 +56,7 @@ export function useBuildCollectionRegistryController(props: {
 
         if (!overriddenCollection) return undefined;
 
-        let result: Partial<EntityCollection> | undefined = overriddenCollection;
+        let result: Partial<CollectionConfig> | undefined = overriddenCollection;
         const subcollections = "subcollections" in overriddenCollection ? overriddenCollection.subcollections : undefined;
         const callbacks = overriddenCollection.callbacks;
         result = {
@@ -69,11 +69,11 @@ export function useBuildCollectionRegistryController(props: {
         }
 
         return { ...overriddenCollection,
-...result } as EntityCollection;
+...result } as CollectionConfig;
 
     }, [userConfigPersistence]);
 
-    const getRawCollection = useCallback((slugOrPath: string): EntityCollection | undefined => {
+    const getRawCollection = useCallback((slugOrPath: string): CollectionConfig | undefined => {
         const registry = collectionRegistryRef.current;
         if (registry === undefined) return undefined;
 
@@ -82,7 +82,7 @@ export function useBuildCollectionRegistryController(props: {
 
         const pathSegments = cleanedPath.split("/");
 
-        return registry.getRaw(pathSegments.join("/")) as EntityCollection | undefined;
+        return registry.getRaw(pathSegments.join("/")) as CollectionConfig | undefined;
     }, []);
 
     const getParentReferencesFromPath = useCallback((path: string): EntityReference[] => {
@@ -115,7 +115,7 @@ export function useBuildCollectionRegistryController(props: {
             result.push(oddPathSegments.slice(0, i));
         }
 
-        const getCollectionFromPaths = (pathSegments: string[]): EntityCollection | undefined => {
+        const getCollectionFromPaths = (pathSegments: string[]): CollectionConfig | undefined => {
             if (!pathSegments?.length) return undefined;
             const testPath = pathSegments.reduce((acc, segment, idx) => {
                 if (idx === 0) return segment;
@@ -144,11 +144,11 @@ export function useBuildCollectionRegistryController(props: {
     const convertIdsToPaths = useCallback((ids: string[]): string[] => {
         const registry = collectionRegistryRef.current;
         if (!registry) return [];
-        let currentCollections: EntityCollection[] = registry.getCollections();
+        let currentCollections: CollectionConfig[] = registry.getCollections();
         const paths: string[] = [];
         for (let i = 0; i < ids.length; i++) {
             const id = ids[i];
-            const collection: EntityCollection | undefined = currentCollections.find(c => c.slug === id);
+            const collection: CollectionConfig | undefined = currentCollections.find(c => c.slug === id);
             if (!collection)
                 throw Error(`Collection with id ${id} not found`);
             paths.push(collection.slug);

package/src/hooks/navigation/useBuildNavigationStateController.tsx

@@ -1,8 +1,8 @@
-import type { AppView, EntityCollection, NavigationResult, RebasePlugin, NavigationStateController, UrlController, NavigationGroupMapping } from "@rebasepro/types";
+import type { AppView, CollectionConfig, NavigationResult, RebasePlugin, NavigationStateController, UrlController, NavigationGroupMapping } from "@rebasepro/types";
 import { useCallback, useMemo, useRef } from "react";
 
 import { AuthController, RebaseData, CollectionRegistryController, User } from "@rebasepro/types";
-import type { EntityCollectionsBuilder, AppViewsBuilder, EffectiveRoleController } from "@rebasepro/types";
+import type { CollectionConfigsBuilder, AppViewsBuilder, EffectiveRoleController } from "@rebasepro/types";
 import { CollectionRegistry } from "@rebasepro/common";
 
 
@@ -10,9 +10,9 @@ import { useResolvedCollections } from "./useResolvedCollections";
 import { useResolvedViews } from "./useResolvedViews";
 import { useTopLevelNavigation } from "./useTopLevelNavigation";
 
-export type BuildNavigationStateProps<EC extends EntityCollection, USER extends User> = {
+export type BuildNavigationStateProps<EC extends CollectionConfig, USER extends User> = {
     authController: AuthController<USER>;
-    collections?: EC[] | EntityCollectionsBuilder<EC>;
+    collections?: EC[] | CollectionConfigsBuilder<EC>;
     views?: AppView[] | AppViewsBuilder;
     adminViews?: AppView[] | AppViewsBuilder;
     data: RebaseData;
@@ -37,7 +37,7 @@ export type BuildNavigationStateProps<EC extends EntityCollection, USER extends
  *
  * The NavigationStateController type is preserved as a public API.
  */
-export function useBuildNavigationStateController<EC extends EntityCollection, USER extends User>(
+export function useBuildNavigationStateController<EC extends CollectionConfig, USER extends User>(
     props: BuildNavigationStateProps<EC, USER>
 ): NavigationStateController {
 

package/src/hooks/navigation/useNavigationResolution.ts

@@ -3,8 +3,8 @@ import type {
     AppViewsBuilder,
     AuthCollectionConfig,
     EntityAction,
-    EntityCollection,
-    EntityCollectionsBuilder,
+    CollectionConfig,
+    CollectionConfigsBuilder,
     RebaseContext,
     RebasePlugin,
     UserCreationResult
@@ -23,7 +23,7 @@ function isRebaseContext(ctx: unknown): ctx is RebaseContext {
     return typeof ctx === "object" && ctx !== null && "dialogsController" in ctx;
 }
 
-export function filterOutNotAllowedCollections(resolvedCollections: EntityCollection[], authController: AuthController): EntityCollection[] {
+export function filterOutNotAllowedCollections(resolvedCollections: CollectionConfig[], authController: AuthController): CollectionConfig[] {
     return resolvedCollections
         .filter((c) => canReadCollection(c, authController))
         .map((c) => {
@@ -35,8 +35,8 @@ export function filterOutNotAllowedCollections(resolvedCollections: EntityCollec
         });
 }
 
-export function applyPluginModifyCollection(resolvedCollections: EntityCollection[], modifyCollection: (collection: EntityCollection) => EntityCollection): EntityCollection[] {
-    return resolvedCollections.map((collection): EntityCollection => {
+export function applyPluginModifyCollection(resolvedCollections: CollectionConfig[], modifyCollection: (collection: CollectionConfig) => CollectionConfig): CollectionConfig[] {
+    return resolvedCollections.map((collection): CollectionConfig => {
         const modifiedCollection = modifyCollection(collection);
         if (modifiedCollection.childCollections) {
             return {
@@ -53,13 +53,20 @@ export function applyPluginModifyCollection(resolvedCollections: EntityCollectio
  * 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: EntityCollection[]): EntityCollection[] {
+function injectAuthCollectionConfig(
+    collections: CollectionConfig[],
+    adminPasswordResetSupported: boolean
+): CollectionConfig[] {
     return collections.map((collection) => {
         const authProp = collection.auth;
         if (!authProp) return collection;
@@ -78,7 +85,11 @@ function injectAuthCollectionConfig(collections: EntityCollection[]): EntityColl
         if (resetPref === false) {
             actionToInject = undefined;
         } else if (typeof resetPref === "object") {
+            // An explicitly supplied action is the collection author's own; they
+            // own its backend, so the adapter capability doesn't apply.
             actionToInject = resetPref;
+        } else if (!adminPasswordResetSupported) {
+            actionToInject = undefined;
         } else {
             actionToInject = resetPasswordAction;
         }
@@ -116,7 +127,7 @@ function injectAuthCollectionConfig(collections: EntityCollection[]): EntityColl
 
                     const creationResult: UserCreationResult = {
                         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 as string[] : [],
@@ -129,7 +140,8 @@ function injectAuthCollectionConfig(collections: EntityCollection[]): EntityColl
                             isAnonymous: false
                         },
                         invitationSent: !!values.invitationSent,
-                        temporaryPassword: typeof values.temporaryPassword === "string" ? values.temporaryPassword : undefined
+                        temporaryPassword: typeof values.temporaryPassword === "string" ? values.temporaryPassword : undefined,
+                        emailDeliveryFailed: !!values.emailDeliveryFailed
                     };
 
                     const { closeDialog } = dialogsController.open({
@@ -150,12 +162,12 @@ function injectAuthCollectionConfig(collections: EntityCollection[]): EntityColl
 }
 
 export async function resolveCollections(
-    collections: undefined | EntityCollection[] | EntityCollectionsBuilder,
+    collections: undefined | CollectionConfig[] | CollectionConfigsBuilder,
     authController: AuthController,
     data: RebaseData,
     plugins: RebasePlugin[] | undefined
-): Promise<EntityCollection[]> {
-    let resolvedCollections: EntityCollection[] = [];
+): Promise<CollectionConfig[]> {
+    let resolvedCollections: CollectionConfig[] = [];
     if (typeof collections === "function") {
         resolvedCollections = await collections({
             user: authController.user,
@@ -179,7 +191,10 @@ export async function resolveCollections(
     }
 
     // Auto-inject auth entity actions and callbacks (resetPassword, creation dialog, etc.)
-    resolvedCollections = injectAuthCollectionConfig(resolvedCollections);
+    resolvedCollections = injectAuthCollectionConfig(
+        resolvedCollections,
+        authController.capabilities?.adminPasswordReset ?? true
+    );
 
     resolvedCollections = filterOutNotAllowedCollections(resolvedCollections, authController);
     return resolvedCollections;

package/src/hooks/navigation/useResolvedCollections.ts

@@ -1,8 +1,8 @@
-import type { EntityCollection, RebasePlugin } from "@rebasepro/types";
+import type { CollectionConfig, RebasePlugin } from "@rebasepro/types";
 import { useRef, useMemo } from "react";
 
 import { AuthController, CollectionRegistryController, RebaseData, User } from "@rebasepro/types";
-import type { EntityCollectionsBuilder } from "@rebasepro/types";
+import type { CollectionConfigsBuilder } from "@rebasepro/types";
 import { CollectionRegistry } from "@rebasepro/common";
 
 
@@ -10,9 +10,9 @@ import { resolveCollections } from "./useNavigationResolution";
 import { areCollectionListsEqual } from "./utils";
 import { useAsyncResolver } from "./useAsyncResolver";
 
-export type UseResolvedCollectionsProps<EC extends EntityCollection, USER extends User> = {
+export type UseResolvedCollectionsProps<EC extends CollectionConfig, USER extends User> = {
     authController: AuthController<USER>;
-    collections?: EC[] | EntityCollectionsBuilder<EC>;
+    collections?: EC[] | CollectionConfigsBuilder<EC>;
     data: RebaseData;
     plugins?: RebasePlugin[];
     disabled?: boolean;
@@ -21,7 +21,7 @@ export type UseResolvedCollectionsProps<EC extends EntityCollection, USER extend
 };
 
 export type UseResolvedCollectionsResult = {
-    collections: EntityCollection[];
+    collections: CollectionConfig[];
     loading: boolean;
     error: Error | undefined;
     refresh: () => void;
@@ -29,7 +29,7 @@ export type UseResolvedCollectionsResult = {
 
 /**
  * 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
@@ -38,7 +38,7 @@ export type UseResolvedCollectionsResult = {
  * Uses refs for potentially-unstable dependencies (driver, authController,
  * plugins) to avoid re-triggering effects when their object identity changes.
  */
-export function useResolvedCollections<EC extends EntityCollection, USER extends User>(
+export function useResolvedCollections<EC extends CollectionConfig, USER extends User>(
     props: UseResolvedCollectionsProps<EC, USER>
 ): UseResolvedCollectionsResult {
 
@@ -66,7 +66,7 @@ export function useResolvedCollections<EC extends EntityCollection, USER extends
     const pluginsRef = useRef(plugins);
     pluginsRef.current = plugins;
 
-    const { data: collections, loading, error, refresh } = useAsyncResolver<EntityCollection[]>({
+    const { data: collections, loading, error, refresh } = useAsyncResolver<CollectionConfig[]>({
         resolver: async () => {
             const resolved = await resolveCollections(
                 collectionsProp,

package/src/hooks/navigation/useTopLevelNavigation.ts

@@ -1,4 +1,4 @@
-import type { AppView, UrlController, EntityCollection, RebasePlugin, NavigationEntry, NavigationGroupMapping, NavigationResult } from "@rebasepro/types";
+import type { AppView, UrlController, CollectionConfig, RebasePlugin, NavigationEntry, NavigationGroupMapping, NavigationResult } from "@rebasepro/types";
 import { useCallback, useMemo, useRef } from "react";
 import { deepEqual as equal } from "fast-equals";
 
@@ -8,7 +8,7 @@ import { CollectionRegistry } from "@rebasepro/common";
 import { computeNavigationGroups, getGroup, NAVIGATION_ADMIN_GROUP_NAME, NAVIGATION_DEFAULT_GROUP_NAME } from "./utils";
 
 export type UseTopLevelNavigationProps = {
-    collections: EntityCollection[];
+    collections: CollectionConfig[];
     views: AppView[] | undefined;
     adminViews: AppView[] | undefined;
     plugins?: RebasePlugin[];

package/src/hooks/navigation/utils.ts

@@ -1,4 +1,4 @@
-import type { AppView, EntityCollection, RebasePlugin, NavigationGroupMapping } from "@rebasepro/types";
+import type { AppView, CollectionConfig, RebasePlugin, NavigationGroupMapping } from "@rebasepro/types";
 
 import { getSubcollections } from "@rebasepro/common";
 import { deepEqual as equal } from "fast-equals";
@@ -6,7 +6,7 @@ import { deepEqual as equal } from "fast-equals";
 export const NAVIGATION_DEFAULT_GROUP_NAME = "Views";
 export const NAVIGATION_ADMIN_GROUP_NAME = "Admin";
 
-export function getGroup(collectionOrView: EntityCollection | AppView) {
+export function getGroup(collectionOrView: CollectionConfig | AppView) {
     const trimmed = collectionOrView.group?.trim();
     if (!trimmed || trimmed === "") {
         return NAVIGATION_DEFAULT_GROUP_NAME;
@@ -21,7 +21,7 @@ export function computeNavigationGroups({
     plugins
 }: {
     navigationGroupMappings?: NavigationGroupMapping[],
-    collections?: EntityCollection[],
+    collections?: CollectionConfig[],
     views?: AppView[],
     plugins?: RebasePlugin[]
 }): NavigationGroupMapping[] {
@@ -146,7 +146,7 @@ export function computeNavigationGroups({
     return result;
 }
 
-export function areCollectionListsEqual(a: EntityCollection[], b: EntityCollection[], visitedSlugs: string[] = []) {
+export function areCollectionListsEqual(a: CollectionConfig[], b: CollectionConfig[], visitedSlugs: string[] = []) {
     if (a.length !== b.length) {
         return false;
     }
@@ -157,7 +157,7 @@ export function areCollectionListsEqual(a: EntityCollection[], b: EntityCollecti
     return aSorted.every((value, index) => areCollectionsEqual(value, bSorted[index], visitedSlugs));
 }
 
-export function areCollectionsEqual(a: EntityCollection, b: EntityCollection, visitedSlugs: string[] = []) {
+export function areCollectionsEqual(a: CollectionConfig, b: CollectionConfig, visitedSlugs: string[] = []) {
     if (a.slug !== b.slug) {
         return false;
     }

package/src/hooks/{useBuildSideEntityController.tsx → useBuildSidePanel.tsx}

@@ -1,5 +1,5 @@
-import type { EntityCollection } from "@rebasepro/types";
-import type { CustomizationController, EntitySidePanelProps, SideDialogPanelProps, SideDialogsController, SideEntityController, UrlController, NavigationStateController, Property } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
+import type { CustomizationController, SidePanelBindingProps, SideDialogPanelProps, SideDialogsController, SidePanelController, UrlController, NavigationStateController, Property } from "@rebasepro/types";
 import { useCallback, useEffect, useRef, useMemo } from "react";
 import { AuthController, CollectionRegistryController } from "@rebasepro/types";
 import { useLocation } from "react-router-dom";
@@ -10,11 +10,11 @@ import {
     resolveDefaultSelectedView
 } from "@rebasepro/common";
 import { resolvedSelectedEntityView } from "../util/resolutions";
-import { ADDITIONAL_TAB_WIDTH, CONTAINER_FULL_WIDTH, FORM_CONTAINER_WIDTH } from "@rebasepro/core";
-import { useCustomizationController, useLargeLayout, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
-import { JSON_TAB_VALUE, HISTORY_TAB_VALUE } from "../components/EntityEditView";
+import { ADDITIONAL_TAB_WIDTH, CONTAINER_FULL_WIDTH, FORM_CONTAINER_WIDTH } from "@rebasepro/app";
+import { useCustomizationController, useLargeLayout, useComponentOverride, CollectionScopeProvider } from "@rebasepro/app";
+import { JSON_TAB_VALUE, HISTORY_TAB_VALUE } from "../components/EditViewBinding";
 import React from "react";
-import { EntitySidePanel } from "../components/EntitySidePanel";
+import { SidePanelBinding } from "../components/SidePanelBinding";
 
 /**
  * Thin wrapper that resolves the Entity.SidePanel component override.
@@ -22,26 +22,26 @@ import { EntitySidePanel } from "../components/EntitySidePanel";
  * 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: EntitySidePanelProps) {
-    const Resolved = useComponentOverride("Entity.SidePanel", EntitySidePanel);
+function ResolvedSidePanelBindingInner(props: SidePanelBindingProps) {
+    const Resolved = useComponentOverride("Entity.SidePanel", SidePanelBinding);
     return <Resolved {...props}/>;
 }
 
-function ResolvedEntitySidePanel(props: EntitySidePanelProps) {
-    if (props.collection?.components) {
+function ResolvedSidePanelBinding(props: SidePanelBindingProps) {
+    if (props.collection) {
         return (
-            <CollectionComponentOverrideProvider overrides={props.collection.components}>
-                <ResolvedEntitySidePanelInner {...props}/>
-            </CollectionComponentOverrideProvider>
+            <CollectionScopeProvider collection={props.collection}>
+                <ResolvedSidePanelBindingInner {...props}/>
+            </CollectionScopeProvider>
         );
     }
-    return <ResolvedEntitySidePanelInner {...props}/>;
+    return <ResolvedSidePanelBindingInner {...props}/>;
 }
 
 const NEW_URL_HASH = "new_side";
 const SIDE_URL_HASH = "side";
 
-export function getEntityViewWidth(props: EntitySidePanelProps<any>, small: boolean, customizationController: CustomizationController): string {
+export function getEntityViewWidth(props: SidePanelBindingProps<any>, small: boolean, customizationController: CustomizationController): string {
     if (small) return CONTAINER_FULL_WIDTH;
 
     const {
@@ -72,7 +72,7 @@ export function getEntityViewWidth(props: EntitySidePanelProps<any>, small: bool
 
 const collectionViewWidthCache: { [key: string]: string } = {};
 
-function calculateCollectionDesiredWidth(collection: EntityCollection<any>): string {
+function calculateCollectionDesiredWidth(collection: CollectionConfig<any>): string {
     if (collectionViewWidthCache[collection.slug]) {
         return collectionViewWidthCache[collection.slug];
     }
@@ -108,12 +108,12 @@ function getNestedPropertiesDepth(property: Property, accumulator = 0): number {
     }
 }
 
-export const useBuildSideEntityController = (collectionRegistryController: CollectionRegistryController,
+export const useBuildSidePanel = (collectionRegistryController: CollectionRegistryController,
     urlController: UrlController,
     navigationStateController: NavigationStateController,
     sideDialogsController: SideDialogsController,
     authController: AuthController
-): SideEntityController => {
+): SidePanelController => {
 
     const location = useLocation();
     const initialised = useRef<boolean>(false);
@@ -172,12 +172,12 @@ export const useBuildSideEntityController = (collectionRegistryController: Colle
 
     // update side panels to match browser size
     // Only update panel widths on layout change — don't recreate components.
-    // Recreating components would unmount/remount EntitySidePanel, losing
+    // Recreating components would unmount/remount SidePanelBinding, losing
     // scroll position, unsaved form state, and triggering unnecessary data fetches.
     useEffect(() => {
         const updatedSidePanels = sideDialogsController.sidePanels.map(sidePanelProps => {
             if (sidePanelProps.additional) {
-                const entityProps = sidePanelProps.additional as EntitySidePanelProps;
+                const entityProps = sidePanelProps.additional as SidePanelBindingProps;
                 const newWidth = getEntityViewWidth(entityProps, smallLayout, customizationController);
                 if (sidePanelProps.width !== newWidth) {
                     return { ...sidePanelProps,
@@ -193,10 +193,10 @@ width: newWidth };
         sideDialogsController.close();
     }, [sideDialogsController]);
 
-    const open = useCallback((props: EntitySidePanelProps<any>) => {
+    const open = useCallback((props: SidePanelBindingProps<any>) => {
 
         if (props.copy && !props.entityId) {
-            throw Error("If you want to copy an entity you need to provide an entityId");
+            throw Error("If you want to copy a entity you need to provide a entityId");
         }
 
         const defaultSelectedView = resolveDefaultSelectedView(
@@ -222,10 +222,10 @@ width: newWidth };
 
     }, [sideDialogsController, urlController.buildUrlCollectionPath, urlController.resolveDatabasePathsFrom, smallLayout, authController.user, location.search]);
 
-    const replace = useCallback((props: EntitySidePanelProps<any>) => {
+    const replace = useCallback((props: SidePanelBindingProps<any>) => {
 
         if (props.copy && !props.entityId) {
-            throw Error("If you want to copy an entity you need to provide an 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));
@@ -239,14 +239,14 @@ width: newWidth };
     }), [close, open, replace]);
 };
 
-export function buildSidePanelsFromUrl(path: string, collections: EntityCollection[], newFlag: boolean): EntitySidePanelProps<any>[] {
+export function buildSidePanelsFromUrl(path: string, collections: CollectionConfig[], newFlag: boolean): SidePanelBindingProps<any>[] {
 
     const navigationViewsForPath: NavigationViewInternal<any>[] = getNavigationEntriesFromPath({
         path,
         collections
     });
 
-    let sidePanel: EntitySidePanelProps<any> | undefined = undefined;
+    let sidePanel: SidePanelBindingProps<any> | undefined = undefined;
     let lastCollectionPath = "";
     let lastCollectionId: string | undefined = undefined;
     for (let i = 0; i < navigationViewsForPath.length; i++) {
@@ -306,7 +306,7 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
     return sidePanel ? [sidePanel] : [];
 }
 
-const propsToSidePanel = (props: EntitySidePanelProps,
+const propsToSidePanel = (props: SidePanelBindingProps,
     buildUrlCollectionPath: (path: string) => string,
     resolveIdsFrom: (pathWithAliases: string) => string,
     smallLayout: boolean,
@@ -331,7 +331,7 @@ const propsToSidePanel = (props: EntitySidePanelProps,
         ? buildUrlCollectionPath(collectionPath)
         : undefined;
 
-    const resolvedPanelProps: EntitySidePanelProps<any> = {
+    const resolvedPanelProps: SidePanelBindingProps<any> = {
         ...props,
         formProps: props.formProps
     };
@@ -339,7 +339,7 @@ const propsToSidePanel = (props: EntitySidePanelProps,
     const entityViewWidth = getEntityViewWidth(props, smallLayout, customizationController);
     return {
         key: `${props.path}/${props.entityId}`,
-        component: <ResolvedEntitySidePanel {...resolvedPanelProps}/>,
+        component: <ResolvedSidePanelBinding {...resolvedPanelProps}/>,
         urlPath: urlPath,
         parentUrlPath: parentUrlPath,
         width: entityViewWidth,

package/src/hooks/useCMSContext.tsx

@@ -1,10 +1,10 @@
 import { useMemo } from "react";
-import { useRebaseContext } from "@rebasepro/core";
+import { useRebaseContext } from "@rebasepro/app";
 import type {
     AuthController,
     RebaseContext,
     SideDialogsController,
-    SideEntityController,
+    SidePanelController,
     User
 } from "@rebasepro/types";
 import type {
@@ -12,7 +12,7 @@ import type {
     NavigationStateController,
     UrlController
 } from "@rebasepro/types";
-import { useSideEntityController } from "./useSideEntityController";
+import { useSidePanel } from "./useSidePanel";
 import { useSideDialogsController } from "./useSideDialogsController";
 import {
     useUrlController,
@@ -32,7 +32,7 @@ export type CMSContext<
     USER extends User = User,
     AuthControllerType extends AuthController<USER> = AuthController<USER>
 > = RebaseContext<USER, AuthControllerType> & {
-    sideEntityController: SideEntityController;
+    sidePanelController: SidePanelController;
     sideDialogsController: SideDialogsController;
     urlController: UrlController;
     navigationStateController: NavigationStateController;
@@ -55,7 +55,7 @@ export function useCMSContext<
     AuthControllerType extends AuthController<USER> = AuthController<USER>
 >(): CMSContext<DB, USER, AuthControllerType> {
     const baseContext = useRebaseContext<USER, AuthControllerType>();
-    const sideEntityController = useSideEntityController();
+    const sidePanelController = useSidePanel();
     const sideDialogsController = useSideDialogsController();
     const urlController = useUrlController();
     const navigationStateController = useNavigationStateController();
@@ -63,14 +63,14 @@ export function useCMSContext<
 
     return useMemo(() => ({
         ...baseContext,
-        sideEntityController,
+        sidePanelController,
         sideDialogsController,
         urlController,
         navigationStateController,
         collectionRegistryController
     }), [
         baseContext,
-        sideEntityController,
+        sidePanelController,
         sideDialogsController,
         urlController,
         navigationStateController,

package/src/hooks/{useEntityHistory.ts → useHistory.ts}

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
-import { useApiConfig } from "@rebasepro/core";
+import { useApiConfig } from "@rebasepro/app";
 
 export interface HistoryEntryData {
     id: string;
@@ -27,7 +27,7 @@ export interface UseEntityHistoryResult {
  * Hook to fetch entity history from the backend REST API.
  * Replaces the old subcollection-based approach with a proper API call.
  */
-export function useEntityHistory(params: {
+export function useHistory(params: {
     slug: string;
     entityId: string | number | undefined;
     enabled?: boolean;

package/src/hooks/useResolvedNavigationFrom.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection, EntityCustomView } from "@rebasepro/types";
+import type { CollectionConfig, EntityCustomView } from "@rebasepro/types";
 import { Entity, RebaseContext, User } from "@rebasepro/types";
 import { useEffect, useState, useMemo } from "react";
 import { getNavigationEntriesFromPath } from "@rebasepro/common";
@@ -22,7 +22,7 @@ export interface ResolvedNavigationEntity<M extends Record<string, unknown>> {
     entity: Entity<M>;
     entityId: string | number;
     path: string;
-    parentCollection: EntityCollection<M>;
+    parentCollection: CollectionConfig<M>;
 }
 
 /**
@@ -32,7 +32,7 @@ export interface ResolvedNavigationEntity<M extends Record<string, unknown>> {
 export interface ResolvedNavigationCollection<M extends Record<string, unknown>> {
     type: "collection";
     path: string;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
 }
 
 /**
@@ -85,9 +85,14 @@ export function resolveNavigationFrom<M extends Record<string, unknown>, USER ex
                 if (!collection) {
                     throw Error(`No collection defined in the navigation for the entity with path ${entry.slug}`);
                 }
+                // `context.data` is the flat SDK layer; re-wrap the row into the
+                // Entity view-model the navigation entry expects. The address is
+                // the one we just fetched by — reading it back off the row would
+                // find nothing, since a row is only its columns.
                 return data.collection(entry.slug).findById(entry.entityId)
-                    .then((entity) => {
-                        if (!entity) return undefined;
+                    .then((row) => {
+                        if (!row) return undefined;
+                        const entity = { id: entry.entityId, path: entry.slug, values: row };
                         return { ...entry,
 entity };
                     });