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

package/src/components/CollectionViewBinding/hooks/useCollectionInlineEditor.ts

@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from "react";
-import { setIn } from "@rebasepro/formex";
+import { setIn } from "@rebasepro/forms";
 import { CollectionConfig, RebaseData, RebaseContext } from "@rebasepro/types";
-import { OnCellValueChange, saveEntityWithCallbacks, SaveEntityWithCallbacksProps, UniqueFieldValidator } from "@rebasepro/core";
+import { OnCellValueChange, saveEntityWithCallbacks, SaveEntityWithCallbacksProps, UniqueFieldValidator } from "@rebasepro/app";
 
 export interface UseCollectionInlineEditorParams<M extends Record<string, unknown>> {
     path: string;

package/src/components/CollectionViewBinding/hooks/useKanbanDragAndDrop.ts

@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from "react";
-import { setIn } from "@rebasepro/formex";
+import { setIn } from "@rebasepro/forms";
 import { CollectionConfig, RebaseData, RebaseContext, AnalyticsController, Entity } from "@rebasepro/types";
-import { saveEntityWithCallbacks, SaveEntityWithCallbacksProps } from "@rebasepro/core";
+import { saveEntityWithCallbacks, SaveEntityWithCallbacksProps } from "@rebasepro/app";
 import { BoardItem } from "@rebasepro/ui";
 import { BoardDataController } from "../useBoardDataController";
 import { generateKeyBetween } from "fractional-indexing";

package/src/components/CollectionViewBinding/useBoardDataController.tsx

@@ -1,7 +1,7 @@
 import type { CollectionConfig } from "@rebasepro/types";
 import { Entity, FilterValues } from "@rebasepro/types";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useData, useRebaseContext } from "@rebasepro/core";
+import { getRelationIncludeParams, useData, useRebaseContext } from "@rebasepro/app";
 
 const DEFAULT_PAGE_SIZE = 20;
 
