@rebasepro/admin 0.7.0 → 0.8.0

package/dist/types/components/PropertyPreviewProps.d.ts

@@ -1,3 +1,4 @@
+import { InferPropertyType } from "@rebasepro/types";
 import { Property } from "@rebasepro/types";
 /**
  * @group Preview components
@@ -11,7 +12,7 @@ export interface PropertyPreviewProps<P extends Property | Property, CustomProps
      * Name of the property
      */
     propertyKey?: string;
-    value: any;
+    value: InferPropertyType<P> | any;
     /**
      * Property this display is related to, now strongly typed to P
      */

package/dist/types/fields.d.ts

@@ -1,8 +1,9 @@
+import { InferPropertyType } from "@rebasepro/types";
 import { Entity } from "@rebasepro/types";
 import { FormexController } from "./components/formex";
 import { EntityCollection } from "@rebasepro/types";
 import { Property } from "@rebasepro/types";
-export type DefaultFieldConfig = "text_field" | "multiline" | "markdown" | "url" | "email" | "switch" | "select" | "multi_select" | "user_select" | "number_input" | "number_select" | "multi_number_select" | "file_upload" | "multi_file_upload" | "reference_as_string" | "reference" | "multi_references" | "relation" | "date_time" | "group" | "key_value" | "repeat" | "custom_array" | "block" | "vector_input";
+export type DefaultFieldConfig = "text_field" | "multiline" | "markdown" | "url" | "email" | "switch" | "select" | "multi_select" | "user_select" | "number_input" | "number_select" | "multi_number_select" | "file_upload" | "multi_file_upload" | "reference" | "multi_references" | "relation" | "date_time" | "group" | "key_value" | "repeat" | "custom_array" | "block" | "vector_input";
 /**
  * When building a custom field you need to create a React component that takes
  * this interface as props.
@@ -18,11 +19,8 @@ export interface FieldProps<P extends Property | Property = Property, CustomProp
     /**
      * 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
      * @param propertyKey

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/admin",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Rebase CMS — content management views, forms, and routing",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -31,14 +31,6 @@
     "headless cms",
     "content manager"
   ],
-  "scripts": {
-    "watch": "vite build --watch",
-    "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
-    "test:lint": "eslint \"src/**\" --quiet",
-    "test": "jest --passWithNoTests",
-    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f",
-    "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -63,13 +55,6 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@floating-ui/dom": "^1.7.6",
-    "@rebasepro/common": "workspace:*",
-    "@rebasepro/core": "workspace:*",
-    "@rebasepro/formex": "workspace:*",
-    "@rebasepro/schema-inference": "workspace:*",
-    "@rebasepro/types": "workspace:*",
-    "@rebasepro/ui": "workspace:*",
-    "@rebasepro/utils": "workspace:*",
     "cmdk": "^1.1.1",
     "date-fns": "^4.4.0",
     "exceljs": "^4.4.0",
@@ -97,7 +82,14 @@
     "prosemirror-view": "^1.41.9",
     "react-dropzone": "^15.0.0",
     "react-use-measure": "^2.1.7",
-    "zod": "^4.4.3"
+    "zod": "^4.4.3",
+    "@rebasepro/common": "0.8.0",
+    "@rebasepro/core": "0.8.0",
+    "@rebasepro/formex": "0.8.0",
+    "@rebasepro/schema-inference": "0.8.0",
+    "@rebasepro/types": "0.8.0",
+    "@rebasepro/ui": "0.8.0",
+    "@rebasepro/utils": "0.8.0"
   },
   "peerDependencies": {
     "react": ">=19.0.0",
@@ -168,5 +160,13 @@
       "^@rebasepro/formex$": "<rootDir>/../formex/src/index.ts",
       "^@rebasepro/utils$": "<rootDir>/../utils/src/index.ts"
     }
+  },
+  "scripts": {
+    "watch": "vite build --watch",
+    "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
+    "test:lint": "eslint \"src/**\" --quiet",
+    "test": "jest --passWithNoTests",
+    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f",
+    "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
   }
-}
+}

package/src/collection_editor/_cms_internals.ts

@@ -16,7 +16,7 @@ export { FieldCaption } from "../components/FieldCaption";
 export { SearchIconsView } from "../components/SearchIconsView";
 export { PropertyConfigBadge } from "../components/PropertyConfigBadge";
 export { EntityCollectionTable } from "../components/EntityCollectionTable";
-export { VirtualTableInput } from "../components/EntityCollectionTable/fields/VirtualTableInput";
+export { VirtualTableInput } from "@rebasepro/ui";
 export { ArrayContainer } from "../components/ArrayContainer";
 export type { ArrayEntryParams } from "../components/ArrayContainer";
 export { useSelectionController } from "../components/EntityCollectionView/useSelectionController";

package/src/collection_editor/api/generateCollectionApi.ts

@@ -55,8 +55,9 @@ export const DEFAULT_COLLECTION_GENERATION_ENDPOINT = "https://api.rebase.pro/co
  */
 export interface BuildCollectionGenerationCallbackProps {
     /**
-     * Function to get the auth token (e.g., from Firebase Auth)
-     * This is typically `authController.getAuthToken` from `@rebasepro/client-firebase`
+     * Function to get the auth token.
+     * This is typically `authController.getAuthToken` from `@rebasepro/client`
+     * (or `@rebasepro/client-firebase` if using Firebase).
      */
     getAuthToken: () => Promise<string>;
 

package/src/collection_editor/pgColumnToProperty.ts

@@ -1,4 +1,4 @@
-import { EntityCollection, Property, StringProperty, NumberProperty, ArrayProperty, TableColumnInfo, TableMetadata } from "@rebasepro/types";
+import { EntityCollection, Property, StringProperty, NumberProperty, ArrayProperty, TableColumnInfo, TableMetadata, PostgresProperties } from "@rebasepro/types";
 import { prettifyIdentifier } from "@rebasepro/utils";
 
 /**
@@ -282,7 +282,7 @@ export function buildCollectionFromTableMetadata(
         name: prettifiedName,
         slug: tableName,
         table: tableName,
-        properties,
+        properties: properties as PostgresProperties,
         propertiesOrder,
         ...(relations.length > 0 ? { relations } : {}),
         ...(securityRules.length > 0 ? { securityRules } : {})

package/src/collection_editor/serializable_types.ts

@@ -12,33 +12,22 @@
  */
 
 import type {
-    DataType,
-    EnumValues,
-    PropertyValidationSchema,
-    NumberPropertyValidationSchema,
     ArrayPropertyValidationSchema,
-    PropertyConditions,
-    ImageResize,
-    FileType,
-    ColorKey,
-    ColorScheme,
-} from "@rebasepro/types";
-
-import type {
-    ViewMode,
     CollectionSize,
-    SecurityRule,
-    FilterValues,
+    EnumValues,
+    FileType,
     FilterPreset,
-    WhereFilterOp,
+    FilterValues,
+    ImageResize,
+    JoinStep,
     KanbanConfig,
-    SecurityOperation,
     NavigationGroupMapping,
-} from "@rebasepro/types";
-
-import type {
+    NumberPropertyValidationSchema,
     OnAction,
-    JoinStep,
+    PropertyConditions,
+    PropertyValidationSchema,
+    SecurityRule,
+    ViewMode,
 } from "@rebasepro/types";
 
 // ═══════════════════════════════════════════════════════════════════════
@@ -109,6 +98,8 @@ export interface SerializableStorageConfig {
     includeBucketUrl?: boolean;
     storeUrl?: boolean;
     maxSize?: number;
+    /** Key of the named storage backend to use (see `StorageConfig.storageSource`). */
+    storageSource?: string;
     // processFile, postProcess, previewUrl are dropped (functions)
 }
 
@@ -200,13 +191,9 @@ export interface SerializableStringProperty extends SerializableBaseProperty {
     validation?: SerializableStringValidation;
     isId?: boolean | "manual" | "uuid" | "cuid" | string;
     enum?: EnumValues;
-    multiline?: boolean;
-    markdown?: boolean;
     storage?: SerializableStorageConfig;
     userSelect?: boolean;
-    url?: boolean | "image" | "video" | "audio" | "file";
     email?: boolean;
-    previewAsTag?: boolean;
     reference?: SerializableReferenceProperty;
 }
 
@@ -236,7 +223,6 @@ export interface SerializableDateProperty extends SerializableBaseProperty {
     mode?: "date" | "date_time";
     timezone?: string;
     autoValue?: "on_create" | "on_update";
-    clearable?: boolean;
 }
 
 /** JSON-serializable `GeopointProperty`. */
@@ -391,7 +377,8 @@ export interface SerializableCollection {
     icon?: string;
 
     group?: string;
-    driver?: string;
+    engine?: string;
+    dataSource?: string;
     databaseId?: string;
 
     properties: SerializableProperties;

package/src/collection_editor/serializable_utils.ts

@@ -9,44 +9,44 @@
  */
 
 import type {
-    EntityCollection,
-    Property,
-    StringProperty,
-    NumberProperty,
+    ArrayProperty,
+    BaseUIConfig,
+    BinaryProperty,
     BooleanProperty,
     DateProperty,
+    EntityCollection,
     GeopointProperty,
-    ReferenceProperty,
-    RelationProperty,
-    ArrayProperty,
     MapProperty,
-    VectorProperty,
-    BinaryProperty,
+    NumberProperty,
     Properties,
+    Property,
+    ReferenceProperty,
+    RelationProperty,
     StorageConfig,
-    BaseUIConfig,
+    StringProperty,
+    VectorProperty,
 } from "@rebasepro/types";
 
 import type {
-    SerializableCollection,
-    SerializableProperty,
-    SerializableProperties,
-    SerializableStorageConfig,
-    SerializableBaseUIConfig,
+    SerializableArrayProperty,
     SerializableBaseProperty,
-    SerializableStringProperty,
-    SerializableNumberProperty,
+    SerializableBaseUIConfig,
+    SerializableBinaryProperty,
     SerializableBooleanProperty,
+    SerializableCollection,
     SerializableDateProperty,
+    SerializableDateValidation,
     SerializableGeopointProperty,
+    SerializableMapProperty,
+    SerializableNumberProperty,
+    SerializableProperties,
+    SerializableProperty,
     SerializableReferenceProperty,
     SerializableRelationProperty,
-    SerializableArrayProperty,
-    SerializableMapProperty,
-    SerializableVectorProperty,
-    SerializableBinaryProperty,
+    SerializableStorageConfig,
+    SerializableStringProperty,
     SerializableStringValidation,
-    SerializableDateValidation,
+    SerializableVectorProperty,
 } from "./serializable_types";
 
 // ═══════════════════════════════════════════════════════════════════════
@@ -90,6 +90,7 @@ function toSerializableStorageConfig(storage: StorageConfig | undefined): Serial
     if (storage.includeBucketUrl !== undefined) result.includeBucketUrl = storage.includeBucketUrl;
     if (storage.storeUrl !== undefined) result.storeUrl = storage.storeUrl;
     if (storage.maxSize !== undefined) result.maxSize = storage.maxSize;
+    if (storage.storageSource !== undefined) result.storageSource = storage.storageSource;
     // processFile, postProcess, previewUrl are intentionally dropped (functions)
 
     return result;
@@ -167,12 +168,8 @@ export function toSerializableProperty(property: Property): SerializableProperty
             if (sp.columnType) result.columnType = sp.columnType;
             if (sp.isId !== undefined) result.isId = sp.isId;
             if (sp.enum) result.enum = sp.enum;
-            if (sp.multiline) result.multiline = sp.multiline;
-            if (sp.markdown) result.markdown = sp.markdown;
             if (sp.userSelect) result.userSelect = sp.userSelect;
-            if (sp.url) result.url = sp.url;
             if (sp.email) result.email = sp.email;
-            if (sp.previewAsTag) result.previewAsTag = sp.previewAsTag;
 
             // Convert validation.matches from RegExp to string
             if (sp.validation) {
@@ -187,11 +184,6 @@ export function toSerializableProperty(property: Property): SerializableProperty
             const storage = toSerializableStorageConfig(sp.storage);
             if (storage) result.storage = storage;
 
-            // Reference sub-property
-            if (sp.reference) {
-                result.reference = toSerializableProperty(sp.reference) as SerializableReferenceProperty;
-            }
-
             return result;
         }
 
@@ -228,7 +220,6 @@ export function toSerializableProperty(property: Property): SerializableProperty
             if (dp.mode) result.mode = dp.mode;
             if (dp.timezone) result.timezone = dp.timezone;
             if (dp.autoValue) result.autoValue = dp.autoValue;
-            if (dp.clearable) result.clearable = dp.clearable;
 
             // Convert Date validation min/max to ISO strings
             if (dp.validation) {
@@ -416,7 +407,8 @@ export function toSerializableCollection(collection: EntityCollection): Serializ
     if (collection.singularName) result.singularName = collection.singularName;
     if (collection.description) result.description = collection.description;
     if (collection.group) result.group = collection.group;
-    if (collection.driver) result.driver = collection.driver;
+    if (collection.engine) result.engine = collection.engine;
+    if (collection.dataSource) result.dataSource = collection.dataSource;
     if (collection.databaseId) result.databaseId = collection.databaseId;
     if (collection.titleProperty) result.titleProperty = collection.titleProperty as string;
     if (collection.ownerId) result.ownerId = collection.ownerId;
@@ -543,10 +535,6 @@ export function fromSerializableProperty(serialized: SerializableProperty): Prop
         case "string": {
             const sp = serialized as SerializableStringProperty;
             const result = { ...sp } as unknown as StringProperty;
-            // Convert reference sub-property
-            if (sp.reference) {
-                result.reference = fromSerializableProperty(sp.reference) as ReferenceProperty;
-            }
             return result;
         }
 

package/src/collection_editor/ui/collection_editor/AICollectionGeneratorPopover.tsx

@@ -95,7 +95,7 @@ export function AICollectionGeneratorPopover({
                 name: c.name,
                 properties: c.properties,
                 propertiesOrder: c.propertiesOrder
-            }));
+            } as Partial<EntityCollection>));
 
             const result = await generateCollection({
                 prompt: prompt.trim(),
@@ -106,7 +106,7 @@ export function AICollectionGeneratorPopover({
                         name: existingCollection.name,
                         properties: existingCollection.properties,
                         propertiesOrder: existingCollection.propertiesOrder
-                    }
+                    } as Partial<EntityCollection>
                 })
             });
 

