@rebasepro/admin 0.11.0 → 0.11.1-canary.g8caabf3

package/src/components/RebaseAdmin.tsx

@@ -3,7 +3,7 @@ import { useRebaseRegistryDispatch } from "@rebasepro/app";
 import type { RebaseAdminConfig } from "@rebasepro/admin-types";
 
 /**
- * Declarative component to configure the CMS in Rebase.
+ * Declarative component to configure the admin in Rebase.
  * Renders nothing — purely registers config into the RebaseRegistry.
  *
  * When `collectionEditor` is provided, the built-in visual schema editor
@@ -14,7 +14,7 @@ export function RebaseAdmin({ collections, views, homePage, entityViews, entityA
     const dispatch = useRebaseRegistryDispatch();
 
     useLayoutEffect(() => {
-        dispatch.registerCMS({ collections,
+        dispatch.registerAdmin({ collections,
 views,
 homePage,
 entityViews,
@@ -22,7 +22,7 @@ entityActions,
 collectionEditor,
 navigationGroupMappings,
 basePath });
-        return () => dispatch.unregisterCMS();
+        return () => dispatch.unregisterAdmin();
     }, [dispatch, collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings, basePath]);
 
     return null;

package/src/components/RebaseAuthGate.tsx

@@ -15,7 +15,7 @@ import type { AuthControllerExtended } from "@rebasepro/admin-types";
  * - Renders `children` when a user is authenticated.
  *
  * **Independently usable**: Use this alone when you want auth gating
- * without the full CMS layout or navigation.
+ * without the full admin layout or navigation.
  *
  * @example
  * ```tsx

package/src/components/RebaseLayout.tsx

@@ -19,8 +19,12 @@ export interface RebaseLayoutProps {
     appBar?: React.ReactNode;
     /** Custom Drawer to override the default. */
     drawer?: React.ReactNode;
-    /** Whether to auto-open the drawer on load. */
+    /** Expand the drawer while the pointer is over it. Not a load-time default — that is `defaultDrawerOpen`. */
     autoOpenDrawer?: boolean;
+    /** Start with the drawer expanded instead of collapsed to icons. Ignored on small layouts. */
+    defaultDrawerOpen?: boolean;
+    /** Path to the logo shown in the drawer and top bar. Falls back to the Rebase mark. */
+    logo?: string;
     /** Dev views passed to AdminModeSyncer (resolved from RebaseNavigation). */
     devViews?: AppView[];
 }
@@ -49,6 +53,8 @@ export function RebaseLayout(props: RebaseLayoutProps) {
         appBar,
         drawer,
         autoOpenDrawer = false,
+        defaultDrawerOpen = false,
+        logo,
         devViews = []
     } = props;
 
