@rebasepro/admin 0.7.0 → 0.9.0

package/src/index.ts

@@ -2,33 +2,33 @@
 export * from "./types";
 // Editor types only — the full ProseMirror editor (RichTextEditor) is a heavy import (~300 KB)
 // and is available as a separate entry point: @rebasepro/admin/editor
-export type { RichTextEditorProps, RichTextEditorTextSize, RebaseEditorProps, RebaseEditorTextSize, JSONContent, EditorAIController } from "./editor";
+export type { RichTextEditorProps, RichTextEditorTextSize, JSONContent, EditorAIController } from "./editor";
 export * from "./form";
 export * from "./preview";
 export * from "./routes";
 
 // Components — explicitly listed to avoid conflicts with ./types re-exports
 export {
-    EntityView,
-    EntitySelectionTable,
+    EntityViewBinding,
+    SelectionTableBinding,
     SelectableTable,
     SelectableTableContext,
-    EntityCollectionView,
-    EntityCollectionViewActions,
-    EntityCollectionCardView,
-    EntityCard,
+    CollectionViewBinding,
+    CollectionViewActions,
+    CollectionCardViewBinding,
+    EntityCardBinding,
     useSelectionController,
     PropertyConfigBadge,
     PropertyIdCopyTooltip,
-    EntityCollectionTable,
-    EntityCollectionRowActions,
+    CollectionTableBinding,
+    CollectionRowActions,
     VirtualTableInput,
     ArrayContainer,
     type ArrayEntryParams,
     ReferenceWidget,
     SearchIconsView,
     FieldCaption,
-    EntityPreview,
+    EntityPreviewBinding,
     getFieldConfig,
     getFieldId,
     getDefaultFieldConfig,
@@ -38,7 +38,7 @@ export {
     copyEntityAction,
     deleteEntityAction,
     resetPasswordAction,
-    SideEntityProvider,
+    SidePanelProvider,
     Scaffold,
     AppBar,
     Drawer,
@@ -57,8 +57,8 @@ export {
     CollectionPanel
 } from "./components";
 export type {
-    EntityViewProps,
-    EntitySelectionProps,
+    EntityViewBindingProps,
+    SelectionProps,
     SelectableTableProps,
     CollectionPanelProps
 } from "./components";

package/src/preview/PropertyPreview.tsx

@@ -82,6 +82,7 @@ export const PropertyPreview = React.memo(function PropertyPreview<P extends Pro
                 content = <StorageThumbnail
                     interactive={interactive}
                     storeUrl={property.storage?.storeUrl ?? false}
+                    storageSourceKey={stringProperty.storage.storageSource}
                     size={props.size}
                     fill={fill}
                     storagePathOrDownloadUrl={filePath}/>;
@@ -107,22 +108,6 @@ export const PropertyPreview = React.memo(function PropertyPreview<P extends Pro
                     propertyKey={propertyKey}
                     size={props.size}
                 />;
-            } else if (stringProperty.reference) {
-                if (typeof stringProperty.reference.path === "string") {
-                    content = <ReferencePreview
-                        disabled={!stringProperty.reference.path}
-                        previewProperties={stringProperty.reference?.ui?.previewProperties}
-                        includeId={stringProperty.reference.includeId}
-                        includeEntityLink={stringProperty.reference.includeEntityLink}
-                        size={props.size}
-                        reference={new EntityReference({ id: value,
-path: stringProperty.reference.path })}
-                        textOnly={props.textOnly}
-                    />;
-                } else {
-                    content = <EmptyValue/>;
-                }
-
             } else {
                 content = <StringPropertyPreview {...props}
                     property={stringProperty}

package/src/preview/components/ReferencePreview.tsx

@@ -1,13 +1,13 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import * as React from "react";
 
 import { Entity, EntityReference } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
-import { useCustomizationController, useEntityFetch, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
+import { useCustomizationController, useFetch, useComponentOverride, CollectionScopeProvider } from "@rebasepro/core";
 import { Skeleton } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { ErrorView } from "@rebasepro/core";
-import { EntityPreview, EntityPreviewContainer } from "../../components/EntityPreview";
+import { EntityPreviewBinding, EntityPreviewContainer } from "../../components/EntityPreviewBinding";
 import { useCollectionRegistryController } from "../../index";
 import { getEntityTitlePropertyKey } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
@@ -59,7 +59,7 @@ function ReferencePreviewInternalInner({
     includeId = true,
     textOnly,
     collection
-}: ReferencePreviewProps & { collection?: EntityCollection }) {
+}: ReferencePreviewProps & { collection?: CollectionConfig }) {
     const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference);
 
     if (!collection) {
@@ -102,11 +102,11 @@ function ReferencePreviewInternal(props: ReferencePreviewProps) {
         />
     );
 
-    if (collection?.components) {
+    if (collection) {
         return (
-            <CollectionComponentOverrideProvider overrides={collection.components}>
+            <CollectionScopeProvider collection={collection}>
                 {content}
-            </CollectionComponentOverrideProvider>
+            </CollectionScopeProvider>
         );
     }
     return content;
@@ -124,17 +124,17 @@ function ReferencePreviewExisting<M extends Record<string, unknown> = Record<str
     hover,
     textOnly
 }: ReferencePreviewProps & {
-    collection: EntityCollection<M>
+    collection: CollectionConfig<M>
 }) {
 
-    const ResolvedEntityPreview = useComponentOverride("Entity.Preview", EntityPreview);
+    const ResolvedEntityPreview = useComponentOverride("EntityPreview", EntityPreviewBinding);
     const customizationController = useCustomizationController();
 
     const {
         entity,
         dataLoading,
         dataLoadingError
-    } = useEntityFetch({
+    } = useFetch({
         path: reference.path,
         entityId: reference.id,
         collection,

package/src/preview/components/RelationPreview.tsx

@@ -1,11 +1,11 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import * as React from "react";
 
 import { Entity, EntityRelation } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
-import { useCustomizationController, useEntityFetch, ErrorView, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
+import { useCustomizationController, useFetch, ErrorView, useComponentOverride, CollectionScopeProvider } from "@rebasepro/core";
 import { Skeleton } from "@rebasepro/ui";
-import { EntityPreview, EntityPreviewContainer } from "../../components";
+import { EntityPreviewBinding, EntityPreviewContainer } from "../../components";
 import { useCollectionRegistryController } from "../../index";
 import { getEntityTitlePropertyKey } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";
@@ -31,7 +31,7 @@ function extractDisplayFromPlainObject(obj: unknown): string {
     if (!obj || typeof obj !== "object") return "—";
     const record = obj as Record<string, unknown>;
 
-    // Try data.values.{name,title,...} (EntityRelation.data is an Entity with .values)
+    // Try data.values.{name,title,...} (EntityRelation.data is a Entity with .values)
     const data = record.data;
     if (data && typeof data === "object") {
         const dataRecord = data as Record<string, unknown>;
@@ -92,7 +92,7 @@ function RelationPreviewInternalInner({
     includeId = true,
     textOnly,
     collection
-}: RelationPreviewProps & { collection?: EntityCollection }) {
+}: RelationPreviewProps & { collection?: CollectionConfig }) {
     const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference);
 
     if (!collection) {
@@ -132,11 +132,11 @@ function RelationPreviewInternal(props: RelationPreviewProps) {
         />
     );
 
-    if (collection?.components) {
+    if (collection) {
         return (
-            <CollectionComponentOverrideProvider overrides={collection.components}>
+            <CollectionScopeProvider collection={collection}>
                 {content}
-            </CollectionComponentOverrideProvider>
+            </CollectionScopeProvider>
         );
     }
     return content;
@@ -154,18 +154,19 @@ function RelationPreviewExisting<M extends Record<string, unknown> = Record<stri
     hover,
     textOnly
 }: RelationPreviewProps & {
-    collection: EntityCollection<M>
+    collection: CollectionConfig<M>
 }) {
 
-    const passedEntity = relation.data;
-    const ResolvedEntityPreview = useComponentOverride("Entity.Preview", EntityPreview);
+    // CMS wire format embeds relation data as { id, path, values }
+    const passedEntity = relation.data as Entity<M> | undefined;
+    const ResolvedEntityPreview = useComponentOverride("EntityPreview", EntityPreviewBinding);
     const customizationController = useCustomizationController();
 
     const {
         entity,
         dataLoading,
         dataLoadingError
-    } = useEntityFetch({
+    } = useFetch({
         path: relation.path,
         entityId: passedEntity ? undefined : relation.id,
         collection,

package/src/preview/components/StorageThumbnail.tsx

@@ -2,7 +2,8 @@ import React, { useEffect } from "react";
 
 import { renderSkeletonImageThumbnail } from "../property_previews/SkeletonPropertyComponent";
 import { UrlComponentPreview } from "./UrlComponentPreview";
-import { ErrorView, useStorageSource } from "@rebasepro/core";
+import { ErrorView, useStorageSource, useStorageSources } from "@rebasepro/core";
+import { resolveStorageSource } from "@rebasepro/common";
 import { DownloadConfig, FileType } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { Skeleton } from "@rebasepro/ui";
@@ -12,6 +13,8 @@ type StorageThumbnailProps = {
     size: PreviewSize;
     interactive?: boolean;
     fill?: boolean;
+    /** Key of the storage source backing this property (`StorageConfig.storageSource`). */
+    storageSourceKey?: string;
 };
 
 /**
@@ -24,7 +27,8 @@ function areEqual(prevProps: StorageThumbnailProps, nextProps: StorageThumbnailP
         prevProps.storagePathOrDownloadUrl === nextProps.storagePathOrDownloadUrl &&
         prevProps.storeUrl === nextProps.storeUrl &&
         prevProps.interactive === nextProps.interactive &&
-        prevProps.fill === nextProps.fill;
+        prevProps.fill === nextProps.fill &&
+        prevProps.storageSourceKey === nextProps.storageSourceKey;
 }
 
 const URL_CACHE: Record<string, DownloadConfig> = {};
@@ -34,13 +38,26 @@ export function StorageThumbnailInternal({
     interactive,
     storagePathOrDownloadUrl,
     size,
-    fill
+    fill,
+    storageSourceKey
 }: StorageThumbnailProps) {
 
     const [error, setError] = React.useState<Error | undefined>(undefined);
-    const storage = useStorageSource();
+    const defaultStorage = useStorageSource();
+    const storageSources = useStorageSources();
+    // Resolve the per-property backend so previews of `storeUrl: false`
+    // properties pointing at a named source hit the right backend.
+    const storage = resolveStorageSource({
+        sourceKey: storageSourceKey,
+        sources: storageSources.sources,
+        defaultSource: defaultStorage
+    });
 
-    const [downloadConfig, setDownloadConfig] = React.useState<DownloadConfig>(URL_CACHE[storagePathOrDownloadUrl]);
+    // Cache key is namespaced by source so the same path on two backends
+    // does not collide.
+    const cacheKey = `${storageSourceKey ?? ""}::${storagePathOrDownloadUrl}`;
+
+    const [downloadConfig, setDownloadConfig] = React.useState<DownloadConfig>(URL_CACHE[cacheKey]);
 
     useEffect(() => {
         if (!storagePathOrDownloadUrl)
@@ -50,13 +67,13 @@ export function StorageThumbnailInternal({
             .then(function (downloadConfig) {
                 if (!unmounted) {
                     setDownloadConfig(downloadConfig);
-                    URL_CACHE[storagePathOrDownloadUrl] = downloadConfig;
+                    URL_CACHE[cacheKey] = downloadConfig;
                 }
             }).catch(setError);
         return () => {
             unmounted = true;
         };
-    }, [storagePathOrDownloadUrl]);
+    }, [storagePathOrDownloadUrl, cacheKey]);
 
     if (!storagePathOrDownloadUrl) return null;
 

package/src/routes/RebaseRoute.tsx

@@ -1,10 +1,10 @@
-import type { EntityCollection, ViewMode } from "@rebasepro/types";
+import type { CollectionConfig, ViewMode } from "@rebasepro/types";
 import { Blocker, useBlocker, useLocation } from "react-router-dom";
-import { EntityEditView } from "../components/EntityEditView";
-import { EntityDetailView } from "../components/EntityDetailView";
+import { EditViewBinding } from "../components/EditViewBinding";
+import { DetailViewBinding } from "../components/DetailViewBinding";
 import { useEffect, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { EntityCollectionView } from "../components";
+import { CollectionViewBinding } from "../components";
 import { NotFoundPage, useUserConfigurationPersistence, useComponentOverride } from "@rebasepro/core";
 import { UnsavedChangesDialog } from "@rebasepro/core";
 import { CircularProgressCenter } from "@rebasepro/ui";
@@ -20,7 +20,7 @@ export function RebaseRoute() {
     const urlController = useUrlController();
     const breadcrumbs = useBreadcrumbsController();
     const userConfigPersistence = useUserConfigurationPersistence();
-    const ResolvedCollectionView = useComponentOverride("Collection.View", EntityCollectionView);
+    const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
 
     const hash = location.hash;
     const isSidePanel = hash.includes("#side");
@@ -82,7 +82,7 @@ export function RebaseRoute() {
     }
 
     if (navigationEntries.length === 1 && navigationEntries[0].type === "collection") {
-        let collection: EntityCollection<any> | undefined;
+        let collection: CollectionConfig<any> | undefined;
         collection = collectionRegistry.getCollection(navigationEntries[0].id);
         if (!collection)
             collection = collectionRegistry.getCollection(navigationEntries[0].slug);
@@ -104,7 +104,7 @@ export function RebaseRoute() {
     if (isSidePanel) {
         const lastCollectionEntry = [...navigationEntries].reverse().find((entry) => entry.type === "collection");
         if (lastCollectionEntry) {
-            let collection: EntityCollection<any> | undefined;
+            let collection: CollectionConfig<any> | undefined;
             const firstEntry = navigationEntries[0] as NavigationViewCollectionInternal<any>;
             collection = collectionRegistry.getCollection(firstEntry.id);
             if (!collection)
@@ -140,7 +140,7 @@ export function RebaseRoute() {
         lastEntityEntry?.type === "entity" &&
         (navigationEntries.length === 2 || navigationEntries.length === 3)
     ) {
-        let collection: EntityCollection<any> | undefined;
+        let collection: CollectionConfig<any> | undefined;
         collection = collectionRegistry.getCollection(firstCollectionEntry.id);
         if (!collection)
             collection = collectionRegistry.getCollection(firstCollectionEntry.slug);
@@ -345,7 +345,7 @@ function EntityFullScreenRoute({
 
     if (isDetailMode) {
         return <>
-            <EntityDetailView
+            <DetailViewBinding
                 key={collection.slug + "_view_" + entityId}
                 entityId={entityId}
                 collection={collection}
@@ -372,7 +372,7 @@ function EntityFullScreenRoute({
     }
 
     return <>
-        <EntityEditView
+        <EditViewBinding
             key={collection.slug + "_" + (isNew ? "new" : (isCopy ? entityId + "_copy" : entityId))}
             entityId={isNew ? undefined : entityId}
             collection={collection}

package/src/types/components/EntityFormActionsProps.tsx

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

package/src/types/components/EntityFormProps.tsx

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

package/src/types/components/PropertyPreviewProps.tsx

@@ -15,7 +15,7 @@ export interface PropertyPreviewProps<P extends Property | Property, CustomProps
      */
     propertyKey?: string;
 
-    value: any;
+    value: InferPropertyType<P> | any;
 
     /**
      * Property this display is related to, now strongly typed to P

package/src/types/fields.tsx

@@ -1,7 +1,7 @@
 import { InferPropertyType } from "@rebasepro/types";
 import { Entity } from "@rebasepro/types";
 import { FormexController } from "./components/formex";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { Property } from "@rebasepro/types";
 
 export type DefaultFieldConfig =
@@ -19,7 +19,6 @@ export type DefaultFieldConfig =
     | "multi_number_select"
     | "file_upload"
     | "multi_file_upload"
-    | "reference_as_string"
     | "reference"
     | "multi_references"
     | "relation"
@@ -51,12 +50,8 @@ export interface FieldProps<
     /**
      * Current value of this field, inferred from the property type P
      */
-    value: any;
-
-    /**
-     * Set value of field directly
-     */
-    setValue: (value: any | null, shouldValidate?: boolean) => void;
+    value: InferPropertyType<P> | any;
+    setValue: (value: InferPropertyType<P> | null | any, shouldValidate?: boolean) => void;
 
     /**
      * Set value of a different field directly
@@ -195,7 +190,7 @@ export interface FormContext<M extends Record<string, unknown> = Record<string,
     /**
      * Collection of the entity being modified
      */
-    collection?: EntityCollection<M>;
+    collection?: CollectionConfig<M>;
 
     /**
      * Entity id, it can be undefined if it's a new entity

package/src/util/dataControllerAdapter.ts

@@ -9,25 +9,19 @@ import type { Entity, EntityTableController } from "@rebasepro/types";
 import type { CollectionDataController } from "@rebasepro/ui";
 
 /**
- * Flatten Entity<M> objects to plain row objects.
- * The headless view works with flat `Record<string, unknown>` rows,
- * while the entity system uses `{ id, path, values: M }`.
- *
- * The flattened row includes `id` and `path` at the top level,
- * plus all values spread.
+ * Unwrap `Entity<M>` objects to flat rows for the headless view.
+ * The entity system uses `{ id, path, values: M }`; `values` is already the
+ * flat row `M` carrying its real primary key, so unwrapping is just `.values` —
+ * no `id`/`path` merge (those are view-model metadata, not row columns).
  */
 function flattenEntities<M extends Record<string, unknown>>(
     entities: Entity<M>[]
-): Array<M & { id: string | number; path: string }> {
-    return entities.map(entity => ({
-        id: entity.id,
-        path: entity.path,
-        ...entity.values
-    }));
+): M[] {
+    return entities.map(entity => entity.values);
 }
 
 /**
- * React hook that adapts an EntityTableController to a CollectionDataController.
+ * React hook that adapts a EntityTableController to a CollectionDataController.
  *
  * Usage:
  * ```tsx
@@ -39,13 +33,13 @@ function flattenEntities<M extends Record<string, unknown>>(
  */
 export function useCollectionDataController<M extends Record<string, unknown>>(
     tableController: EntityTableController<M>
-): CollectionDataController<M & { id: string | number; path: string }> {
+): CollectionDataController<M> {
     const flatData = useMemo(
         () => flattenEntities(tableController.data),
         [tableController.data]
     );
 
-    return useMemo((): CollectionDataController<M & { id: string | number; path: string }> => ({
+    return useMemo((): CollectionDataController<M> => ({
         data: flatData,
         loading: tableController.dataLoading,
         noMoreToLoad: tableController.noMoreToLoad,

package/src/util/navigation_utils.ts

@@ -1,4 +1,4 @@
-import type { EntityCollection, UrlController, SideEntityController, NavigateOptions } from "@rebasepro/types";
+import type { CollectionConfig, UrlController, SidePanelController, NavigateOptions } from "@rebasepro/types";
 
 // Canonical path utilities — single source of truth in @rebasepro/common
 export {
@@ -13,7 +13,7 @@ export {
 } from "@rebasepro/common";
 
 /**
- * Navigate to an entity using either a side panel or full-screen mode.
+ * Navigate to a entity using either a side panel or full-screen mode.
  * This is an admin-specific UI concern and lives here (not in common).
  */
 export function navigateToEntity({
@@ -24,7 +24,7 @@ export function navigateToEntity({
     path,
     selectedTab,
     defaultValues,
-    sideEntityController,
+    sidePanelController,
     onClose,
     navigation,
     replace
@@ -32,7 +32,7 @@ export function navigateToEntity({
 
     {
         openEntityMode?: "side_panel" | "full_screen" | "split" | "dialog";
-        collection?: EntityCollection;
+        collection?: CollectionConfig;
         entityId?: string | number;
         selectedTab?: string;
         copy?: boolean;
@@ -40,13 +40,13 @@ export function navigateToEntity({
          * Pre-populate the new entity form with these values.
          * Only applied when entityId is not set (i.e. "new" mode).
          *
-         * Side panel: passed through EntitySidePanelProps → EntityEditView.
+         * Side panel: passed through SidePanelBindingProps → EditViewBinding.
          * Full screen: carried via React Router location.state so the route
          * component can read it on mount without polluting the URL.
          */
         defaultValues?: Record<string, unknown>;
         path: string;
-        sideEntityController: SideEntityController;
+        sidePanelController: SidePanelController;
         onClose?: () => void;
         navigation: UrlController;
         replace?: boolean;
@@ -55,7 +55,7 @@ export function navigateToEntity({
     if (openEntityMode === "side_panel" || openEntityMode === "dialog") {
 
 
-        sideEntityController.open({
+        sidePanelController.open({
             entityId,
             path: path,
             copy,

package/src/util/previews.ts

@@ -1,4 +1,4 @@
-import type { EntityCollection, Property, PropertyConfig } from "@rebasepro/types";
+import type { CollectionConfig, Property, PropertyConfig } from "@rebasepro/types";
 import { AuthController } from "@rebasepro/types";
 import { isPropertyBuilder } from "@rebasepro/common";
 import { isReferenceProperty, isRelationProperty } from "./property_utils";
@@ -8,9 +8,28 @@ function isHiddenProperty(property: Property | undefined): boolean {
     return Boolean(property.ui?.hideFromCollection);
 }
 
+/**
+ * Returns true when the property holds file-storage content (single image,
+ * array of images, generic upload, …).  These properties are rendered by the
+ * dedicated image-slot and should NOT appear as regular preview columns.
+ */
+function isStorageProperty(property: Property | undefined): boolean {
+    if (!property) return false;
+    // 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;
+    // 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;
+    }
+    return false;
+}
+
 export function getEntityPreviewKeys(
     authController: AuthController,
-    targetCollection: EntityCollection<any>,
+    targetCollection: CollectionConfig<any>,
     fields: Record<string, PropertyConfig>,
     previewProperties?: string[],
     limit = 3) {
@@ -33,12 +52,13 @@ export function getEntityPreviewKeys(
             .filter(key => {
                 const property = targetCollection.properties[key];
                 return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isHiddenProperty(property)
+                    && !isStorageProperty(property as Property)
                     && (hasExplicitOrder || !isRelationProperty(property));
             }).slice(0, limit);
     }
 }
 
-export function getEntityTitlePropertyKey<M extends Record<string, unknown>>(collection: EntityCollection<M>, propertyConfigs: Record<string, PropertyConfig>): string | undefined {
+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;
     }

package/src/util/propertyConfigMapper.ts

@@ -44,10 +44,10 @@ export function mapPropertyToConfig(property: Property): CollectionPropertyConfi
         if (property.enum) {
             base.enum = mapEnumValues(property.enum);
         }
-        if (property.multiline) base.multiline = true;
+        if (property.ui?.multiline) base.multiline = true;
         if (property.ui?.previewAsTag) base.previewAsTag = true;
-        if (property.url || property.ui?.url) base.url = property.url ?? property.ui?.url;
-        if (property.ui?.markdown || property.markdown) base.markdown = true;
+        if (property.ui?.url) base.url = property.ui.url;
+        if (property.ui?.markdown) base.markdown = true;
         if (property.storage) base.storage = true;
         if (property.email) base.email = true;
     }

package/src/util/property_utils.tsx

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