@rebasepro/admin 0.8.0 → 0.9.1-canary.09aaf62

package/src/collection_editor/types/collection_editor_controller.tsx

@@ -1,5 +1,5 @@
 import { CollectionsConfigController } from "./config_controller";
-import { Entity, EntityCollection, Property } from "@rebasepro/types";
+import { Entity, CollectionConfig, Property } from "@rebasepro/types";
 
 /**
  * Controller to open the collection editor dialog.
@@ -11,7 +11,7 @@ export interface CollectionEditorController {
         id?: string,
         path?: string,
         parentCollectionSlugs: string[], parentEntityIds: string[],
-        parentCollection?: EntityCollection,
+        parentCollection?: CollectionConfig,
         existingEntities?: Entity<any>[],
         /**
          * Initial view to open: "general", "display", or "properties"
@@ -34,9 +34,9 @@ export interface CollectionEditorController {
          * 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,
         parentCollectionSlugs: string[], parentEntityIds: string[],
-        parentCollection?: EntityCollection,
+        parentCollection?: CollectionConfig,
         redirect: boolean,
         sourceClick?: string
     }) => void;
@@ -47,7 +47,7 @@ export interface CollectionEditorController {
         currentPropertiesOrder?: string[],
         editedCollectionId: string,
         parentCollectionSlugs: string[], parentEntityIds: string[],
-        collection: EntityCollection,
+        collection: CollectionConfig,
         existingEntities: Entity<any>[]
     }) => void;
 

package/src/collection_editor/types/collection_inference.ts

@@ -1,4 +1,4 @@
-import { EntityCollection, FilterValues } from "@rebasepro/types";
+import { CollectionConfig, FilterValues } from "@rebasepro/types";
 
 /**
  * This function is used to infer the configuration of a collection given its path.
@@ -14,4 +14,4 @@ export type CollectionInference = (
     databaseId?: string,
     initialFilter?: FilterValues<string>,
     initialSort?: [string, "asc" | "desc"]
-) => Promise<Partial<EntityCollection> | null>;
+) => Promise<Partial<CollectionConfig> | null>;

package/src/collection_editor/types/config_controller.tsx

@@ -1,4 +1,4 @@
-import { EntityCollection, NavigationGroupMapping, Property } from "@rebasepro/types";
+import { CollectionConfig, NavigationGroupMapping, Property } from "@rebasepro/types";
 
 export interface CollectionsSetupInfo {
     status: "ongoing" | "complete" | "error";
@@ -13,7 +13,7 @@ export interface CollectionsConfigController {
 
     loading: boolean;
 
-    collections?: EntityCollection[];
+    collections?: CollectionConfig[];
 
     /**
      * If true, the configuration cannot be modified.
@@ -32,7 +32,7 @@ export interface CollectionsConfigController {
      */
     collectionsSetup?: CollectionsSetupInfo;
 
-    getCollection: (id: string) => EntityCollection;
+    getCollection: (id: string) => CollectionConfig;
 
     saveCollection: <M extends { [Key: string]: any }>(params: SaveCollectionParams<M>) => Promise<void>;
     updateCollection: <M extends { [Key: string]: any }>(params: UpdateCollectionParams<M>) => Promise<void>;
@@ -59,14 +59,14 @@ export interface CollectionsConfigController {
 
 export type UpdateCollectionParams<M extends Record<string, unknown> = Record<string, unknown>> = {
     id: string,
-    collectionData: Partial<EntityCollection<M>>,
+    collectionData: Partial<CollectionConfig<M>>,
     previousId?: string,
     parentCollectionSlugs?: string[], parentEntityIds?: string[]
 }
 
 export type SaveCollectionParams<M extends Record<string, unknown> = Record<string, unknown>> = {
     id: string,
-    collectionData: EntityCollection<M>,
+    collectionData: CollectionConfig<M>,
     previousId?: string,
     parentCollectionSlugs?: string[], parentEntityIds?: string[]
 }
@@ -96,14 +96,14 @@ export type DeleteCollectionParams = {
 export type UpdatePropertiesOrderParams = {
     fullPath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];
-    collection: EntityCollection;
+    collection: CollectionConfig;
     newPropertiesOrder: string[];
 }
 
 export type UpdateKanbanColumnsOrderParams = {
     fullPath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];
-    collection: EntityCollection;
+    collection: CollectionConfig;
     kanbanColumnProperty: string;
     newColumnsOrder: string[];
 }

package/src/collection_editor/ui/AddKanbanColumnAction.tsx