package/src/collection_editor/ui/collection_editor/CollectionEditorDialog.tsx

@@ -1,31 +1,50 @@
-
-import { useUnsavedChangesDialog, UnsavedChangesDialog } from "@rebasepro/core";
-import { useNavigationStateController, useCollectionRegistryController, useUrlController } from "../../_cms_internals";
 import * as React from "react";
 import { useEffect, useRef, useState } from "react";
-import { ConfirmationDialog, ErrorView, useAuthController, useCustomizationController, useSnackbarController } from "@rebasepro/core";
+import {
+    ConfirmationDialog,
+    ErrorView,
+    UnsavedChangesDialog,
+    useAuthController,
+    useCustomizationController,
+    useUnsavedChangesDialog
+} from "@rebasepro/core";
+import {
+    getInferenceType,
+    ImportSaveInProgress,
+    useCollectionRegistryController,
+    useImportConfig,
+    useNavigationStateController,
+    useUrlController
+} from "../../_cms_internals";
 import { useSafeSnackbarController } from "../../useSafeSnackbarController";
-import { CircularProgressCenter } from "@rebasepro/ui";
 import {
     ArrowLeftIcon,
     Button,
     CheckIcon,
+    CircularProgressCenter,
     cls,
     coolIconKeys,
     defaultBorderMixin,
     Dialog,
-    DialogActions,
-    DialogContent,
     DialogTitle,
     IconButton,
     LoadingButton,
     Tab,
-    Tabs,
-    Typography
+    Tabs
 } from "@rebasepro/ui";
