@rebasepro/admin 0.10.0 → 0.10.1-canary.0a881d4

package/src/collection_editor/ui/CollectionViewHeaderAction.tsx

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

package/src/collection_editor/ui/EditorCollectionAction.tsx

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

package/src/collection_editor/ui/EditorCollectionActionStart.tsx

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

package/src/collection_editor/ui/EditorEntityAction.tsx

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

package/src/collection_editor/ui/HomePageEditorCollectionAction.tsx

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

package/src/collection_editor/ui/KanbanSetupAction.tsx

@@ -1,8 +1,9 @@
 import React from "react";
 import { useTranslation } from "@rebasepro/app";
-import { CollectionConfig } from "@rebasepro/types";
+
 import { Button } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 /**
  * Component rendered when Kanban view is missing orderProperty configuration.
@@ -14,7 +15,7 @@ export function KanbanSetupAction({
     parentCollectionSlugs,
     parentEntityIds
 }: {
-    collection: CollectionConfig;
+    collection: AdminCollection;
     fullPath: string;
     parentCollectionSlugs: string[], parentEntityIds: string[];
 }) {

package/src/collection_editor/ui/MissingReferenceWidget.tsx

@@ -3,7 +3,7 @@ import { ErrorView, useTranslation } from "@rebasepro/app";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import { Button } from "@rebasepro/ui";
 import { prettifyIdentifier } from "@rebasepro/utils";
-import { getLastSegment } from "@rebasepro/common";
+import { getLastSegment } from "@rebasepro/app";
 
 export function MissingReferenceWidget({ path: pathProp }: {
     path: string

package/src/collection_editor/ui/NewCollectionCard.tsx

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

package/src/collection_editor/ui/PropertyAddColumnComponent.tsx

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

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

@@ -3,7 +3,7 @@ import { AIIcon } from "@rebasepro/app";
 import { useCollectionRegistryController } from "../../_cms_internals";
 import React, { useState } from "react";
 import { useSafeSnackbarController } from "../../useSafeSnackbarController";
-import { CollectionConfig } from "@rebasepro/types";
+
 import {
     Button,
     CircularProgress,
@@ -20,18 +20,19 @@ import {
     CollectionOperation
 } from "../../api/generateCollectionApi";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export interface AICollectionGeneratorPopoverProps {
     /**
      * Current collection being edited (if modifying an existing collection)
      */
-    existingCollection?: CollectionConfig<any>;
+    existingCollection?: AdminCollection<any>;
 
     /**
      * Callback when a collection is generated or modified.
      * Includes the collection and optionally the operations that were applied.
      */
