@rebasepro/admin 0.7.0 → 0.9.0

package/src/components/{EntityCollectionView/EntityBoardCard.tsx → CollectionViewBinding/BoardCardBinding.tsx}

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+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";
@@ -6,10 +6,10 @@ import { PropertyPreview } from "../../preview";
 import { useAuthController, useCustomizationController } from "@rebasepro/core";
 import { IconForView } from "@rebasepro/core";
 import { BoardItemViewProps } from "@rebasepro/ui";
-import { useCollectionSlotKeys, resolveEntitySlots } from "./useEntityPreviewSlots";
+import { useCollectionSlotKeys, resolveEntitySlots } from "./usePreviewSlots";
 
-export type EntityBoardCardProps<M extends Record<string, unknown> = Record<string, unknown>> = BoardItemViewProps<Entity<M>> & {
-    collection: EntityCollection<M>;
+export type BoardCardBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = BoardItemViewProps<Entity<M>> & {
+    collection: CollectionConfig<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     onSelectionChange?: (entity: Entity<M>, selected: boolean) => void;
@@ -17,14 +17,14 @@ export type EntityBoardCardProps<M extends Record<string, unknown> = Record<stri
 };
 
 /**
- * Compact card component for displaying an entity in a Kanban board.
+ * Compact card component for displaying a entity in a Kanban board.
  * Uses the shared slot system for consistent preview rendering.
  *
  * Selection UX: The checkbox overlays on top of the image/icon thumbnail area,
  * revealed on card hover or when the card is selected. This keeps the card
  * layout clean while providing intuitive selection affordance.
  */
-function EntityBoardCardInner<M extends Record<string, unknown> = Record<string, unknown>>({
+function BoardCardBindingInner<M extends Record<string, unknown> = Record<string, unknown>>({
     item,
     isDragging,
     isGroupedOver,
@@ -34,13 +34,13 @@ function EntityBoardCardInner<M extends Record<string, unknown> = Record<string,
     selected,
     onSelectionChange,
     selectionEnabled = false
-}: EntityBoardCardProps<M>) {
+}: BoardCardBindingProps<M>) {
     const entity = item.data;
     const authController = useAuthController();
     const customizationController = useCustomizationController();
 
     const slotKeys = useCollectionSlotKeys(
-        collection as EntityCollection<Record<string, unknown>>,
+        collection as CollectionConfig<Record<string, unknown>>,
         authController,
         customizationController.propertyConfigs
     );
@@ -48,7 +48,7 @@ function EntityBoardCardInner<M extends Record<string, unknown> = Record<string,
     const slots = useMemo(
         () => resolveEntitySlots(
             entity as Entity<Record<string, unknown>>,
-            collection as EntityCollection<Record<string, unknown>>,
+            collection as CollectionConfig<Record<string, unknown>>,
             slotKeys
         ),
         [entity, collection, slotKeys]
@@ -234,13 +234,13 @@ function EntityBoardCardInner<M extends Record<string, unknown> = Record<string,
 }
 
 // Memoized to prevent unnecessary re-renders when other cards in the board change
-export const EntityBoardCard = memo(EntityBoardCardInner) as typeof EntityBoardCardInner;
+export const BoardCardBinding = memo(BoardCardBindingInner) as typeof BoardCardBindingInner;
 
 /**
- * Wrapper component that adapts EntityBoardCard to BoardItemViewProps interface
+ * Wrapper component that adapts BoardCardBinding to BoardItemViewProps interface
  */
-export function createEntityBoardCardComponent<M extends Record<string, unknown>>(
-    collection: EntityCollection<M>,
+export function createBoardCardBindingComponent<M extends Record<string, unknown>>(
+    collection: CollectionConfig<M>,
     options: {
         onClick?: (entity: Entity<M>) => void;
         isEntitySelected?: (entity: Entity<M>) => boolean;
@@ -248,9 +248,9 @@ export function createEntityBoardCardComponent<M extends Record<string, unknown>
         selectionEnabled?: boolean;
     }
 ): React.ComponentType<BoardItemViewProps<Entity<M>>> {
-    return function EntityBoardCardWrapper(props: BoardItemViewProps<Entity<M>>) {
+    return function BoardCardBindingWrapper(props: BoardItemViewProps<Entity<M>>) {
         return (
-            <EntityBoardCard
+            <BoardCardBinding
                 {...props}
                 collection={collection}
                 onClick={options.onClick}

package/src/components/{EntityCollectionView/EntityCollectionBoardView.tsx → CollectionViewBinding/CollectionBoardViewBinding.tsx}

@@ -1,7 +1,7 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Entity, EntityTableController, EnumValueConfig, SaveEntityProps, SelectionController } from "@rebasepro/types";
-import { EntityBoardCard } from "./EntityBoardCard";
+import { Entity, EntityTableController, EnumValueConfig, SelectionController } from "@rebasepro/types";
+import { BoardCardBinding } from "./BoardCardBinding";
 import {
     Button,
     ChipColorKey,
@@ -26,6 +26,7 @@ import { resolveEnumValues } from "@rebasepro/common";
 import { getPropertyInPath } from "../../util/property_utils";
 import {
     saveEntityWithCallbacks,
+    SaveEntityWithCallbacksProps,
     useAuthController,
     useCustomizationController,
     useData,
@@ -37,11 +38,11 @@ import { useAnalyticsController } from "@rebasepro/core";
 import { setIn } from "@rebasepro/formex";
 import { useBoardDataController } from "./useBoardDataController";
 import { useKanbanDragAndDrop } from "./hooks/useKanbanDragAndDrop";
-import { useSideEntityController } from "../../index";
+import { useSidePanel } from "../../index";
 import { generateNKeysBetween } from "fractional-indexing";
 
-export type EntityCollectionBoardViewProps<M extends Record<string, unknown> = Record<string, unknown>> = {
-    collection: EntityCollection<M>;
+export type CollectionBoardViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
+    collection: CollectionConfig<M>;
     tableController: EntityTableController<M>;
     fullPath: string;
     parentCollectionSlugs?: string[], parentEntityIds?: string[];
@@ -58,7 +59,7 @@ export type EntityCollectionBoardViewProps<M extends Record<string, unknown> = R
 /**
  * Kanban board view for displaying entities grouped by a string enum property.
  */
-export function EntityCollectionBoardView<M extends Record<string, unknown> = Record<string, unknown>>({
+export function CollectionBoardViewBinding<M extends Record<string, unknown> = Record<string, unknown>>({
     collection,
     tableController,
     fullPath,
@@ -71,11 +72,11 @@ export function EntityCollectionBoardView<M extends Record<string, unknown> = Re
     highlightedEntities,
     emptyComponent,
     deletedEntities
-}: EntityCollectionBoardViewProps<M>) {
+}: CollectionBoardViewBindingProps<M>) {
     const customizationController = useCustomizationController();
     const context = useRebaseContext();
     const dataClient = useData();
-    const sideEntityController = useSideEntityController();
+    const sidePanelController = useSidePanel();
     const analyticsController = useAnalyticsController();
     const { t } = useTranslation();
     const plugins = customizationController.plugins ?? [];
@@ -281,7 +282,7 @@ parentEntityIds,
         }).catch(e => console.warn("Failed to get total count:", e));
 
         accessor.count({
-            where: { [orderProperty]: "neq.null" }
+            where: { [orderProperty]: ["!=", null] }
         }).then(count => {
             orderedCount = count;
             completed++;
@@ -391,7 +392,7 @@ parentEntityIds,
             entitiesToUpdate.forEach((entity: Entity<M>, index: number) => {
                 const updatedValues = setIn({ ...entity.values }, orderProperty, keys[index]);
 
-                const saveProps: SaveEntityProps = {
+                const saveProps: SaveEntityWithCallbacksProps<Record<string, unknown>> = {
                     path: entity.path,
                     entityId: entity.id,
                     values: updatedValues as M,
@@ -464,9 +465,9 @@ parentEntityIds,
     // the card → DOM is destroyed/recreated → CSS :hover state is lost → flicker.
     const ItemComponent = useMemo(() => {
         const Comp = (props: BoardItemViewProps<Entity<M>>) => (
-            <EntityBoardCard
+            <BoardCardBinding
                 {...props}
-                collection={collectionRef.current as EntityCollection<M>}
+                collection={collectionRef.current as CollectionConfig<M>}
                 onClick={stableOnClick}
                 selected={isEntitySelectedRef.current(props.item.data)}
                 onSelectionChange={stableOnSelectionChange}
@@ -610,7 +611,7 @@ parentEntityIds,
                             path: fullPath,
                             column
                         });
-                        sideEntityController.open({
+                        sidePanelController.open({
                             path: fullPath,
                             collection,
                             entityId: undefined,

package/src/components/{EntityCollectionView/EntityCollectionCardView.tsx → CollectionViewBinding/CollectionCardViewBinding.tsx}

@@ -1,7 +1,7 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { CollectionSize, Entity, EntityTableController, SelectionController } from "@rebasepro/types";
-import { EntityCard } from "./EntityCard";
+import { EntityCardBinding } from "./EntityCardBinding";
 import {
     cls,
     CircularProgress,
@@ -10,8 +10,8 @@ import {
 } from "@rebasepro/ui";
 import { useComponentOverride } from "@rebasepro/core";
 
-export type EntityCollectionCardViewProps<M extends Record<string, unknown> = Record<string, unknown>> = {
-    collection: EntityCollection<M>;
+export type CollectionCardViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
+    collection: CollectionConfig<M>;
     tableController: EntityTableController<M>;
     onEntityClick?: (entity: Entity<M>) => void;
     selectionController?: SelectionController<M>;
@@ -77,9 +77,9 @@ function getScrollParent(element: HTMLElement | null): HTMLElement | null {
 
 /**
  * Card grid view for displaying entities with infinite scroll.
- * Alternative to the EntityCollectionTable for visual browsing.
+ * Alternative to the CollectionTableBinding for visual browsing.
  */
-export function EntityCollectionCardView<M extends Record<string, unknown> = Record<string, unknown>>({
+export function CollectionCardViewBinding<M extends Record<string, unknown> = Record<string, unknown>>({
     collection,
     tableController,
     onEntityClick,
@@ -90,9 +90,9 @@ export function EntityCollectionCardView<M extends Record<string, unknown> = Rec
     onScroll,
     initialScroll,
     size = "m"
-}: EntityCollectionCardViewProps<M>) {
+}: CollectionCardViewBindingProps<M>) {
 
-    const ResolvedEntityCard = useComponentOverride("Collection.Card", EntityCard) as typeof EntityCard;
+    const ResolvedEntityCard = useComponentOverride("Collection.Card", EntityCardBinding) as typeof EntityCardBinding;
 
     const {
         data,

package/src/components/{EntityCollectionView/EntityCollectionListView.tsx → CollectionViewBinding/CollectionListViewBinding.tsx}

@@ -1,5 +1,5 @@
 
-import type { EntityCollection, Property } from "@rebasepro/types";
+import type { CollectionConfig, Property } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { CollectionSize, Entity, EntityAction, EntityTableController, SelectionController } from "@rebasepro/types";
 import {
@@ -22,12 +22,12 @@ import { useAnalyticsController } from "@rebasepro/core";
 import { getEntityPreviewKeys } from "../../util/previews";
 import { IconForView } from "@rebasepro/core";
 import { getValueInPath } from "@rebasepro/utils";
-import { useCollectionSlotKeys, resolveEntitySlots, type CollectionSlotKeys } from "./useEntityPreviewSlots";
+import { useCollectionSlotKeys, resolveEntitySlots, type CollectionSlotKeys } from "./usePreviewSlots";
 import { useCMSContext } from "../../hooks/useCMSContext";
 import { resolveEntityAction } from "../../util/resolutions";
 
-export type EntityCollectionListViewProps<M extends Record<string, unknown> = Record<string, unknown>> = {
-    collection: EntityCollection<M>;
+export type CollectionListViewBindingProps<M extends Record<string, unknown> = Record<string, unknown>> = {
+    collection: CollectionConfig<M>;
     tableController: EntityTableController<M>;
     onEntityClick?: (entity: Entity<M>) => void;
     selectionController?: SelectionController<M>;
@@ -215,7 +215,7 @@ function compactValueSummary(value: unknown, property: Property): string | null
         if (typeof value === "string" || typeof value === "number") return String(value);
         if (value && typeof value === "object") {
             const obj = value as Record<string, unknown>;
-            // EntityRelation.data is an Entity: { id, path, values: { name, ... } }
+            // EntityRelation.data is a Entity: { id, path, values: { name, ... } }
             if (obj.data && typeof obj.data === "object") {
                 const data = obj.data as Record<string, unknown>;
                 const values = (data.values && typeof data.values === "object")
@@ -271,7 +271,7 @@ year: diffDays > 365 ? "numeric" : undefined });
  * - Column-sortable headers
  * - Infinite scroll
  */
-export function EntityCollectionListView<M extends Record<string, unknown> = Record<string, unknown>>({
+export function CollectionListViewBinding<M extends Record<string, unknown> = Record<string, unknown>>({
     collection,
     tableController,
     onEntityClick,
@@ -285,7 +285,7 @@ export function EntityCollectionListView<M extends Record<string, unknown> = Rec
     getActionsForEntity,
     path,
     openEntityMode
-}: EntityCollectionListViewProps<M>) {
+}: CollectionListViewBindingProps<M>) {
     const authController = useAuthController();
     const customizationController = useCustomizationController();
     const analyticsController = useAnalyticsController();
@@ -327,7 +327,7 @@ export function EntityCollectionListView<M extends Record<string, unknown> = Rec
 
     // ── Shared slot resolution (replaces 4 individual useMemo calls) ──
     const slotKeys = useCollectionSlotKeys(
-        resolvedCollection as EntityCollection<Record<string, unknown>>,
+        resolvedCollection as CollectionConfig<Record<string, unknown>>,
         authController,
         customizationController.propertyConfigs
     );
@@ -402,7 +402,18 @@ export function EntityCollectionListView<M extends Record<string, unknown> = Rec
             "id"
         ]);
 
-        const availableExtraKeys = allKeys.filter(k => !usedKeys.has(k) && resolvedCollection.properties[k]);
+        const availableExtraKeys = allKeys.filter(k => {
+            if (usedKeys.has(k)) return false;
+            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 === "array" && prop.of && !Array.isArray(prop.of)) {
+                const inner = prop.of;
+                if (inner.type === "string" && (inner.storage || inner.ui?.url === "image")) return false;
+            }
+            return true;
+        });
 
         availableExtraKeys.forEach(key => {
             const prop = resolvedCollection.properties[key] as Property;
@@ -600,7 +611,7 @@ const ListRow = React.memo(function ListRow<M extends Record<string, unknown>>({
     openEntityMode
 }: {
     entity: Entity<M>;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     highlighted?: boolean;
@@ -622,7 +633,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 EntityCollection<Record<string, unknown>>,
+        collection as CollectionConfig<Record<string, unknown>>,
         slotKeys
     );
 
@@ -851,7 +862,7 @@ const ListRow = React.memo(function ListRow<M extends Record<string, unknown>>({
                                         path,
                                         collection,
                                         context: context!,
-                                        sideEntityController: context?.sideEntityController,
+                                        sidePanelController: context?.sidePanelController,
                                         selectionController,
                                         openEntityMode: openEntityMode ?? collection?.openEntityMode ?? "full_screen"
                                     });
@@ -866,7 +877,7 @@ const ListRow = React.memo(function ListRow<M extends Record<string, unknown>>({
     );
 }) as <M extends Record<string, unknown>>(props: {
     entity: Entity<M>;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     onClick?: (entity: Entity<M>) => void;
     selected?: boolean;
     highlighted?: boolean;

package/src/components/{EntityCollectionView/EntityCollectionViewActions.tsx → CollectionViewBinding/CollectionViewActions.tsx}

@@ -1,5 +1,5 @@
 
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { lazy, Suspense } from "react";
 
 import { useLargeLayout, useTranslation, useSlot, resolveComponentRef } from "@rebasepro/core";
@@ -15,8 +15,8 @@ import { EditorCollectionAction } from "../../collection_editor/ui/EditorCollect
 import { useCollectionEditorController } from "../../collection_editor/useCollectionEditorController";
 import { useCMSContext } from "../../index";
 
-export type EntityCollectionViewActionsProps<M extends Record<string, unknown>> = {
-    collection: EntityCollection<M>;
+export type CollectionViewActionsProps<M extends Record<string, unknown>> = {
+    collection: CollectionConfig<M>;
     path: string;
     relativePath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];
@@ -31,7 +31,7 @@ export type EntityCollectionViewActionsProps<M extends Record<string, unknown>>
     openNewDocument: (defaultValues?: Record<string, unknown>) => void;
 }
 
-export function EntityCollectionViewActions<M extends Record<string, unknown>>({
+export function CollectionViewActions<M extends Record<string, unknown>>({
     collection,
     relativePath,
     parentCollectionSlugs, parentEntityIds,
@@ -45,7 +45,7 @@ export function EntityCollectionViewActions<M extends Record<string, unknown>>({
     compact,
     children,
     openNewDocument
-}: EntityCollectionViewActionsProps<M>) {
+}: CollectionViewActionsProps<M>) {
     const context = useCMSContext();
 
     const { canCreate, canDelete } = usePermissions();