-import { Entity, EntityCollection, MapProperty, Properties, Property, PropertyConfig, User, getDataSourceCapabilities } from "@rebasepro/types";
-import type { PostgresCollection } from "@rebasepro/types";
-import { getSubcollections, isPropertyBuilder, removeInitialAndTrailingSlashes, getTableName } from "@rebasepro/common";
+import {
+    EngineProperties,
+    Entity,
+    EntityCollection,
+    getDataSourceCapabilities,
+    MapProperty,
+    Properties,
+    Property,
+    PropertyConfig,
+    TableMetadata,
+    User
+} from "@rebasepro/types";
+import { getSubcollections, getTableName, isPropertyBuilder, removeInitialAndTrailingSlashes } from "@rebasepro/common";
 import { CollectionEditorSchema } from "./CollectionYupValidation";
 import { GeneralSettingsForm } from "./GeneralSettingsForm";
 import { DisplaySettingsForm } from "./DisplaySettingsForm";
@@ -33,7 +52,6 @@ import { CollectionPropertiesEditorForm } from "./CollectionPropertiesEditorForm
 import { CollectionsConfigController } from "../../types/config_controller";
 import { CollectionEditorWelcomeView } from "./CollectionEditorWelcomeView";
 import { CollectionInference } from "../../types/collection_inference";