@@ -4,9 +4,9 @@ import {
     useAuthController,
     useCustomizationController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { getPropertyInPath } from "../_cms_internals";
-import { EntityCollection, EnumValueConfig, StringProperty } from "@rebasepro/types";
+import { CollectionConfig, EnumValueConfig, StringProperty } from "@rebasepro/types";
 import { resolveEnumValues } from "@rebasepro/common";
 import {
     Button,
@@ -34,7 +34,7 @@ export function AddKanbanColumnAction({
     parentCollectionSlugs, parentEntityIds,
     columnProperty
 }: {
-    collection: EntityCollection;
+    collection: CollectionConfig;
     fullPath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];
     columnProperty: string;

package/src/collection_editor/ui/CollectionViewHeaderAction.tsx

@@ -1,5 +1,5 @@
-import { useTranslation } from "@rebasepro/core";
-import { EntityCollection, EntityTableController, Property } from "@rebasepro/types";
+import { useTranslation } from "@rebasepro/app";
+import { CollectionConfig, EntityTableController, Property } from "@rebasepro/types";
 import { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 import React from "react";
 import { useCollectionEditorController } from "../useCollectionEditorController";
@@ -18,7 +18,7 @@ export function CollectionViewHeaderAction({
     onHover: boolean,
     path: string,
     parentCollectionSlugs: string[], parentEntityIds: string[],
-    collection: EntityCollection;
+    collection: CollectionConfig;
     tableController: EntityTableController;
 }) {
 

package/src/collection_editor/ui/EditorCollectionAction.tsx

@@ -1,6 +1,6 @@
 import { useCollectionRegistryController } from "../_cms_internals";
-import { useAuthController, useTranslation } from "@rebasepro/core";
-import { EntityCollection, CollectionActionsProps } from "@rebasepro/types";
+import { useAuthController, useTranslation } from "@rebasepro/app";
+import { CollectionConfig, CollectionActionsProps } from "@rebasepro/types";
 import { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
@@ -38,7 +38,7 @@ export function EditorCollectionAction({
                     path,
                     parentCollectionSlugs,
 parentEntityIds,
-                    parentCollection: parentCollection as EntityCollection,
+                    parentCollection: parentCollection as CollectionConfig,
                     existingEntities: tableController?.data ?? []
                 })
                 : undefined}>

package/src/collection_editor/ui/EditorCollectionActionStart.tsx

@@ -4,8 +4,8 @@ import {
     useAuthController,
     useSnackbarController,
     useTranslation
-} from "@rebasepro/core";
-import { EntityCollection, CollectionActionsProps } from "@rebasepro/types";
+} from "@rebasepro/app";
+import { CollectionConfig, CollectionActionsProps } from "@rebasepro/types";
 import { Button, SaveIcon, Tooltip, UndoIcon } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
@@ -42,7 +42,7 @@ export function EditorCollectionActionStart({
                             id: collection.slug,
                             parentCollectionSlugs,
 parentEntityIds,
-                            collectionData: mergeDeep(collection as EntityCollection,
+                            collectionData: mergeDeep(collection as CollectionConfig,
                                 {
                                     defaultFilter: tableController.filterValues ?? null,
                                     sort: tableController.sortBy ?? null

package/src/collection_editor/ui/EditorEntityAction.tsx

@@ -1,6 +1,6 @@
 import { useCollectionRegistryController } from "../_cms_internals";
-import { useAuthController, useTranslation } from "@rebasepro/core";
-import { EntityCollection, PluginFormActionProps } from "@rebasepro/types";
+import { useAuthController, useTranslation } from "@rebasepro/app";
+import { CollectionConfig, PluginFormActionProps } from "@rebasepro/types";
 import { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
@@ -35,7 +35,7 @@ export function EditorEntityAction({
                     path,
                     parentCollectionSlugs,
 parentEntityIds,
-                    parentCollection: parentCollection as EntityCollection
+                    parentCollection: parentCollection as CollectionConfig
                 })
                 : undefined}>
             <SettingsIcon/>

package/src/collection_editor/ui/HomePageEditorCollectionAction.tsx

@@ -3,7 +3,7 @@ import {
     useAuthController,
     useSnackbarController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { PluginHomePageActionsProps } from "@rebasepro/types";
 import { CopyIcon, IconButton, Menu, MenuItem, MoreVerticalIcon, SettingsIcon, Trash2Icon } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";

package/src/collection_editor/ui/KanbanSetupAction.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { useTranslation } from "@rebasepro/core";
-import { EntityCollection } from "@rebasepro/types";
+import { useTranslation } from "@rebasepro/app";
+import { CollectionConfig } from "@rebasepro/types";
 import { Button } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
@@ -14,7 +14,7 @@ export function KanbanSetupAction({
     parentCollectionSlugs,
     parentEntityIds
 }: {
-    collection: EntityCollection;
+    collection: CollectionConfig;
     fullPath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];
 }) {

package/src/collection_editor/ui/MissingReferenceWidget.tsx

@@ -1,5 +1,5 @@
 import { useCollectionRegistryController } from "../_cms_internals";
-import { ErrorView, useTranslation } from "@rebasepro/core";
+import { ErrorView, useTranslation } from "@rebasepro/app";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import { Button } from "@rebasepro/ui";
 import { prettifyIdentifier } from "@rebasepro/utils";

package/src/collection_editor/ui/NewCollectionButton.tsx

@@ -1,6 +1,6 @@
 import { Button, PlusIcon } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
-import { useAdminModeController, useTranslation } from "@rebasepro/core";
+import { useAdminModeController, useTranslation } from "@rebasepro/app";
 
 export function NewCollectionButton() {
     const adminModeController = useAdminModeController();

package/src/collection_editor/ui/NewCollectionCard.tsx

@@ -1,7 +1,7 @@
 import {
     useAuthController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { PluginHomePageAdditionalCardsProps } from "@rebasepro/types";
 import { Card, cls, PlusIcon, Typography } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";

package/src/collection_editor/ui/PropertyAddColumnComponent.tsx

@@ -1,9 +1,9 @@
 import {
     useAuthController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { getDefaultPropertiesOrder } from "../_cms_internals";
-import { EntityCollection, EntityTableController } from "@rebasepro/types";
+import { CollectionConfig, EntityTableController } from "@rebasepro/types";
 import { PlusIcon, Tooltip } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
@@ -15,7 +15,7 @@ export function PropertyAddColumnComponent({
 }: {
     path: string,
     parentCollectionSlugs: string[], parentEntityIds: string[],
-    collection: EntityCollection;
+    collection: CollectionConfig;
     tableController: EntityTableController;
 }) {
 

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

@@ -1,9 +1,9 @@
 
-import { AIIcon } from "@rebasepro/core";
+import { AIIcon } from "@rebasepro/app";
 import { useCollectionRegistryController } from "../../_cms_internals";
 import React, { useState } from "react";
 import { useSafeSnackbarController } from "../../useSafeSnackbarController";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import {
     Button,
     CircularProgress,
@@ -25,13 +25,13 @@ export interface AICollectionGeneratorPopoverProps {
     /**
      * Current collection being edited (if modifying an existing collection)
      */
-    existingCollection?: EntityCollection<any>;
+    existingCollection?: CollectionConfig<any>;
 
     /**
      * Callback when a collection is generated or modified.
      * Includes the collection and optionally the operations that were applied.
      */
-    onGenerated: (collection: EntityCollection, operations?: CollectionOperation[]) => void;
+    onGenerated: (collection: CollectionConfig, operations?: CollectionOperation[]) => void;
 
     /**
      * Callback function for generating/modifying collections.
@@ -95,7 +95,7 @@ export function AICollectionGeneratorPopover({
                 name: c.name,
                 properties: c.properties,
                 propertiesOrder: c.propertiesOrder
-            } as Partial<EntityCollection>));
+            } as Partial<CollectionConfig>));
 
             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>
+                    } as Partial<CollectionConfig>
                 })
             });
 

package/src/collection_editor/ui/collection_editor/CollectionDetailsForm.tsx

@@ -1,10 +1,10 @@
 
-import { IconForView } from "@rebasepro/core";
+import { IconForView } from "@rebasepro/app";
 import { FieldCaption } from "../../_cms_internals";
 import React, { useMemo, useState } from "react";
-import { useAuthController, useCustomizationController } from "@rebasepro/core";
+import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { getFieldConfig, PropertyConfigBadge, SearchIconsView } from "../../_cms_internals";
-import { EntityCollection, Property } from "@rebasepro/types";
+import { CollectionConfig, Property } from "@rebasepro/types";
 import {
     BooleanSwitchWithLabel,
     Button,
@@ -24,7 +24,7 @@ import {
     XIcon
 } from "@rebasepro/ui";
 
-import { Field, getIn, useFormex } from "@rebasepro/formex";
+import { Field, getIn, useFormex } from "@rebasepro/forms";
 import { useCollectionEditorController } from "../../useCollectionEditorController";
 import { LayoutModeSwitch } from "./LayoutModeSwitch";
 import { ViewModeSwitch } from "./ViewModeSwitch";
@@ -42,7 +42,7 @@ export function CollectionDetailsForm({
     isNewCollection: boolean,
     existingPaths?: string[];
     existingIds?: string[];
-    parentCollection?: EntityCollection;
+    parentCollection?: CollectionConfig;
     parentCollectionSlugs?: string[], parentEntityIds?: string[];
     expandKanban?: boolean;
 }) {
@@ -57,7 +57,7 @@ export function CollectionDetailsForm({
         setFieldTouched,
         isSubmitting,
         submitCount
-    } = useFormex<EntityCollection>();
+    } = useFormex<CollectionConfig>();
 
     const collectionEditor = useCollectionEditorController();
 

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

@@ -7,7 +7,7 @@ import {
     useAuthController,
     useCustomizationController,
     useUnsavedChangesDialog
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import {
     getInferenceType,
     ImportSaveInProgress,
@@ -35,7 +35,7 @@ import {
 import {
     EngineProperties,
     Entity,
-    EntityCollection,
+    CollectionConfig,
     getDataSourceCapabilities,
     MapProperty,
     Properties,
@@ -52,11 +52,11 @@ import { CollectionPropertiesEditorForm } from "./CollectionPropertiesEditorForm
 import { CollectionsConfigController } from "../../types/config_controller";
 import { CollectionEditorWelcomeView } from "./CollectionEditorWelcomeView";
 import { CollectionInference } from "../../types/collection_inference";
-import { buildEntityPropertiesFromData } from "@rebasepro/schema-inference";
+import { buildEntityPropertiesFromData } from "@rebasepro/inference";
 import { CollectionEditorImportMapping } from "./import/CollectionEditorImportMapping";
 import { CollectionEditorImportDataPreview } from "./import/CollectionEditorImportDataPreview";
 import { cleanPropertiesFromImport } from "./import/clean_import_data";
-import { Formex, FormexController, useCreateFormex } from "@rebasepro/formex";
+import { Formex, FormexController, useCreateFormex } from "@rebasepro/forms";
 import { getFullIdPath } from "./util";
 import { AICollectionGeneratorPopover } from "./AICollectionGeneratorPopover";
 import { AIModifiedPathsProvider, useAIModifiedPaths } from "./AIModifiedPathsContext";
@@ -77,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?: {
@@ -92,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".
@@ -213,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(() => {
@@ -234,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);
                 }
@@ -259,7 +259,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
     }, [collection, fallbackSlug]);
 
     // Build initial values - handle copyFrom for duplication
-    const initialValues = React.useMemo((): EntityCollection<any> => {
+    const initialValues = React.useMemo((): CollectionConfig<any> => {
         return (initialCollection
             ? applyPropertyConfigs(initialCollection, propertyConfigs)
             : copyFromProp
@@ -270,7 +270,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
                         ...rest,
                         name: "",
                         ownerId: authController.user?.uid ?? ""
-                    } as EntityCollection<any>;
+                    } as CollectionConfig<any>;
                 })()
                 : {
                     slug: initialValuesProp?.slug ?? fallbackSlug,
@@ -280,7 +280,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
                     propertiesOrder: [],
                     icon: initialIcon,
                     ownerId: authController.user?.uid ?? ""
-                }) as EntityCollection<any>;
+                }) as CollectionConfig<any>;
     }, [initialCollection, propertyConfigs, copyFromProp, initialValuesProp, fallbackSlug, initialIcon, authController.user?.uid]);
 
     if (!initialLoadingCompleted) {
@@ -341,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>,
 }
 ) {
@@ -395,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({
@@ -442,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,
@@ -451,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) {
@@ -497,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 {
 
@@ -506,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;
             }
@@ -544,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();
@@ -560,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;
@@ -595,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,
@@ -689,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);
         }
@@ -749,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/>}
@@ -776,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);
@@ -975,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
@@ -992,7 +992,7 @@ function applyPropertyConfigs<M extends Record<string, unknown> = Record<string,
     return {
         ...rest,
         properties: propertiesResult as EngineProperties
-    } as EntityCollection<M>;
+    } as CollectionConfig<M>;
 }
 
 function applyPropertiesConfig(property: Property, propertyConfigs: Record<string, PropertyConfig>) {

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

@@ -1,8 +1,8 @@
-import { AIIcon } from "@rebasepro/core";
+import { AIIcon } from "@rebasepro/app";
 ;
 import React, { useState } from "react";
 ;
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import {
     Button,
     Card,
@@ -26,7 +26,7 @@ import { blogCollectionTemplate } from "./templates/blog_template";
 import { usersCollectionTemplate } from "./templates/users_template";
 import { ImportFileUpload } from "../../_cms_internals";
 import { pagesCollectionTemplate } from "./templates/pages_template";
-import { useFormex } from "@rebasepro/formex";
+import { useFormex } from "@rebasepro/forms";
 import { useCollectionEditorController } from "../../useCollectionEditorController";
 import { AICollectionGeneratorPopover } from "./AICollectionGeneratorPopover";
 import { CollectionGenerationCallback } from "../../api/generateCollectionApi";
@@ -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({