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

package/src/preview/components/ReferencePreview.tsx

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import * as React from "react";
 
 import { Entity, EntityReference } from "@rebasepro/types";
@@ -9,8 +9,9 @@ import { ErrorBoundary } from "@rebasepro/ui";
 import { ErrorView } from "@rebasepro/app";
 import { EntityPreviewBinding, EntityPreviewContainer } from "../../components/EntityPreviewBinding";
 import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
-import { getEntityTitlePropertyKey } from "../../util/previews";
+import { getEntityTitlePropertyKeyForEntity } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export type ReferencePreviewProps = {
     disabled?: boolean;
@@ -59,7 +60,7 @@ function ReferencePreviewInternalInner({
     includeId = true,
     textOnly,
     collection
-}: ReferencePreviewProps & { collection?: CollectionConfig }) {
+}: ReferencePreviewProps & { collection?: AdminCollection }) {
     const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference);
 
     if (!collection) {
@@ -124,7 +125,7 @@ function ReferencePreviewExisting<M extends Record<string, unknown> = Record<str
     hover,
     textOnly
 }: ReferencePreviewProps & {
-    collection: CollectionConfig<M>
+    collection: AdminCollection<M>
 }) {
 
     const ResolvedEntityPreview = useComponentOverride("EntityPreview", EntityPreviewBinding);
@@ -196,7 +197,7 @@ function ReferencePreviewExisting<M extends Record<string, unknown> = Record<str
     }
 
     if (textOnly) {
-        const titleProperty = getEntityTitlePropertyKey(collection, customizationController.propertyConfigs);
+        const titleProperty = getEntityTitlePropertyKeyForEntity(collection, usedEntity.values, usedEntity.id);
         const titleValue = titleProperty ? getValueInPath(usedEntity.values, titleProperty) : undefined;
         const displayValue = titleValue !== undefined && titleValue !== null ? String(titleValue) : String(reference.id);
         return <span className="truncate">{displayValue}</span>;

package/src/preview/components/RelationPreview.tsx

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import * as React from "react";
 
 import { Entity, EntityRelation } from "@rebasepro/types";
@@ -7,8 +7,9 @@ import { useCustomizationController, useFetch, ErrorView, useComponentOverride,
 import { Skeleton } from "@rebasepro/ui";
 import { EntityPreviewBinding, EntityPreviewContainer } from "../../components/EntityPreviewBinding";
 import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
-import { getEntityTitlePropertyKey } from "../../util/previews";
+import { getEntityTitlePropertyKeyForEntity } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export type RelationPreviewProps = {
     disabled?: boolean;
@@ -92,7 +93,7 @@ function RelationPreviewInternalInner({
     includeId = true,
     textOnly,
     collection
-}: RelationPreviewProps & { collection?: CollectionConfig }) {
+}: RelationPreviewProps & { collection?: AdminCollection }) {
     const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference);
 
     if (!collection) {
@@ -154,7 +155,7 @@ function RelationPreviewExisting<M extends Record<string, unknown> = Record<stri
     hover,
     textOnly
 }: RelationPreviewProps & {
-    collection: CollectionConfig<M>
+    collection: AdminCollection<M>
 }) {
 
     // CMS wire format embeds relation data as { id, path, values }
@@ -228,7 +229,7 @@ function RelationPreviewExisting<M extends Record<string, unknown> = Record<stri
     }
 
     if (textOnly) {
-        const titleProperty = getEntityTitlePropertyKey(collection, customizationController.propertyConfigs);
+        const titleProperty = getEntityTitlePropertyKeyForEntity(collection, usedEntity.values, usedEntity.id);
         const titleValue = titleProperty ? getValueInPath(usedEntity.values, titleProperty) : undefined;
         const displayValue = titleValue !== undefined && titleValue !== null ? String(titleValue) : String(relation.id);
         return <span className="truncate">{displayValue}</span>;

package/src/preview/components/UrlComponentPreview.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 
 import { ImagePreview } from "./ImagePreview";
-import { PreviewType } from "@rebasepro/types";
+import { PreviewType } from "@rebasepro/admin-types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { cls, ExternalLinkIcon, FileTextIcon, Tooltip, Typography } from "@rebasepro/ui";
 import { EmptyValue } from "./EmptyValue";

package/src/preview/components/UserPreview.tsx

@@ -3,19 +3,28 @@ import type { StringProperty } from "@rebasepro/types";
 import React from "react";
 import { EmptyValue } from "./EmptyValue";
 import { Typography } from "@rebasepro/ui";
+import { getUserLabel, useResolvedUser } from "../../hooks/useResolvedUsers";
 
 /**
  * Preview component for displaying a user reference value.
  *
- * Shows the raw user ID. Collection-based user management means
- * user records are fetched through the standard data layer.
+ * Resolves the stored auth user id to a name (or email) the same way a
+ * relation resolves its target, and falls back to the raw id only while the
+ * lookup is in flight or when the user cannot be resolved.
  *
  * @group Preview components
  */
 export function UserPreview({ value }: PropertyPreviewProps<StringProperty>) {
-    if (typeof value !== "string" || !value) {
+    const uid = typeof value === "string" && value ? value : undefined;
+    const user = useResolvedUser(uid);
+
+    if (!uid) {
         return <EmptyValue/>;
     }
 
-    return <Typography variant={"caption"} color={"secondary"}>{value}</Typography>;
+    return <Typography variant={"caption"}
+        color={"secondary"}
+        className={"truncate"}>
+        {user ? getUserLabel(user) : uid}
+    </Typography>;
 }

package/src/preview/property_previews/ArrayOfReferencesPreview.tsx

@@ -30,7 +30,7 @@ export function ArrayOfReferencesPreview({
                         key={`preview_array_ref_${propertyKey}_${index}`}>
                         <ReferencePreview
                             disabled={!ofProperty.path}
-                            previewProperties={ofProperty.ui?.previewProperties}
+                            previewProperties={ofProperty.admin?.previewProperties}
                             size={childSize}
                             reference={reference}
                             includeId={ofProperty.includeId}

package/src/preview/property_previews/ArrayOfRelationsPreview.tsx

@@ -36,7 +36,7 @@ export function ArrayOfRelationsPreview({
                             key={`preview_array_rel_${propertyKey}_${index}`}>
                             <RelationPreview
                                 disabled={!ofProperty.relation}
-                                previewProperties={ofProperty.ui?.previewProperties}
+                                previewProperties={ofProperty.admin?.previewProperties}
                                 size={"small"}
                                 relation={entityRelation}
                                 includeId={ofProperty.includeId}

package/src/preview/property_previews/SkeletonPropertyComponent.tsx

@@ -26,7 +26,7 @@ export function SkeletonPropertyComponent({
     let content: React.ReactNode | any;
     if (property.type === "string") {
         const stringProperty = property as StringProperty;
-        if (stringProperty.ui?.url) {
+        if (stringProperty.admin?.urlPreview) {
             content = renderUrlComponent(stringProperty, size);
         } else if (stringProperty.storage) {
             content = renderSkeletonImageThumbnail(size);
@@ -240,7 +240,7 @@ function renderReference() {
 
 function renderUrlComponent(property: StringProperty, size: PreviewSize = "large") {
 
-    if (typeof property.ui?.url === "boolean") {
+    if (typeof property.admin?.urlPreview === "boolean") {
         return <div style={{
             display: "flex"
         }}>

package/src/preview/property_previews/StringPropertyPreview.tsx

@@ -2,7 +2,7 @@ import type { StringProperty } from "@rebasepro/types";
 import React from "react";
 
 import { EnumValuesChip } from "../components/EnumValuesChip";
-import { PreviewType } from "@rebasepro/types";
+import { PreviewType } from "@rebasepro/admin-types";
 import type { PropertyPreviewProps } from "../../types/components/PropertyPreviewProps";
 import { UrlComponentPreview } from "../components/UrlComponentPreview";
 import { ErrorBoundary } from "@rebasepro/ui";
@@ -15,7 +15,8 @@ export function StringPropertyPreview({
     propertyKey,
     value,
     property,
-    size
+    size,
+    textOnly
 }: PropertyPreviewProps<StringProperty>): React.ReactElement {
 
     const strValue = value as string;
@@ -26,7 +27,7 @@ export function StringPropertyPreview({
             enumKey={enumKey}
             enumValues={property.enum}
             size={size}/>;
-    } else if (property.ui?.previewAsTag) {
+    } else if (property.admin?.previewAsTag) {
         const colorScheme = getColorSchemeForSeed(propertyKey ?? "");
         return (
             <ErrorBoundary>
@@ -36,22 +37,27 @@ export function StringPropertyPreview({
                     {strValue}
                 </Chip>
             </ErrorBoundary>);
-    } else if (property.ui?.url) {
+    } else if (property.admin?.urlPreview) {
         return (
             <UrlComponentPreview size={size}
                 url={strValue}
-                previewType={typeof property.ui?.url === "string" ? property.ui?.url as PreviewType : undefined}/>
+                previewType={typeof property.admin?.urlPreview === "string" ? property.admin?.urlPreview as PreviewType : undefined}/>
         );
     } else {
         if (!strValue) return <></>;
-        const lines = strValue.split("\n");
-        return strValue && strValue.includes("\n")
-            ? <div className={cls("overflow-x-scroll overflow-hidden", size === "small" ? "text-sm" : "")}>
-                {lines.map((str: any, index: number) =>
-                    <React.Fragment key={`string_preview_${index}`}>
-                        <span>{str}</span>
-                        {index !== lines.length - 1 && <br/>}
-                    </React.Fragment>)}
+        // When used as a title/subtitle (textOnly), collapse newlines so the
+        // parent `truncate` can clamp it to a single line.
+        if (textOnly) {
+            const singleLine = strValue.replace(/\s*\n\s*/g, " ");
+            return size === "small"
+                ? <span className={"text-sm"}>{singleLine}</span>
+                : <>{singleLine}</>;
+        }
+        return strValue.includes("\n")
+            ? <div className={cls(
+                "whitespace-pre-line line-clamp-3 overflow-hidden",
+                size === "small" ? "text-sm" : "")}>
+                {strValue}
             </div>
             : (size === "small"
                 ? <span className={"text-sm"}>{strValue}</span>

package/src/preview/util.ts

@@ -1,4 +1,4 @@
-import { CollectionSize } from "@rebasepro/types";
+import { CollectionSize } from "@rebasepro/admin-types";
 import type { PreviewSize } from "../types/components/PropertyPreviewProps";
 export function sanitizeUrl(url: string | undefined): string {
     if (!url) return "about:blank";

package/src/routes/CustomViewRoute.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from "react";
-import type { AppView } from "@rebasepro/types";
+import type { AppView } from "@rebasepro/admin-types";
 import { useBreadcrumbsController } from "../hooks/useBreadcrumbsController";
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
 

package/src/routes/RebaseRoute.tsx

@@ -1,4 +1,5 @@
-import type { CollectionConfig, ViewMode } from "@rebasepro/types";
+
+import type { ViewMode, AdminCollection } from "@rebasepro/admin-types";
 import { useLocation } from "react-router-dom";
 import { EditViewBinding } from "../components/EditViewBinding";
 import { DetailViewBinding } from "../components/DetailViewBinding";
@@ -9,7 +10,8 @@ import { NotFoundPage, useUserConfigurationPersistence, useComponentOverride, us
 import { resolveOpenEntityMode, resolveViewMode } from "../util/view_mode";
 import { UnsavedChangesDialog } from "@rebasepro/app";
 import { CircularProgressCenter } from "@rebasepro/ui";
-import { getNavigationEntriesFromPath, NavigationViewCollectionInternal, NavigationViewEntityCustomInternal, NavigationViewInternal } from "@rebasepro/common";
+import { NavigationViewCollectionInternal, NavigationViewEntityCustomInternal, NavigationViewInternal } from "@rebasepro/app";
+import { getNavigationEntriesFromPath } from "@rebasepro/app";
 import { toArray } from "@rebasepro/utils";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
@@ -84,7 +86,7 @@ export function RebaseRoute() {
     }
 
     if (navigationEntries.length === 1 && navigationEntries[0].type === "collection") {
-        let collection: CollectionConfig<any> | undefined;
+        let collection: AdminCollection<any> | undefined;
         collection = collectionRegistry.getCollection(navigationEntries[0].id);
         if (!collection)
             collection = collectionRegistry.getCollection(navigationEntries[0].slug);
@@ -106,7 +108,7 @@ export function RebaseRoute() {
     if (isSidePanel) {
         const lastCollectionEntry = [...navigationEntries].reverse().find((entry) => entry.type === "collection");
         if (lastCollectionEntry) {
-            let collection: CollectionConfig<any> | undefined;
+            let collection: AdminCollection<any> | undefined;
             const firstEntry = navigationEntries[0] as NavigationViewCollectionInternal<any>;
             collection = collectionRegistry.getCollection(firstEntry.id);
             if (!collection)
@@ -142,7 +144,7 @@ export function RebaseRoute() {
         lastEntityEntry?.type === "entity" &&
         (navigationEntries.length === 2 || navigationEntries.length === 3)
     ) {
-        let collection: CollectionConfig<any> | undefined;
+        let collection: AdminCollection<any> | undefined;
         collection = collectionRegistry.getCollection(firstCollectionEntry.id);
         if (!collection)
             collection = collectionRegistry.getCollection(firstCollectionEntry.slug);

package/src/types/components/EntityFormActionsProps.tsx

@@ -1,11 +1,12 @@
 import { Entity } from "@rebasepro/types";
-import { CollectionConfig } from "@rebasepro/types";
+
 import { FormContext } from "../fields";
 import { FormexController } from "./formex";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export interface EntityFormActionsProps {
     path: string;
-    collection: CollectionConfig;
+    collection: AdminCollection;
     entity?: Entity;
     layout: "bottom" | "side" | "responsive";
     savingError?: Error;

package/src/types/components/EntityFormProps.tsx

@@ -1,5 +1,6 @@
 import { Entity, EntityStatus } from "@rebasepro/types";
-import { CollectionConfig, EntityCustomViewParams } from "@rebasepro/types";
+
+import { EntityCustomViewParams, AdminCollection } from "@rebasepro/admin-types";
 import { FormContext } from "../fields";
 import { FormexController } from "./formex";
 import { EntityFormActionsProps } from "./EntityFormActionsProps";
@@ -12,7 +13,7 @@ import { EntityFormActionsProps } from "./EntityFormActionsProps";
 export type EntityFormProps<M extends Record<string, unknown>> = {
     path: string;
     fullIdPath?: string;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     entityId?: string | number;
     entity?: Entity<M>;
     databaseId?: string;
@@ -120,5 +121,5 @@ export type OnUpdateParams = {
     path: string,
     entityId?: string | number;
     selectedTab?: string;
-    collection: CollectionConfig<Record<string, unknown>>
+    collection: AdminCollection<Record<string, unknown>>
 };

package/src/types/fields.tsx

@@ -1,8 +1,9 @@
 import { InferPropertyType } from "@rebasepro/types";
 import { Entity } from "@rebasepro/types";
 import { FormexController } from "./components/formex";
-import { CollectionConfig } from "@rebasepro/types";
+
 import { Property } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export type DefaultFieldConfig =
     | "text_field"
@@ -190,7 +191,7 @@ export interface FormContext<M extends Record<string, unknown> = Record<string,
     /**
      * Collection of the entity being modified
      */
-    collection?: CollectionConfig<M>;
+    collection?: AdminCollection<M>;
 
     /**
      * Entity id, it can be undefined if it's a new entity

package/src/util/dataControllerAdapter.ts

@@ -5,7 +5,8 @@
  */
 
 import { useMemo } from "react";
-import type { Entity, EntityTableController } from "@rebasepro/types";
+import type { Entity } from "@rebasepro/types";
+import type { EntityTableController } from "@rebasepro/admin-types";
 import type { CollectionDataController } from "@rebasepro/ui";
 
 /**

package/src/util/entity_actions.ts

@@ -1,4 +1,4 @@
-import type { EntityAction } from "@rebasepro/types";
+import type { EntityAction } from "@rebasepro/admin-types";
 
 const reservedKeys = ["edit", "copy", "delete"];
 

package/src/util/navigation_utils.ts

@@ -1,17 +1,9 @@
-import type { CollectionConfig, UrlController, SidePanelController, NavigateOptions } from "@rebasepro/types";
+
+import type { UrlController, SidePanelController, NavigateOptions, AdminCollection } from "@rebasepro/admin-types";
 import { withViewMode } from "./view_mode";
 
 // Canonical path utilities — single source of truth in @rebasepro/common
-export {
-    removeInitialAndTrailingSlashes,
-    removeInitialSlash,
-    removeTrailingSlash,
-    addInitialSlash,
-    getLastSegment,
-    resolveCollectionPathIds,
-    getCollectionBySlugWithin,
-    getCollectionPathsCombinations
-} from "@rebasepro/common";
+export { removeInitialAndTrailingSlashes, removeInitialSlash, removeTrailingSlash, addInitialSlash, getLastSegment, resolveCollectionPathIds, getCollectionBySlugWithin, getCollectionPathsCombinations } from "@rebasepro/app";
 
 /**
  * Navigate to a entity using either a side panel or full-screen mode.
@@ -33,7 +25,7 @@ export function navigateToEntity({
 
     {
         openEntityMode?: "side_panel" | "full_screen" | "split" | "dialog";
-        collection?: CollectionConfig;
+        collection?: AdminCollection;
         entityId?: string | number;
         selectedTab?: string;
         copy?: boolean;
@@ -55,7 +47,6 @@ export function navigateToEntity({
 
     if (openEntityMode === "side_panel" || openEntityMode === "dialog") {
 
-
         sidePanelController.open({
             entityId,
             path: path,

package/src/util/previews.ts

@@ -1,11 +1,13 @@
-import type { CollectionConfig, Property, PropertyConfig } from "@rebasepro/types";
-import { AuthController } from "@rebasepro/types";
+import type { Property } from "@rebasepro/types";
+import type { PropertyConfig, AdminCollection } from "@rebasepro/admin-types";
+import { AuthController } from "@rebasepro/admin-types";
 import { isPropertyBuilder } from "@rebasepro/common";
+import { getTitlePropertyKey, getTitlePropertyKeyForValues } from "@rebasepro/app";
 import { isReferenceProperty, isRelationProperty } from "./property_utils";
 
 function isHiddenProperty(property: Property | undefined): boolean {
     if (!property) return false;
-    return Boolean(property.ui?.hideFromCollection);
+    return Boolean(property.admin?.hideFromCollection);
 }
 
 /**
@@ -18,18 +20,18 @@ function isStorageProperty(property: Property | undefined): boolean {
     // Single string with storage config
     if (property.type === "string" && property.storage) return true;
     // String displayed as image URL
-    if (property.type === "string" && property.ui?.url === "image") return true;
+    if (property.type === "string" && property.admin?.urlPreview === "image") return true;
     // Array whose inner element has storage config or image URL
     if (property.type === "array" && property.of && !Array.isArray(property.of)) {
         const inner = property.of;
-        if (inner.type === "string" && (inner.storage || inner.ui?.url === "image")) return true;
+        if (inner.type === "string" && (inner.storage || inner.admin?.urlPreview === "image")) return true;
     }
     return false;
 }
 
 export function getEntityPreviewKeys(
     authController: AuthController,
-    targetCollection: CollectionConfig<any>,
+    targetCollection: AdminCollection<any>,
     fields: Record<string, PropertyConfig>,
     previewProperties?: string[],
     limit = 3) {
@@ -58,54 +60,43 @@ export function getEntityPreviewKeys(
     }
 }
 
-export function getEntityTitlePropertyKey<M extends Record<string, unknown>>(collection: CollectionConfig<M>, propertyConfigs: Record<string, PropertyConfig>): string | undefined {
-    if (collection.titleProperty) {
-        return collection.titleProperty as string;
-    }
-
-    const hasExplicitOrder = !!(collection.propertiesOrder as string[] | undefined);
-    const orderToSearch = (collection.propertiesOrder as string[]) || Object.keys(collection.properties);
-
-    // If explicit propertiesOrder is set, allow the first non-ID relation or string to be the titleKey.
-    // Storage/image properties are excluded — they are rendered by the dedicated image slot,
-    // so using one here would duplicate the same image in both the image and title slots.
-    if (hasExplicitOrder) {
-        for (const key of orderToSearch) {
-            const property = collection.properties[key];
-            if (property && !isPropertyBuilder(property)) {
-                const prop = property as Property;
-                const isIdProp = prop && typeof prop === "object" && "isId" in prop && Boolean((prop as { isId?: boolean }).isId);
-                if (isIdProp || key === "id" || isHiddenProperty(prop)) {
-                    continue;
-                }
-                if (prop.type === "relation" || (prop.type === "string" && !isStorageProperty(prop))) {
-                    return key;
-                }
-            }
-        }
-    }
+/**
+ * The property that fills the title slot for a collection.
+ *
+ * Ranking lives in `@rebasepro/common` so every surface (list rows, cards,
+ * board cards, detail header, relation chips) agrees on what an entity is
+ * called. Identifiers are excluded from the property *schema* — primary keys,
+ * foreign keys, UUID columns — not from the key name.
+ */
+export function getEntityTitlePropertyKey<M extends Record<string, unknown>>(collection: AdminCollection<M>, propertyConfigs: Record<string, PropertyConfig>): string | undefined {
+    return getTitlePropertyKey(collection);
+}
 
-    let firstStringCandidate: string | undefined;
+/**
+ * Same as {@link getEntityTitlePropertyKey}, but skips candidates that carry
+ * no readable value for this particular entity (empty, or an opaque id).
+ */
+export function getEntityTitlePropertyKeyForEntity<M extends Record<string, unknown>>(
+    collection: AdminCollection<M>,
+    values: Record<string, unknown> | undefined,
+    entityId?: string | number
+): string | undefined {
+    return getTitlePropertyKeyForValues(collection, values, entityId);
+}
 
-    for (const key of orderToSearch) {
-        const property = collection.properties[key];
-        if (property && !isPropertyBuilder(property)) {
-            const prop = property as Property;
-            if (isHiddenProperty(prop)) {
-                continue;
-            }
-            if (prop.type === "string" && !prop.ui?.multiline && !prop.ui?.markdown && !prop.storage && !prop.isId) {
-                if (!firstStringCandidate) {
-                    firstStringCandidate = key;
-                }
-                const lowerKey = key.toLowerCase();
-                if (["name", "title", "label", "displayname", "username"].includes(lowerKey)) {
-                    return key; // Immediate return if it's a strong title candidate
-                }
-            }
-        }
-    }
-    return firstStringCandidate;
+/**
+ * True when a property key points at a user picker, whose stored value is an
+ * auth user id that has to be resolved before it can be displayed.
+ */
+export function isUserSelectProperty<M extends Record<string, unknown>>(
+    collection: AdminCollection<M>,
+    propertyKey: string | undefined
+): boolean {
+    if (!propertyKey) return false;
+    const property = collection.properties[propertyKey];
+    if (!property || isPropertyBuilder(property)) return false;
+    const prop = property as Property;
+    return prop.type === "string" && Boolean(prop.userSelect);
 }
 
 /**
@@ -183,4 +174,3 @@ export function resolveTitleToString(title: any): string {
     }
 }
 
-

package/src/util/propertyConfigMapper.ts

@@ -35,8 +35,8 @@ export function mapPropertyToConfig(property: Property): CollectionPropertyConfi
         type: TYPE_MAP[property.type] ?? "string",
         name: property.name,
         description: property.description,
-        columnWidth: property.ui?.columnWidth,
-        hideFromCollection: property.ui?.hideFromCollection,
+        columnWidth: property.admin?.columnWidth,
+        hideFromCollection: property.admin?.hideFromCollection,
     };
 
     // String-specific
@@ -44,10 +44,10 @@ export function mapPropertyToConfig(property: Property): CollectionPropertyConfi
         if (property.enum) {
             base.enum = mapEnumValues(property.enum);
         }
-        if (property.ui?.multiline) base.multiline = true;
-        if (property.ui?.previewAsTag) base.previewAsTag = true;
-        if (property.ui?.url) base.url = property.ui.url;
-        if (property.ui?.markdown) base.markdown = true;
+        if (property.admin?.multiline) base.multiline = true;
+        if (property.admin?.previewAsTag) base.previewAsTag = true;
+        if (property.admin?.urlPreview) base.url = property.admin.urlPreview;
+        if (property.admin?.markdown) base.markdown = true;
         if (property.storage) base.storage = true;
         if (property.email) base.email = true;
     }
@@ -76,7 +76,7 @@ export function mapPropertyToConfig(property: Property): CollectionPropertyConfi
     }
 
     // Custom preview component
-    if (property.ui?.Preview) {
+    if (property.admin?.Preview) {
         // The connected wrapper will handle this by injecting via cellRenderer override
         // We don't copy it here because Preview may reference entity-aware components
     }

package/src/util/property_utils.tsx

@@ -1,6 +1,7 @@
 
 import type { Properties } from "@rebasepro/types";
-import type { CollectionConfig, MapProperty, Property, PropertyConfig } from "@rebasepro/types";
+import type { MapProperty, Property } from "@rebasepro/types";
+import type { PropertyConfig, AdminCollection } from "@rebasepro/admin-types";
 import React from "react";
 
 import { isPropertyBuilder } from "@rebasepro/common";
@@ -72,9 +73,9 @@ function getDefaultIconForProperty(property: Property): LucideIcon {
     switch (property.type) {
         case "string": {
             if (property.storage) return UploadIcon;
-            if (property.ui?.url) return GlobeIcon;
+            if (property.admin?.urlPreview) return GlobeIcon;
             if (property.email) return MailIcon;
-            if (property.ui?.multiline || property.ui?.markdown) return AlignLeftIcon;
+            if (property.admin?.multiline || property.admin?.markdown) return AlignLeftIcon;
             return TextIcon;
         }
         case "number":
@@ -224,7 +225,7 @@ export function getPropertiesWithPropertiesOrder(properties: Properties, propert
     return result;
 }
 
-export function getDefaultPropertiesOrder(collection: CollectionConfig): string[] {
+export function getDefaultPropertiesOrder(collection: AdminCollection): string[] {
     if (collection.propertiesOrder) return collection.propertiesOrder;
     return [...Object.keys(collection.properties), ...(collection.additionalFields ?? []).map(field => field.key)];
 }

package/src/util/resolutions.ts

@@ -1,6 +1,6 @@
 import { HistoryIcon } from "@rebasepro/ui";
 import React from "react";
-import type { CustomizationController, EntityAction, EntityCustomView } from "@rebasepro/types";
+import type { CustomizationController, EntityAction, EntityCustomView } from "@rebasepro/admin-types";
 
 /**
  * Built-in entity views that are resolved by token name.