-import { getInferenceType, ImportSaveInProgress, useImportConfig } from "../../_cms_internals";
 import { buildEntityPropertiesFromData } from "@rebasepro/schema-inference";
 import { CollectionEditorImportMapping } from "./import/CollectionEditorImportMapping";
 import { CollectionEditorImportDataPreview } from "./import/CollectionEditorImportDataPreview";
@@ -42,10 +60,9 @@ import { Formex, FormexController, useCreateFormex } from "@rebasepro/formex";
 import { getFullIdPath } from "./util";
 import { AICollectionGeneratorPopover } from "./AICollectionGeneratorPopover";
 import { AIModifiedPathsProvider, useAIModifiedPaths } from "./AIModifiedPathsContext";
-import { CollectionOperation, CollectionGenerationCallback } from "../../api/generateCollectionApi";
+import { CollectionGenerationCallback, CollectionOperation } from "../../api/generateCollectionApi";
 import { CollectionRLSTab } from "./CollectionRLSTab";
 import { buildCollectionFromTableMetadata } from "../../pgColumnToProperty";
-import { TableMetadata } from "@rebasepro/types";
 import { mergeDeep, randomString, removeUndefined } from "@rebasepro/utils";
 import type { CollectionEditorExtensionProps, CollectionEditorTab } from "../../extensibility_types";
 