@@ -410,18 +410,24 @@ values: { ...e.values,
 
         // Set up listener or fetch
         const accessor = currentDataClient.collection(currentResolvedPath);
+
+        // Eagerly include relations to avoid N+1 fetches.
+        const includeParams = getRelationIncludeParams(currentCollection);
+
         if (accessor.listen) {
             const unsubscribe = accessor.listen({
                 where: whereFilter,
                 limit: itemCount,
-                orderBy: orderByParam
+                orderBy: orderByParam,
+                include: includeParams
             }, res => onUpdate(res.data as Entity<M>[]), onError);
             unsubscribersRef.current[column] = unsubscribe;
         } else {
             accessor.find({
                 where: whereFilter,
                 limit: itemCount,
-                orderBy: orderByParam
+                orderBy: orderByParam,
+                include: includeParams
             })
                 .then(res => onUpdate(res.data as Entity<M>[]))
                 .catch(onError);

package/src/components/CollectionViewBinding/usePreviewSlots.ts

@@ -2,7 +2,7 @@ import { useMemo } from "react";
 import type { CollectionConfig, Property, RelationProperty } from "@rebasepro/types";
 import type { Entity, PropertyConfig, EntityRelation } from "@rebasepro/types";
 import { getEntityImagePreviewPropertyKey } from "@rebasepro/common";
-import { getEntityFromCache } from "@rebasepro/core";
+import { getEntityFromCache } from "@rebasepro/app";
 import { getEntityTitlePropertyKey, getEntityPreviewKeys } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
 import type { AuthController } from "@rebasepro/types";

package/src/components/DefaultAppBar.tsx

@@ -2,7 +2,7 @@
 import React from "react";
 
 import { Link, useNavigate } from "react-router-dom";
-import { RebaseLogo, LanguageToggle } from "@rebasepro/core";
+import { RebaseLogo, LanguageToggle } from "@rebasepro/app";
 import { ErrorBoundary, iconSize } from "@rebasepro/ui";
 import {
     Avatar,
@@ -18,12 +18,12 @@ import {
     SunMoonIcon,
     Typography
 } from "@rebasepro/ui";
-import { useAuthController, useLargeLayout, useModeController, useAdminModeController, useTranslation } from "@rebasepro/core";
+import { useAuthController, useLargeLayout, useModeController, useAdminModeController, useTranslation } from "@rebasepro/app";
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
 import { User } from "@rebasepro/types";
 import { useApp } from "./app/useApp";
 import { useBreadcrumbsController } from "../hooks/useBreadcrumbsController";
-import { UserSettingsView } from "@rebasepro/core";
+import { UserSettingsView } from "@rebasepro/app";
 
 export type DefaultAppBarProps<ADDITIONAL_PROPS = object> = {
 

package/src/components/DefaultDrawer.tsx

@@ -1,7 +1,7 @@
 import type { NavigationEntry, NavigationResult } from "@rebasepro/types";
 import React, { useMemo } from "react";
 
-import { useCollapsedGroups, buildCollapsedDefaults, useLargeLayout, useAdminModeController, useAuthController, useModeController, useTranslation, useSlot, useRebaseContext, useAnalyticsController, useRebaseRegistry, useComponentOverride } from "@rebasepro/core";
+import { useCollapsedGroups, buildCollapsedDefaults, useLargeLayout, useAdminModeController, useAuthController, useModeController, useTranslation, useSlot, useRebaseContext, useAnalyticsController, useRebaseRegistry, useComponentOverride } from "@rebasepro/app";
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
 import { useNavigationStateController } from "../hooks/navigation/contexts/NavigationStateContext";
 
@@ -29,7 +29,7 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { DrawerNavigationGroup } from "./DrawerNavigationGroup";
-import { LanguageToggle, RebaseLogo } from "@rebasepro/core";
+import { LanguageToggle, RebaseLogo } from "@rebasepro/app";
 import { useApp } from "./app/useApp";
 
 /**
@@ -166,7 +166,7 @@ function CMSNavigationContent() {
     const allNavigationEntries = navigationState.topLevelNavigation?.navigationEntries ?? [];
 
     // Build a set of Studio-only dev view slugs so we can distinguish them from
-    // CMS custom views added via <RebaseCMS views={...}> or plugins.
+    // CMS custom views added via <RebaseAdmin views={...}> or plugins.
     const studioViewSlugs = useMemo(() => {
         const slugs = new Set<string>();
         (registry.studioConfig?.devViews ?? []).forEach(v => slugs.add(v.slug));

package/src/components/DeleteEntityDialog.tsx

@@ -9,7 +9,7 @@ import {
     useData,
     useSnackbarController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { useCMSContext } from "../hooks";
 import { EntityViewBinding } from "./EntityViewBinding";
 

package/src/components/DetailViewBinding.tsx

@@ -3,7 +3,7 @@ import type { FormContext } from "../types/fields";
 import type { PluginFormActionProps } from "@rebasepro/types";
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Entity, EntityStatus, getCollectionDataPath, Property } from "@rebasepro/types";
-import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionScopeProvider } from "@rebasepro/core";
+import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionScopeProvider } from "@rebasepro/app";
 
 import { CollectionViewBinding, EntityViewBinding } from "../components";
 import { CircularProgressCenter, iconSize } from "@rebasepro/ui";
@@ -25,7 +25,7 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
-import { ErrorView, createFormexStub, usePermissions, useTranslation, getIcon } from "@rebasepro/core";
+import { ErrorView, createFormexStub, usePermissions, useTranslation, getIcon } from "@rebasepro/app";
 import {
     getSubcollections,
     removeInitialAndTrailingSlashes,
@@ -38,7 +38,7 @@ import {
     useRebaseContext,
     useLargeLayout,
     useSlot
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { useUrlController, useCollectionRegistryController } from "../index";
 import { useNavigate } from "react-router-dom";
 import { getValueInPath } from "@rebasepro/utils";

package/src/components/DrawerNavigationGroup.tsx

@@ -2,9 +2,9 @@ import type { NavigationEntry } from "@rebasepro/types";
 import React from "react";
 import { ChevronDownIcon, cls, iconSize, Typography } from "@rebasepro/ui";
 
-import { IconForView } from "@rebasepro/core";
+import { IconForView } from "@rebasepro/app";
 import { DrawerNavigationItem } from "./DrawerNavigationItem";
-import { useTranslation, useComponentOverride } from "@rebasepro/core";
+import { useTranslation, useComponentOverride } from "@rebasepro/app";
 
 export interface DrawerNavigationGroupProps {
     /**

package/src/components/EditFormActions.tsx

@@ -14,11 +14,11 @@ import {
     useCustomizationController,
     useSnackbarController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { SideDialogController, useSideDialogContext } from "./SideDialogs";
-import { FormexController } from "@rebasepro/formex";
-import { ErrorTooltip } from "@rebasepro/core";
-import { usePermissions } from "@rebasepro/core";
+import { FormexController } from "@rebasepro/forms";
+import { ErrorTooltip } from "@rebasepro/app";
+import { usePermissions } from "@rebasepro/app";
 import { useCMSContext } from "../index";
 
 export function EditFormActions({

package/src/components/EditViewBinding.tsx

@@ -3,7 +3,7 @@ import type { FormContext } from "../types/fields";
 import type { PluginFormActionProps } from "@rebasepro/types";
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Entity, EntityStatus, getCollectionDataPath } from "@rebasepro/types";
-import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionScopeProvider } from "@rebasepro/core";
+import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionScopeProvider } from "@rebasepro/app";
 
 import { CollectionViewBinding, EntityViewBinding } from "../components";
 import { CircularProgressCenter, iconSize } from "@rebasepro/ui";
@@ -23,7 +23,7 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
-import { ErrorView } from "@rebasepro/core";
+import { ErrorView } from "@rebasepro/app";
 import {
     getSubcollections,
     removeInitialAndTrailingSlashes,
@@ -37,8 +37,8 @@ import {
     useLargeLayout,
     useSlot,
     getIcon
-} from "@rebasepro/core";
-import { getEntityFromMemoryCache } from "@rebasepro/core";
+} from "@rebasepro/app";
+import { getEntityFromMemoryCache } from "@rebasepro/app";
 import { EntityFormBinding } from "../form";
 import type { EntityFormBindingProps } from "../form";
 import type { OnUpdateParams } from "../types/components/EntityFormProps";
@@ -46,8 +46,8 @@ import { EditFormActions } from "./EditFormActions";
 import { JsonPreviewBinding } from "../components/JsonPreviewBinding";
 // Lazy-load history view — only loaded when user clicks the HistoryIcon tab
 const EntityHistoryView = lazy(() => import("../components/history").then(m => ({ default: m.EntityHistoryView })));
-import { createFormexStub, getEntityFromCache } from "@rebasepro/core";
-import { usePermissions } from "@rebasepro/core";
+import { createFormexStub, getEntityFromCache } from "@rebasepro/app";
+import { usePermissions } from "@rebasepro/app";
 import { useUrlController } from "../index";
 import { useNavigate } from "react-router-dom";
 

package/src/components/EntityPreviewBinding.tsx

@@ -21,9 +21,9 @@ import {
     useCustomizationController,
     useData,
     ErrorView
-} from "@rebasepro/core";
-import { useAnalyticsController } from "@rebasepro/core";
-import { IconForView } from "@rebasepro/core";
+} from "@rebasepro/app";
+import { useAnalyticsController } from "@rebasepro/app";
+import { IconForView } from "@rebasepro/app";
 import { getPropertyInPath } from "../util/property_utils";
 import { getEntityPreviewKeys, getEntityTitlePropertyKey } from "../util/previews";
 import { getValueInPath } from "@rebasepro/utils";

package/src/components/EntityViewBinding.tsx

@@ -5,8 +5,8 @@ import React from "react";
 import { Entity } from "@rebasepro/types";
 import { cls, defaultBorderMixin, ExternalLinkIcon, IconButton, Typography } from "@rebasepro/ui";
 ;
-import { useCustomizationController } from "@rebasepro/core";
-import { useAuthController } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
+import { useAuthController } from "@rebasepro/app";
 import { PropertyCollectionView } from "./PropertyCollectionView";
 
 /**

package/src/components/HomePage/ContentHomePage.tsx

@@ -19,10 +19,10 @@ import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable"
 import { restrictToVerticalAxis, restrictToWindowEdges } from "@dnd-kit/modifiers";
 import { RenameGroupDialog } from "./RenameGroupDialog";
 import { toArray } from "@rebasepro/utils";
-import { useCollapsedGroups, buildCollapsedDefaults, useCustomizationController, useTranslation, useSlot, useAdminModeController, useRebaseRegistry } from "@rebasepro/core";
-import { useRestoreScroll } from "@rebasepro/core";
+import { useCollapsedGroups, buildCollapsedDefaults, useCustomizationController, useTranslation, useSlot, useAdminModeController, useRebaseRegistry } from "@rebasepro/app";
+import { useRestoreScroll } from "@rebasepro/app";
 
-import { SchemaDriftBanner } from "@rebasepro/core";
+import { SchemaDriftBanner } from "@rebasepro/app";
 import { useBreadcrumbsController, useCMSContext } from "../../index";
 
 export const DEFAULT_GROUP_NAME = "Views";
@@ -64,7 +64,7 @@ export function ContentHomePage({
     } = navigationStateController.topLevelNavigation || {};
 
     // Build a set of Studio-only dev view slugs so we can distinguish them from
-    // CMS custom views added via <RebaseCMS views={...}> or plugins.
+    // CMS custom views added via <RebaseAdmin views={...}> or plugins.
     const studioViewSlugs = useMemo(() => {
         const slugs = new Set<string>();
         (registry.studioConfig?.devViews ?? []).forEach(v => slugs.add(v.slug));

package/src/components/HomePage/FavouritesView.tsx

@@ -2,7 +2,7 @@ import type { NavigationEntry } from "@rebasepro/types";
 import { useNavigate } from "react-router-dom";
 ;
 import { Chip, Collapse, StarIcon } from "@rebasepro/ui";
-import { useUserConfigurationPersistence } from "@rebasepro/core";
+import { useUserConfigurationPersistence } from "@rebasepro/app";
 import { useNavigationStateController } from "../../index";
 
 function NavigationChip({ entry }: { entry: NavigationEntry }) {

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -5,9 +5,9 @@ import { IconButton, StarIcon, Tooltip } from "@rebasepro/ui";
 import { NavigationCard } from "./NavigationCard";
 import { SmallNavigationCard } from "./SmallNavigationCard";
 import React from "react";
-import { useRebaseContext, useSlot } from "@rebasepro/core";
-import { IconForView } from "@rebasepro/core";
-import { useUserConfigurationPersistence } from "@rebasepro/core";
+import { useRebaseContext, useSlot } from "@rebasepro/app";
+import { IconForView } from "@rebasepro/app";
+import { useUserConfigurationPersistence } from "@rebasepro/app";
 
 /**
  * This is the component used in the home page to render a card for each

package/src/components/HomePage/NavigationGroup.tsx

@@ -1,6 +1,6 @@
 import React, { PropsWithChildren, useState } from "react";
 import { cls, ExpandablePanel, IconButton, iconSize, PencilIcon, Typography } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 export function NavigationGroup({
     children,

package/src/components/HomePage/RenameGroupDialog.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Button, Dialog, DialogActions, DialogContent, DialogTitle, TextField } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 interface RenameGroupDialogProps {
     open: boolean;

package/src/components/JsonPreviewBinding.tsx

@@ -1,6 +1,6 @@
 import React, { useRef } from "react";
 import { Highlight, themes } from "prism-react-renderer";
-import { useModeController } from "@rebasepro/core";
+import { useModeController } from "@rebasepro/app";
 
 export function JsonPreviewBinding({ values }: { values: object }) {
     const code = JSON.stringify(values, null, "\t");

package/src/components/{RebaseCMS.tsx → RebaseAdmin.tsx}

@@ -1,6 +1,6 @@
 import React, { useLayoutEffect } from "react";
-import { useRebaseRegistryDispatch } from "@rebasepro/core";
-import type { RebaseCMSConfig } from "@rebasepro/types";
+import { useRebaseRegistryDispatch } from "@rebasepro/app";
+import type { RebaseAdminConfig } from "@rebasepro/types";
 
 /**
  * Declarative component to configure the CMS in Rebase.
@@ -10,7 +10,7 @@ import type { RebaseCMSConfig } from "@rebasepro/types";
  * is auto-wired as a native feature (slots, provider, Studio view) without
  * needing any external plugin.
  */
-export function RebaseCMS({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings, basePath }: RebaseCMSConfig) {
+export function RebaseAdmin({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings, basePath }: RebaseAdminConfig) {
     const dispatch = useRebaseRegistryDispatch();
 
     useLayoutEffect(() => {

package/src/components/RebaseAuthGate.tsx

@@ -2,9 +2,9 @@ import React from "react";
 import {
     useRebaseRegistry,
     useAuthController
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { CircularProgressCenter } from "@rebasepro/ui";
-import { LoginView } from "@rebasepro/core";
+import { LoginView } from "@rebasepro/app";
 import type { AuthControllerExtended } from "@rebasepro/types";
 
 /**

package/src/components/RebaseLayout.tsx

@@ -4,10 +4,9 @@ import {
     useAdminModeController,
     useComponentOverride,
     useRebaseRegistry
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 
 import { Scaffold } from "./app/Scaffold";
-import { AppBar } from "./app/AppBar";
 import { Drawer } from "./app/Drawer";
 import { SideDialogs } from "./SideDialogs";
 import { AdminModeSyncer } from "./AdminModeSyncer";
@@ -16,7 +15,7 @@ import type { AppView } from "@rebasepro/types";
 export interface RebaseLayoutProps {
     /** Title shown in the drawer. */
     title?: string;
-    /** Custom AppBar to override the default. */
+    /** Top bar. Only rendered if provided — pass `<AppBar/>` for the default one. */
     appBar?: React.ReactNode;
     /** Custom Drawer to override the default. */
     drawer?: React.ReactNode;
@@ -27,17 +26,18 @@ export interface RebaseLayoutProps {
 }
 
 /**
- * Layout layer — provides the Scaffold, AppBar, Drawer, and SideDialogs.
+ * Layout layer — provides the Scaffold, Drawer, and SideDialogs.
  *
  * Wraps the route outlet with the standard Rebase admin layout.
- * Override individual pieces (appBar, drawer) via props.
+ * Override the drawer via props; pass `appBar` to add a top bar (there is
+ * none by default — the drawer owns navigation and user actions).
  *
  * **Independently usable**: Use this when you want the Rebase layout
  * without its default route definitions.
  *
  * @example
  * ```tsx
- * <RebaseLayout title="My Admin">
+ * <RebaseLayout title="My Admin" appBar={<AppBar/>}>
  *   <Route path="/" element={<MyHomePage />} />
  *   <Route path="/custom" element={<CustomView />} />
  * </RebaseLayout>
@@ -53,14 +53,8 @@ export function RebaseLayout(props: RebaseLayoutProps) {
     } = props;
 
     const adminModeController = useAdminModeController();
-    const ResolvedAppBar = useComponentOverride("Shell.AppBar", AppBar);
     const ResolvedDrawer = useComponentOverride("Shell.Drawer", Drawer);
 
-    const ActiveAppBar = appBar ?? <ResolvedAppBar
-        includeLanguageToggle={false}
-        includeModeToggle={false}
-        includeUserMenu={false}
-    />;
     const ActiveDrawer = drawer ?? (
         <ResolvedDrawer
             title={title}
@@ -71,7 +65,7 @@ export function RebaseLayout(props: RebaseLayoutProps) {
     return (
         <Scaffold autoOpenDrawer={autoOpenDrawer}>
             <AdminModeSyncer devViews={devViews}/>
-            {ActiveAppBar}
+            {appBar}
             {ActiveDrawer}
             <Outlet/>
             <SideDialogs/>

package/src/components/RebaseNavigation.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useRef, useEffect, lazy, Suspense } from "react";
+import React, { useMemo, useRef, useEffect, useCallback, useContext, lazy, Suspense } from "react";
 import {
     useRebaseRegistry,
     useRebaseContext,
@@ -9,11 +9,12 @@ import {
     useRebaseClient,
     useData,
     useDataSources,
+    CollectionResolverRegistrationContext,
     StudioBridgeRegistryProvider,
     useBridgeRegistration,
     CustomizationControllerContext,
     RebaseDataContext
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { buildRoutedRebaseData, resolveDataSource } from "@rebasepro/common";
 import { CircularProgressCenter } from "@rebasepro/ui";
 import type { AppView, CollectionEditorOptions, EntityCustomView, EntityAction, CollectionConfig, RebasePlugin } from "@rebasepro/types";
@@ -103,6 +104,20 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
     const defaultData = useData();
     const getCollectionRef = useRef(collectionRegistryController.getCollection);
     getCollectionRef.current = collectionRegistryController.getCollection;
+
+    // Hand the data layer a way to read this registry. It was built by <Rebase>,
+    // above us, and needs a collection's primary keys to give its rows an
+    // address — rows themselves carry only columns.
+    //
+    // Registered during render, not in an effect: the views that fetch rows are
+    // below us, and their effects run before ours, so an effect here would bind
+    // after the first page had already been converted. The call only assigns a
+    // ref, so repeating it per render is free.
+    const registerCollectionResolver = useContext(CollectionResolverRegistrationContext);
+    const resolveCollection = useCallback(
+        (slug: string) => getCollectionRef.current(slug),
+        []);
+    registerCollectionResolver(resolveCollection);
     const routedData = useMemo(() => buildRoutedRebaseData({
         defaultData,
         sources: dataSources.sources,
@@ -220,7 +235,7 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
 
     // ── Merge CMS-registered entityViews/entityActions into the customization controller ──
     // The <Rebase> component builds the customizationController from its own props,
-    // but entity views passed to <RebaseCMS> are stored in the registry and not
+    // but entity views passed to <RebaseAdmin> are stored in the registry and not
     // automatically merged. We re-provide an enriched controller here so that
     // downstream consumers (EditViewBinding, side panels, etc.) can resolve
     // string-keyed entity views like "blog_preview".

package/src/components/RebaseRouteDefs.tsx

@@ -7,7 +7,7 @@ import {
     UIReferenceView,
     NotFoundPage,
     useComponentOverride
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { CircularProgressCenter } from "@rebasepro/ui";
 
 import { ContentHomePage as DefaultHomePage } from "./HomePage/ContentHomePage";
@@ -17,7 +17,7 @@ import { CustomViewRoute } from "../routes/CustomViewRoute";
 import { useNavigationStateController } from "../hooks/navigation/contexts/NavigationStateContext";
 import { CollectionEditorDialogs } from "./CollectionEditorDialogs";
 import { useEffect } from "react";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { useBreadcrumbsController } from "../index";
 
 function SettingsView() {

package/src/components/RebaseShell.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 import {
     useRebaseRegistry
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { ErrorBoundary } from "@rebasepro/ui";
 
 import { RebaseAuthGate } from "./RebaseAuthGate";
@@ -11,6 +11,7 @@ import { RebaseRouteDefs } from "./RebaseRouteDefs";
 
 export interface RebaseShellProps {
     title?: string;
+    /** Top bar. Only rendered if provided — pass `<AppBar/>` for the default one. */
     appBar?: React.ReactNode;
     drawer?: React.ReactNode;
     autoOpenDrawer?: boolean;

package/src/components/ReferenceTable/SelectionTableBinding.tsx

@@ -14,15 +14,15 @@ import {
     useDataTableController,
     useLargeLayout,
     usePermissions
-} from "@rebasepro/core";
-import { ErrorView } from "@rebasepro/core";
+} from "@rebasepro/app";
+import { ErrorView } from "@rebasepro/app";
 import { Button, DialogActions, PlusIcon, Typography } from "@rebasepro/ui";
-import { IconForView } from "@rebasepro/core";
+import { IconForView } from "@rebasepro/app";
 import { useSelectionController } from "../CollectionViewBinding/useSelectionController";
 
-import { useColumnIds } from "@rebasepro/core";
+import { useColumnIds } from "@rebasepro/app";
 import { useSideDialogContext } from "../SideDialogs";
-import { useAnalyticsController } from "@rebasepro/core";
+import { useAnalyticsController } from "@rebasepro/app";
 import { useUrlController, useSidePanel } from "../../index";
 
 /**

package/src/components/RelationSelector.tsx

@@ -26,7 +26,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { Command as CommandPrimitive } from "cmdk";
 import { Entity, EntityRelation, FilterValues, Relation, getCollectionDataPath } from "@rebasepro/types";
 import { EntityPreviewBindingData } from "./EntityPreviewBinding";
-import { useData, useRelationSelector } from "@rebasepro/core";
+import { useData, useRelationSelector } from "@rebasepro/app";
 import { useSidePanel } from "../hooks/useSidePanel";
 import { normalizeToEntityRelation } from "@rebasepro/common";
 import { EmptyValue } from "../preview";

package/src/components/SearchIconsView.tsx

@@ -10,8 +10,8 @@ import {
     SearchBar,
     Tooltip
 } from "@rebasepro/ui";
-import { iconsSearch } from "@rebasepro/core";
-import { useTranslation } from "@rebasepro/core";
+import { iconsSearch } from "@rebasepro/app";
+import { useTranslation } from "@rebasepro/app";
 
 const UPDATE_SEARCH_INDEX_WAIT_MS = 220;
 

package/src/components/SelectableTable/SelectableTable.tsx

@@ -3,11 +3,11 @@ import type { Property, WhereFilterOp } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { CollectionSize, Entity, EntityTableController, FilterValues, SelectedCellProps } from "@rebasepro/types";
 import { CellRendererParams, TableView, VirtualTableColumn, VirtualTableFilterValues, OnRowClickParams } from "@rebasepro/ui";
-import { DEFAULT_PAGE_SIZE, DataCollectionTableController, OnCellValueChange, OnColumnResizeParams } from "@rebasepro/core";
+import { DEFAULT_PAGE_SIZE, DataCollectionTableController, OnCellValueChange, OnColumnResizeParams } from "@rebasepro/app";
 import { FilterFormFieldProps } from "@rebasepro/ui";
 import { useOutsideAlerter } from "@rebasepro/ui";
 import { SelectableTableContext } from "./SelectableTableContext";
-import { getRowHeight } from "@rebasepro/core";
+import { getRowHeight } from "@rebasepro/app";
 import { FilterFieldBinding } from "./filters/FilterFieldBinding";
 
 export type SelectableTableProps<M extends Record<string, unknown>> = {

package/src/components/SelectableTable/SelectableTableContext.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from "react";
-import { DataCollectionTableController } from "@rebasepro/core";
+import { DataCollectionTableController } from "@rebasepro/app";
 
 export const SelectableTableContext = React.createContext<DataCollectionTableController<Record<string, unknown>>>(null! as DataCollectionTableController<Record<string, unknown>>);
 

package/src/components/SelectableTable/filters/BooleanFilterField.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { VirtualTableWhereFilterOp } from "@rebasepro/ui";
 import { BooleanSwitchWithLabel } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 interface BooleanFieldProps {
     name: string,

package/src/components/SelectableTable/filters/DateTimeFilterField.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { VirtualTableWhereFilterOp } from "@rebasepro/ui";
 import { DateTimeField, Select, SelectItem } from "@rebasepro/ui";
-import { useCustomizationController } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
 
 interface DateTimeFilterFieldProps {
     name: string,

package/src/components/SelectableTable/filters/FilterFieldBinding.tsx

@@ -8,7 +8,7 @@ import {
     WhereFilterOp
 } from "@rebasepro/types";
 import { enumToObjectEntries, resolveFilterOperators } from "@rebasepro/common";
-import { useCollectionScope, useComponentOverride, useResolvedComponent } from "@rebasepro/core";
+import { useCollectionScope, useComponentOverride, useResolvedComponent } from "@rebasepro/app";
 import { StringNumberFilterField } from "./StringNumberFilterField";
 import { BooleanFilterField } from "./BooleanFilterField";
 import { DateTimeFilterField } from "./DateTimeFilterField";

package/src/components/SelectableTable/filters/ReferenceFilterField.tsx

@@ -6,7 +6,7 @@ import { Entity, EntityReference } from "@rebasepro/types";
 import { ReferencePreview } from "../../../preview";
 import { Button, Checkbox, Label, Select, SelectItem } from "@rebasepro/ui";
 import { getReferenceFrom } from "@rebasepro/common";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { useCollectionRegistryController } from "../../../index";
 
 interface ReferenceFilterFieldProps {