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

package/src/components/ClearFilterSortButton.tsx

@@ -1,5 +1,5 @@
 import { Button, FilterXIcon, iconSize, Tooltip } from "@rebasepro/ui";
-import { EntityTableController } from "@rebasepro/types";
+import { EntityTableController } from "@rebasepro/admin-types";
 import { useTranslation } from "@rebasepro/app";
 
 export function ClearFilterSortButton({

package/src/components/CollectionPanel.tsx

@@ -1,4 +1,5 @@
-import type { CollectionConfig, ViewMode } from "@rebasepro/types";
+
+import type { ViewMode, AdminCollection } from "@rebasepro/admin-types";
 import React, { useMemo } from "react";
 import { CollectionViewBinding } from "./CollectionViewBinding/CollectionViewBinding";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
@@ -66,7 +67,7 @@ export type CollectionPanelProps = {
      * Any additional collection-level overrides (e.g. `previewProperties`,
      * `enabledViews`, `entityActions`, `defaultFilter`, etc.).
      */
-    collectionOverrides?: Partial<CollectionConfig>;
+    collectionOverrides?: Partial<AdminCollection>;
 };
 
 /**
@@ -101,7 +102,7 @@ function CollectionPanelInner({
     title,
     updateUrl,
     className
-}: CollectionPanelProps & { mergedCollection: CollectionConfig }) {
+}: CollectionPanelProps & { mergedCollection: AdminCollection }) {
     const ResolvedCollectionView = useComponentOverride("Collection.View", CollectionViewBinding);
 
     return (
@@ -150,7 +151,7 @@ export function CollectionPanel(props: CollectionPanelProps) {
             ...registeredCollection,
             ...(collectionOverrides ?? {}),
             ...propOverrides
-        } as CollectionConfig;
+        } as AdminCollection;
     }, [registeredCollection, collectionOverrides, viewMode, sort, limit, openEntityMode]);
 
     if (!mergedCollection) {

package/src/components/CollectionTableBinding/CollectionRowActions.tsx

@@ -1,8 +1,9 @@
-import type { CollectionConfig } from "@rebasepro/types";
-import type { EntityAction } from "@rebasepro/types";
+
+import type { EntityAction, AdminCollection } from "@rebasepro/admin-types";
 import React, { MouseEvent, useCallback } from "react";
 
-import { CollectionSize, Entity, SelectionController } from "@rebasepro/types";
+import { Entity } from "@rebasepro/types";
+import { CollectionSize, SelectionController } from "@rebasepro/admin-types";
 import {
     Badge,
     Checkbox,
@@ -16,7 +17,7 @@ import {
 } from "@rebasepro/ui";
 import { useTranslation } from "@rebasepro/app";
 import { getEntityFromCache } from "@rebasepro/app";
-import { getLocalChangesBackup } from "@rebasepro/common";
+import { getLocalChangesBackup } from "@rebasepro/app";
 import { useCMSContext } from "../../hooks/useCMSContext";
 
 /**
@@ -56,7 +57,7 @@ export const CollectionRowActions = function CollectionRowActions({
 }:
     {
         entity: Entity<any>,
-        collection?: CollectionConfig<any>,
+        collection?: AdminCollection<any>,
         path?: string,
         width: number,
         frozen?: boolean,
@@ -78,7 +79,6 @@ export const CollectionRowActions = function CollectionRowActions({
         isDraggable?: boolean;
     }) {
 
-
     const context = useCMSContext();
     const sidePanelCtrl = context.sidePanelController;
     const { t } = useTranslation();

package/src/components/CollectionTableBinding/CollectionTableBinding.tsx

@@ -1,6 +1,7 @@
-import type { AdditionalFieldDelegate } from "@rebasepro/types";
+import type { AdditionalFieldDelegate, AdminCollection } from "@rebasepro/admin-types";
 import React, { useCallback, useMemo, useRef } from "react";
-import { CollectionSize, Entity, RebaseContext, User, Property } from "@rebasepro/types";
+import { Entity, User, Property } from "@rebasepro/types";
+import { CollectionSize, RebaseContext } from "@rebasepro/admin-types";
 import { PropertyTableCell } from "./PropertyTableCell";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { useRebaseContext, useLargeLayout } from "@rebasepro/app";
@@ -29,7 +30,7 @@ import { getValueInPath } from "@rebasepro/utils";
  * 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}.
  *
@@ -145,7 +146,7 @@ export const CollectionTableBinding = function CollectionTableBinding<M extends
             propertyKey,
             entity
         }) ?? columnCustom?.resolvedProperty;
-        if (!property?.ui?.disabled) {
+        if (!property?.admin?.disabled) {
             disabled = false;
         }
 

package/src/components/CollectionTableBinding/CollectionTableBindingProps.tsx

@@ -1,8 +1,9 @@
 import type { Properties } from "@rebasepro/types";
-import type { AdditionalFieldDelegate } from "@rebasepro/types";
+import type { AdditionalFieldDelegate } from "@rebasepro/admin-types";
 import type { Property } from "@rebasepro/types";
 import React from "react";
-import { CollectionSize, Entity, EntityTableController, FilterValues, SelectionController, User } from "@rebasepro/types";
+import { Entity, FilterValues, User } from "@rebasepro/types";
+import { CollectionSize, EntityTableController, SelectionController } from "@rebasepro/admin-types";
 import { OnCellValueChange, OnColumnResizeParams, UniqueFieldValidator } from "@rebasepro/app";
 import { VirtualTableColumn } from "@rebasepro/ui";
 

package/src/components/CollectionTableBinding/PropertyTableCell.tsx

@@ -18,7 +18,7 @@ import { EntityTableCellActions } from "./internal/EntityTableCellActions";
 import { useSelectableTableController } from "../SelectableTable/SelectableTableContext";
 import { useClearRestoreValue } from "../../form/useClearRestoreValue";
 import { getRowHeight } from "@rebasepro/app";
-import { isReadOnly } from "@rebasepro/common";
+import { isReadOnly } from "@rebasepro/app";
 import { TableRelationField } from "./fields/TableRelationField";
 import { TableRelationSelectorField } from "./fields/TableRelationSelectorField";
 
@@ -91,11 +91,11 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any>>(
             setSavedTimestamp(Date.now());
         }, []);
 
-        const customField = Boolean(property.ui?.Field);
-        const customPreview = Boolean(property.ui?.Preview);
+        const customField = Boolean(property.admin?.Field);
+        const customPreview = Boolean(property.admin?.Preview);
         const readOnlyProperty = isReadOnly(property);
-        const disabledTooltip: string | undefined = typeof property.ui?.disabled === "object" ? property.ui?.disabled.disabledMessage : undefined;
-        const disabled = readonly || disabledProp || Boolean(property.ui?.disabled);
+        const disabledTooltip: string | undefined = typeof property.admin?.disabled === "object" ? property.admin?.disabled.disabledMessage : undefined;
+        const disabled = readonly || disabledProp || Boolean(property.admin?.disabled);
 
         const validation = useMemo(() => mapPropertyToZod({
             property,

package/src/components/CollectionTableBinding/fields/TableMultipleRelationField.tsx

@@ -1,5 +1,5 @@
 import { useSelectionDialog } from "../../../hooks/useSelectionDialog";
-import type { CollectionConfig } from "@rebasepro/types";
+
 import { getCollectionDataPath } from "@rebasepro/types";
 import React, { useCallback } from "react";
 import { deepEqual as equal } from "fast-equals";
@@ -8,7 +8,8 @@ import { cls, PencilIcon } from "@rebasepro/ui";
 import { getRelationFrom, normalizeToEntityRelation } from "@rebasepro/common";
 
 import { RelationPreview } from "../../../preview";
-import { CollectionSize, Entity, EntityRelation, FilterValues, Relation } from "@rebasepro/types";
+import { Entity, EntityRelation, FilterValues, Relation } from "@rebasepro/types";
+import { CollectionSize, AdminCollection } from "@rebasepro/admin-types";
 import { } from "@rebasepro/app";
 import { ErrorView } from "@rebasepro/app";
 import { EntityPreviewContainer } from "../../EntityPreviewBinding";
@@ -34,7 +35,7 @@ export function TableMultipleRelationField(props: TableMultipleRelationFieldProp
 
 export const TableMultipleRelationFieldInternal = React.memo(
     function TableMultipleRelationFieldInternal(props: TableMultipleRelationFieldProps & {
-        collection: CollectionConfig;
+        collection: AdminCollection;
     }) {
         const {
             name,

package/src/components/CollectionTableBinding/fields/TableReferenceField.tsx

@@ -1,10 +1,11 @@
 import { useSelectionDialog } from "../../../hooks/useSelectionDialog";
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useCallback } from "react";
 import { deepEqual as equal } from "fast-equals"
 
 import { ReferencePreview } from "../../../preview";
-import { CollectionSize, Entity, EntityReference, FilterValues } from "@rebasepro/types";
+import { Entity, EntityReference, FilterValues } from "@rebasepro/types";
+import { CollectionSize, AdminCollection } from "@rebasepro/admin-types";
 
 import { getPreviewSizeFrom } from "../../../preview/util";
 import { useComponentOverride, ErrorView, CollectionScopeProvider } from "@rebasepro/app";
@@ -30,7 +31,7 @@ type TableReferenceFieldProps = {
 
 const DefaultMissingReference: React.FC<{ path: string }> = () => null;
 
-function TableReferenceFieldResolver(props: TableReferenceFieldProps & { collection: CollectionConfig | undefined }) {
+function TableReferenceFieldResolver(props: TableReferenceFieldProps & { collection: AdminCollection | undefined }) {
     const ResolvedMissingReference = useComponentOverride("Entity.MissingReference", DefaultMissingReference);
     const { path, collection } = props;
 
@@ -68,7 +69,7 @@ export function TableReferenceField(props: TableReferenceFieldProps) {
 
 export const TableReferenceFieldInternal = React.memo(
     function TableReferenceFieldInternal(props: TableReferenceFieldProps & {
-        collection: CollectionConfig;
+        collection: AdminCollection;
     }) {
         const {
             name,

package/src/components/CollectionTableBinding/fields/TableRelationField.tsx

@@ -1,11 +1,12 @@
 import { useSelectionDialog } from "../../../hooks/useSelectionDialog";
-import type { CollectionConfig } from "@rebasepro/types";
+
 import { getCollectionDataPath } from "@rebasepro/types";
 import React, { useCallback } from "react";
 import { deepEqual as equal } from "fast-equals"
 
 import { RelationPreview } from "../../../preview";
-import { CollectionSize, Entity, EntityRelation, FilterValues, Relation } from "@rebasepro/types";
+import { Entity, EntityRelation, FilterValues, Relation } from "@rebasepro/types";
+import { CollectionSize, AdminCollection } from "@rebasepro/admin-types";
 
 import { getPreviewSizeFrom } from "../../../preview/util";
 import { } from "@rebasepro/app";
@@ -57,7 +58,7 @@ export function TableRelationField(props: TableRelationFieldProps) {
 
 export const TableRelationFieldInternal = React.memo(
     function TableRelationFieldInternal(props: TableRelationFieldProps & {
-        collection: CollectionConfig;
+        collection: AdminCollection;
     }) {
         const {
             name,

package/src/components/CollectionTableBinding/internal/common.tsx

@@ -1,5 +1,6 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import type { ArrayProperty, Property } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export function getTableCellAlignment(property: Property): "right" | "left" | "center" {
     if (property.type === "boolean") {
@@ -17,20 +18,20 @@ export function getTableCellAlignment(property: Property): "right" | "left" | "c
 
 export function getTablePropertyColumnWidth(property: Property): number {
 
-    if (property.ui?.columnWidth) {
-        return property.ui?.columnWidth;
+    if (property.admin?.columnWidth) {
+        return property.admin?.columnWidth;
     }
 
     if (property.type === "string") {
-        if (property.ui?.url) {
+        if (property.admin?.urlPreview) {
             return 280;
         } else if (property.storage) {
             return 160;
         } else if (property.enum) {
             return 200;
-        } else if (property.ui?.multiline) {
+        } else if (property.admin?.multiline) {
             return 300;
-        } else if (property.ui?.markdown) {
+        } else if (property.admin?.markdown) {
             return 300;
         } else if (property.email) {
             return 200;
@@ -68,6 +69,6 @@ export function getTablePropertyColumnWidth(property: Property): number {
     }
 }
 
-export function getSubcollectionColumnId(collection: CollectionConfig) {
+export function getSubcollectionColumnId(collection: AdminCollection) {
     return `subcollection:${collection.slug}`;
 }

package/src/components/CollectionTableBinding/internal/popup_field/PopupFormField.tsx

@@ -1,5 +1,5 @@
 import type { Properties } from "@rebasepro/types";
-import type { CollectionConfig } from "@rebasepro/types";
+
 import type { FormContext, PropertyFieldBindingProps } from "../../../../types/fields";
 import type { Property } from "@rebasepro/types";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useState } from "react";
@@ -16,7 +16,8 @@ import { getPropertyInPath } from "../../../../util/property_utils";
 import { PropertyFieldBinding, zodToFormErrors } from "../../../../form";
 import { useAuthController, useCustomizationController, useData, useRebaseContext } from "@rebasepro/app";
 import type { OnCellValueChangeParams } from "@rebasepro/app";
-import { isReadOnly } from "@rebasepro/common";
+import { isReadOnly } from "@rebasepro/app";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 interface PopupFormFieldProps<M extends Record<string, unknown>> {
     customFieldValidator?: CustomFieldValidator;
@@ -24,7 +25,7 @@ interface PopupFormFieldProps<M extends Record<string, unknown>> {
     entityId: string | number;
     tableKey: string;
     propertyKey?: Extract<keyof M, string>;
-    collection?: CollectionConfig<any>;
+    collection?: AdminCollection<any>;
     cellRect?: DOMRect;
     open: boolean;
     onClose: () => void;
@@ -290,7 +291,7 @@ export function PopupFormFieldInternal<M extends Record<string, unknown>>({
     const fieldProps: PropertyFieldBindingProps<M> | undefined = propertyKey && property
         ? {
             propertyKey: propertyKey as string,
-            disabled: isSubmitting || isReadOnly(property) || !!property.ui?.disabled,
+            disabled: isSubmitting || isReadOnly(property) || !!property.admin?.disabled,
             property,
             includeDescription: false,
             underlyingValueHasChanged: false,

package/src/components/CollectionTableBinding/table_bindings.tsx

@@ -44,7 +44,7 @@ export interface TableFieldConfig {
 }
 
 export function isStorageProperty(property: Property) {
-    if (property.type === "string" && property.ui?.markdown)
+    if (property.type === "string" && property.admin?.markdown)
         return false;
     if (property.type === "string" && (property as StringProperty).storage)
         return true;
@@ -159,8 +159,8 @@ export function getTableBindingForProperty(
                 ),
                 fullHeight: true
             };
-        } else if (stringProperty.ui?.markdown || !stringProperty.storage) {
-            const multiline = Boolean(stringProperty.ui?.multiline) || Boolean(stringProperty.ui?.markdown);
+        } else if (stringProperty.admin?.markdown || !stringProperty.storage) {
+            const multiline = Boolean(stringProperty.admin?.multiline) || Boolean(stringProperty.admin?.markdown);
             return {
                 Component: ({ error, validationError, disabled, selected, internalValue, updateValue }: TableFieldBindingProps) => (
                     <VirtualTableInput
@@ -221,7 +221,7 @@ export function getTableBindingForProperty(
                         size={size}
                         path={(property as ReferenceProperty).path!}
                         multiselect={false}
-                        previewProperties={(property as ReferenceProperty).ui?.previewProperties}
+                        previewProperties={(property as ReferenceProperty).admin?.previewProperties}
                         includeId={(property as ReferenceProperty).includeId}
                         includeEntityLink={(property as ReferenceProperty).includeEntityLink}
                         title={property.name ?? propertyKey}
@@ -234,7 +234,7 @@ export function getTableBindingForProperty(
         }
     } else if (property.type === "relation") {
         if ((property as RelationProperty).relation) {
-            if ((property as RelationProperty).ui?.widget === "dialog") {
+            if ((property as RelationProperty).admin?.widget === "dialog") {
                 return {
                     Component: RelationDialogBindingComponent,
                     allowScroll: false
@@ -288,7 +288,7 @@ export function getTableBindingForProperty(
                                 size={size}
                                 multiselect={true}
                                 path={refOfProp.path!}
-                                previewProperties={refOfProp.ui?.previewProperties}
+                                previewProperties={refOfProp.admin?.previewProperties}
                                 title={arrayProperty.name}
                                 fixedFilter={refOfProp.fixedFilter}
                                 includeId={refOfProp.includeId}
@@ -317,7 +317,7 @@ function RelationDialogBindingComponent({ propertyKey, internalValue, updateValu
             size={size}
             multiselect={false}
             relation={relProp.relation!}
-            previewProperties={relProp.ui?.previewProperties}
+            previewProperties={relProp.admin?.previewProperties}
             includeId={relProp.includeId}
             includeEntityLink={relProp.includeEntityLink}
             title={relProp.name ?? propertyKey}

package/src/components/CollectionViewBinding/BoardCardBinding.tsx

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { memo, useCallback, useMemo } from "react";
 import { Entity } from "@rebasepro/types";
 import { Checkbox, Chip, cls, defaultBorderMixin, Markdown } from "@rebasepro/ui";
@@ -7,9 +7,10 @@ import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { IconForView } from "@rebasepro/app";
 import { BoardItemViewProps } from "@rebasepro/ui";
 import { useCollectionSlotKeys, resolveEntitySlots } from "./usePreviewSlots";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export type BoardCardBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = BoardItemViewProps<Entity<M>> & {
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     onSelectionChange?: (entity: Entity<M>, selected: boolean) => void;
@@ -40,7 +41,7 @@ function BoardCardBindingInner<M extends Record<string, unknown> = Record<string
     const customizationController = useCustomizationController();
 
     const slotKeys = useCollectionSlotKeys(
-        collection as CollectionConfig<Record<string, unknown>>,
+        collection as AdminCollection<Record<string, unknown>>,
         authController,
         customizationController.propertyConfigs
     );
@@ -48,7 +49,7 @@ function BoardCardBindingInner<M extends Record<string, unknown> = Record<string
     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]
@@ -240,7 +241,7 @@ export const BoardCardBinding = memo(BoardCardBindingInner) as typeof BoardCardB
  * Wrapper component that adapts BoardCardBinding to BoardItemViewProps interface
  */
 export function createBoardCardBindingComponent<M extends Record<string, unknown>>(
-    collection: CollectionConfig<M>,
+    collection: AdminCollection<M>,
     options: {
         onClick?: (entity: Entity<M>) => void;
         isEntitySelected?: (entity: Entity<M>) => boolean;

package/src/components/CollectionViewBinding/CollectionBoardViewBinding.tsx

@@ -1,6 +1,7 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Entity, EntityTableController, EnumValueConfig, SelectionController } from "@rebasepro/types";
+import { Entity, EnumValueConfig } from "@rebasepro/types";
+import { EntityTableController, SelectionController, AdminCollection } from "@rebasepro/admin-types";
 import { BoardCardBinding } from "./BoardCardBinding";
 import {
     Button,
@@ -42,7 +43,7 @@ import { useSidePanel } from "../../hooks/useSidePanel";
 import { generateNKeysBetween } from "fractional-indexing";
 
 export type CollectionBoardViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     tableController: EntityTableController<M>;
     fullPath: string;
     parentCollectionSlugs?: string[], parentEntityIds?: string[];
@@ -467,7 +468,7 @@ parentEntityIds,
         const Comp = (props: BoardItemViewProps<Entity<M>>) => (
             <BoardCardBinding
                 {...props}
-                collection={collectionRef.current as CollectionConfig<M>}
+                collection={collectionRef.current as AdminCollection<M>}
                 onClick={stableOnClick}
                 selected={isEntitySelectedRef.current(props.item.data)}
                 onSelectionChange={stableOnSelectionChange}
@@ -486,7 +487,6 @@ parentEntityIds,
         parentEntityIds
     });
 
-
     // Get AddKanbanColumnComponent from plugin slots
     const addKanbanColumnSlots = useSlot("kanban.add-column", {
         collection,
@@ -496,7 +496,6 @@ parentEntityIds,
         columnProperty
     });
 
-
     // Check for loading error
     const hasError = Boolean(dataLoadingError);
     const errorMessage = dataLoadingError?.message || "";

package/src/components/CollectionViewBinding/CollectionCardViewBinding.tsx

@@ -1,6 +1,7 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useCallback, useEffect, useMemo, useRef } 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 { EntityCardBinding } from "./EntityCardBinding";
 import {
     cls,
@@ -11,7 +12,7 @@ import {
 import { useComponentOverride } from "@rebasepro/app";
 
 export type CollectionCardViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     tableController: EntityTableController<M>;
     onEntityClick?: (entity: Entity<M>) => void;
     selectionController?: SelectionController<M>;

package/src/components/CollectionViewBinding/CollectionListViewBinding.tsx

@@ -1,7 +1,8 @@
 
-import type { CollectionConfig, Property } from "@rebasepro/types";
+import type { Property } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { CollectionSize, Entity, EntityAction, EntityTableController, SelectionController } from "@rebasepro/types";
+import { Entity } from "@rebasepro/types";
+import { CollectionSize, EntityAction, EntityTableController, SelectionController, AdminCollection } from "@rebasepro/admin-types";
 import {
     Checkbox,
     Chip,
@@ -27,7 +28,7 @@ import { useCMSContext } from "../../hooks/useCMSContext";
 import { resolveEntityAction } from "../../util/resolutions";
 
 export type CollectionListViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     tableController: EntityTableController<M>;
     onEntityClick?: (entity: Entity<M>) => void;
     selectionController?: SelectionController<M>;
@@ -78,7 +79,6 @@ type ListColumnDef = {
     width: string;
 };
 
-
 /**
  * Get row padding/spacing classes based on size
  */
@@ -327,20 +327,18 @@ export function CollectionListViewBinding<M extends Record<string, unknown> = Re
 
     // ── Shared slot resolution (replaces 4 individual useMemo calls) ──
     const slotKeys = useCollectionSlotKeys(
-        resolvedCollection as CollectionConfig<Record<string, unknown>>,
+        resolvedCollection as AdminCollection<Record<string, unknown>>,
         authController,
         customizationController.propertyConfigs
     );
     const { titleKey: titlePropertyKey, imageKey: imagePropertyKey, subtitleKey, statusKey: statusPropertyKey, dateKey: datePropertyKey } = slotKeys;
 
-
     const previewKeys = useMemo(
         () => getEntityPreviewKeys(authController, resolvedCollection, customizationController.propertyConfigs, undefined, 10)
             .filter(key => key !== titlePropertyKey && key !== imagePropertyKey && key !== statusPropertyKey && key !== datePropertyKey),
         [authController, resolvedCollection, customizationController.propertyConfigs, titlePropertyKey, imagePropertyKey, statusPropertyKey, datePropertyKey]
     );
 
-
     const columns = useMemo(() => {
         const cols: ListColumnDef[] = [];
 
@@ -407,10 +405,10 @@ export function CollectionListViewBinding<M extends Record<string, unknown> = Re
             const prop = resolvedCollection.properties[k] as Property | undefined;
             if (!prop) return false;
             // Exclude storage/image properties — they are already rendered in the image slot
-            if (prop.type === "string" && (prop.storage || prop.ui?.url === "image")) return false;
+            if (prop.type === "string" && (prop.storage || prop.admin?.urlPreview === "image")) return false;
             if (prop.type === "array" && prop.of && !Array.isArray(prop.of)) {
                 const inner = prop.of;
-                if (inner.type === "string" && (inner.storage || inner.ui?.url === "image")) return false;
+                if (inner.type === "string" && (inner.storage || inner.admin?.urlPreview === "image")) return false;
             }
             return true;
         });
@@ -459,7 +457,6 @@ export function CollectionListViewBinding<M extends Record<string, unknown> = Re
 
     const showImage = size !== "xs";
 
-
     // Responsive: determine visible columns based on container width.
     // The first extra column requires significantly more available space (600px)
     // to ensure the title area has generous room before columns appear.
@@ -611,7 +608,7 @@ const ListRow = React.memo(function ListRow<M extends Record<string, unknown>>({
     openEntityMode
 }: {
     entity: Entity<M>;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     highlighted?: boolean;
@@ -633,7 +630,7 @@ const ListRow = React.memo(function ListRow<M extends Record<string, unknown>>({
     // ── Resolve slots (pure function, no hooks) ──
     const slots = resolveEntitySlots(
         entity as Entity<Record<string, unknown>>,
-        collection as CollectionConfig<Record<string, unknown>>,
+        collection as AdminCollection<Record<string, unknown>>,
         slotKeys
     );
 
@@ -877,7 +874,7 @@ const ListRow = React.memo(function ListRow<M extends Record<string, unknown>>({
     );
 }) as <M extends Record<string, unknown>>(props: {
     entity: Entity<M>;
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     highlighted?: boolean;

package/src/components/CollectionViewBinding/CollectionViewActions.tsx

@@ -1,9 +1,9 @@
 
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { lazy, Suspense } from "react";
 
 import { useLargeLayout, useTranslation, useSlot, resolveComponentRef } from "@rebasepro/app";
-import { CollectionActionsProps, EntityTableController, SelectionController } from "@rebasepro/types";
+import { CollectionActionsProps, EntityTableController, SelectionController, AdminCollection } from "@rebasepro/admin-types";
 import { Button, IconButton, Tooltip, Popover, iconSize } from "@rebasepro/ui";
 import { ErrorBoundary, MoreVerticalIcon, PlusIcon, Trash2Icon } from "@rebasepro/ui";
 import { usePermissions } from "@rebasepro/app";
@@ -16,7 +16,7 @@ import { useCollectionEditorController } from "../../collection_editor/useCollec
 import { useCMSContext } from "../../hooks/useCMSContext";
 
 export type CollectionViewActionsProps<M extends Record<string, unknown>> = {
-    collection: CollectionConfig<M>;
+    collection: AdminCollection<M>;
     path: string;
     relativePath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];