@@ -242,8 +259,8 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
     }, [collection, fallbackSlug]);
 
     // Build initial values - handle copyFrom for duplication
-    const initialValues: EntityCollection<any> = React.useMemo(() => {
-        return initialCollection
+    const initialValues = React.useMemo((): EntityCollection<any> => {
+        return (initialCollection
             ? applyPropertyConfigs(initialCollection, propertyConfigs)
             : copyFromProp
                 ? (() => {
@@ -259,11 +276,11 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
                     slug: initialValuesProp?.slug ?? fallbackSlug,
                     table: initialValuesProp?.slug ?? "",
                     name: initialValuesProp?.name ?? "",
-                    properties: {} as Properties,
+                    properties: {} as EngineProperties,
                     propertiesOrder: [],
                     icon: initialIcon,
                     ownerId: authController.user?.uid ?? ""
-                };
+                }) as EntityCollection<any>;
     }, [initialCollection, propertyConfigs, copyFromProp, initialValuesProp, fallbackSlug, initialIcon, authController.user?.uid]);
 
     if (!initialLoadingCompleted) {
@@ -455,7 +472,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
             };
 
             if (Object.keys(inferredCollection.properties ?? {}).length > 0) {
-                values.properties = inferredCollection.properties as Properties;
+                values.properties = inferredCollection.properties as EngineProperties;
                 values.propertiesOrder = inferredCollection.propertiesOrder as Extract<keyof M, string>[];
             }
 
@@ -697,7 +714,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                             {(!visibleTabs || visibleTabs.includes("properties")) && <Tab value={"properties"}>
                                 Properties
                             </Tab>}
-                            {(!visibleTabs || visibleTabs.includes("rls")) && getDataSourceCapabilities(values.driver).supportsRLS && <Tab value={"rls"}>
+                            {(!visibleTabs || visibleTabs.includes("rls")) && getDataSourceCapabilities(values.engine).supportsRLS && <Tab value={"rls"}>
                                 RLS
                             </Tab>}
                         </Tabs>
@@ -807,7 +824,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                             <DisplaySettingsForm expandKanban={expandKanban} standalone={standalone}/>
                         }
 
-                        {currentView === "rls" && getDataSourceCapabilities(values.driver).supportsRLS &&
+                        {currentView === "rls" && getDataSourceCapabilities(values.engine).supportsRLS &&
                             <CollectionRLSTab/>
                         }
 
@@ -974,8 +991,8 @@ function applyPropertyConfigs<M extends Record<string, unknown> = Record<string,
 
     return {
         ...rest,
-        properties: propertiesResult
-    };
+        properties: propertiesResult as EngineProperties
+    } as EntityCollection<M>;
 }
 
 function applyPropertiesConfig(property: Property, propertyConfigs: Record<string, PropertyConfig>) {

package/src/collection_editor/ui/collection_editor/PropertyEditView.tsx

@@ -505,13 +505,6 @@ function PropertyEditFormFields({
                 existing={existing}
                 multiple={false}
                 disabled={disabled}/>;
-    } else if (selectedFieldConfigId === "reference_as_string") {
-        childComponent =
-            <ReferencePropertyField showErrors={showErrors}
-                existing={existing}
-                asString={true}
-                multiple={false}
-                disabled={disabled}/>;
     } else if (selectedFieldConfigId === "date_time") {
         childComponent = <DateTimePropertyField disabled={disabled}/>;
     } else if (selectedFieldConfigId === "multi_references") {
@@ -686,7 +679,6 @@ const WIDGET_TYPE_MAP: Record<PropertyConfigId, string> = {
     multi_file_upload: "File",
     relation: "Relation",
     reference: "Reference",
-    reference_as_string: "Text",
     multi_references: "Reference",
     date_time: "Date",
     group: "Group",
@@ -707,7 +699,6 @@ const WIDGET_BASE_TYPE_MAP: Record<string, PropertyType> = {
     multi_select: "string",
     file_upload: "string",
     multi_file_upload: "string",
-    reference_as_string: "string",
     user_select: "string",
     number_input: "number",
     number_select: "number",

package/src/collection_editor/ui/collection_editor/properties/StoragePropertyField.tsx

@@ -13,7 +13,8 @@ import {
 } from "@rebasepro/ui";
 
 import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/formex";
-import { useTranslation } from "@rebasepro/core";
+import { useStorageSources, useTranslation } from "@rebasepro/core";
+import { DEFAULT_STORAGE_SOURCE_KEY } from "@rebasepro/types";
 import { GeneralPropertyValidation } from "./validation/GeneralPropertyValidation";
 import { ArrayPropertyValidation } from "./validation/ArrayPropertyValidation";
 import { ValidationPanel } from "./validation/ValidationPanel";
@@ -42,9 +43,11 @@ export function StoragePropertyField({
         setFieldValue
     } = useFormex();
     const { t } = useTranslation();
+    const storageSources = useStorageSources();
 
     const baseStoragePath = multiple ? "of.storage" : "storage";
     const acceptedFiles = `${baseStoragePath}.acceptedFiles`;
+    const storageSource = `${baseStoragePath}.storageSource`;
 
     const metadata = `${baseStoragePath}.metadata`;
     const fileName = `${baseStoragePath}.fileName`;
@@ -76,6 +79,11 @@ export function StoragePropertyField({
     const fileTypesValue: string[] | undefined = Array.isArray(storedValue) ? storedValue : undefined;
     const allFileTypesSelected = !fileTypesValue || fileTypesValue.length === 0;
 
+    // Available storage backends (from `<Rebase storageSources={...}>`).
+    const sourceKeys = Object.keys(storageSources.sources)
+        .filter((key) => key !== DEFAULT_STORAGE_SOURCE_KEY);
+    const storageSourceValue = (getIn(values, storageSource) as string | undefined) ?? DEFAULT_STORAGE_SOURCE_KEY;
+
     const handleTypesChange = (value: string[]) => {
         if (!value) setFieldValue(acceptedFiles, undefined);
         else setFieldValue(acceptedFiles, value);
@@ -102,6 +110,32 @@ export function StoragePropertyField({
 
                     <div className={"grid grid-cols-12 gap-2 p-4"}>
 
+                        {sourceKeys.length > 0 && (
+                            <div className={"col-span-12"}>
+                                <Select
+                                    className={"w-full"}
+                                    disabled={disabled}
+                                    name={storageSource}
+                                    value={storageSourceValue}
+                                    onValueChange={(value) =>
+                                        setFieldValue(storageSource, !value || value === DEFAULT_STORAGE_SOURCE_KEY ? undefined : value)}
+                                    label={"Storage backend"}
+                                    renderValue={(key) => {
+                                        const label = storageSources.registry[key]?.label;
+                                        return label ?? (key === DEFAULT_STORAGE_SOURCE_KEY ? "Default" : key);
+                                    }}>
+                                    <SelectItem value={DEFAULT_STORAGE_SOURCE_KEY}>
+                                        Default
+                                    </SelectItem>
+                                    {sourceKeys.map((key) => (
+                                        <SelectItem key={key} value={key}>
+                                            {storageSources.registry[key]?.label ?? key}
+                                        </SelectItem>
+                                    ))}
+                                </Select>
+                            </div>
+                        )}
+
                         <div className={"col-span-12"}>
 
                             <MultiSelect

package/src/collection_editor/ui/collection_editor/templates/blog_template.ts

@@ -93,7 +93,7 @@ export const blogCollectionTemplate = {
         publish_date: {
             name: "Publish date",
             type: "date",
-            clearable: true
+            ui: { clearable: true }
         },
         reviewed: {
             name: "Reviewed",

package/src/collection_editor/ui/collection_editor/utils/supported_fields.tsx

@@ -16,7 +16,6 @@ export const supportedFieldsIds: PropertyConfigId[] = [
     "file_upload",
     "multi_file_upload",
     "reference",
-    "reference_as_string",
     "multi_references",
     "relation",
     "switch",