@@ -63,7 +69,7 @@ export function RebaseLayout(props: RebaseLayoutProps) {
     );
 
     return (
-        <Scaffold autoOpenDrawer={autoOpenDrawer}>
+        <Scaffold autoOpenDrawer={autoOpenDrawer} defaultDrawerOpen={defaultDrawerOpen} logo={logo}>
             <AdminModeSyncer devViews={devViews}/>
             {appBar}
             {ActiveDrawer}

package/src/components/RebaseNavigation.tsx

@@ -50,13 +50,13 @@ export interface RebaseNavigationProps {
 }
 
 /**
- * Navigation layer — builds and provides all CMS navigation controllers:
+ * Navigation layer — builds and provides all admin navigation controllers:
  * collection registry, URL controller, navigation state, side entity,
  * and the self-assembling Studio bridge.
  *
  * Also handles the collection editor config controller when enabled.
  *
- * **Independently usable**: Use this when you need CMS navigation
+ * **Independently usable**: Use this when you need admin navigation
  * (entity tables, side panels) in a custom layout.
  *
  * @example
@@ -76,7 +76,7 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
 
     // ── Collection Editor resolution ──────────────────────────────────
     // The collection editor is ALWAYS enabled when Studio is registered.
-    // The `collectionEditor` CMS config is for fine-tuning (readOnly, auth, etc.),
+    // The `collectionEditor` admin config is for fine-tuning (readOnly, auth, etc.),
     // not for opting-in. When omitted, the editor defaults to enabled
     // (read-only in production).
     const collectionEditorConfig = registry.cmsConfig?.collectionEditor;
@@ -86,7 +86,7 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
         return collectionEditorConfig;
     }, [collectionEditorConfig]);
 
-    // ── Combine CMS and Studio Configs ────────────────────────────────
+    // ── Combine admin and Studio Configs ────────────────────────────────
     const cmsCollections = registry.cmsConfig?.collections ?? EMPTY_COLLECTIONS;
 
     // ── Build the navigation controllers ──────────────────────────────
@@ -203,8 +203,8 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
         return base;
     }, [registry.studioConfig?.devViews, schemaView]);
 
-    // Merge CMS-registered views with Studio dev views.
-    // Order: CMS views (developer's primary content) → Studio dev views (tooling).
+    // Merge admin-registered views with Studio dev views.
+    // Order: admin views (developer's primary content) → Studio dev views (tooling).
     // Plugin views are merged later inside resolveAppViews.
     const cmsViews = registry.cmsConfig?.views;
     const mergedViews = useMemo(() => {
@@ -234,7 +234,7 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
         adminMode: adminModeController?.mode
     });
 
-    // ── Merge CMS-registered entityViews/entityActions into the customization controller ──
+    // ── Merge admin-registered entityViews/entityActions into the customization controller ──
     // The <Rebase> component builds the customizationController from its own props,
     // but entity views passed to <RebaseAdmin> are stored in the registry and not
     // automatically merged. We re-provide an enriched controller here so that
@@ -260,7 +260,7 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
     }, [parentCustomizationController, registry.cmsConfig?.entityViews, registry.cmsConfig?.entityActions]);
 
     // ── Inner content with all context providers ──────────────────────
-    // Re-provide RebaseDataContext with the routed data so that every CMS
+    // Re-provide RebaseDataContext with the routed data so that every admin
     // consumer (list/entity views, references, board, import/export, and
     // `context.data`) is routed to the correct driver by collection path.
     const navigationContent = (
@@ -302,7 +302,7 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
 }
 
 /**
- * Internal component that auto-registers CMS controllers into the
+ * Internal component that auto-registers admin controllers into the
  * self-assembling Studio bridge. Must be rendered inside both the
  * navigation contexts and the StudioBridgeRegistryProvider.
  */

package/src/components/RebaseRouteDefs.tsx

@@ -45,7 +45,7 @@ export interface RebaseRouteDefsProps {
 }
 
 /**
- * Route definitions for the CMS.
+ * Route definitions for the admin.
  *
  * Defines all standard routes: home, studio home, collection view,
  * settings, debug, custom views, and a catch-all 404.
@@ -77,7 +77,7 @@ export function RebaseRouteDefs({ children, layout }: RebaseRouteDefsProps) {
 
     const routeContents = (
         <>
-            {/* Core CMS Routes */}
+            {/* Core admin Routes */}
             <Route path={"/"} element={cmsHomePage}/>
             {registry.studioConfig && (
                 <Route path={"/s"} element={studioHomePage}/>

package/src/components/RebaseShell.tsx

@@ -14,12 +14,17 @@ export interface RebaseShellProps {
     /** Top bar. Only rendered if provided — pass `<AppBar/>` for the default one. */
     appBar?: React.ReactNode;
     drawer?: React.ReactNode;
+    /** Expand the drawer while the pointer is over it. Not a load-time default — that is `defaultDrawerOpen`. */
     autoOpenDrawer?: boolean;
+    /** Start with the drawer expanded instead of collapsed to icons. Ignored on small layouts. */
+    defaultDrawerOpen?: boolean;
+    /** Path to the logo shown in the drawer and top bar. Falls back to the Rebase mark. */
+    logo?: string;
     children?: React.ReactNode;
 }
 
 /**
- * Convenience component that composes all four CMS layers:
+ * Convenience component that composes all four admin layers:
  *
  * ```
  * <RebaseAuthGate>
@@ -40,6 +45,8 @@ export function RebaseShell(props: RebaseShellProps) {
         appBar,
         drawer,
         autoOpenDrawer = false,
+        defaultDrawerOpen = false,
+        logo,
         children
     } = props;
 
@@ -61,6 +68,8 @@ export function RebaseShell(props: RebaseShellProps) {
                                 appBar={appBar}
                                 drawer={drawer}
                                 autoOpenDrawer={autoOpenDrawer}
+                                defaultDrawerOpen={defaultDrawerOpen}
+                                logo={logo}
                                 devViews={devViews}
                             />
                         }

package/src/components/RelationSelector.tsx

@@ -223,7 +223,7 @@ export const RelationSelector = React.forwardRef<
 
                 if (hasEmbeddedData) {
                     const r = rel as EntityRelation;
-                    // CMS wire format embeds relation data as { id, path, values }
+                    // admin wire format embeds relation data as { id, path, values }
                     newResolvedItems.push(toRelationItem(r.data as unknown as Entity, r));
                 } else if (currentSelectedMap.has(relId)) {
                     // We already have it in currentSelected
@@ -259,7 +259,7 @@ export const RelationSelector = React.forwardRef<
                     const relation = isPrimitive ? new EntityRelation(relId, path) : rel as EntityRelation;
 
                     if (!isPrimitive && (rel as EntityRelation).data) {
-                        // CMS wire format embeds relation data as { id, path, values }
+                        // admin wire format embeds relation data as { id, path, values }
                         return toRelationItem((rel as EntityRelation).data as unknown as Entity, relation);
                     }
                     if (currentSelectedMap.has(String(relId))) {

package/src/components/SidePanelProvider.tsx

@@ -15,8 +15,8 @@ import { useAuthController, useBridgeRegistration, NavigationBlockerProvider } f
  * Provider that builds the SidePanelController and makes it available
  * via the SidePanelControllerContext from @rebasepro/app.
  *
- * After the CMS extraction refactor, `useBuildSidePanel` lives
- * in the CMS package while the context it feeds into lives in core.
+ * After the admin extraction refactor, `useBuildSidePanel` lives
+ * in the admin package while the context it feeds into lives in core.
  * This provider bridges the two: place it inside the `<Rebase>` tree and
  * above any component that calls `useSidePanel()`.
  *

package/src/components/app/Scaffold.tsx

@@ -18,6 +18,18 @@ export interface ScaffoldProps {
      */
     autoOpenDrawer?: boolean;
 
+    /**
+     * Start with the drawer expanded rather than collapsed to icons.
+     *
+     * Distinct from {@link autoOpenDrawer}, which is a hover behaviour: this one
+     * only seeds the initial state, so the user's own toggle still wins for the
+     * rest of the session.
+     *
+     * Ignored on small layouts, where an expanded drawer covers the content it is
+     * meant to navigate.
+     */
+    defaultDrawerOpen?: boolean;
+
     /**
      * Logo to be displayed in the top bar and drawer.
      * Note that this has no effect if you are using a custom AppBar or Drawer.
@@ -51,6 +63,7 @@ export const Scaffold = React.memo<PropsWithChildren<ScaffoldProps>>(
         const {
             children,
             autoOpenDrawer,
+            defaultDrawerOpen = false,
             logo,
             className,
             style,
@@ -70,7 +83,9 @@ export const Scaffold = React.memo<PropsWithChildren<ScaffoldProps>>(
         const includeDrawer = drawerChildren.length > 0;
         const largeLayout = useLargeLayout();
 
-        const [drawerOpen, setDrawerOpen] = React.useState(false);
+        // Seeded once, deliberately: a `useEffect` syncing this to the prop would
+        // re-expand the drawer under a user who had just collapsed it.
+        const [drawerOpen, setDrawerOpen] = React.useState(defaultDrawerOpen && largeLayout);
         const [onHover, setOnHover] = React.useState(false);
 
         const setOnHoverTrue = useCallback(() => setOnHover(true), []);

package/src/data_export/export/ExportCollectionAction.tsx

@@ -7,7 +7,7 @@ import {
     useData,
     useTranslation
 } from "@rebasepro/app";
-import { useCMSContext } from "../../hooks";
+import { useAdminContext } from "../../hooks";
 import { Entity, User } from "@rebasepro/types";
 import { CollectionActionsProps, ExportConfig, RebaseContext, AdminCollection } from "@rebasepro/admin-types";
 import { getDefaultValuesFor } from "@rebasepro/common";
@@ -56,7 +56,7 @@ export function ExportCollectionAction<M extends Record<string, unknown>, USER e
     const [exportType, setExportType] = React.useState<"csv" | "json">("csv");
     const [dateExportType, setDateExportType] = React.useState<"timestamp" | "string">("string");
 
-    const context = useCMSContext<USER>();
+    const context = useAdminContext<USER>();
     const dataClient = useData();
 
     const canExport = !exportAllowed || exportAllowed({

package/src/form/EntityForm.tsx

@@ -39,9 +39,9 @@ import {
 /**
  * Headless entity form component.
  *
- * Renders a form for a entity collection without any CMS or backend dependencies.
+ * Renders a form for a entity collection without any admin or backend dependencies.
  * All backend concerns (save, caching, analytics, plugin slots) are provided via
- * callback props. For CMS-connected usage, use {@link EntityFormBinding} instead.
+ * callback props. For admin-connected usage, use {@link EntityFormBinding} instead.
  *
  * @group Components
  */

package/src/form/EntityFormActions.tsx

@@ -5,6 +5,7 @@ import type { EntityAction, AdminCollection } from "@rebasepro/admin-types";
 import React from "react";
 import { Entity } from "@rebasepro/types";
 import type { EntityFormActionsProps } from "../types/components/EntityFormActionsProps";
+import { getIcon } from "@rebasepro/app";
 import {
     AlertCircleIcon,
     Button,
@@ -136,7 +137,7 @@ function buildBottomActions<M extends Record<string, unknown>>({
                                 formContext
                             });
                     }}>
-                    {action.icon}
+                    {getIcon(action.icon, undefined, undefined, "smallest")}
                 </IconButton>
             ))}
         </div>}

