@rebasepro/admin 0.7.0 → 0.9.0

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,
+    CollectionConfig,
+    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";
 
@@ -60,11 +77,11 @@ export interface CollectionEditorDialogProps extends CollectionEditorExtensionPr
      * A collection to duplicate from. If provided, the new collection will be
      * pre-populated with the same properties (but with empty name, path, and id).
      */
-    copyFrom?: EntityCollection;
+    copyFrom?: CollectionConfig;
     editedCollectionId?: string;
     path?: string; // full path of this particular collection, like `products/123/locales`
     parentCollectionSlugs?: string[], parentEntityIds?: string[]; // path ids of the parent collection, like [`products`]
-    handleClose: (collection?: EntityCollection) => void;
+    handleClose: (collection?: CollectionConfig) => void;
     configController: CollectionsConfigController;
     collectionInference?: CollectionInference;
     extraView?: {
@@ -75,7 +92,7 @@ export interface CollectionEditorDialogProps extends CollectionEditorExtensionPr
     };
     getUser?: (uid: string) => User | null;
     getData?: (path: string, parentPaths: string[]) => Promise<object[]>;
-    parentCollection?: EntityCollection;
+    parentCollection?: CollectionConfig;
     existingEntities?: Entity<any>[];
     /**
      * Initial view to open when editing: "general", "display", or "properties".
@@ -196,7 +213,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
     const collectionsInThisLevel = (props.parentCollection ? getSubcollections(props.parentCollection) : collections) ?? [];
     const existingPaths = collectionsInThisLevel.map(col => getTableName(col)?.trim().toLowerCase()).filter(Boolean);
     const existingIds = collectionsInThisLevel.map(col => col.slug?.trim().toLowerCase()).filter(Boolean) as string[];
-    const [collection, setCollection] = React.useState<EntityCollection<any> | undefined>();
+    const [collection, setCollection] = React.useState<CollectionConfig<any> | undefined>();
     const [initialLoadingCompleted, setInitialLoadingCompleted] = React.useState(false);
 
     useEffect(() => {
@@ -217,7 +234,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
 
                     const registryCol = getRawCollection ? getRawCollection(collectionPath) : undefined;
                     const configCol = props.configController?.collections?.find(c => c.slug === props.editedCollectionId);
-                    setCollection((registryCol ?? configCol) as EntityCollection<any>);
+                    setCollection((registryCol ?? configCol) as CollectionConfig<any>);
                 } else {
                     setCollection(undefined);
                 }
@@ -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((): CollectionConfig<any> => {
+        return (initialCollection
             ? applyPropertyConfigs(initialCollection, propertyConfigs)
             : copyFromProp
                 ? (() => {
@@ -253,17 +270,17 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
                         ...rest,
                         name: "",
                         ownerId: authController.user?.uid ?? ""
-                    } as EntityCollection<any>;
+                    } as CollectionConfig<any>;
                 })()
                 : {
                     slug: initialValuesProp?.slug ?? fallbackSlug,
                     table: initialValuesProp?.slug ?? "",
                     name: initialValuesProp?.name ?? "",
-                    properties: {} as Properties,
+                    properties: {} as EngineProperties,
                     propertiesOrder: [],
                     icon: initialIcon,
                     ownerId: authController.user?.uid ?? ""
-                };
+                }) as CollectionConfig<any>;
     }, [initialCollection, propertyConfigs, copyFromProp, initialValuesProp, fallbackSlug, initialIcon, authController.user?.uid]);
 
     if (!initialLoadingCompleted) {
@@ -324,12 +341,12 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 }: CollectionEditorDialogProps & {
     handleCancel: () => void,
     setFormDirty: (dirty: boolean) => void,
-    initialValues: EntityCollection<M>,
+    initialValues: CollectionConfig<M>,
     existingPaths: string[],
     existingIds: string[],
     includeTemplates: boolean,
-    collection: EntityCollection<M> | undefined,
-    setCollection: (collection: EntityCollection<M>) => void,
+    collection: CollectionConfig<M> | undefined,
+    setCollection: (collection: CollectionConfig<M>) => void,
     propertyConfigs: Record<string, PropertyConfig>,
 }
 ) {
@@ -378,7 +395,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
     const [error, setError] = React.useState<Error | undefined>();
 
-    const saveCollection = (updatedCollection: EntityCollection<M>): Promise<boolean> => {
+    const saveCollection = (updatedCollection: CollectionConfig<M>): Promise<boolean> => {
         const id = updatedCollection.slug;
 
         return configController.saveCollection({
@@ -425,7 +442,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
     };
 
-    const doCollectionInference = collectionInference ? (collection: EntityCollection<any>) => {
+    const doCollectionInference = collectionInference ? (collection: CollectionConfig<any>) => {
         if (!collectionInference) return undefined;
         return collectionInference?.(
             collection.slug,
@@ -434,7 +451,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         );
     } : undefined;
 
-    const inferCollectionFromData = async (newCollection: EntityCollection<M>) => {
+    const inferCollectionFromData = async (newCollection: CollectionConfig<M>) => {
 
         try {
             if (!doCollectionInference) {
@@ -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>[];
             }
 
@@ -480,7 +497,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         }
     };
 
-    const onSubmit = async (newCollectionState: EntityCollection<M>, formexController: FormexController<EntityCollection<M>>) => {
+    const onSubmit = async (newCollectionState: CollectionConfig<M>, formexController: FormexController<CollectionConfig<M>>) => {
         console.debug("Submitting collection", newCollectionState);
         try {
 
@@ -489,7 +506,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                 if (success) {
                     aiModifiedPaths?.clearAllPaths();
                     formexController.resetForm({ values: newCollectionState });
-                    handleClose(newCollectionState as EntityCollection);
+                    handleClose(newCollectionState as CollectionConfig);
                 }
                 return;
             }
@@ -527,7 +544,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                 if (success) {
                     formexController.resetForm({ values: initialValues });
                     setNextMode();
-                    handleClose(newCollectionState as EntityCollection);
+                    handleClose(newCollectionState as CollectionConfig);
                 }
             } else {
                 setNextMode();
@@ -543,7 +560,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         }
     };
 
-    const validation = (col: EntityCollection<M>) => {
+    const validation = (col: CollectionConfig<M>) => {
 
         let errors: Record<string, string> = {};
         const schema = (currentView === "properties" || currentView === "general") && CollectionEditorSchema;
@@ -578,7 +595,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         return errors;
     };
 
-    const formController = useCreateFormex<EntityCollection<M>>({
+    const formController = useCreateFormex<CollectionConfig<M>>({
         initialValues,
         onSubmit,
         validation,
@@ -672,8 +689,8 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
     const aiModifiedPaths = useAIModifiedPaths();
 
-    const handleAIGenerated = (generatedCollection: EntityCollection, operations?: CollectionOperation[]) => {
-        formController.setValues(generatedCollection as EntityCollection<M>);
+    const handleAIGenerated = (generatedCollection: CollectionConfig, operations?: CollectionOperation[]) => {
+        formController.setValues(generatedCollection as CollectionConfig<M>);
         if (operations && aiModifiedPaths) {
             aiModifiedPaths.addModifiedPaths(operations);
         }
@@ -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>
@@ -732,7 +749,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                     onSubmit={formController.handleSubmit}
                     className="flex-grow flex flex-col min-h-0 relative">
 
-                    <div className="flex-grow flex flex-col min-h-0 no-scrollbar relative w-full h-full bg-surface-50 dark:bg-surface-800">
+                    <div className="flex-grow flex flex-col min-h-0 relative w-full h-full bg-surface-50 dark:bg-surface-800">
 
                         {currentView === "loading" &&
                             <CircularProgressCenter/>}
@@ -759,7 +776,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                                         formController.setValues({
                                             ...formController.values,
                                             ...collectionData
-                                        } as EntityCollection<M>);
+                                        } as CollectionConfig<M>);
                                         onWelcomeScreenContinue();
                                     } catch (e: unknown) {
                                         console.error("Error importing table:", e);
@@ -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/>
                         }
 
@@ -958,7 +975,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
 }
 
-function applyPropertyConfigs<M extends Record<string, unknown> = Record<string, unknown>>(collection: EntityCollection<M>, propertyConfigs: Record<string, PropertyConfig>): EntityCollection<M> {
+function applyPropertyConfigs<M extends Record<string, unknown> = Record<string, unknown>>(collection: CollectionConfig<M>, propertyConfigs: Record<string, PropertyConfig>): CollectionConfig<M> {
     const {
         properties,
         ...rest
@@ -974,8 +991,8 @@ function applyPropertyConfigs<M extends Record<string, unknown> = Record<string,
 
     return {
         ...rest,
-        properties: propertiesResult
-    };
+        properties: propertiesResult as EngineProperties
+    } as CollectionConfig<M>;
 }
 
 function applyPropertiesConfig(property: Property, propertyConfigs: Record<string, PropertyConfig>) {

package/src/collection_editor/ui/collection_editor/CollectionEditorWelcomeView.tsx

@@ -2,7 +2,7 @@ import { AIIcon } from "@rebasepro/core";
 ;
 import React, { useState } from "react";
 ;
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import {
     Button,
     Card,
@@ -43,7 +43,7 @@ export function CollectionEditorWelcomeView({
     onImportFromTable
 }: {
     path: string;
-    parentCollection?: EntityCollection;
+    parentCollection?: CollectionConfig;
     onContinue: (importData?: object[], propertiesOrder?: string[]) => void;
     existingCollectionPaths?: string[];
     generateCollection?: CollectionGenerationCallback;
@@ -61,7 +61,7 @@ export function CollectionEditorWelcomeView({
         setFieldValue,
         setValues,
         submitCount
-    } = useFormex<EntityCollection>();
+    } = useFormex<CollectionConfig>();
 
     const [jsonImportOpen, setJsonImportOpen] = useState(false);
     const [importingTable, setImportingTable] = useState<string | null>(null);

package/src/collection_editor/ui/collection_editor/CollectionJsonImportDialog.tsx

@@ -13,7 +13,7 @@ import {
     TextField,
     Typography
 } from "@rebasepro/ui";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { validateCollectionJson, CollectionValidationError } from "../../validateCollectionJson";
 
 const EXAMPLE_JSON = `{
@@ -41,7 +41,7 @@ const EXAMPLE_JSON = `{
 export interface CollectionJsonImportDialogProps {
     open: boolean;
     onClose: () => void;
-    onImport: (collection: EntityCollection) => void;
+    onImport: (collection: CollectionConfig) => void;
 }
 
 export function CollectionJsonImportDialog({

package/src/collection_editor/ui/collection_editor/CollectionPropertiesEditorForm.tsx

@@ -21,7 +21,7 @@ import {
     Tooltip,
     Typography
 } from "@rebasepro/ui";
-import { EntityCollection, MapProperty, Properties, Property, PropertyConfig, User } from "@rebasepro/types";
+import { CollectionConfig, MapProperty, Properties, Property, PropertyConfig, User } from "@rebasepro/types";
 import { isPropertyBuilder } from "@rebasepro/common";
 
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath } from "./util";
@@ -31,7 +31,7 @@ import { GetCodeDialog } from "./GetCodeDialog";
 import { useAIModifiedPaths } from "./AIModifiedPathsContext";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
 import type { PropertyTypePreset, PropertyType } from "../../extensibility_types";
-import type { SerializableProperty, SerializableCollection } from "../../serializable_types";
+import type { SerializableProperty, SerializableCollectionConfig } from "../../serializable_types";
 
 type PropertyOrBuilder = Property | Record<string, unknown>;
 
@@ -44,7 +44,7 @@ type CollectionEditorFormProps = {
     extraIcon: React.ReactNode;
     getUser?: (uid: string) => User | null;
     getData?: () => Promise<object[]>;
-    doCollectionInference?: (collection: EntityCollection) => Promise<Partial<EntityCollection> | null> | undefined;
+    doCollectionInference?: (collection: CollectionConfig) => Promise<Partial<CollectionConfig> | null> | undefined;
     propertyConfigs: Record<string, PropertyConfig>;
     propertyTypePresets?: PropertyTypePreset[];
     hiddenPropertyTypes?: PropertyType[];
@@ -52,7 +52,7 @@ type CollectionEditorFormProps = {
         metadata: Record<string, unknown>;
         onMetadataChange: (key: string, value: unknown) => void;
         property: SerializableProperty;
-        collection: SerializableCollection;
+        collection: SerializableCollectionConfig;
     }) => React.ReactNode;
     standalone?: boolean;
 };
@@ -82,7 +82,7 @@ export function CollectionPropertiesEditorForm({
         setFieldTouched,
         errors,
         dirty
-    } = useFormex<EntityCollection>();
+    } = useFormex<CollectionConfig>();
 
     const snackbarController = useSafeSnackbarController();
     const configControllerFromContext = useCollectionsConfigController();
@@ -420,9 +420,9 @@ export function CollectionPropertiesEditorForm({
     };
 
     const body = (
-        <div className={"grid grid-cols-12 h-full bg-surface-50 dark:bg-surface-800"}>
+        <div className={"grid grid-cols-12 h-full min-h-0 bg-surface-50 dark:bg-surface-800"}>
             <div className={cls(
-                "col-span-12 lg:col-span-5 h-full flex flex-col bg-surface-50 dark:bg-surface-800",
+                "col-span-12 lg:col-span-5 h-full min-h-0 flex flex-col bg-surface-50 dark:bg-surface-800",
                 !asDialog && "border-r " + defaultBorderMixin
             )}>
                 {/* Sidebar Header */}
