@rebasepro/admin 0.0.1-canary.eae7889 → 0.0.1-canary.eb08332

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,23 +10,45 @@ 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 } 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.
+ * Because the JSX is created inside `propsToSidePanel` (a plain function,
+ * not a React component), we need this wrapper so the hook is called at the
+ * top level of a React component per the Rules of Hooks.
+ */
+function ResolvedSidePanelBindingInner(props: SidePanelBindingProps) {
+    const Resolved = useComponentOverride("Entity.SidePanel", SidePanelBinding);
+    return <Resolved {...props}/>;
+}
+
+function ResolvedSidePanelBinding(props: SidePanelBindingProps) {
+    if (props.collection) {
+        return (
+            <CollectionScopeProvider collection={props.collection}>
+                <ResolvedSidePanelBindingInner {...props}/>
+            </CollectionScopeProvider>
+        );
+    }
+    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 {
         selectedSecondaryForm
     } = resolvedSelectedEntityView(props.collection?.entityViews, customizationController, props.selectedTab);
 
-    const shouldUseSmallLayout = !props.selectedTab || props.selectedTab === JSON_TAB_VALUE || props.selectedTab === HISTORY_TAB_VALUE || Boolean(selectedSecondaryForm);
+    const shouldUseSmallLayout = !props.selectedTab || props.selectedTab === "edit" || props.selectedTab === JSON_TAB_VALUE || props.selectedTab === HISTORY_TAB_VALUE || Boolean(selectedSecondaryForm);
 
     let resolvedWidth: string | undefined;
     if (props.width) {
@@ -50,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];
     }
@@ -86,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);
@@ -150,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,
@@ -171,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(
@@ -187,8 +209,8 @@ width: newWidth };
 
         sideDialogsController.open(
             propsToSidePanel({
-                selectedTab: defaultSelectedView,
-                ...props
+                ...props,
+                selectedTab: props.selectedTab ?? defaultSelectedView
             },
                 urlController.buildUrlCollectionPath,
                 urlController.resolveDatabasePathsFrom,
@@ -200,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));
@@ -217,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++) {
@@ -241,6 +263,7 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
                 path: navigationEntry.slug,
                 entityId: navigationEntry.entityId,
                 copy: false,
+                collection: navigationEntry.parentCollection,
                 width: navigationEntry.parentCollection?.sideDialogWidth
             };
         } else if (navigationEntry.type === "custom_view") {
@@ -257,6 +280,22 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
 
     }
 
