@rebasepro/admin 0.10.0 → 0.10.1-canary.0a881d4

package/src/components/EditFormActions.tsx

@@ -1,9 +1,10 @@
 
-import type { CollectionConfig } from "@rebasepro/types";
+
 import type { FormContext } from "../types/fields";
-import type { EntityAction, EntityActionClickProps, SidePanelController } from "@rebasepro/types";
+import type { EntityAction, EntityActionClickProps, SidePanelController, AdminCollection } from "@rebasepro/admin-types";
 import React, { useMemo } from "react";
-import { Entity, getCollectionDataPath, RebaseContext } from "@rebasepro/types";
+import { Entity, getCollectionDataPath } from "@rebasepro/types";
+import { RebaseContext } from "@rebasepro/admin-types";
 import type { EntityFormActionsProps } from "../types/components/EntityFormActionsProps";
 import { copyEntityAction, deleteEntityAction } from "./common/default_entity_actions";
 import { mergeEntityActions } from "../util/entity_actions";
@@ -116,7 +117,7 @@ type ActionsViewProps<M extends Record<string, unknown>> = {
     savingError: Error | undefined,
     entity: Entity<M> | undefined,
     formActions: EntityAction[],
-    collection: CollectionConfig,
+    collection: AdminCollection,
     context: RebaseContext,
     sidePanelController: SidePanelController,
     disabled: boolean,
@@ -164,7 +165,6 @@ function buildBottomActions<M extends Record<string, unknown>>({
         {formActions.length > 0 && <div className="grow flex overflow-auto no-scrollbar">
             {formActions.map((action, index) => {
 
-
                 const props = {
                     view: "form",
                     entity,

package/src/components/EditViewBinding.tsx

@@ -1,9 +1,10 @@
-import type { ComponentRef, CollectionConfig, EntityCustomViewParams, FormViewConfig } from "@rebasepro/types";
+import type { ComponentRef } from "@rebasepro/types";
+import type { EntityCustomViewParams, FormViewConfig, AdminCollection } from "@rebasepro/admin-types";
 import type { FormContext } from "../types/fields";
-import type { PluginFormActionProps } from "@rebasepro/types";
+import type { PluginFormActionProps } from "@rebasepro/admin-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/app";
+import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionScopeProvider, getAdminSubcollections } from "@rebasepro/app";
 
 import { CollectionViewBinding } from "./CollectionViewBinding/CollectionViewBinding";
 import { EntityViewBinding } from "./EntityViewBinding";
@@ -25,11 +26,8 @@ import {
 } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { ErrorView } from "@rebasepro/app";
-import {
-    getSubcollections,
-    removeInitialAndTrailingSlashes,
-    resolveDefaultSelectedView
-} from "@rebasepro/common";
+
+import { removeInitialAndTrailingSlashes, resolveDefaultSelectedView } from "@rebasepro/app";
 import { resolvedSelectedEntityView } from "../util/resolutions";
 import {
     useCustomizationController,
@@ -66,7 +64,7 @@ export type OnTabChangeParams<M extends Record<string, unknown>> = {
     path: string;
     entityId?: string | number;
     selectedTab?: string;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
 
 };
 
@@ -75,7 +73,7 @@ export interface EditViewBindingProps<M extends Record<string, unknown> = Record
      * The CMS path of the entity, e.g. "users" or "products".
      */
     path: string;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     entityId?: string | number;
     databaseId?: string;
     copy?: boolean;
@@ -260,7 +258,7 @@ parentEntityIds,
         }
     }, [selectedTabProp, defaultSelectedView]);
 
-    const subcollections = getSubcollections(collection).filter(c => !c.hideFromNavigation);
+    const subcollections = getAdminSubcollections(collection).filter(c => !c.hideFromNavigation);
     const subcollectionsCount = subcollections?.length ?? 0;
     const customViews = collection.entityViews ?? [];
     const customViewsCount = customViews?.length ?? 0;
@@ -460,7 +458,7 @@ parentEntityIds,
     }, [status, onTabChange, path, entityId, collection]);
 
     // Resolve formView.Builder if provided
-    const formViewConfig = (collection as CollectionConfig<M> & { formView?: FormViewConfig<M> }).formView;
+    const formViewConfig = (collection as AdminCollection<M> & { formView?: FormViewConfig<M> }).formView;
     const FormViewBuilder = formViewConfig?.Builder ? resolveComponentRef<EntityCustomViewParams>(formViewConfig.Builder as ComponentRef<EntityCustomViewParams>) : null;
     const formViewIncludeActions = formViewConfig?.includeActions !== false;
 
@@ -619,7 +617,6 @@ parentEntityIds,
         </Tooltip>
     ) : null;
 
-
     let result = <div className="relative flex flex-col h-full w-full bg-white dark:bg-surface-800">
 
         {shouldShowTopBar && <div
@@ -634,7 +631,6 @@ parentEntityIds,
                 status
             })}
 
