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

package/src/components/CollectionViewBinding/CollectionViewBinding.tsx

@@ -1,14 +1,17 @@
-import type { AdditionalFieldDelegate, EntityAction, CollectionConfig, Property } from "@rebasepro/types";
+import type { Property } from "@rebasepro/types";
+import type { AdditionalFieldDelegate, EntityAction, AdminCollection } from "@rebasepro/admin-types";
 import {
-    CollectionSize,
     Entity,
     EntityReference,
-    EntityTableController,
     FilterValues,
-    getCollectionDataPath,
+    getCollectionDataPath
+} from "@rebasepro/types";
+import {
+    CollectionSize,
+    EntityTableController,
     PartialCollectionConfig,
     ViewMode
-} from "@rebasepro/types";
+} from "@rebasepro/admin-types";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 
@@ -120,10 +123,10 @@ export type CollectionViewBindingProps<M extends Record<string, unknown>> = {
      */
     selectedTab?: string;
 
-} & CollectionConfig<M>;
+} & AdminCollection<M>;
 
 /**
- * This component is in charge of binding a driver path with an {@link CollectionConfig}
+ * This component is in charge of binding a driver path with an {@link AdminCollection}
  * where it's configuration is defined. It includes an infinite scrolling table
  * and a 'Add' new entities button,
  *
@@ -181,7 +184,7 @@ const CollectionViewBindingInner = React.memo(
         const collection = useMemo(() => {
             const registryCollection = collectionRegistry.getCollection(path) || collectionProp;
             const userOverride = userConfigPersistence?.getCollectionConfig<M>(path);
-            return (userOverride ? mergeDeep(registryCollection, userOverride) : registryCollection) as CollectionConfig<M>;
+            return (userOverride ? mergeDeep(registryCollection, userOverride) : registryCollection) as AdminCollection<M>;
         }, [collectionProp, path, userConfigPersistence, collectionRegistry]);
 
         const collectionRef = React.useRef(collection);
@@ -601,7 +604,6 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
                 property = getPropertyInPath(resolvedCollection.properties, propertyKey);
             }
 
-
             // In v4, properties are already resolved, so we return them directly
             return property ?? null;
         }, [collection.properties, resolvedCollection.properties]);
@@ -622,7 +624,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
         const additionalFields = useMemo(() => {
             // v4: use getSubcollections helper to access subcollections
             const subcollectionsList = getSubcollections(collection);
-            const subcollectionColumns: AdditionalFieldDelegate<M, any>[] = subcollectionsList.map((subcollection: CollectionConfig) => {
+            const subcollectionColumns: AdditionalFieldDelegate<M, any>[] = subcollectionsList.map((subcollection: AdminCollection) => {
                 return {
                     key: getSubcollectionColumnId(subcollection),
                     name: subcollection.name,
@@ -778,7 +780,7 @@ parentEntityIds: parentEntityIds ?? EMPTY_ARRAY,
                 propertyKey,
                 onHover,
                 path,
-                collection: collection as CollectionConfig,
+                collection: collection as AdminCollection,
                 tableController: tableController as EntityTableController,
                 parentCollectionSlugs: parentCollectionSlugs ?? EMPTY_ARRAY,
 parentEntityIds: parentEntityIds ?? EMPTY_ARRAY
@@ -1062,7 +1064,6 @@ parentEntityIds,
                     </div>
                 )}
 
-
                 {/* When isSplitLayout, SplitListView is ALWAYS mounted — regardless
                     of viewMode. The toolbar + current view live in the left panel;
                     the right panel (entity detail) shows/hides based on selection.
@@ -1168,7 +1169,7 @@ export const CollectionViewBinding = React.memo(
 
         if (collection) {
             return (
-                <CollectionScopeProvider collection={collection as CollectionConfig}>
+                <CollectionScopeProvider collection={collection as AdminCollection}>
                     {content}
                 </CollectionScopeProvider>
             );
@@ -1233,7 +1234,7 @@ function EntitiesCount({
     onCountChange
 }: {
     path: string,
-    collection: CollectionConfig,
+    collection: AdminCollection,
     filter?: FilterValues<any>,
     sortBy?: [string, "asc" | "desc"],
     onCountChange?: (count: number | null | undefined) => void,
@@ -1298,7 +1299,7 @@ function buildPropertyWidthOverwrite(key: string, width: number): PartialCollect
         const [parentKey, ...childKey] = key.split(".");
         return { properties: { [parentKey]: buildPropertyWidthOverwrite(childKey.join("."), width) } } as PartialCollectionConfig;
     }
-    return { properties: { [key]: { ui: { columnWidth: width } } } } as PartialCollectionConfig;
+    return { properties: { [key]: { admin: { columnWidth: width } } } } as PartialCollectionConfig;
 }
 
 function EntityIdHeaderWidget({
@@ -1307,7 +1308,7 @@ function EntityIdHeaderWidget({
     idPath,
     openEntityMode
 }: {
-    collection: CollectionConfig,
+    collection: AdminCollection,
     path: string,
     idPath: string,
     /**

package/src/components/CollectionViewBinding/CollectionViewStartActions.tsx

@@ -1,8 +1,8 @@
 import type { Properties } from "@rebasepro/types";
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useState, useCallback } from "react";
 import { useAuthController, useLargeLayout, useTranslation, useSlot } from "@rebasepro/app";
-import { CollectionActionsProps, EntityTableController, SelectionController } from "@rebasepro/types";
+import { CollectionActionsProps, EntityTableController, SelectionController, AdminCollection } from "@rebasepro/admin-types";
 import { ErrorBoundary, iconSize } from "@rebasepro/ui";
 import { ArrowLeftIcon, Badge, Button, cls, FilterIcon, IconButton, Tooltip } from "@rebasepro/ui";
 import { ClearFilterSortButton } from "../ClearFilterSortButton";
@@ -15,7 +15,7 @@ import { useCMSContext } from "../../hooks/useCMSContext";
 import { withViewMode } from "../../util/view_mode";
 
 export type CollectionViewStartActionsProps<M extends Record<string, unknown>> = {
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     path: string;
     relativePath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];

package/src/components/CollectionViewBinding/EntityCardBinding.tsx

@@ -1,6 +1,7 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useMemo } from "react";
-import { CollectionSize, Entity } from "@rebasepro/types";
+import { Entity } from "@rebasepro/types";
+import { CollectionSize, AdminCollection } from "@rebasepro/admin-types";
 import {
     Card,
     Checkbox,
@@ -19,7 +20,7 @@ import { useCollectionSlotKeys, resolveEntitySlots } from "./usePreviewSlots";
 
 export type EntityCardBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
     entity: Entity<M>;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     highlighted?: boolean;
@@ -50,7 +51,7 @@ export function EntityCardBinding<M extends Record<string, unknown> = Record<str
     const customizationController = useCustomizationController();
 
     const slotKeys = useCollectionSlotKeys(
-        collection as CollectionConfig<Record<string, unknown>>,
+        collection as AdminCollection<Record<string, unknown>>,
         authController,
         customizationController.propertyConfigs
     );
@@ -58,7 +59,7 @@ export function EntityCardBinding<M extends Record<string, unknown> = Record<str
     const slots = useMemo(
         () => resolveEntitySlots(
             entity as Entity<Record<string, unknown>>,
-            collection as CollectionConfig<Record<string, unknown>>,
+            collection as AdminCollection<Record<string, unknown>>,
             slotKeys
         ),
         [entity, collection, slotKeys]

package/src/components/CollectionViewBinding/FilterPresetsButton.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useMemo } from "react";
 import { CheckIcon, ChevronsUpDownIcon, cls, FilterChip, Menu, MenuItem, Tooltip } from "@rebasepro/ui";
-import type { EntityTableController, FilterValues, FilterPreset } from "@rebasepro/types";
+import type { FilterValues, FilterPreset } from "@rebasepro/types";
+import type { EntityTableController } from "@rebasepro/admin-types";
 
 export interface FilterPresetsButtonProps<M extends Record<string, unknown>> {
     filterPresets: FilterPreset<Extract<keyof M, string> | (string & {})>[];

package/src/components/CollectionViewBinding/FiltersDialog.tsx

@@ -4,7 +4,7 @@ import React, { useCallback, useMemo, useState } from "react";
 import { FilterValues, WhereFilterOp } from "@rebasepro/types";
 import { Button, cls, defaultBorderMixin, Dialog, DialogActions, DialogContent, DialogTitle, Typography } from "@rebasepro/ui";
 import { FilterIcon, VirtualTableWhereFilterOp } from "@rebasepro/ui";
-import { resolveFilterOperators } from "@rebasepro/common";
+import { resolveFilterOperators } from "@rebasepro/app";
 import { useCollectionScope, useTranslation } from "@rebasepro/app";
 import { FilterFieldBinding } from "../SelectableTable/filters/FilterFieldBinding";
 
@@ -77,7 +77,7 @@ export function FiltersDialog({
             // A property is filterable when it has a custom filter field, or
             // when at least one operator survives the engine ∩ type ∩
             // property-narrowing resolution.
-            if (baseProperty.ui?.Filter) return true;
+            if (baseProperty.admin?.Filter) return true;
             return resolveFilterOperators({ property: baseProperty, isArray, engine }).length > 0;
         });
     }, [properties, fixedFilter, engine]);

package/src/components/CollectionViewBinding/SplitListView.tsx

@@ -1,6 +1,7 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { CollectionSize, Entity, EntityTableController, SelectionController } from "@rebasepro/types";
+import { Entity } from "@rebasepro/types";
+import { CollectionSize, EntityTableController, SelectionController, AdminCollection } from "@rebasepro/admin-types";
 import { EditViewBinding } from "../EditViewBinding";
 import { DetailViewBinding } from "../DetailViewBinding";
 import {
@@ -16,7 +17,7 @@ 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>;
+    collection: AdminCollection<M>;
     tableController: EntityTableController<M>;
     onEntityClick?: (entity: Entity<M>) => void;
     onNewClick?: () => void;
@@ -358,7 +359,7 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
                     ? <DetailViewBinding
                         key={String(renderedEntityId)}
                         path={path}
-                        collection={collection as CollectionConfig<Record<string, unknown>>}
+                        collection={collection as AdminCollection<Record<string, unknown>>}
                         entityId={renderedEntityId}
                         parentCollectionSlugs={usedParentCollectionIds}
                         parentEntityIds={usedParentEntityIds}
@@ -379,7 +380,7 @@ export function SplitListView<M extends Record<string, unknown> = Record<string,
                     : <EditViewBinding
                         key={String(renderedEntityId)}
                         path={path}
-                        collection={collection as CollectionConfig<Record<string, unknown>>}
+                        collection={collection as AdminCollection<Record<string, unknown>>}
                         entityId={renderedEntityId}
                         parentCollectionSlugs={usedParentCollectionIds}
                         parentEntityIds={usedParentEntityIds}

package/src/components/CollectionViewBinding/ViewModeToggle.tsx

@@ -1,6 +1,6 @@
 
 import React, { useMemo } from "react";
-import { CollectionSize, ViewMode } from "@rebasepro/types";
+import { CollectionSize, ViewMode } from "@rebasepro/admin-types";
 import {
     Button,
     ColumnsIcon,

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

@@ -1,11 +1,12 @@
 import { useCallback, useMemo } from "react";
 import { setIn } from "@rebasepro/forms";
-import { CollectionConfig, RebaseData, RebaseContext } from "@rebasepro/types";
+import { RebaseData } from "@rebasepro/types";
+import { RebaseContext, AdminCollection } from "@rebasepro/admin-types";
 import { OnCellValueChange, saveEntityWithCallbacks, SaveEntityWithCallbacksProps, UniqueFieldValidator } from "@rebasepro/app";
 
 export interface UseCollectionInlineEditorParams<M extends Record<string, unknown>> {
     path: string;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     dataClient: RebaseData;
     context: RebaseContext;
 }

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

@@ -1,13 +1,14 @@
 import { useCallback, useMemo } from "react";
 import { setIn } from "@rebasepro/forms";
-import { CollectionConfig, RebaseData, RebaseContext, AnalyticsController, Entity } from "@rebasepro/types";
+import { RebaseData, Entity } from "@rebasepro/types";
+import { RebaseContext, AnalyticsController, AdminCollection } from "@rebasepro/admin-types";
 import { saveEntityWithCallbacks, SaveEntityWithCallbacksProps } from "@rebasepro/app";
 import { BoardItem } from "@rebasepro/ui";
 import { BoardDataController } from "../useBoardDataController";
 import { generateKeyBetween } from "fractional-indexing";
 
 export interface UseKanbanDragAndDropParams<M extends Record<string, unknown>> {
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     fullPath: string;
     columnProperty: string;
     orderProperty?: string;

package/src/components/CollectionViewBinding/useBoardDataController.tsx

@@ -1,7 +1,8 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import { Entity, FilterValues } from "@rebasepro/types";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { getRelationIncludeParams, useData, useRebaseContext } from "@rebasepro/app";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 const DEFAULT_PAGE_SIZE = 20;
 
@@ -67,7 +68,7 @@ export interface UseBoardDataControllerProps<M extends Record<string, unknown> =
     /** Full path to the collection */
     fullPath: string;
     /** The entity collection configuration */
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     /** Property key used for column assignment */
     columnProperty: string;
     /** Array of column values (enum values from columnProperty) */