+    // When the URL doesn't contain a tab segment but the collection has a
+    // defaultSelectedView, resolve it so the panel opens with the correct
+    // width and the URL is updated on the next replace() cycle.
+    if (sidePanel && !sidePanel.selectedTab && sidePanel.collection) {
+        const defaultView = resolveDefaultSelectedView(
+            sidePanel.collection.defaultSelectedView,
+            {
+                status: sidePanel.copy ? "copy" : (sidePanel.entityId ? "existing" : "new"),
+                entityId: sidePanel.entityId
+            }
+        );
+        if (defaultView) {
+            sidePanel.selectedTab = defaultView;
+        }
+    }
+
     if (newFlag) {
         sidePanel = {
             path: lastCollectionPath,
@@ -267,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,
@@ -292,7 +331,7 @@ const propsToSidePanel = (props: EntitySidePanelProps,
         ? buildUrlCollectionPath(collectionPath)
         : undefined;
 
-    const resolvedPanelProps: EntitySidePanelProps<any> = {
+    const resolvedPanelProps: SidePanelBindingProps<any> = {
         ...props,
         formProps: props.formProps
     };
@@ -300,7 +339,7 @@ const propsToSidePanel = (props: EntitySidePanelProps,
     const entityViewWidth = getEntityViewWidth(props, smallLayout, customizationController);
     return {
         key: `${props.path}/${props.entityId}`,
-        component: <EntitySidePanel {...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;
@@ -20,14 +20,14 @@ export interface UseEntityHistoryResult {
     hasMore: boolean;
     error?: Error;
     loadMore: () => void;
-    revert: (historyId: string) => Promise<void>;
+    revert: (historyId: string) => Promise<Record<string, unknown>>;
 }
 
 /**
  * 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;
@@ -129,7 +129,7 @@ signal });
         }
     }, [isLoading, hasMore, pageSize, offset, entries.length, total]);
 
-    const revert = useCallback(async (historyId: string) => {
+    const revert = useCallback(async (historyId: string): Promise<Record<string, unknown>> => {
         if (!apiConfig?.apiUrl || !entityId) {
             throw new Error("Cannot revert: missing API configuration or entity ID");
         }
@@ -149,10 +149,15 @@ headers });
             throw new Error(errorData.error?.message || `Failed to revert (${response.status})`);
         }
 
+        const result = await response.json();
+
         // Refresh the history list after revert by resetting the entity ref
         // and triggering the effect.
         currentEntityRef.current = undefined;
         setRefreshTrigger(prev => prev + 1);
+
+        // Return the reverted entity data so callers can update the form
+        return result.data as Record<string, unknown>;
     }, [apiConfig, slug, entityId]);
 
     return useMemo(() => ({

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,12 @@ 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.
                 return data.collection(entry.slug).findById(entry.entityId)
-                    .then((entity) => {
-                        if (!entity) return undefined;
+                    .then((row) => {
+                        if (!row) return undefined;
+                        const entity = { id: row.id, path: entry.slug, values: row };
                         return { ...entry,
 entity };
                     });

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

@@ -1,34 +1,34 @@
 // CMS-specific types take priority over base types when names conflict
 export * from "./types";
-// Editor types only — the full ProseMirror editor is a heavy import (~300 KB)
+// Editor types only — the full ProseMirror editor (RichTextEditor) is a heavy import (~300 KB)
 // and is available as a separate entry point: @rebasepro/admin/editor
-export type { RebaseEditorProps, JSONContent, EditorAIController } from "./editor";
+export type { RichTextEditorProps, RichTextEditorTextSize, JSONContent, EditorAIController } from "./editor";
 export * from "./form";
 export * from "./preview";
 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,
@@ -37,25 +37,30 @@ export {
     editEntityAction,
     copyEntityAction,
     deleteEntityAction,
-    SideEntityProvider,
+    resetPasswordAction,
+    SidePanelProvider,
     Scaffold,
     AppBar,
     Drawer,
+    DefaultDrawer,
+    DrawerFooterActions,
     AdminModeSyncer,
-    // ContentHomePage, UsersView, RolesView are lazy-loaded — not re-exported here
-    RebaseCMS,
+    // ContentHomePage is lazy-loaded — not re-exported here
+    RebaseAdmin,
     RebaseShell,
     RebaseAuthGate,
     RebaseNavigation,
     RebaseLayout,
     RebaseRouteDefs,
     SideDialogs,
-    useApp
+    useApp,
+    CollectionPanel
 } from "./components";
 export type {
-    EntityViewProps,
-    EntitySelectionProps,
-    SelectableTableProps
+    EntityViewBindingProps,
+    SelectionProps,
+    SelectableTableProps,
+    CollectionPanelProps
 } from "./components";
 
 export * from "./hooks";
@@ -72,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,
@@ -82,14 +87,23 @@ 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";
 
+// Headless collection view adapters
+// Map entity types to the data-agnostic CollectionView from @rebasepro/ui
+export { mapPropertyToConfig, mapPropertiesToConfigs } from "./util/propertyConfigMapper";
+export { useCollectionDataController, createStaticDataController } from "./util/dataControllerAdapter";
+
 // Data import/export — merged from former standalone packages
 export * from "./data_import";
 export * from "./data_export";
 
 // Collection editor — moved from @rebasepro/studio (CMS-dependent visual schema editor)
 export * from "./collection_editor";
+
+
+export { CreationResultDialog } from "./components/admin/CreationResultDialog";
+