package/src/form/EntityFormBinding.tsx

@@ -30,7 +30,7 @@ import {
 
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 import { useSidePanel } from "../hooks/useSidePanel";
-import { useCMSContext } from "../hooks/useCMSContext";
+import { useAdminContext } from "../hooks/useAdminContext";
 import { EntityForm } from "./EntityForm";
 import {
     extractTouchedValues,
@@ -41,9 +41,9 @@ import {
 import { mergeDeep } from "@rebasepro/utils";
 
 /**
- * Props for the CMS-connected EntityFormBinding wrapper.
+ * Props for the admin-connected EntityFormBinding wrapper.
  * Extends EntityFormProps — you can pass all the same props as EntityForm,
- * but the binding provides CMS context (save, caching, analytics, plugin slots)
+ * but the binding provides admin context (save, caching, analytics, plugin slots)
  * automatically.
  */
 export type EntityFormBindingProps<M extends Record<string, unknown>> = Omit<EntityFormProps<M>,
@@ -63,7 +63,7 @@ export type EntityFormBindingProps<M extends Record<string, unknown>> = Omit<Ent
 >;
 
 /**
- * CMS-connected wrapper around EntityForm.
+ * admin-connected wrapper around EntityForm.
  *
  * Provides all backend concerns that the headless EntityForm delegates via callbacks:
  * - Save via the data layer (`saveEntityWithCallbacks`)
@@ -74,8 +74,8 @@ export type EntityFormBindingProps<M extends Record<string, unknown>> = Omit<Ent
  * - Analytics events
  * - Navigation via side entity controller
  *
- * Use this component inside the CMS (`<RebaseShell>`).
- * For headless usage outside the CMS, use `EntityForm` directly.
+ * Use this component inside the admin (`<RebaseShell>`).
+ * For headless usage outside the admin, use `EntityForm` directly.
  *
  * @group Components
  */
@@ -102,7 +102,7 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
     const dataClient = useData();
     const snackbarController = useSnackbarController();
     const customizationController = useCustomizationController();
-    const context = useCMSContext();
+    const context = useAdminContext();
     const analyticsController = useAnalyticsController();
 
     const [status, setStatus] = useState<EntityStatus>(initialStatus);

package/src/hooks/index.ts

@@ -13,4 +13,4 @@ export * from "./navigation/useResolvedViews";
 export * from "./navigation/useTopLevelNavigation";
 export * from "./useSideDialogsController";
 export * from "./useBreadcrumbsController";
-export * from "./useCMSContext";
+export * from "./useAdminContext";

package/src/hooks/navigation/useNavigationResolution.ts

@@ -238,13 +238,13 @@ export async function resolveAppViews(
             if (count > 1) {
                 console.warn(
                     `[Rebase] Duplicate view slug "${slug}" detected (${count} views). ` +
-                    `Last-write-wins. Ensure unique slugs across CMS views and plugins.`
+                    `Last-write-wins. Ensure unique slugs across admin views and plugins.`
                 );
             }
         });
     }
 
-    // Filter by roles — applies to CMS, plugin, and builder-returned views
+    // Filter by roles — applies to admin, plugin, and builder-returned views
     resolvedViews = filterViewsByRole(resolvedViews, authController);
 
     return resolvedViews;

package/src/hooks/{useCMSContext.tsx → useAdminContext.tsx}

@@ -25,13 +25,13 @@ import {
 } from "./navigation/contexts";
 
 /**
- * The CMS context extends the core RebaseContext with CMS-specific
- * controllers that are only available inside the CMS routing tree.
+ * The admin context extends the core RebaseContext with admin-specific
+ * controllers that are only available inside the admin routing tree.
  *
- * Use {@link useCMSContext} to obtain an instance.
+ * Use {@link useAdminContext} to obtain an instance.
  * @group Hooks and utilities
  */
-export type CMSContext<
+export type AdminContext<
     DB = Record<string, unknown>,
     USER extends User = User,
     AuthControllerType extends AuthController<USER> = AuthController<USER>
@@ -44,20 +44,20 @@ export type CMSContext<
 };
 
 /**
- * Hook that builds a fully-populated CMS context by combining the
- * core {@link RebaseContext} with CMS-specific controllers.
+ * Hook that builds a fully-populated admin context by combining the
+ * core {@link RebaseContext} with admin-specific controllers.
  *
- * Use this instead of `useRebaseContext()` in CMS components that
+ * Use this instead of `useRebaseContext()` in admin components that
  * need to pass context to entity action callbacks, plugin slots,
- * or any consumer that expects CMS controllers on the context object.
+ * or any consumer that expects admin controllers on the context object.
  *
  * @group Hooks and utilities
  */
