@rebasepro/admin 0.9.0 → 0.9.1-canary.0de22e0

package/src/components/CollectionViewBinding/SplitListView.tsx

@@ -8,11 +8,12 @@ import {
     defaultBorderMixin,
     ResizablePanels
 } from "@rebasepro/ui";
-import { useLargeLayout } from "@rebasepro/core";
-import { useCollectionRegistryController } from "../../index";
+import { useLargeLayout, UnsavedChangesDialog, useNavigationBlocker } from "@rebasepro/app";
+import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
 import { useNavigate, useLocation } from "react-router-dom";
-import { useUrlController } from "../../index";
+import { useUrlController } from "../../hooks/navigation/contexts/UrlContext";
 import { ErrorBoundary } from "@rebasepro/ui";
+import { withViewMode } from "../../util/view_mode";
 
 export type SplitListViewProps<M extends Record<string, unknown> = Record<string, unknown>> = {
     collection: CollectionConfig<M>;
@@ -55,6 +56,27 @@ export type SplitListViewProps<M extends Record<string, unknown> = Record<string
 
 const PANEL_SIZE_KEY = "rebase_split_list_panel_size";
 
+/**
+ * Whether the element accepts text, and therefore owns the keystroke.
+ * Covers native fields plus the ARIA roles custom editors expose.
+ */
+function isTextEntryTarget(target: HTMLElement | null): boolean {
+    if (!target) return false;
+    const tag = target.tagName;
+    if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT") return true;
+    if (target.isContentEditable) return true;
+    return Boolean(target.closest('[contenteditable="true"], [role="textbox"], [role="combobox"], [role="searchbox"]'));
+}
+
+/**
+ * Whether a bare letter shortcut may act on this target. Only the list side of
+ * the split owns them — inside the detail panel a keystroke belongs to the form.
+ */
+function isListShortcutTarget(target: HTMLElement | null, detailPanel: HTMLElement | null): boolean {
+    if (!target || target === document.body) return true;
+    return !detailPanel?.contains(target);
+}
+
 function getSavedPanelSize(path: string): number {
     try {
         const saved = localStorage.getItem(`${PANEL_SIZE_KEY}_${path}`);
@@ -115,6 +137,37 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
 
     const showDetail = selectedEntityId !== undefined;
 
+    // ── Unsaved changes ──
+    // The detail form lives inside the split layout, so every way out of it
+    // (Escape, j/k, clicking another row, the browser back button) is a plain
+    // router navigation. A ref — not state — because the blocker predicate must
+    // observe the change synchronously, before the navigation it is guarding.
+    const dirty = useRef(false);
+    const detailPanelRef = useRef<HTMLDivElement>(null);
+    const setDirty = useCallback((modified: boolean) => {
+        dirty.current = modified;
+    }, []);
+
+    // The form remounts per entity, so its dirty state must not leak into the next one.
+    useEffect(() => {
+        dirty.current = false;
+    }, [selectedEntityId]);
+
+    const blocker = useNavigationBlocker(useCallback(({
+        currentLocation,
+        nextLocation
+    }) => {
+        if (!dirty.current) return false;
+        if (currentLocation.pathname === nextLocation.pathname) return false;
+        // Side panel overlays (e.g. following a relation) render above the form
+        // and leave it mounted — nothing is lost in either direction.
+        const nextHash = nextLocation.hash;
+        if (nextHash === "#side" || nextHash === "#new_side") return false;
+        const currentHash = currentLocation.hash;
+        if (currentHash === "#side" || currentHash === "#new_side") return false;
+        return true;
+    }, []));
+
     // Panel size state with persistence
     const [panelSize, setPanelSize] = useState(() => getSavedPanelSize(path));
 
@@ -170,16 +223,15 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
         };
     }, [selectedEntityId]); // Intentionally only depend on selectedEntityId
 