-    onGenerated: (collection: CollectionConfig, operations?: CollectionOperation[]) => void;
+    onGenerated: (collection: AdminCollection, operations?: CollectionOperation[]) => void;
 
     /**
      * Callback function for generating/modifying collections.
@@ -95,7 +96,7 @@ export function AICollectionGeneratorPopover({
                 name: c.name,
                 properties: c.properties,
                 propertiesOrder: c.propertiesOrder
-            } as Partial<CollectionConfig>));
+            } as Partial<AdminCollection>));
 
             const result = await generateCollection({
                 prompt: prompt.trim(),
@@ -106,7 +107,7 @@ export function AICollectionGeneratorPopover({
                         name: existingCollection.name,
                         properties: existingCollection.properties,
                         propertiesOrder: existingCollection.propertiesOrder
-                    } as Partial<CollectionConfig>
+                    } as Partial<AdminCollection>
                 })
             });
 

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

@@ -4,7 +4,7 @@ import { FieldCaption } from "../../_cms_internals";
 import React, { useMemo, useState } from "react";
 import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { getFieldConfig, PropertyConfigBadge, SearchIconsView } from "../../_cms_internals";
-import { CollectionConfig, Property } from "@rebasepro/types";
+import { Property } from "@rebasepro/types";
 import {
     BooleanSwitchWithLabel,
     Button,
@@ -31,6 +31,7 @@ import { ViewModeSwitch } from "./ViewModeSwitch";
 import { KanbanConfigSection } from "./KanbanConfigSection";
 import { PropertyFormDialog } from "./PropertyEditView";
 import { singular, toSnakeCase, unslugify } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export function CollectionDetailsForm({
     isNewCollection,
@@ -42,12 +43,11 @@ export function CollectionDetailsForm({
     isNewCollection: boolean,
     existingPaths?: string[];
     existingIds?: string[];
-    parentCollection?: CollectionConfig;
+    parentCollection?: AdminCollection;
     parentCollectionSlugs?: string[], parentEntityIds?: string[];
     expandKanban?: boolean;
 }) {
 
-
     const {
         values,
         setFieldValue,
@@ -57,7 +57,7 @@ export function CollectionDetailsForm({
         setFieldTouched,
         isSubmitting,
         submitCount
-    } = useFormex<CollectionConfig>();
+    } = useFormex<AdminCollection>();
 
     const collectionEditor = useCollectionEditorController();
 
@@ -110,7 +110,6 @@ export function CollectionDetailsForm({
 
     const collectionIcon = <IconForView collectionOrView={values}/>;
 
-
     const isSubcollection = !!parentCollection;
 
     const showErrors = submitCount > 0;
@@ -175,7 +174,6 @@ export function CollectionDetailsForm({
 
                     </div>
 
-
                     <LayoutModeSwitch
                         className={"col-span-12"}
                         value={values.openEntityMode ?? "side_panel"}
@@ -294,7 +292,7 @@ export function CollectionDetailsForm({
                                         property={{
                                             type: "string",
                                             name: dialogPropertyName,
-                                            ui: { disabled: true,
+                                            admin: { disabled: true,
 hideFromCollection: true }
                                         }}
                                         propertyKey={dialogPropertyKey}

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

@@ -32,19 +32,10 @@ import {
     Tab,
     Tabs
 } from "@rebasepro/ui";
-import {
-    EngineProperties,
-    Entity,
-    CollectionConfig,
-    getDataSourceCapabilities,
-    MapProperty,
-    Properties,
-    Property,
-    PropertyConfig,
-    TableMetadata,
-    User
-} from "@rebasepro/types";
-import { getSubcollections, getTableName, isPropertyBuilder, removeInitialAndTrailingSlashes } from "@rebasepro/common";
+import { EngineProperties, Entity, getDataSourceCapabilities, MapProperty, Properties, Property, TableMetadata, User } from "@rebasepro/types";
+import { PropertyConfig, AdminCollection } from "@rebasepro/admin-types";
+import { getSubcollections, getTableName, isPropertyBuilder } from "@rebasepro/common";
+import { removeInitialAndTrailingSlashes } from "@rebasepro/app";
 import { CollectionEditorSchema } from "./CollectionYupValidation";
 import { GeneralSettingsForm } from "./GeneralSettingsForm";
 import { DisplaySettingsForm } from "./DisplaySettingsForm";
@@ -77,11 +68,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?: CollectionConfig;
+    copyFrom?: AdminCollection;
     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?: CollectionConfig) => void;
+    handleClose: (collection?: AdminCollection) => void;
     configController: CollectionsConfigController;
     collectionInference?: CollectionInference;
     extraView?: {
@@ -92,7 +83,7 @@ export interface CollectionEditorDialogProps extends CollectionEditorExtensionPr
     };
     getUser?: (uid: string) => User | null;
     getData?: (path: string, parentPaths: string[]) => Promise<object[]>;
-    parentCollection?: CollectionConfig;
+    parentCollection?: AdminCollection;
     existingEntities?: Entity<any>[];
     /**
      * Initial view to open when editing: "general", "display", or "properties".
@@ -213,7 +204,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<CollectionConfig<any> | undefined>();
+    const [collection, setCollection] = React.useState<AdminCollection<any> | undefined>();
     const [initialLoadingCompleted, setInitialLoadingCompleted] = React.useState(false);
 
     useEffect(() => {
@@ -234,7 +225,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 CollectionConfig<any>);
+                    setCollection((registryCol ?? configCol) as AdminCollection<any>);
                 } else {
                     setCollection(undefined);
                 }
@@ -245,7 +236,6 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
         }
     }, [props.editedCollectionId, props.parentCollectionSlugs, props.parentEntityIds, standalone, collectionRegistry.initialised, collectionRegistry.getRawCollection, props.configController.collections, props.configController.loading, collections]);
 
-
     const initialIcon = React.useMemo(() => coolIconKeys[Math.floor(Math.random() * coolIconKeys.length)], []);
     const fallbackSlug = React.useMemo(() => randomString(16), []);
 
@@ -259,7 +249,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
     }, [collection, fallbackSlug]);
 
     // Build initial values - handle copyFrom for duplication
-    const initialValues = React.useMemo((): CollectionConfig<any> => {
+    const initialValues = React.useMemo((): AdminCollection<any> => {
         return (initialCollection
             ? applyPropertyConfigs(initialCollection, propertyConfigs)
             : copyFromProp
@@ -270,7 +260,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
                         ...rest,
                         name: "",
                         ownerId: authController.user?.uid ?? ""
-                    } as CollectionConfig<any>;
+                    } as AdminCollection<any>;
                 })()
                 : {
                     slug: initialValuesProp?.slug ?? fallbackSlug,
@@ -280,7 +270,7 @@ export function CollectionEditor(props: CollectionEditorDialogProps & {
                     propertiesOrder: [],
                     icon: initialIcon,
                     ownerId: authController.user?.uid ?? ""
-                }) as CollectionConfig<any>;
+                }) as AdminCollection<any>;
     }, [initialCollection, propertyConfigs, copyFromProp, initialValuesProp, fallbackSlug, initialIcon, authController.user?.uid]);
 
     if (!initialLoadingCompleted) {
@@ -341,12 +331,12 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 }: CollectionEditorDialogProps & {
     handleCancel: () => void,
     setFormDirty: (dirty: boolean) => void,
-    initialValues: CollectionConfig<M>,
+    initialValues: AdminCollection<M>,
     existingPaths: string[],
     existingIds: string[],
     includeTemplates: boolean,
-    collection: CollectionConfig<M> | undefined,
-    setCollection: (collection: CollectionConfig<M>) => void,
+    collection: AdminCollection<M> | undefined,
+    setCollection: (collection: AdminCollection<M>) => void,
     propertyConfigs: Record<string, PropertyConfig>,
 }
 ) {
@@ -395,7 +385,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
     const [error, setError] = React.useState<Error | undefined>();
 
-    const saveCollection = (updatedCollection: CollectionConfig<M>): Promise<boolean> => {
+    const saveCollection = (updatedCollection: AdminCollection<M>): Promise<boolean> => {
         const id = updatedCollection.slug;
 
         return configController.saveCollection({
@@ -442,7 +432,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
     };
 
-    const doCollectionInference = collectionInference ? (collection: CollectionConfig<any>) => {
+    const doCollectionInference = collectionInference ? (collection: AdminCollection<any>) => {
         if (!collectionInference) return undefined;
         return collectionInference?.(
             collection.slug,
@@ -451,7 +441,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         );
     } : undefined;
 
-    const inferCollectionFromData = async (newCollection: CollectionConfig<M>) => {
+    const inferCollectionFromData = async (newCollection: AdminCollection<M>) => {
 
         try {
             if (!doCollectionInference) {
@@ -497,7 +487,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         }
     };
 
-    const onSubmit = async (newCollectionState: CollectionConfig<M>, formexController: FormexController<CollectionConfig<M>>) => {
+    const onSubmit = async (newCollectionState: AdminCollection<M>, formexController: FormexController<AdminCollection<M>>) => {
         console.debug("Submitting collection", newCollectionState);
         try {
 
@@ -506,7 +496,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                 if (success) {
                     aiModifiedPaths?.clearAllPaths();
                     formexController.resetForm({ values: newCollectionState });
-                    handleClose(newCollectionState as CollectionConfig);
+                    handleClose(newCollectionState as AdminCollection);
                 }
                 return;
             }
@@ -544,7 +534,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                 if (success) {
                     formexController.resetForm({ values: initialValues });
                     setNextMode();
-                    handleClose(newCollectionState as CollectionConfig);
+                    handleClose(newCollectionState as AdminCollection);
                 }
             } else {
                 setNextMode();
@@ -560,7 +550,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         }
     };
 
-    const validation = (col: CollectionConfig<M>) => {
+    const validation = (col: AdminCollection<M>) => {
 
         let errors: Record<string, string> = {};
         const schema = (currentView === "properties" || currentView === "general") && CollectionEditorSchema;
@@ -595,7 +585,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
         return errors;
     };
 
-    const formController = useCreateFormex<CollectionConfig<M>>({
+    const formController = useCreateFormex<AdminCollection<M>>({
         initialValues,
         onSubmit,
         validation,
@@ -689,8 +679,8 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
     const aiModifiedPaths = useAIModifiedPaths();
 
-    const handleAIGenerated = (generatedCollection: CollectionConfig, operations?: CollectionOperation[]) => {
-        formController.setValues(generatedCollection as CollectionConfig<M>);
+    const handleAIGenerated = (generatedCollection: AdminCollection, operations?: CollectionOperation[]) => {
+        formController.setValues(generatedCollection as AdminCollection<M>);
         if (operations && aiModifiedPaths) {
             aiModifiedPaths.addModifiedPaths(operations);
         }
@@ -776,7 +766,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                                         formController.setValues({
                                             ...formController.values,
                                             ...collectionData
-                                        } as CollectionConfig<M>);
+                                        } as AdminCollection<M>);
                                         onWelcomeScreenContinue();
                                     } catch (e: unknown) {
                                         console.error("Error importing table:", e);
@@ -975,7 +965,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
 
 }
 
-function applyPropertyConfigs<M extends Record<string, unknown> = Record<string, unknown>>(collection: CollectionConfig<M>, propertyConfigs: Record<string, PropertyConfig>): CollectionConfig<M> {
+function applyPropertyConfigs<M extends Record<string, unknown> = Record<string, unknown>>(collection: AdminCollection<M>, propertyConfigs: Record<string, PropertyConfig>): AdminCollection<M> {
     const {
         properties,
         ...rest
@@ -992,7 +982,7 @@ function applyPropertyConfigs<M extends Record<string, unknown> = Record<string,
     return {
         ...rest,
         properties: propertiesResult as EngineProperties
-    } as CollectionConfig<M>;
+    } as AdminCollection<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/app";
 ;
 import React, { useState } from "react";
 ;
-import { CollectionConfig } from "@rebasepro/types";
+
 import {
     Button,
     Card,
@@ -31,6 +31,7 @@ import { useCollectionEditorController } from "../../useCollectionEditorControll
 import { AICollectionGeneratorPopover } from "./AICollectionGeneratorPopover";
 import { CollectionGenerationCallback } from "../../api/generateCollectionApi";
 import { prettifyIdentifier } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export function CollectionEditorWelcomeView({
     path,
@@ -43,7 +44,7 @@ export function CollectionEditorWelcomeView({
     onImportFromTable
 }: {
     path: string;
-    parentCollection?: CollectionConfig;
+    parentCollection?: AdminCollection;
     onContinue: (importData?: object[], propertiesOrder?: string[]) => void;
     existingCollectionPaths?: string[];
     generateCollection?: CollectionGenerationCallback;
@@ -61,7 +62,7 @@ export function CollectionEditorWelcomeView({
         setFieldValue,
         setValues,
         submitCount
-    } = useFormex<CollectionConfig>();
+    } = useFormex<AdminCollection>();
 
     const [jsonImportOpen, setJsonImportOpen] = useState(false);
     const [importingTable, setImportingTable] = useState<string | null>(null);

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

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

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

@@ -21,7 +21,8 @@ import {
     Tooltip,
     Typography
 } from "@rebasepro/ui";
-import { CollectionConfig, MapProperty, Properties, Property, PropertyConfig, User } from "@rebasepro/types";
+import { MapProperty, Properties, Property, User } from "@rebasepro/types";
+import { PropertyConfig, AdminCollection } from "@rebasepro/admin-types";
 import { isPropertyBuilder } from "@rebasepro/common";
 
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath } from "./util";
@@ -44,7 +45,7 @@ type CollectionEditorFormProps = {
     extraIcon: React.ReactNode;
     getUser?: (uid: string) => User | null;
     getData?: () => Promise<object[]>;
-    doCollectionInference?: (collection: CollectionConfig) => Promise<Partial<CollectionConfig> | null> | undefined;
+    doCollectionInference?: (collection: AdminCollection) => Promise<Partial<AdminCollection> | null> | undefined;
     propertyConfigs: Record<string, PropertyConfig>;
     propertyTypePresets?: PropertyTypePreset[];
     hiddenPropertyTypes?: PropertyType[];
@@ -82,7 +83,7 @@ export function CollectionPropertiesEditorForm({
         setFieldTouched,
         errors,
         dirty
-    } = useFormex<CollectionConfig>();
+    } = useFormex<AdminCollection>();
 
     const snackbarController = useSafeSnackbarController();
     const configControllerFromContext = useCollectionsConfigController();

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

@@ -1,5 +1,5 @@
 
-import { CollectionConfig, SecurityRule as GeneratedSecurityRule } from "@rebasepro/types";
+import { SecurityRule as GeneratedSecurityRule } from "@rebasepro/types";
 import { getPolicyNamesForRule, getPolicyNamesForRules } from "@rebasepro/utils";
 import { getEffectiveSecurityRules } from "@rebasepro/common";
 import React, { useState, useEffect, useMemo } from "react";
@@ -41,6 +41,7 @@ import {
 } from "@rebasepro/ui";
 import { useFormex } from "@rebasepro/forms";
 import { useRebaseContext } from "@rebasepro/app";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 /** Postgres RLS policy shape — defined inline to avoid depending on @rebasepro/studio */
 export interface PostgresPolicy {
@@ -63,7 +64,7 @@ interface SecurityRule {
     roles?: string[];
 }
 
-type CollectionWithSecurity = CollectionConfig & {
+type CollectionWithSecurity = AdminCollection & {
     securityRules?: SecurityRule[];
     id?: string;
     table?: string;
@@ -183,7 +184,7 @@ export function CollectionRLSTab() {
      */
     const generatedPolicyNames = useMemo(() => {
         if (!tableName) return new Set<string>();
-        const effectiveRules = getEffectiveSecurityRules(values as CollectionConfig);
+        const effectiveRules = getEffectiveSecurityRules(values as AdminCollection);
         return getPolicyNamesForRules(
             [...(rules as unknown as GeneratedSecurityRule[]), ...effectiveRules],
             tableName

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

@@ -22,11 +22,12 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { useFormex } from "@rebasepro/forms";
-import { PostgresCollectionConfig, Relation } from "@rebasepro/types";
+import { Relation } from "@rebasepro/types";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
+import type { AdminPostgresCollection } from "@rebasepro/admin-types";
 
 export function CollectionRelationsTab() {
-    const { values, setFieldValue } = useFormex<PostgresCollectionConfig>();
+    const { values, setFieldValue } = useFormex<AdminPostgresCollection>();
     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 { CollectionConfig } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-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?: CollectionConfig) => void;
+    onSave?: (collection?: AdminCollection) => void;
 
     /**
      * Called when the user cancels editing.

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

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