-export function useCMSContext<
+export function useAdminContext<
     DB = Record<string, unknown>,
     USER extends User = User,
     AuthControllerType extends AuthController<USER> = AuthController<USER>
->(): CMSContext<DB, USER, AuthControllerType> {
+>(): AdminContext<DB, USER, AuthControllerType> {
     const baseContext = useRebaseContext<USER, AuthControllerType>();
     const sidePanelController = useSidePanel();
     const sideDialogsController = useSideDialogsController();

package/src/hooks/useResolvedNavigationFrom.tsx

@@ -4,7 +4,7 @@ import { Entity, User } from "@rebasepro/types";
 import { RebaseContext } from "@rebasepro/admin-types";
 import { useEffect, useState, useMemo } from "react";
 import { getNavigationEntriesFromPath } from "@rebasepro/app";
-import { useCMSContext } from "./useCMSContext";
+import { useAdminContext } from "./useAdminContext";
 
 /**
  * @see resolveNavigationFrom
@@ -136,7 +136,7 @@ export function useResolvedNavigationFrom<M extends Record<string, unknown>>(
         path
     }: NavigationFromProps): NavigationFrom<M> {
 
-    const context = useCMSContext();
+    const context = useAdminContext();
     const { navigationStateController, collectionRegistryController } = context;
 
     const [data, setData] = useState<ResolvedNavigationEntry<M>[] | undefined>();

package/src/index.ts

@@ -1,4 +1,4 @@
-// CMS-specific types take priority over base types when names conflict
+// admin-specific types take priority over base types when names conflict
 export * from "./types";
 // 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
@@ -77,7 +77,7 @@ export {
     mergeEntityActions,
     resolveEntityAction,
     resolveEntityView,
-    // Property utilities (moved from @rebasepro/app — property-aware logic belongs in CMS)
+    // Property utilities (moved from @rebasepro/app — property-aware logic belongs in admin)
     isReferenceProperty,
     isRelationProperty,
     getIconForWidget,
@@ -87,7 +87,7 @@ export {
     getBracketNotation,
     getPropertiesWithPropertiesOrder,
     getDefaultPropertiesOrder,
-    // Preview utilities (moved from @rebasepro/app — property-aware logic belongs in CMS)
+    // Preview utilities (moved from @rebasepro/app — property-aware logic belongs in admin)
     getEntityPreviewKeys,
     getEntityTitlePropertyKey,
     getEntityTitlePropertyKeyForEntity
@@ -102,7 +102,7 @@ export { useCollectionDataController, createStaticDataController } from "./util/
 export * from "./data_import";
 export * from "./data_export";
 
-// Collection editor — moved from @rebasepro/studio (CMS-dependent visual schema editor)
+// Collection editor — moved from @rebasepro/studio (admin-dependent visual schema editor)
 export * from "./collection_editor";
 
 

package/src/preview/components/RelationPreview.tsx

@@ -158,7 +158,7 @@ function RelationPreviewExisting<M extends Record<string, unknown> = Record<stri
     collection: AdminCollection<M>
 }) {
 
-    // CMS wire format embeds relation data as { id, path, values }
+    // admin 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();

package/src/types/components/EntityFormProps.tsx

@@ -7,7 +7,7 @@ import { EntityFormActionsProps } from "./EntityFormActionsProps";
 
 /**
  * Props for the headless EntityForm component.
- * This form can be used without CMS context — all backend concerns
+ * This form can be used without admin context — all backend concerns
  * (save, caching, analytics, plugin slots) are provided via callbacks.
  */
 export type EntityFormProps<M extends Record<string, unknown>> = {
@@ -51,7 +51,7 @@ export type EntityFormProps<M extends Record<string, unknown>> = {
 
     children?: React.ReactNode;
 
-    // --- Headless callbacks (replace internal CMS hooks) ---
+    // --- Headless callbacks (replace internal admin hooks) ---
 
     /**
      * Called on form submit with the values to save.

package/src/types/fields.tsx

@@ -243,7 +243,7 @@ export interface PropertyFieldBindingProps<M extends Record<string, unknown> = R
     propertyKey: string;
 
     /**
-     * The CMS property you are binding this field to
+     * The admin property you are binding this field to
      */
     property: Property;