@@ -467,7 +467,7 @@ export function CollectionPropertiesEditorForm({
                 </div>
 
                 {/* Sidebar Content */}
-                <div className="flex-grow overflow-y-auto p-3 no-scrollbar space-y-3 bg-surface-50 dark:bg-surface-800">
+                <div className="flex-grow overflow-y-auto p-3 space-y-3 bg-surface-50 dark:bg-surface-800">
                     {owner && (
                         <div className="px-1 py-0.5">
                             <Typography variant="body2" color="secondary">

package/src/collection_editor/ui/collection_editor/CollectionRLSTab.tsx

@@ -1,5 +1,5 @@
 
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import React, { useState, useEffect } from "react";
 
 /**
@@ -61,7 +61,7 @@ interface SecurityRule {
     roles?: string[];
 }
 
-type CollectionWithSecurity = EntityCollection & {
+type CollectionWithSecurity = CollectionConfig & {
     securityRules?: SecurityRule[];
     id?: string;
     table?: string;

package/src/collection_editor/ui/collection_editor/CollectionRelationsTab.tsx

@@ -22,11 +22,11 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { useFormex } from "@rebasepro/formex";
-import { PostgresCollection, Relation } from "@rebasepro/types";
+import { PostgresCollectionConfig, Relation } from "@rebasepro/types";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
 
 export function CollectionRelationsTab() {
-    const { values, setFieldValue } = useFormex<PostgresCollection>();
+    const { values, setFieldValue } = useFormex<PostgresCollectionConfig>();
     const { collections } = useCollectionsConfigController();
     const [editingRelationIndex, setEditingRelationIndex] = useState<number | null>(null);
     const [editingRelationState, setEditingRelationState] = useState<Partial<Relation> | null>(null);

package/src/collection_editor/ui/collection_editor/CollectionStudioView.tsx

@@ -6,7 +6,7 @@ import { Button, PlusIcon, Typography } from "@rebasepro/ui";
 import { CollectionEditorDialogProps } from "./CollectionEditorDialog";
 import { AIModifiedPathsProvider } from "./AIModifiedPathsContext";
 import { CollectionEditor } from "./CollectionEditorDialog";
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 
 export type CollectionStudioViewProps = Omit<CollectionEditorDialogProps, "open" | "isNewCollection" | "editedCollectionId" | "handleClose" | "handleCancel"> & {
     collectionId?: string | "new";
@@ -16,7 +16,7 @@ export type CollectionStudioViewProps = Omit<CollectionEditorDialogProps, "open"
      * Receives the saved collection (or undefined if dismissed without saving).
      * When not provided, save completes silently.
      */
-    onSave?: (collection?: EntityCollection) => void;
+    onSave?: (collection?: CollectionConfig) => void;
 
     /**
      * Called when the user cancels editing.

package/src/collection_editor/ui/collection_editor/CollectionsStudioView.tsx

@@ -12,7 +12,7 @@ import {
     Tooltip,
     Typography
 } from "@rebasepro/ui";
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import { CollectionsConfigController } from "../../types/config_controller";
 import { CollectionStudioView } from "./CollectionStudioView";
 import type { CollectionEditorExtensionProps } from "../../extensibility_types";
@@ -25,7 +25,7 @@ export interface CollectionsStudioViewProps extends CollectionEditorExtensionPro
      * When provided, overrides the collections from `configController`.
      * Use this to control exactly which collections the editor displays.
      */
-    collections?: EntityCollection[];
+    collections?: CollectionConfig[];
 
     /**
      * Controlled active collection ID.

package/src/collection_editor/ui/collection_editor/DisplaySettingsForm.tsx

@@ -4,7 +4,7 @@ import React, { useMemo, useState } from "react";
 import { useCustomizationController } from "@rebasepro/core";
 import { getFieldConfig } from "../../../components/field_configs";
 import { PropertyConfigBadge } from "../../../components/PropertyConfigBadge";
-import { EntityCollection, Property } from "@rebasepro/types";
+import { CollectionConfig, Property } from "@rebasepro/types";
 import {
     BooleanSwitchWithLabel,
     Button,
@@ -39,7 +39,7 @@ export function DisplaySettingsForm({
         setFieldValue,
         handleChange,
         submitCount
-    } = useFormex<EntityCollection>();
+    } = useFormex<CollectionConfig>();
 
     const [orderPropertyDialogOpen, setOrderPropertyDialogOpen] = useState(false);
 

package/src/collection_editor/ui/collection_editor/EntityActionsEditTab.tsx

@@ -5,7 +5,7 @@ import {
     useCustomizationController
 } from "@rebasepro/core";
 import { resolveEntityAction } from "../../_cms_internals";
-import { type EntityCollection } from "@rebasepro/types";
+import { type CollectionConfig } from "@rebasepro/types";
 import { EntityAction } from "@rebasepro/types";
 import {
     Alert,
@@ -30,7 +30,7 @@ export function EntityActionsEditTab({
     collection,
     embedded = false
 }: {
-    collection: EntityCollection,
+    collection: CollectionConfig,
     embedded?: boolean;
 }) {
 
@@ -42,7 +42,7 @@ export function EntityActionsEditTab({
     const {
         values,
         setFieldValue
-    } = useFormex<EntityCollection>();
+    } = useFormex<CollectionConfig>();
 
     const resolvedEntityActions = ((values.entityActions ?? []) as (string | EntityAction<any>)[])
         .filter((e): e is string => typeof e === "string")

package/src/collection_editor/ui/collection_editor/GeneralSettingsForm.tsx

@@ -4,7 +4,7 @@ import { FieldCaption } from "../../_cms_internals";
 import React, { useState } from "react";
 
 import { SearchIconsView } from "../../_cms_internals";
-import type { EntityCollection, PostgresCollection } from "@rebasepro/types";
+import type { CollectionConfig, PostgresCollectionConfig } from "@rebasepro/types";
 import {
     BooleanSwitchWithLabel,
     Chip,
@@ -27,7 +27,7 @@ import { Field, getIn, useFormex } from "@rebasepro/formex";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
 import { singular, toSnakeCase } from "@rebasepro/utils";
 import type { ExtraCollectionFieldsParams } from "../../extensibility_types";
-import { toSerializableCollection } from "../../serializable_utils";
+import { toSerializableCollectionConfig } from "../../serializable_utils";
 
 export function GeneralSettingsForm({
     isNewCollection,
@@ -40,7 +40,7 @@ export function GeneralSettingsForm({
     isNewCollection: boolean;
     existingPaths?: string[];
     existingIds?: string[];
-    parentCollection?: EntityCollection;
+    parentCollection?: CollectionConfig;
     renderExtraCollectionFields?: (params: ExtraCollectionFieldsParams) => React.ReactNode;
     standalone?: boolean;
 }) {
@@ -53,7 +53,7 @@ export function GeneralSettingsForm({
         errors,
         setFieldTouched,
         submitCount
-    } = useFormex<PostgresCollection>();
+    } = useFormex<PostgresCollectionConfig>();
 
     const [iconDialogOpen, setIconDialogOpen] = useState(false);
 
@@ -255,7 +255,7 @@ export function GeneralSettingsForm({
                             onMetadataChange: (key: string, value: unknown) => {
                                 setFieldValue(`metadata.${key}`, value);
                             },
-                            collection: toSerializableCollection(values),
+                            collection: toSerializableCollectionConfig(values),
                         })}
                     </div>
                 )}

package/src/collection_editor/ui/collection_editor/GetCodeDialog.tsx

@@ -1,5 +1,5 @@
 import { useSafeSnackbarController } from "../../useSafeSnackbarController";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { Button, CopyIcon, Dialog, DialogActions, DialogContent, DialogTitle, Typography } from "@rebasepro/ui";
 import React from "react";
 import JSON5 from "json5";
@@ -12,12 +12,12 @@ export function GetCodeDialog({
     collection,
     onOpenChange,
     open
-}: { onOpenChange: (open: boolean) => void, collection: EntityCollection, open: boolean }) {
+}: { onOpenChange: (open: boolean) => void, collection: CollectionConfig, open: boolean }) {
 
     const snackbarController = useSafeSnackbarController();
 
     const code = collection
-        ? "import { EntityCollection } from \"@rebasepro/core\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:EntityCollection = " + JSON5.stringify(collectionToCode({ ...collection }), null, "\t")
+        ? "import { CollectionConfig } from \"@rebasepro/core\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:CollectionConfig = " + JSON5.stringify(collectionToCode({ ...collection }), null, "\t")
         : "No collection selected";
     return <Dialog open={open}
         onOpenChange={onOpenChange}
@@ -78,7 +78,7 @@ export function GetCodeDialog({
     </Dialog>;
 }
 
-function collectionToCode(collection: EntityCollection): object {
+function collectionToCode(collection: CollectionConfig): object {
 
     const propertyCleanup = (value: unknown): unknown => {
         if (value === undefined || value === null) {

package/src/collection_editor/ui/collection_editor/KanbanConfigSection.tsx

@@ -2,7 +2,7 @@
 import { FieldCaption } from "../../_cms_internals";
 import React, { useMemo, useRef, useState } from "react";
 import { useAuthController, useCustomizationController } from "@rebasepro/core";
-import { EntityCollection, Property } from "@rebasepro/types";
+import { CollectionConfig, Property } from "@rebasepro/types";
 import { PropertyConfigBadge } from "../../../components/PropertyConfigBadge";
 import { getFieldConfig } from "../../../components/field_configs";
 import { Button, IconButton, iconSize, Select, SelectItem, Typography, XIcon } from "@rebasepro/ui";
@@ -19,7 +19,7 @@ export function KanbanConfigSection({
 }) {
     const authController = useAuthController();
     const customizationController = useCustomizationController();
-    const { values, setFieldValue } = useFormex<EntityCollection>();
+    const { values, setFieldValue } = useFormex<CollectionConfig>();
     const panelRef = useRef<HTMLDivElement>(null);
     const [columnPropertyDialogOpen, setColumnPropertyDialogOpen] = useState(false);