-
             {pluginActionsTop}
 
             {hasAdditionalViews && <div className={"flex-1 flex justify-end min-w-0 shrink-0"}>
@@ -716,7 +712,7 @@ parentEntityIds,
     return result;
 }
 
-function EntityFormSkeleton({ collection }: { collection: CollectionConfig }) {
+function EntityFormSkeleton({ collection }: { collection: AdminCollection }) {
     return (
         <div className="flex-1 flex flex-row w-full overflow-y-auto justify-center">
             <div className="relative flex flex-row max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-6xl w-full h-fit">

package/src/components/EntityPreviewBinding.tsx

@@ -1,11 +1,11 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import type { Property } from "@rebasepro/types";
 import * as React from "react";
 import { useEffect, useMemo } from "react";
 
 import { Entity } from "@rebasepro/types";
 import type { PreviewSize } from "../types/components/PropertyPreviewProps";
-import { getEntityImagePreviewPropertyKey } from "@rebasepro/common";
+import { getEntityImagePreviewPropertyKey } from "@rebasepro/app";
 import {
     ArrowRightToLineIcon,
     cls,
@@ -25,15 +25,16 @@ import {
 import { useAnalyticsController } from "@rebasepro/app";
 import { IconForView } from "@rebasepro/app";
 import { getPropertyInPath } from "../util/property_utils";
-import { getEntityPreviewKeys, getEntityTitlePropertyKey } from "../util/previews";
+import { getEntityPreviewKeys, getEntityTitlePropertyKeyForEntity } from "../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 import { useSidePanel } from "../hooks/useSidePanel";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export type EntityPreviewBindingProps = {
     size?: PreviewSize,
     actions?: React.ReactNode,
-    collection?: CollectionConfig,
+    collection?: AdminCollection,
     hover?: boolean;
     previewKeys?: string[],
     disabled?: boolean,
@@ -49,7 +50,7 @@ export type EntityPreviewBindingProps = {
 export type EntityPreviewBindingDataProps = {
     size?: "smallest" | "small" | "medium" | "large",
     actions?: React.ReactNode,
-    collection?: CollectionConfig,
+    collection?: AdminCollection,
     previewKeys?: string[],
     entity: Entity<any>,
     onSidePanelClick?: (entity: Entity) => void,
@@ -98,7 +99,7 @@ export function EntityPreviewBindingData({
         );
     }
 
-    const titleProperty = includeTitle ? getEntityTitlePropertyKey(collection, customizationController.propertyConfigs) : undefined;
+    const titleProperty = includeTitle ? getEntityTitlePropertyKeyForEntity(collection, entity.values, entity.id) : undefined;
     const imagePropertyKey = includeImage ? getEntityImagePreviewPropertyKey(collection) : undefined;
     const imageProperty = imagePropertyKey ? collection.properties[imagePropertyKey] : undefined;
     const ofProp = imageProperty && "of" in imageProperty ? imageProperty.of : undefined;

package/src/components/EntityViewBinding.tsx

@@ -1,6 +1,6 @@
 import type { Properties } from "@rebasepro/types";
-import type { CollectionConfig } from "@rebasepro/types";
-import type { CustomizationController } from "@rebasepro/types";
+
+import type { CustomizationController, AdminCollection } from "@rebasepro/admin-types";
 import React from "react";
 import { Entity } from "@rebasepro/types";
 import { cls, defaultBorderMixin, ExternalLinkIcon, IconButton, Typography } from "@rebasepro/ui";
@@ -14,7 +14,7 @@ import { PropertyCollectionView } from "./PropertyCollectionView";
  */
 export interface EntityViewBindingProps<M extends Record<string, unknown>> {
     entity: Entity<M>;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     path: string;
     className?: string;
 }

package/src/components/HomePage/ContentHomePage.tsx

@@ -1,8 +1,8 @@
-import type { HomePageSection, NavigationEntry, NavigationGroupMapping, PluginGenericProps } from "@rebasepro/types";
+import type { HomePageSection, NavigationEntry, NavigationGroupMapping, PluginGenericProps } from "@rebasepro/admin-types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Fuse from "fuse.js";
 import { Container, SearchBar } from "@rebasepro/ui";
-import { AnalyticsEvent } from "@rebasepro/types";
+import { AnalyticsEvent } from "@rebasepro/admin-types";
 import { FavouritesView } from "./FavouritesView";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { NavigationGroup } from "./NavigationGroup";

package/src/components/HomePage/FavouritesView.tsx

@@ -1,4 +1,4 @@
-import type { NavigationEntry } from "@rebasepro/types";
+import type { NavigationEntry } from "@rebasepro/admin-types";
 import { useNavigate } from "react-router-dom";
 ;
 import { Chip, Collapse, StarIcon } from "@rebasepro/ui";

package/src/components/HomePage/HomePageDnD.tsx

@@ -1,4 +1,4 @@
-import type { NavigationEntry } from "@rebasepro/types";
+import type { NavigationEntry } from "@rebasepro/admin-types";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import {
     Active,

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -1,4 +1,5 @@
-import type { NavigationEntry, CollectionConfig } from "@rebasepro/types";
+
+import type { NavigationEntry, AdminCollection } from "@rebasepro/admin-types";
 import { useNavigate } from "react-router-dom";
 ;
 import { IconButton, StarIcon, Tooltip } from "@rebasepro/ui";
@@ -81,7 +82,6 @@ export function NavigationCardBinding({
         context
     });
 
-
     const actions: React.ReactNode | undefined = <>
         {actionsArray}
         {pluginCardActions}

package/src/components/PropertyConfigBadge.tsx

@@ -1,4 +1,5 @@
-import type { PropertyConfig, Property } from "@rebasepro/types";
+import type { Property } from "@rebasepro/types";
+import type { PropertyConfig } from "@rebasepro/admin-types";
 import { getDefaultFieldConfig } from "./field_configs";
 import { getIconForWidget } from "../util/property_utils";
 

package/src/components/RebaseAdmin.tsx

@@ -1,6 +1,6 @@
 import React, { useLayoutEffect } from "react";
 import { useRebaseRegistryDispatch } from "@rebasepro/app";
-import type { RebaseAdminConfig } from "@rebasepro/types";
+import type { RebaseAdminConfig } from "@rebasepro/admin-types";
 
 /**
  * Declarative component to configure the CMS in Rebase.

package/src/components/RebaseAuthGate.tsx

@@ -5,7 +5,7 @@ import {
 } from "@rebasepro/app";
 import { CircularProgressCenter } from "@rebasepro/ui";
 import { LoginView } from "@rebasepro/app";
-import type { AuthControllerExtended } from "@rebasepro/types";
+import type { AuthControllerExtended } from "@rebasepro/admin-types";
 
 /**
  * Auth gate component that handles the authentication flow.

package/src/components/RebaseLayout.tsx

@@ -10,7 +10,7 @@ import { Scaffold } from "./app/Scaffold";
 import { Drawer } from "./app/Drawer";
 import { SideDialogs } from "./SideDialogs";
 import { AdminModeSyncer } from "./AdminModeSyncer";
-import type { AppView } from "@rebasepro/types";
+import type { AppView } from "@rebasepro/admin-types";
 
 export interface RebaseLayoutProps {
     /** Title shown in the drawer. */

package/src/components/RebaseNavigation.tsx

@@ -17,12 +17,13 @@ import {
 } 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";
+
+import type { AppView, CollectionEditorOptions, EntityCustomView, EntityAction, RebasePlugin, AdminCollection } from "@rebasepro/admin-types";
 import type { CollectionRegistryController } from "@rebasepro/types";
-import type { UrlController, NavigationStateController } from "@rebasepro/types";
+import type { UrlController, NavigationStateController } from "@rebasepro/admin-types";
 
 const EMPTY_PLUGINS: RebasePlugin[] = [];
-const EMPTY_COLLECTIONS: CollectionConfig[] = [];
+const EMPTY_COLLECTIONS: AdminCollection[] = [];
 
 import { useBuildNavigationStateController } from "../hooks/navigation/useBuildNavigationStateController";
 import { useBuildUrlController } from "../hooks/navigation/useBuildUrlController";

package/src/components/ReferenceTable/SelectionTableBinding.tsx

@@ -1,6 +1,7 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { CollectionSize, Entity, FilterValues } from "@rebasepro/types";
+import { Entity, FilterValues } from "@rebasepro/types";
+import { CollectionSize, AdminCollection } from "@rebasepro/admin-types";
 
 import {
     CollectionRowActions,
@@ -39,7 +40,7 @@ export interface SelectionProps<M extends Record<string, unknown>> {
     /**
      * Entity collection config
      */
-    collection?: CollectionConfig<M>;
+    collection?: AdminCollection<M>;
 
     /**
      * Absolute path of the collection.
@@ -113,7 +114,7 @@ function SelectionTableBindingInternal<M extends Record<string, unknown>>(
         description,
         fixedFilter,
         maxSelection
-    }: SelectionProps<M> & { collection: CollectionConfig<M> }) {
+    }: SelectionProps<M> & { collection: AdminCollection<M> }) {
 
     const sideDialogContext = useSideDialogContext();
     const sidePanelController = useSidePanel();
@@ -331,7 +332,7 @@ function EntitySelectionDialogActions({
     onClear,
     onNewClick
 }: {
-    collection: CollectionConfig<any>,
+    collection: AdminCollection<any>,
     path: string,
     onClear: () => void,
     onNewClick: () => void

package/src/components/ReferenceWidget.tsx

@@ -1,5 +1,5 @@
 import { useSelectionDialog } from "../hooks/useSelectionDialog";
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useCallback, useMemo } from "react";
 
 import { Entity, EntityReference, FilterValues } from "@rebasepro/types";
@@ -8,6 +8,7 @@ import { getReferenceFrom } from "@rebasepro/common";
 import { ReferencePreview } from "../preview";
 import { Button, cls } from "@rebasepro/ui";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export type ReferenceWidgetProps<M extends Record<string, unknown>> = {
     name?: string,
@@ -55,7 +56,7 @@ export function ReferenceWidget<M extends Record<string, unknown>>({
 
     const collectionRegistryController = useCollectionRegistryController();
 
-    const collection: CollectionConfig | undefined = useMemo(() => {
+    const collection: AdminCollection | undefined = useMemo(() => {
         return collectionRegistryController.getCollection(path);
     }, [path, collectionRegistryController.getCollection]);
 

package/src/components/SelectableTable/SelectableTable.tsx

@@ -1,7 +1,8 @@
 import { createSelectionStore, AdminSelectedCell } from "./SelectionStore";
 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 { Entity, FilterValues } from "@rebasepro/types";
+import { CollectionSize, EntityTableController, SelectedCellProps, AdminCollection } from "@rebasepro/admin-types";
 import { CellRendererParams, TableView, VirtualTableColumn, VirtualTableFilterValues, OnRowClickParams } from "@rebasepro/ui";
 import { DEFAULT_PAGE_SIZE, DataCollectionTableController, OnCellValueChange, OnColumnResizeParams } from "@rebasepro/app";
 import { FilterFormFieldProps } from "@rebasepro/ui";
@@ -109,7 +110,7 @@ export type SelectableTableProps<M extends Record<string, unknown>> = {
  * a custom view. If you just need to create a default view you can do it
  * exclusively with config options.
  *
- * If you want to bind a {@link CollectionConfig} to a table with the default
+ * If you want to bind a {@link AdminCollection} to a table with the default
  * options you see in collections in the top level navigation, you can
  * check {@link CollectionViewBinding}.
  *
@@ -306,4 +307,3 @@ export const SelectableTable = function SelectableTable<M extends Record<string,
 
 };
 
-

package/src/components/SelectableTable/SelectionStore.ts

@@ -1,5 +1,5 @@
 import { useSyncExternalStore, useCallback, useRef } from "react";
-import { SelectedCellProps } from "@rebasepro/types";
+import { SelectedCellProps } from "@rebasepro/admin-types";
 import {
     createVirtualTableSelectionStore,
     VirtualTableSelectionStore,

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

@@ -1,13 +1,16 @@
 import React, { Suspense } from "react";
 import {
     ArrayProperty,
-    FilterFieldBindingProps,
     Property,
     ReferenceProperty,
     RelationProperty,
     WhereFilterOp
 } from "@rebasepro/types";
-import { enumToObjectEntries, resolveFilterOperators } from "@rebasepro/common";
+import {
+    FilterFieldBindingProps
+} from "@rebasepro/admin-types";
+import { enumToObjectEntries } from "@rebasepro/common";
+import { resolveFilterOperators } from "@rebasepro/app";
 import { useCollectionScope, useComponentOverride, useResolvedComponent } from "@rebasepro/app";
 import { StringNumberFilterField } from "./StringNumberFilterField";
 import { BooleanFilterField } from "./BooleanFilterField";
@@ -40,14 +43,14 @@ export interface FilterFieldBindingInput {
  * Filters dialog.
  *
  * Resolution order:
- * 1. `property.ui.Filter` — per-property replacement (rendered even when the
+ * 1. `property.admin.Filter` — per-property replacement (rendered even when the
  *    resolved operator list is empty; the component owns filterability).
  * 2. `components["Collection.FilterField"]` — collection-level or app-level
  *    override (wrap mode supported via `OriginalComponent`).
  * 3. Built-in field dispatched by property type.
  *
  * The operators handed to the field are the intersection of the engine's
- * capabilities, the property-type defaults, and `property.ui.filterOperators`
+ * capabilities, the property-type defaults, and `property.admin.filterOperators`
  * (see `resolveFilterOperators`). When that intersection is empty and no
  * per-property `Filter` is set, nothing is rendered.
  *
@@ -72,7 +75,7 @@ export function FilterFieldBinding({
     // Hooks must run unconditionally — before any early return.
     const scopeCollection = useCollectionScope();
     const ResolvedFilterField = useComponentOverride<FilterFieldBindingProps>("Collection.FilterField", DefaultFilterField);
-    const PropertyFilter = useResolvedComponent<FilterFieldBindingProps>(baseProperty?.ui?.Filter);
+    const PropertyFilter = useResolvedComponent<FilterFieldBindingProps>(baseProperty?.admin?.Filter);
 
     if (!baseProperty) return null;
 
@@ -136,7 +139,7 @@ function DefaultFilterField({
             path={referenceProperty.path}
             title={title}
             includeId={referenceProperty.includeId}
-            previewProperties={referenceProperty.ui?.previewProperties}
+            previewProperties={referenceProperty.admin?.previewProperties}
             hidden={hidden ?? false}
             setHidden={setHidden ?? (() => undefined)}/>;
     }

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

@@ -1,5 +1,5 @@
 import { useSelectionDialog } from "../../../hooks/useSelectionDialog";
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useMemo, useState } from "react";
 import { VirtualTableWhereFilterOp } from "@rebasepro/ui";
 import { Entity, EntityReference } from "@rebasepro/types";
@@ -8,6 +8,7 @@ import { Button, Checkbox, Label, Select, SelectItem } from "@rebasepro/ui";
 import { getReferenceFrom } from "@rebasepro/common";
 import { useTranslation } from "@rebasepro/app";
 import { useCollectionRegistryController } from "../../../hooks/navigation/contexts/CollectionRegistryContext";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 interface ReferenceFilterFieldProps {
     name: string,
@@ -111,7 +112,7 @@ export function ReferenceFilterField({
     }
 
     const collectionRegistryController = useCollectionRegistryController();
-    const collection: CollectionConfig | undefined = useMemo(() => {
+    const collection: AdminCollection | undefined = useMemo(() => {
         return path ? collectionRegistryController.getCollection(path) : undefined;
     }, [path]);
 

package/src/components/SideDialogs.tsx

@@ -4,7 +4,7 @@ import { useSideDialogsController } from "../hooks";
 import { Sheet, Dialog } from "@rebasepro/ui";
 import { useUnsavedChangesDialog, UnsavedChangesDialog } from "@rebasepro/app";
 import { ErrorBoundary } from "@rebasepro/ui";
-import type { SidePanelBindingProps } from "@rebasepro/types";
+import type { SidePanelBindingProps } from "@rebasepro/admin-types";
 
 
 export type SideDialogController = {
@@ -164,7 +164,7 @@ function SideDialogView({
                     scrollable={false}
                 >
                     {panel && (
-                        <div className="flex flex-col h-[75vh] min-h-[500px] min-w-[55vw] max-w-full overflow-hidden">
+                        <div className="flex flex-col h-[75vh] min-h-[500px] w-full min-w-0 max-w-full overflow-hidden">
                             <ErrorBoundary>
                                 {panel.component}
                             </ErrorBoundary>

package/src/components/SidePanelBinding.tsx

@@ -1,5 +1,5 @@
-import type { CollectionConfig } from "@rebasepro/types";
-import type { SidePanelBindingProps } from "@rebasepro/types";
+
+import type { SidePanelBindingProps, AdminCollection } from "@rebasepro/admin-types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 import type { OnUpdateParams } from "../types/components/EntityFormProps";
@@ -13,7 +13,7 @@ import { saveEntityToMemoryCache, useComponentOverride } from "@rebasepro/app";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 import { useSidePanel } from "../hooks/useSidePanel";
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
-import { resolveDefaultSelectedView } from "@rebasepro/common";
+import { resolveDefaultSelectedView } from "@rebasepro/app";
 
 /**
  * This is the component in charge of rendering the side dialog used
@@ -188,7 +188,7 @@ entityId }
                     ? <ResolvedDetailView
                         path={path}
                         layout={collection?.openEntityMode === "dialog" ? "dialog" : "side_panel"}
-                        collection={collection as CollectionConfig}
+                        collection={collection as AdminCollection}
                         entityId={entityId!}
                         parentCollectionSlugs={parentCollectionSlugs}
                         parentEntityIds={parentEntityIds}
@@ -237,7 +237,7 @@ entityId }
                     : <EditViewBinding
                         {...props}
                         layout={collection?.openEntityMode === "dialog" ? "dialog" : "side_panel"}
-                        collection={collection as CollectionConfig}
+                        collection={collection as AdminCollection}
                         parentCollectionSlugs={parentCollectionSlugs} parentEntityIds={parentEntityIds}
                         onValuesModified={onValuesModified}
                         onSaved={onUpdate}

package/src/components/SidePanelProvider.tsx

@@ -1,4 +1,4 @@
-import type { SidePanelController } from "@rebasepro/types";
+import type { SidePanelController } from "@rebasepro/admin-types";
 import React from "react";
 import { useBuildSidePanel } from "../hooks/useBuildSidePanel";
 import { useBuildSideDialogsController } from "../hooks/useBuildSideDialogsController";

package/src/components/admin/CreationResultDialog.tsx

@@ -14,7 +14,7 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { useSnackbarController, useTranslation } from "@rebasepro/app";
-import { UserCreationResult } from "@rebasepro/types";
+import { UserCreationResult } from "@rebasepro/admin-types";
 
 export function CreationResultDialog({
     result,

package/src/components/common/default_entity_actions.tsx

@@ -17,7 +17,8 @@ import {
     Trash2Icon,
     Typography
 } from "@rebasepro/ui";
-import type { EntityAction, User, UserCreationResult } from "@rebasepro/types";
+import type { User } from "@rebasepro/types";
+import type { EntityAction, UserCreationResult } from "@rebasepro/admin-types";
 import {
     useAuthController,
     useRebaseClient,
@@ -27,7 +28,7 @@ import {
 import { DeleteEntityDialog } from "../DeleteEntityDialog";
 import { addRecentId } from "../CollectionViewBinding/utils";
 import { navigateToEntity } from "../../util/navigation_utils";
-import { resolveDefaultSelectedView } from "@rebasepro/common";
+import { resolveDefaultSelectedView } from "@rebasepro/app";
 import { CreationResultDialog } from "../admin/CreationResultDialog";
 import React, { useState } from "react";