+    // Build a URL below this collection, preserving the active view mode.
+    const buildUrl = useCallback((subPath: string) => {
+        return withViewMode(urlController.buildUrlCollectionPath(subPath));
+    }, [urlController]);
+
     // Close the detail panel: navigate back to the collection path
     const handleCloseDetail = useCallback(() => {
-        let collectionUrl = urlController.buildUrlCollectionPath(path);
-        // Preserve the __view query param so the view mode is retained
-        const currentViewParam = new URLSearchParams(window.location.search).get("__view");
-        if (currentViewParam) {
-            collectionUrl += `${collectionUrl.includes("?") ? "&" : "?"}__view=${currentViewParam}`;
-        }
-        navigate(collectionUrl);
-    }, [navigate, urlController, path]);
+        navigate(buildUrl(path));
+    }, [navigate, buildUrl, path]);
 
     // ── Keyboard navigation ──
     const entityIds = useMemo(
@@ -189,23 +241,33 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
 
     useEffect(() => {
         const handleKeyDown = (e: KeyboardEvent) => {
-            // Don't intercept when user is typing in an input/textarea
-            const tag = (e.target as HTMLElement)?.tagName;
-            if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT" || (e.target as HTMLElement)?.isContentEditable) {
-                // Only intercept Escape when inside the detail panel
-                if (e.key === "Escape" && selectedEntityId) {
-                    handleCloseDetail();
+            const target = e.target as HTMLElement | null;
+
+            // Radix overlays own the keyboard while they are open — including Escape.
+            if (document.querySelector('[role="dialog"][data-state="open"]')) return;
+
+            if (e.key === "Escape") {
+                if (!selectedEntityId) return;
+                // First Escape leaves the field (which may also be dismissing its
+                // own dropdown), a second one closes the panel. Closing straight
+                // from a focused field would discard an in-progress edit.
+                if (isTextEntryTarget(target)) {
+                    target?.blur();
                     e.preventDefault();
+                    return;
                 }
-                return;
-            }
-
-            if (e.key === "Escape" && selectedEntityId) {
                 handleCloseDetail();
                 e.preventDefault();
                 return;
             }
 
+            // Record navigation only belongs to the list side. Inside the detail
+            // panel these keys are the form's — arrows move between fields, and a
+            // bare letter is input for widgets that aren't native fields (rich
+            // text, code editors, comboboxes).
+            if (!isListShortcutTarget(target, detailPanelRef.current)) return;
+            if (isTextEntryTarget(target)) return;
+
             // Arrow down / j → next entity
             if ((e.key === "ArrowDown" || e.key === "j") && !e.metaKey && !e.ctrlKey) {
                 e.preventDefault();
@@ -282,6 +344,7 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
 
     const detailPanel = renderedEntityId !== undefined ? (
         <div
+            ref={detailPanelRef}
             className={cls(
                 "flex-1 flex flex-col min-w-0 h-full transition-all ease-out w-full",
                 animationPhase === "entered"
@@ -302,25 +365,15 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
                         selectedTab={selectedTab}
                         layout="split"
                         onEditClick={() => {
-                            let entityUrl = urlController.buildUrlCollectionPath(`${path}/${renderedEntityId}/edit`);
-                            const currentViewParam = new URLSearchParams(window.location.search).get("__view");
-                            if (currentViewParam) {
-                                entityUrl += `${entityUrl.includes("?") ? "&" : "?"}__view=${currentViewParam}`;
-                            }
-                            navigate(entityUrl);
+                            navigate(buildUrl(`${path}/${renderedEntityId}/edit`));
                         }}
                         onTabChange={(params) => {
                             const newSelectedTab = params.selectedTab;
-                            let entityUrl = urlController.buildUrlCollectionPath(
+                            navigate(buildUrl(
                                 newSelectedTab
                                     ? `${path}/${renderedEntityId}/${newSelectedTab}`
                                     : `${path}/${renderedEntityId}`
-                            );
-                            const currentViewParam = new URLSearchParams(window.location.search).get("__view");
-                            if (currentViewParam) {
-                                entityUrl += `${entityUrl.includes("?") ? "&" : "?"}__view=${currentViewParam}`;
-                            }
-                            navigate(entityUrl);
+                            ));
                         }}
                     />
                     : <EditViewBinding
@@ -332,34 +385,21 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
                         parentEntityIds={usedParentEntityIds}
                         selectedTab={selectedTab}
                         layout="split"
-                        onSaved={(params) => {
-                            let entityUrl = urlController.buildUrlCollectionPath(`${path}/${renderedEntityId}`);
-                            const currentViewParam = new URLSearchParams(window.location.search).get("__view");
-                            if (currentViewParam) {
-                                entityUrl += `${entityUrl.includes("?") ? "&" : "?"}__view=${currentViewParam}`;
-                            }
-                            navigate(entityUrl, { replace: true });
+                        onValuesModified={setDirty}
+                        onSaved={() => {
+                            setDirty(false);
+                            navigate(buildUrl(`${path}/${renderedEntityId}`), { replace: true });
                         }}
                         navigateBack={() => {
-                            let entityUrl = urlController.buildUrlCollectionPath(`${path}/${renderedEntityId}`);
-                            const currentViewParam = new URLSearchParams(window.location.search).get("__view");
-                            if (currentViewParam) {
-                                entityUrl += `${entityUrl.includes("?") ? "&" : "?"}__view=${currentViewParam}`;
-                            }
-                            navigate(entityUrl);
+                            navigate(buildUrl(`${path}/${renderedEntityId}`));
                         }}
                         onTabChange={(params) => {
                             const newSelectedTab = params.selectedTab;
-                            let entityUrl = urlController.buildUrlCollectionPath(
+                            navigate(buildUrl(
                                 newSelectedTab
                                     ? `${path}/${renderedEntityId}/${newSelectedTab}`
                                     : `${path}/${renderedEntityId}`
-                            );
-                            const currentViewParam = new URLSearchParams(window.location.search).get("__view");
-                            if (currentViewParam) {
-                                entityUrl += `${entityUrl.includes("?") ? "&" : "?"}__view=${currentViewParam}`;
-                            }
-                            navigate(entityUrl);
+                            ));
                         }}
                     />
                 }
@@ -368,14 +408,25 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
     ) : <></>;
 
     return (
-        <ResizablePanels
-            stacked={!largeLayout}
-            firstPanel={listPanel}
-            secondPanel={detailPanel}
-            showSecondPanel={isDetailVisible}
-            panelSizePercent={animationPhase === "entering" ? 100 : panelSize}
-            onPanelSizeChange={setPanelSize}
-            minPanelSizePx={240}
-        />
+        <>
+            <ResizablePanels
+                stacked={!largeLayout}
+                firstPanel={listPanel}
+                secondPanel={detailPanel}
+                showSecondPanel={isDetailVisible}
+                panelSizePercent={animationPhase === "entering" ? 100 : panelSize}
+                onPanelSizeChange={setPanelSize}
+                minPanelSizePx={240}
+            />
+
+            <UnsavedChangesDialog
+                open={blocker?.state === "blocked"}
+                handleOk={() => {
+                    dirty.current = false;
+                    blocker?.proceed?.();
+                }}
+                handleCancel={() => blocker?.reset?.()}
+                body={<>You have unsaved changes in this <b>{collection.singularName ?? collection.name}</b>.</>}/>
+        </>
     );
 }

package/src/components/CollectionViewBinding/ViewModeToggle.tsx

@@ -15,7 +15,7 @@ import {
     ToggleButtonGroup,
     ToggleButtonOption
 } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 export type KanbanPropertyOption = {
     key: string;

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,9 +3,10 @@ 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 { CollectionViewBinding } from "./CollectionViewBinding/CollectionViewBinding";
+import { EntityViewBinding } from "./EntityViewBinding";
 import { CircularProgressCenter, iconSize } from "@rebasepro/ui";
 import {
     Alert,
@@ -25,7 +26,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,8 +39,9 @@ import {
     useRebaseContext,
     useLargeLayout,
     useSlot
-} from "@rebasepro/core";
-import { useUrlController, useCollectionRegistryController } from "../index";
+} from "@rebasepro/app";
+import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
+import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 import { useNavigate } from "react-router-dom";
 import { getValueInPath } from "@rebasepro/utils";
 import { getEntityTitlePropertyKey, resolveTitleToString } from "../util/previews";

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

@@ -5,7 +5,7 @@ import type { EntityAction, EntityActionClickProps, SidePanelController } from "
 import React, { useMemo } from "react";
 import { Entity, getCollectionDataPath, RebaseContext } from "@rebasepro/types";
 import type { EntityFormActionsProps } from "../types/components/EntityFormActionsProps";
-import { copyEntityAction, deleteEntityAction } from "../components";
+import { copyEntityAction, deleteEntityAction } from "./common/default_entity_actions";
 import { mergeEntityActions } from "../util/entity_actions";
 import { resolveEntityAction } from "../util/resolutions";
 import { Button, CircularProgress, cls, defaultBorderMixin, DialogActions, IconButton, LoadingButton, Tooltip, Typography } from "@rebasepro/ui";
@@ -14,12 +14,12 @@ 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 { useCMSContext } from "../index";
+import { FormexController } from "@rebasepro/forms";
+import { ErrorTooltip } from "@rebasepro/app";
+import { usePermissions } from "@rebasepro/app";
+import { useCMSContext } from "../hooks/useCMSContext";
 
 export function EditFormActions({
     collection,

package/src/components/EditViewBinding.tsx

@@ -3,9 +3,10 @@ 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 { CollectionViewBinding } from "./CollectionViewBinding/CollectionViewBinding";
+import { EntityViewBinding } from "./EntityViewBinding";
 import { CircularProgressCenter, iconSize } from "@rebasepro/ui";
 import {
     CenteredView,
@@ -23,7 +24,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 +38,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,9 +47,9 @@ 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 { useUrlController } from "../index";
+import { createFormexStub, getEntityFromCache } from "@rebasepro/app";
+import { usePermissions } from "@rebasepro/app";
+import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
 import { useNavigate } from "react-router-dom";
 
 import { MAIN_TAB_VALUE, JSON_TAB_VALUE, HISTORY_TAB_VALUE } from "../util/view_constants";

package/src/components/EntityPreviewBinding.tsx

@@ -21,13 +21,14 @@ 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";
-import { useCollectionRegistryController, useSidePanel } from "../index";
+import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
+import { useSidePanel } from "../hooks/useSidePanel";
 
 export type EntityPreviewBindingProps = {
     size?: PreviewSize,

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,11 +19,12 @@ 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 { useBreadcrumbsController, useCMSContext } from "../../index";
+import { SchemaDriftBanner } from "@rebasepro/app";
+import { useBreadcrumbsController } from "../../hooks/useBreadcrumbsController";
+import { useCMSContext } from "../../hooks/useCMSContext";
 
 export const DEFAULT_GROUP_NAME = "Views";
 export const ADMIN_GROUP_NAME = "Admin";
@@ -64,7 +65,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,8 +2,8 @@ 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 { useNavigationStateController } from "../../index";
+import { useUserConfigurationPersistence } from "@rebasepro/app";
+import { useNavigationStateController } from "../../hooks/navigation/contexts/NavigationStateContext";
 
 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");