package/src/components/CollectionViewBinding/usePreviewSlots.ts

@@ -1,14 +1,15 @@
 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 type { Property, RelationProperty } from "@rebasepro/types";
+import type { Entity, EntityRelation } from "@rebasepro/types";
+import type { PropertyConfig, AdminCollection } from "@rebasepro/admin-types";
+import { getEntityImagePreviewPropertyKey } from "@rebasepro/app";
+import { getTitlePropertyCandidates, looksLikeIdentifierValue } from "@rebasepro/app";
 import { getEntityFromCache } from "@rebasepro/app";
-import { getEntityTitlePropertyKey, getEntityPreviewKeys } from "../../util/previews";
+import { getEntityPreviewKeys } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
-import type { AuthController } from "@rebasepro/types";
+import type { AuthController } from "@rebasepro/admin-types";
 import { ChipColorScheme, CHIP_COLORS } from "@rebasepro/ui";
 
-
 // ── Slot types ────────────────────────────────────────────────────────
 
 /**
@@ -90,6 +91,8 @@ export interface EntityPreviewSlots {
  */
 export interface CollectionSlotKeys {
     titleKey: string | undefined;
+    /** Every property that could act as the title, best first (see `getTitlePropertyCandidates`) */
+    titleKeyCandidates: string[];
     imageKey: string | undefined;
     subtitleKey: string | undefined;
     relationKeys: string[];
@@ -102,11 +105,12 @@ export interface CollectionSlotKeys {
  * Pure function — call inside `useMemo`.
  */
 export function resolveCollectionSlotKeys(
-    collection: CollectionConfig<Record<string, unknown>>,
+    collection: AdminCollection<Record<string, unknown>>,
     authController: AuthController,
     propertyConfigs: Record<string, PropertyConfig>
 ): CollectionSlotKeys {
-    const titleKey = getEntityTitlePropertyKey(collection, propertyConfigs);
+    const titleKeyCandidates = getTitlePropertyCandidates(collection);
+    const titleKey = titleKeyCandidates[0];
     const imageKey = getEntityImagePreviewPropertyKey(collection);
 
     // Status: first string-enum that isn't the title
@@ -194,13 +198,14 @@ export function resolveCollectionSlotKeys(
         : [...previewKeys].sort((a, b) => {
             const propA = collection.properties[a] as Property | undefined;
             const propB = collection.properties[b] as Property | undefined;
-            const scoreA = propA?.type === "string" ? (propA.ui?.multiline ? 2 : 1) : 0;
-            const scoreB = propB?.type === "string" ? (propB.ui?.multiline ? 2 : 1) : 0;
+            const scoreA = propA?.type === "string" ? (propA.admin?.multiline ? 2 : 1) : 0;
+            const scoreB = propB?.type === "string" ? (propB.admin?.multiline ? 2 : 1) : 0;
             return scoreB - scoreA;
         });
     const subtitleKey = sortedPreviewKeys.length > 0 ? sortedPreviewKeys[0] : undefined;
 
     return { titleKey,
+titleKeyCandidates,
 imageKey,
 subtitleKey,
 relationKeys,
@@ -216,7 +221,7 @@ dateKey };
  * and value is the first element (for arrays) or the raw value.
  */
 function resolveImageSlot(
-    collection: CollectionConfig<Record<string, unknown>>,
+    collection: AdminCollection<Record<string, unknown>>,
     imageKey: string,
     entity: Entity<Record<string, unknown>>
 ): PreviewSlot | undefined {
@@ -242,6 +247,30 @@ function resolveImageSlot(
     };
 }
 
+// ── Title resolution (entity-level) ───────────────────────────────────
+
+/**
+ * Walk the collection's ranked title candidates and return the first one that
+ * holds something a person can read for this entity. Candidates are already
+ * ordered and free of identifier properties; this only rejects values —
+ * empties, and strings that turn out to be an id at runtime.
+ */
+function resolveEntityTitleKey(
+    entity: Entity<Record<string, unknown>>,
+    candidates: string[]
+): string | undefined {
+    for (const key of candidates) {
+        const value = getValueInPath(entity.values, key);
+        if (value === undefined || value === null || value === "") continue;
+        if (typeof value === "string") {
+            if (looksLikeIdentifierValue(value)) continue;
+            if (value === String(entity.id)) continue;
+        }
+        return key;
+    }
+    return candidates[0];
+}
+
 // ── Date formatting ───────────────────────────────────────────────────
 
 function formatDateValue(value: unknown): string {
@@ -277,7 +306,7 @@ function formatDateValue(value: unknown): string {
  * `resolveEntitySlots` for each entity row.
  */
 export function useCollectionSlotKeys(
-    collection: CollectionConfig<Record<string, unknown>>,
+    collection: AdminCollection<Record<string, unknown>>,
     authController: AuthController,
     propertyConfigs: Record<string, PropertyConfig>
 ): CollectionSlotKeys {
@@ -296,27 +325,30 @@ export function useCollectionSlotKeys(
  */
 export function resolveEntitySlots(
     entity: Entity<Record<string, unknown>>,
-    collection: CollectionConfig<Record<string, unknown>>,
+    collection: AdminCollection<Record<string, unknown>>,
     slotKeys: CollectionSlotKeys
 ): EntityPreviewSlots {
-    const { titleKey, imageKey, subtitleKey, relationKeys, statusKey, dateKey } = slotKeys;
+    const { titleKey, titleKeyCandidates, imageKey, subtitleKey, relationKeys, statusKey, dateKey } = slotKeys;
 
     // Image
     const image = imageKey ? resolveImageSlot(collection, imageKey, entity) : undefined;
 
-    // Title
+    // Title — the best-ranked candidate that carries a readable value for THIS
+    // entity, so a row whose name is empty (or whose column happens to hold a
+    // UUID) falls through to the next candidate instead of showing an id.
+    const resolvedTitleKey = resolveEntityTitleKey(entity, titleKeyCandidates ?? (titleKey ? [titleKey] : []));
     let title: PreviewSlot | undefined;
-    if (titleKey) {
-        const prop = collection.properties[titleKey] as Property | undefined;
-        const val = getValueInPath(entity.values, titleKey);
+    if (resolvedTitleKey) {
+        const prop = collection.properties[resolvedTitleKey] as Property | undefined;
+        const val = getValueInPath(entity.values, resolvedTitleKey);
         if (prop) title = { property: prop,
-propertyKey: titleKey,
+propertyKey: resolvedTitleKey,
 value: val };
     }
 
     // Subtitle
     let subtitle: PreviewSlot | undefined;
-    if (subtitleKey) {
+    if (subtitleKey && subtitleKey !== resolvedTitleKey) {
         const prop = collection.properties[subtitleKey] as Property | undefined;
         const val = getValueInPath(entity.values, subtitleKey);
         if (prop && val !== undefined && val !== null && val !== "") {
@@ -441,11 +473,11 @@ function resolveRelationDisplayName(
     const data = "data" in relation ? (relation as EntityRelation).data : undefined;
 
     // Resolve target collection from either `prop.relation.target()` or `prop.target()` (inline API)
-    let targetCollection: CollectionConfig | undefined;
+    let targetCollection: AdminCollection | undefined;
     try {
         const resolved = prop.relation?.target?.() ?? (typeof prop.target === "function" ? prop.target() : undefined);
         if (resolved && typeof resolved === "object") {
-            targetCollection = resolved as CollectionConfig;
+            targetCollection = resolved as AdminCollection;
         }
     } catch {
         // Target collection may not be resolvable
@@ -461,14 +493,14 @@ function resolveRelationDisplayName(
 
             // Helper to check if a property is hidden/internal
             const isHiddenProp = (p: Property): boolean => {
-                if (p.ui?.hideFromCollection) return true;
-                if (typeof p.ui?.disabled === "object" && p.ui.disabled.hidden) return true;
+                if (p.admin?.hideFromCollection) return true;
+                if (typeof p.admin?.disabled === "object" && p.admin.disabled.hidden) return true;
                 return false;
             };
 
             // Helper to check if a property is a visible, non-id string
             const isDisplayCandidate = (p: Property): boolean => {
-                return p.type === "string" && !p.ui?.multiline && !p.ui?.markdown && !p.storage
+                return p.type === "string" && !p.admin?.multiline && !p.admin?.markdown && !p.storage
                     && !("isId" in p && p.isId) && !isHiddenProp(p);
             };
 

package/src/components/CollectionViewBinding/useSelectionController.tsx

@@ -1,5 +1,6 @@
 import { useCallback, useMemo, useRef, useState } from "react";
-import { Entity, SelectionController } from "@rebasepro/types";
+import { Entity } from "@rebasepro/types";
+import { SelectionController } from "@rebasepro/admin-types";
 
 export function useSelectionController<M extends Record<string, unknown> = Record<string, unknown>>(
     onSelectionChange?: (entity: Entity<M>, selected: boolean) => void

package/src/components/DefaultDrawer.tsx

@@ -1,4 +1,4 @@
-import type { NavigationEntry, NavigationResult } from "@rebasepro/types";
+import type { NavigationEntry, NavigationResult } from "@rebasepro/admin-types";
 import React, { useMemo } from "react";
 
 import { useCollapsedGroups, buildCollapsedDefaults, useLargeLayout, useAdminModeController, useAuthController, useModeController, useTranslation, useSlot, useRebaseContext, useAnalyticsController, useRebaseRegistry, useComponentOverride } from "@rebasepro/app";
@@ -7,7 +7,7 @@ import { useNavigationStateController } from "../hooks/navigation/contexts/Navig
 
 
 import { Link, useNavigate } from "react-router-dom";
-import { AnalyticsEvent } from "@rebasepro/types";
+import { AnalyticsEvent } from "@rebasepro/admin-types";
 import {
     Avatar,
     ChevronsLeftIcon,

package/src/components/DeleteEntityDialog.tsx

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import { Entity, CollectionCallbacks } from "@rebasepro/types";
 import React, { useCallback, useMemo, useState } from "react";
 import { Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogTitle } from "@rebasepro/ui";
@@ -12,11 +12,12 @@ import {
 } from "@rebasepro/app";
 import { useCMSContext } from "../hooks";
 import { EntityViewBinding } from "./EntityViewBinding";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export interface DeleteEntityDialogProps<M extends Record<string, unknown>> {
     entityOrEntitiesToDelete?: Entity<M> | Entity<M>[],
     path: string,
-    collection: CollectionConfig<M>
+    collection: AdminCollection<M>
     open: boolean;
     onClose: () => void;
     callbacks?: CollectionCallbacks<M>,

package/src/components/DetailViewBinding.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, Property } 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";
@@ -27,11 +28,8 @@ import {
 } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { ErrorView, createFormexStub, usePermissions, useTranslation, getIcon } from "@rebasepro/app";
-import {
-    getSubcollections,
-    removeInitialAndTrailingSlashes,
-    resolveDefaultSelectedView
-} from "@rebasepro/common";
+
+import { removeInitialAndTrailingSlashes, resolveDefaultSelectedView } from "@rebasepro/app";
 import { resolvedSelectedEntityView } from "../util/resolutions";
 import {
     useCustomizationController,
@@ -44,7 +42,8 @@ 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";
+import { getEntityTitlePropertyKeyForEntity, isUserSelectProperty, resolveTitleToString } from "../util/previews";
+import { getUserLabel, useResolvedUser } from "../hooks/useResolvedUsers";
 import { JsonPreviewBinding } from "../components/JsonPreviewBinding";
 
 const EntityHistoryView = lazy(() => import("../components/history").then(m => ({ default: m.EntityHistoryView })));
@@ -62,12 +61,12 @@ export type OnTabChangeParams<M extends Record<string, unknown>> = {
     path: string;
     entityId?: string | number;
     selectedTab?: string;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
 };
 
 export interface DetailViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> {
     path: string;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     entityId: string | number;
     selectedTab?: string;
     parentCollectionSlugs: string[];
@@ -182,7 +181,7 @@ entityId }
         }
     }, [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;
@@ -263,15 +262,21 @@ entityId }
     const pluginActionsTop = useSlot("form.actions.top", formActionTopProps);
 
     // 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;
 
     // Title resolution
-    const titlePropertyKey = getEntityTitlePropertyKey(collection, customizationController.propertyConfigs);
+    const titlePropertyKey = getEntityTitlePropertyKeyForEntity(collection, usedEntity?.values, usedEntity?.id);
     const rawTitle = usedEntity?.values && titlePropertyKey ? getValueInPath(usedEntity.values, titlePropertyKey) : undefined;
-    const title = rawTitle !== undefined && rawTitle !== null
-        ? resolveTitleToString(rawTitle)
-        : (collection.singularName ?? collection.name);
+    // A user picker stores an id: resolve it to the person, like a relation.
+    const titleUser = useResolvedUser(isUserSelectProperty(collection, titlePropertyKey) && typeof rawTitle === "string"
+        ? rawTitle
+        : undefined);
+    const title = titleUser
+        ? getUserLabel(titleUser)
+        : (rawTitle !== undefined && rawTitle !== null
+            ? resolveTitleToString(rawTitle)
+            : (collection.singularName ?? collection.name));
 
     // Non-action custom views
     const nonActionCustomViews = useMemo(() =>
@@ -638,7 +643,7 @@ entityId }
     return result;
 }
 
-function DetailViewSkeleton({ collection }: { collection: CollectionConfig<Record<string, unknown>> }) {
+function DetailViewSkeleton({ collection }: { collection: AdminCollection<Record<string, unknown>> }) {
     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/DrawerNavigationGroup.tsx

@@ -1,4 +1,4 @@
-import type { NavigationEntry } from "@rebasepro/types";
+import type { NavigationEntry } from "@rebasepro/admin-types";
 import React from "react";
 import { ChevronDownIcon, cls, iconSize, Typography } from "@rebasepro/ui";