@rebasepro/admin 0.7.0 → 0.8.0

package/src/components/EntityEditView.tsx

@@ -2,7 +2,7 @@ import type { ComponentRef, EntityCollection, EntityCustomViewParams, FormViewCo
 import type { FormContext } from "../types/fields";
 import type { PluginFormActionProps } from "@rebasepro/types";
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Entity, EntityStatus } from "@rebasepro/types";
+import { Entity, EntityStatus, getCollectionDataPath } from "@rebasepro/types";
 import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
 
 import { EntityCollectionView, EntityView } from "../components";
@@ -416,7 +416,7 @@ parentEntityIds,
 
     const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
         const subcollectionId = subcollection.slug;
-        const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.slug)}` : undefined;
+        const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(getCollectionDataPath(subcollection))}` : undefined;
 
         if (activeTab !== subcollectionId) return null;
         return (

package/src/components/EntityEditViewFormActions.tsx

@@ -3,7 +3,7 @@ import type { EntityCollection } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
 import type { EntityAction, EntityActionClickProps, SideEntityController } from "@rebasepro/types";
 import React, { useMemo } from "react";
-import { Entity, RebaseContext } from "@rebasepro/types";
+import { Entity, getCollectionDataPath, RebaseContext } from "@rebasepro/types";
 import type { EntityFormActionsProps } from "../types/components/EntityFormActionsProps";
 import { copyEntityAction, deleteEntityAction } from "../components";
 import { mergeEntityActions } from "../util/entity_actions";
@@ -168,7 +168,7 @@ function buildBottomActions<M extends Record<string, unknown>>({
                 const props = {
                     view: "form",
                     entity,
-                    path: collection.slug,
+                    path: getCollectionDataPath(collection),
                     collection: collection,
                     context,
                     sideEntityController,
@@ -292,7 +292,7 @@ function buildSideActions<M extends Record<string, unknown>>({
                 const props = {
                     view: "form",
                     entity,
-                    path: collection.slug,
+                    path: getCollectionDataPath(collection),
                     collection: collection,
                     context,
                     sideEntityController,

package/src/components/HomePage/ContentHomePage.tsx

@@ -76,7 +76,7 @@ export function ContentHomePage({
     // Content mode shows collections, CMS custom views, and admin entries — but not Studio dev views.
     const rawNavigationEntries = useMemo(() => {
         if (adminModeController.mode === "studio") {
-            return unFilteredNavigationEntries.filter(e => e.type === "view" || e.type === "admin");
+            return unFilteredNavigationEntries.filter(e => (e.type === "view" && studioViewSlugs.has(e.slug)) || e.type === "admin");
         }
         return unFilteredNavigationEntries.filter(e => e.type !== "view" || !studioViewSlugs.has(e.slug));
     }, [unFilteredNavigationEntries, adminModeController.mode, studioViewSlugs]);

package/src/components/RebaseCMS.tsx

@@ -10,7 +10,7 @@ import type { RebaseCMSConfig } from "@rebasepro/types";
  * is auto-wired as a native feature (slots, provider, Studio view) without
  * needing any external plugin.
  */
-export function RebaseCMS({ collections, views, homePage, entityViews, entityActions, plugins, collectionEditor, navigationGroupMappings }: RebaseCMSConfig) {
+export function RebaseCMS({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings }: RebaseCMSConfig) {
     const dispatch = useRebaseRegistryDispatch();
 
     useLayoutEffect(() => {
@@ -19,11 +19,10 @@ views,
 homePage,
 entityViews,
 entityActions,
-plugins,
 collectionEditor,
 navigationGroupMappings });
         return () => dispatch.unregisterCMS();
-    }, [dispatch, collections, views, homePage, entityViews, entityActions, plugins, collectionEditor, navigationGroupMappings]);
+    }, [dispatch, collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings]);
 
     return null;
 }

package/src/components/RebaseNavigation.tsx

@@ -195,8 +195,10 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
         return [...cmsViews, ...devViews];
     }, [cmsViews, devViews]);
 
+    const parentCustomizationController = useCustomizationController();
+
     const navigationStateController = useBuildNavigationStateController({
-        plugins: registry.cmsConfig?.plugins ?? EMPTY_PLUGINS,
+        plugins: parentCustomizationController.plugins ?? EMPTY_PLUGINS,
         collections: collectionsBuilder,
         views: mergedViews,
         navigationGroupMappings: registry.cmsConfig?.navigationGroupMappings,
@@ -213,7 +215,6 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
     // automatically merged. We re-provide an enriched controller here so that
     // downstream consumers (EntityEditView, side panels, etc.) can resolve
     // string-keyed entity views like "blog_preview".
-    const parentCustomizationController = useCustomizationController();
     const enrichedCustomizationController = useMemo(() => {
         const cmsEntityViews = (registry.cmsConfig?.entityViews ?? []) as EntityCustomView[];
         const cmsEntityActions = (registry.cmsConfig?.entityActions ?? []) as EntityAction[];

package/src/components/RelationSelector.tsx

@@ -24,7 +24,7 @@ import {
 import * as React from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Command as CommandPrimitive } from "cmdk";
-import { Entity, EntityRelation, FilterValues, Relation } from "@rebasepro/types";
+import { Entity, EntityRelation, FilterValues, Relation, getCollectionDataPath } from "@rebasepro/types";
 import { EntityPreviewData } from "./EntityPreview";
 import { useData, useRelationSelector } from "@rebasepro/core";
 import { useSideEntityController } from "../hooks/useSideEntityController";
@@ -115,7 +115,7 @@ export const RelationSelector = React.forwardRef<
             loadMore,
             entityToRelationItem
         } = useRelationSelector({
-            path: collection.slug,
+            path: getCollectionDataPath(collection),
             collection,
             fixedFilter,
             pageSize

package/src/components/SelectableTable/SelectableTable.tsx

@@ -1,4 +1,4 @@
-import { createSelectionStore } from "./SelectionStore";
+import { createSelectionStore, AdminSelectedCell } from "./SelectionStore";
 import type { Property } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { CollectionSize, Entity, EntityRelation, EntityTableController, FilterValues, SelectedCellProps } from "@rebasepro/types";
@@ -192,7 +192,15 @@ export const SelectableTable = function SelectableTable<M extends Record<string,
 
     const select = useCallback((cell?: SelectedCellProps<M>) => {
         setLocalSelectedCell(cell);
-        selectionStore.select(cell);
+        if (cell) {
+            selectionStore.select({
+                ...cell,
+                columnKey: cell.propertyKey,
+                rowId: cell.entityId
+            } as AdminSelectedCell);
+        } else {
+            selectionStore.select(undefined);
+        }
     }, [selectionStore]);
 
     const unselect = useCallback(() => {
@@ -255,7 +263,7 @@ export const SelectableTable = function SelectableTable<M extends Record<string,
                     onColumnResize={onColumnResize}
                     rowHeight={getRowHeight(size)}
                     loading={dataLoading}
-                    filter={filterValues}
+                    filter={filterValues as any}
                     onFilterUpdate={setFilterValues ? onFilterUpdate : undefined}
                     sortBy={sortBy}
                     onSortByUpdate={setSortBy as ((sortBy?: [string, "asc" | "desc"]) => void)}

package/src/components/SelectableTable/SelectionStore.ts

@@ -1,64 +1,34 @@
 import { useSyncExternalStore, useCallback, useRef } from "react";
 import { SelectedCellProps } from "@rebasepro/types";
+import {
+    createVirtualTableSelectionStore,
+    VirtualTableSelectionStore,
+    SelectedCell
+} from "@rebasepro/ui";
+
+export interface AdminSelectedCell extends SelectedCell {
+    entityPath: string;
+    entityId: string | number;
+    propertyKey: string;
+    cellRect: DOMRect;
+    width: number;
+    height: number;
+}
 
-/**
- * A ref-based selection store that avoids React context re-renders.
- *
- * The problem with putting `selectedCell` in a React context value is that
- * ANY cell selection change triggers a context value change, which forces
- * ALL consumers (every PropertyTableCell in the table) to re-render.
- * This causes the DOM to be replaced between mousedown and click events,
- * breaking `alwaysInteractive` cells (like relation selectors) where the
- * user needs to click a button on the very first interaction.
- *
- * This store uses `useSyncExternalStore` so only cells whose `selected`
- * derivation actually changed will re-render.
- */
 export function createSelectionStore() {
-    let selectedCell: SelectedCellProps | undefined = undefined;
-    const listeners = new Set<() => void>();
-
-    function getSnapshot(): SelectedCellProps | undefined {
-        return selectedCell;
-    }
-
-    function subscribe(listener: () => void): () => void {
-        listeners.add(listener);
-        return () => listeners.delete(listener);
-    }
-
-    function select(cell: SelectedCellProps | undefined) {
-        selectedCell = cell;
-        listeners.forEach(l => l());
-    }
-
-    return { getSnapshot,
-subscribe,
-select };
+    return createVirtualTableSelectionStore<AdminSelectedCell>();
 }
 
-export type SelectionStore = ReturnType<typeof createSelectionStore>;
+export type SelectionStore = VirtualTableSelectionStore<AdminSelectedCell>;
 
-/**
- * Hook that subscribes a cell to the selection store and returns
- * whether THIS cell is selected. Only re-renders when the cell's
- * `selected` boolean actually changes (not on every store update).
- */
 export function useCellSelected(
     store: { getSnapshot: () => SelectedCellProps | undefined; subscribe: (listener: () => void) => () => void },
     propertyKey: string,
     entityPath: string,
     entityId: string | number
 ): boolean {
-    // Memoize a selector that derives a boolean from the store snapshot.
-    // useSyncExternalStore calls this on every store notification, but
-    // React only re-renders when the returned value !== the previous one.
-    const selectorRef = useRef({ propertyKey,
-entityPath,
-entityId });
-    selectorRef.current = { propertyKey,
-entityPath,
-entityId };
+    const selectorRef = useRef({ propertyKey, entityPath, entityId });
+    selectorRef.current = { propertyKey, entityPath, entityId };
 
     const getSnapshot = useCallback(() => {
         const cell = store.getSnapshot();

package/src/components/common/default_entity_actions.tsx

@@ -1,6 +1,12 @@
 import { CopyIcon, iconSize, KeyRoundIcon, PencilIcon, Trash2Icon } from "@rebasepro/ui";
 import type { EntityAction, User, UserCreationResult } from "@rebasepro/types";
-import { ConfirmationDialog, useSnackbarController, useTranslation, useRebaseClient, useAuthController } from "@rebasepro/core";
+import {
+    ConfirmationDialog,
+    useAuthController,
+    useRebaseClient,
+    useSnackbarController,
+    useTranslation
+} from "@rebasepro/core";
 import { DeleteEntityDialog } from "../DeleteEntityDialog";
 import { addRecentId } from "../EntityCollectionView/utils";
 import { navigateToEntity } from "../../util/navigation_utils";
@@ -8,7 +14,6 @@ import { resolveDefaultSelectedView } from "@rebasepro/common";
 import { CreationResultDialog } from "../admin/CreationResultDialog";
 import React, { useState } from "react";
 
-
 export const editEntityAction: EntityAction = {
     icon: <PencilIcon size={iconSize.smallest}/>,
     key: "edit",
@@ -55,6 +60,9 @@ export const editEntityAction: EntityAction = {
                     entityId: entity.id
                 }
             );
+        if (!context?.urlController) {
+            throw new Error("INTERNAL: editEntityAction: urlController is undefined");
+        }
         navigateToEntity({
             openEntityMode,
             collection,
@@ -62,7 +70,7 @@ export const editEntityAction: EntityAction = {
             path: newFullIdPath,
             sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
-            navigation: context?.urlController!,
+            navigation: context.urlController,
             selectedTab: defaultSelectedView
         });
 
@@ -98,6 +106,9 @@ export const copyEntityAction: EntityAction = {
         });
 
         const usedPath = path ?? collection?.slug ?? entity.path;
+        if (!context?.urlController) {
+            throw new Error("INTERNAL: copyEntityAction: urlController is undefined");
+        }
         navigateToEntity({
             openEntityMode,
             collection,
@@ -106,7 +117,7 @@ export const copyEntityAction: EntityAction = {
             copy: true,
             sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
-            navigation: context?.urlController!
+            navigation: context.urlController
         });
 
         return Promise.resolve(undefined);

package/src/components/field_configs.tsx

@@ -9,7 +9,6 @@ import { KeyValueFieldBinding } from "../form/field_bindings/KeyValueFieldBindin
 import { MapFieldBinding } from "../form/field_bindings/MapFieldBinding";
 import { MarkdownEditorFieldBinding } from "../form/field_bindings/MarkdownEditorFieldBinding";
 import { MultiSelectFieldBinding } from "../form/field_bindings/MultiSelectFieldBinding";
-import { ReferenceAsStringFieldBinding } from "../form/field_bindings/ReferenceAsStringFieldBinding";
 import { ReferenceFieldBinding } from "../form/field_bindings/ReferenceFieldBinding";
 import { RepeatFieldBinding } from "../form/field_bindings/RepeatFieldBinding";
 import { SelectFieldBinding } from "../form/field_bindings/SelectFieldBinding";
@@ -220,17 +219,6 @@ Field: TextFieldBinding }
             ui: { Field: StorageUploadFieldBinding }
         }
     },
-    reference_as_string: {
-        key: "reference_as_string",
-        name: "Reference (as string)",
-        description: "The value refers to a different collection (it is saved as a string)",
-        Icon: LinkIcon,
-        color: "#154fb3",
-        property: {
-            type: "string",
-            ui: { Field: ReferenceAsStringFieldBinding }
-        }
-    },
     reference: {
         key: "reference",
         name: "Reference",
@@ -393,8 +381,6 @@ export function getDefaultFieldId(property: Property) {
             return "select";
         } else if (property.userSelect) {
             return "user_select";
-        } else if ((property as StringProperty).reference) {
-            return "reference_as_string";
         } else {
             return "text_field";
         }

package/src/editor/editor.tsx

@@ -1,7 +1,7 @@
 "use client";
 import React, { useEffect, useState, useRef, useMemo } from "react";
 import { EditorState, Selection } from "prosemirror-state";
-import { cls, defaultBorderMixin, Separator, useInjectStyles, TextareaAutosize } from "@rebasepro/ui";
+import { cls, defaultBorderMixin, Separator, TextareaAutosize, useInjectStyles } from "@rebasepro/ui";
 import { useTranslation } from "@rebasepro/core";
 import { EditorBubble, ImageBubble, SlashCommandMenu, TableBubble, type JSONContent } from "./components";
 import { NodeSelector } from "./selectors/node-selector";
@@ -26,8 +26,7 @@ export interface MarkdownEditorConfig {
 }
 
 export type RichTextEditorTextSize = "sm" | "base" | "lg";
-/** @deprecated Use `RichTextEditorTextSize` instead. */
-export type RebaseEditorTextSize = RichTextEditorTextSize;
+
 
 export type RichTextEditorProps = {
   content?: JSONContent | string,
@@ -43,8 +42,7 @@ export type RichTextEditorProps = {
   disabled?: boolean;
   markdownConfig?: MarkdownEditorConfig;
 };
-/** @deprecated Use `RichTextEditorProps` instead. */
-export type RebaseEditorProps = RichTextEditorProps;
+
 
 const proseClasses = {
   "sm": "prose-sm",
@@ -324,8 +322,7 @@ view }), [state, view])}>
     </div>
   );
 };
-/** @deprecated Use `RichTextEditor` instead. */
-export const RebaseEditor = RichTextEditor;
+
 
 const cssStyles = `
 .ProseMirror {

package/src/form/EntityFormActions.tsx

@@ -1,5 +1,5 @@
 
-import type { EntityCollection } from "@rebasepro/types";
+import { type EntityCollection, getCollectionDataPath } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
 import type { EntityAction } from "@rebasepro/types";
 import React from "react";
@@ -127,7 +127,7 @@ function buildBottomActions<M extends Record<string, unknown>>({
                             action.onClick({
                                 view: "form",
                                 entity,
-                                path: path ?? collection.slug,
+                                path: path ?? getCollectionDataPath(collection),
                                 collection: collection,
                                 context: undefined,
                                 sideEntityController: undefined,

package/src/form/EntityFormBinding.tsx

@@ -254,7 +254,7 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
         try {
             const accessor = dataClient.collection(path);
             const { data } = await accessor.find({
-                where: { [name]: `eq.${value}` },
+                where: { [name]: ["==", value] },
                 limit: 2
             });
             const otherEntities = entityId ? data.filter(e => e.id !== entityId) : data;

package/src/form/components/StorageUploadProgress.tsx

@@ -3,6 +3,7 @@ import React, { useCallback } from "react";
 import { useSnackbarController, useStorageSource } from "@rebasepro/core";
 import { StorageFieldItem } from "@rebasepro/core";
 import { ErrorView } from "@rebasepro/core";
+import type { StorageSource } from "@rebasepro/types";
 import { cls, paperMixin, Skeleton } from "@rebasepro/ui";
 
 export interface StorageUploadItemProps {
@@ -15,6 +16,10 @@ export interface StorageUploadItemProps {
         uploadedUrl?: string) => Promise<void>;
     imageSize: number;
     simple: boolean;
+    /** Override the storage source for this upload. When provided, this source
+     *  is used instead of the default from context — enabling per-property
+     *  multi-backend uploads. */
+    storageSource?: StorageSource;
 }
 
 export function StorageUploadProgress({
@@ -23,10 +28,12 @@ export function StorageUploadProgress({
     metadata,
     onFileUploadComplete,
     imageSize,
-    simple
+    simple,
+    storageSource: storageSourceProp
 }: StorageUploadItemProps) {
 
-    const storageSource = useStorageSource();
+    const defaultStorageSource = useStorageSource();
+    const storageSource = storageSourceProp ?? defaultStorageSource;
 
     const snackbarController = useSnackbarController();
 

package/src/form/field_bindings/MarkdownEditorFieldBinding.tsx

@@ -1,6 +1,8 @@
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { useAuthController, useStorageSource } from "@rebasepro/core";
+import { useStorageSources } from "@rebasepro/core";
+import { resolveStorageSource } from "@rebasepro/common";
 import { getIconForProperty } from "../../util/property_utils";
 import type { FieldProps } from "../../types/fields";
 import type { ArrayProperty, StringProperty } from "@rebasepro/types";
@@ -84,8 +86,17 @@ export function MarkdownEditorFieldBinding({
     const disabled = disabledProp || isSubmitting;
     const highlight = customProps?.highlight;
     const editorProps = customProps?.editorProps;
-    const storageSource = useStorageSource();
+    const defaultStorageSource = useStorageSource();
     const storage = property.storage;
+    const storageSources = useStorageSources();
+
+    // Resolve the correct storage source for this property.
+    // Mirrors the resolution in useStorageUploadController.
+    const storageSource = useMemo(() => resolveStorageSource({
+        sourceKey: storage?.storageSource,
+        sources: storageSources.sources,
+        defaultSource: defaultStorageSource
+    }), [storage?.storageSource, storageSources.sources, defaultStorageSource]);
 
     const entityValues = context.values;
     const entityId = context.entityId;

package/src/form/field_bindings/MultipleRelationFieldBinding.tsx

@@ -1,14 +1,14 @@
 import { useEntitySelectionDialog } from "../../hooks/useEntitySelectionDialog";
 import type { FieldProps } from "../../types/fields";
 import type { RelationProperty } from "@rebasepro/types";
+import { Entity, getCollectionDataPath, getDataSourceCapabilities } from "@rebasepro/types";
 import React, { useCallback } from "react";
-import { Entity, getDataSourceCapabilities } from "@rebasepro/types";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 import { getIconForProperty } from "../../util/property_utils";
 import { getRelationFrom, resolveRelationProperty } from "@rebasepro/common";
 
-import { useTranslation, ErrorView } from "@rebasepro/core";
+import { ErrorView, useTranslation } from "@rebasepro/core";
 import { Button, cls, ExpandablePanel, fieldBackgroundMixin, PencilIcon, Typography } from "@rebasepro/ui";
 import { RelationPreview } from "../../preview";
 
@@ -41,7 +41,7 @@ export function MultipleRelationFieldBinding({
     }
 
     const parentCollection = context.collection;
-    const capabilities = parentCollection ? getDataSourceCapabilities(parentCollection.driver) : undefined;
+    const capabilities = parentCollection ? getDataSourceCapabilities(parentCollection.engine) : undefined;
     if (!parentCollection || !capabilities?.supportsRelations || !("relations" in parentCollection) || !parentCollection.relations) {
         throw Error("RelationFieldBinding expected a collection with relations support");
     }
@@ -61,7 +61,7 @@ export function MultipleRelationFieldBinding({
 
     const referenceDialogController = useEntitySelectionDialog({
         multiselect: true,
-        path: collection.slug,
+        path: getCollectionDataPath(collection),
         collection,
         onMultipleEntitiesSelected,
         selectedEntityIds,

package/src/form/field_bindings/RelationFieldBinding.tsx

@@ -1,15 +1,13 @@
 import { useEntitySelectionDialog } from "../../hooks/useEntitySelectionDialog";
 import type { FieldProps } from "../../types/fields";
 import type { RelationProperty } from "@rebasepro/types";
+import { Entity, getCollectionDataPath, getDataSourceCapabilities, Relation } from "@rebasepro/types";
 import React, { useCallback } from "react";
-import { Entity, EntityRelation, getDataSourceCapabilities, Relation } from "@rebasepro/types";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { EntityPreviewContainer } from "../../components/EntityPreview";
-import { IconForView } from "@rebasepro/core";
+import { ErrorView, IconForView } from "@rebasepro/core";
 import { getIconForProperty } from "../../util/property_utils";
-import { getRelationFrom, resolveRelationProperty, normalizeToEntityRelation } from "@rebasepro/common";
-
-import { ErrorView } from "@rebasepro/core";
+import { getRelationFrom, normalizeToEntityRelation, resolveRelationProperty } from "@rebasepro/common";
 import { cls } from "@rebasepro/ui";
 import { RelationPreview } from "../../preview";
 import { RelationSelector } from "../../components/RelationSelector";
@@ -22,7 +20,7 @@ export function RelationFieldBinding(props: FieldProps<RelationProperty>) {
         throw Error("RelationFieldBinding expected a property containing a relation");
     }
     const collection = context.collection;
-    const capabilities = collection ? getDataSourceCapabilities(collection.driver) : undefined;
+    const capabilities = collection ? getDataSourceCapabilities(collection.engine) : undefined;
     if (!collection || !capabilities?.supportsRelations || !("relations" in collection) || !collection.relations) {
         throw Error("RelationFieldBinding expected a collection with relations support");
     }
@@ -124,7 +122,7 @@ function SingleRelationFieldBinding({
 
     const referenceDialogController = useEntitySelectionDialog({
         multiselect: false,
-        path: collection.slug,
+        path: getCollectionDataPath(collection),
         collection,
         onSingleEntitySelected,
         selectedEntityIds: validValue && normalizedValue ? [normalizedValue.id] : undefined,

package/src/form/field_bindings/StorageUploadFieldBinding.tsx

@@ -10,6 +10,7 @@ import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { isReadOnly } from "@rebasepro/common";
 import { getIconForProperty } from "../../util/property_utils";
 import { useAuthController, useSnackbarController, useStorageSource, useTranslation } from "@rebasepro/core";
+import { StorageSourceContext } from "@rebasepro/core";
 import {
     closestCenter,
     DndContext,
@@ -62,7 +63,7 @@ export function StorageUploadFieldBinding({
 
     const authController = useAuthController();
 
-    const storageSource = useStorageSource(context.collection);
+    const storageSource = useStorageSource();
     const disabled = isReadOnly(property) || !!property.ui?.disabled || isSubmitting || context.disabled;
 
     const {
@@ -72,7 +73,8 @@ export function StorageUploadFieldBinding({
         storage,
         onFileUploadComplete,
         storagePathBuilder,
-        multipleFilesSupported
+        multipleFilesSupported,
+        resolvedStorageSource
     } = useStorageUploadController({
         entityValues: context.values,
         entityId: context.entityId,
@@ -103,19 +105,21 @@ export function StorageUploadFieldBinding({
                     title={property.name ?? propertyKey}
                     className={"h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"}/>}
 
-            <StorageUpload
-                value={internalValue}
-                name={propertyKey}
-                disabled={disabled ?? false}
-                autoFocus={autoFocus ?? false}
-                property={property}
-                onChange={setValue}
-                setInternalValue={setInternalValue}
-                onFilesAdded={onFilesAdded}
-                onFileUploadComplete={onFileUploadComplete}
-                storagePathBuilder={storagePathBuilder}
-                storage={storage}
-                multipleFilesSupported={multipleFilesSupported}/>
+            <StorageSourceContext.Provider value={resolvedStorageSource}>
+                <StorageUpload
+                    value={internalValue}
+                    name={propertyKey}
+                    disabled={disabled ?? false}
+                    autoFocus={autoFocus ?? false}
+                    property={property}
+                    onChange={setValue}
+                    setInternalValue={setInternalValue}
+                    onFilesAdded={onFilesAdded}
+                    onFileUploadComplete={onFileUploadComplete}
+                    storagePathBuilder={storagePathBuilder}
+                    storage={storage}
+                    multipleFilesSupported={multipleFilesSupported}/>
+            </StorageSourceContext.Provider>
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError}

package/src/form/index.tsx

@@ -12,7 +12,6 @@ export { TextFieldBinding } from "./field_bindings/TextFieldBinding";
 export { SwitchFieldBinding } from "./field_bindings/SwitchFieldBinding";
 export { DateTimeFieldBinding } from "./field_bindings/DateTimeFieldBinding";
 export { ReferenceFieldBinding } from "./field_bindings/ReferenceFieldBinding";
-export { ReferenceAsStringFieldBinding } from "./field_bindings/ReferenceAsStringFieldBinding";
 export { MapFieldBinding } from "./field_bindings/MapFieldBinding";
 export { KeyValueFieldBinding } from "./field_bindings/KeyValueFieldBinding";
 export { RepeatFieldBinding } from "./field_bindings/RepeatFieldBinding";

package/src/index.ts

@@ -2,7 +2,7 @@
 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";

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}