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

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

@@ -4,7 +4,7 @@ import React, { useMemo, useState } from "react";
 import { useCustomizationController } from "@rebasepro/app";
 import { getFieldConfig } from "../../../components/field_configs";
 import { PropertyConfigBadge } from "../../../components/PropertyConfigBadge";
-import { CollectionConfig, Property } from "@rebasepro/types";
+import { Property } from "@rebasepro/types";
 import {
     BooleanSwitchWithLabel,
     Button,
@@ -25,6 +25,7 @@ import { KanbanConfigSection } from "./KanbanConfigSection";
 import { PropertyFormDialog } from "./PropertyEditView";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
 import { unslugify } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export function DisplaySettingsForm({
     expandKanban,
@@ -39,7 +40,7 @@ export function DisplaySettingsForm({
         setFieldValue,
         handleChange,
         submitCount
-    } = useFormex<CollectionConfig>();
+    } = useFormex<AdminCollection>();
 
     const [orderPropertyDialogOpen, setOrderPropertyDialogOpen] = useState(false);
 
@@ -198,7 +199,7 @@ export function DisplaySettingsForm({
                                             property={{
                                                 type: "string",
                                                 name: dialogPropertyName,
-                                                ui: { disabled: true,
+                                                admin: { disabled: true,
 hideFromCollection: true }
                                             }}
                                             propertyKey={dialogPropertyKey}

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

@@ -5,8 +5,8 @@ import {
     useCustomizationController
 } from "@rebasepro/app";
 import { resolveEntityAction } from "../../_cms_internals";
-import { type CollectionConfig } from "@rebasepro/types";
-import { EntityAction } from "@rebasepro/types";
+
+import { EntityAction, AdminCollection } from "@rebasepro/admin-types";
 import {
     Alert,
     Button,
@@ -30,7 +30,7 @@ export function EntityActionsEditTab({
     collection,
     embedded = false
 }: {
-    collection: CollectionConfig,
+    collection: AdminCollection,
     embedded?: boolean;
 }) {
 
@@ -42,7 +42,7 @@ export function EntityActionsEditTab({
     const {
         values,
         setFieldValue
-    } = useFormex<CollectionConfig>();
+    } = useFormex<AdminCollection>();
 
     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 { CollectionConfig, PostgresCollectionConfig } from "@rebasepro/types";
+
 import {
     BooleanSwitchWithLabel,
     Chip,
@@ -28,6 +28,7 @@ import { useCollectionsConfigController } from "../../useCollectionsConfigContro
 import { singular, toSnakeCase } from "@rebasepro/utils";
 import type { ExtraCollectionFieldsParams } from "../../extensibility_types";
 import { toSerializableCollectionConfig } from "../../serializable_utils";
+import type { AdminCollection, AdminPostgresCollection } from "@rebasepro/admin-types";
 
 export function GeneralSettingsForm({
     isNewCollection,
@@ -40,7 +41,7 @@ export function GeneralSettingsForm({
     isNewCollection: boolean;
     existingPaths?: string[];
     existingIds?: string[];
-    parentCollection?: CollectionConfig;
+    parentCollection?: AdminCollection;
     renderExtraCollectionFields?: (params: ExtraCollectionFieldsParams) => React.ReactNode;
     standalone?: boolean;
 }) {
@@ -53,7 +54,7 @@ export function GeneralSettingsForm({
         errors,
         setFieldTouched,
         submitCount
-    } = useFormex<PostgresCollectionConfig>();
+    } = useFormex<AdminPostgresCollection>();
 
     const [iconDialogOpen, setIconDialogOpen] = useState(false);
 
@@ -151,7 +152,6 @@ export function GeneralSettingsForm({
                             </FieldCaption>
                         </div>
 
-
                         {/* Singular Name */}
                         <div className={"col-span-12"}>
                             <TextField

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

@@ -1,5 +1,5 @@
 import { useSafeSnackbarController } from "../../useSafeSnackbarController";
-import { CollectionConfig } from "@rebasepro/types";
+
 import { Button, CopyIcon, Dialog, DialogActions, DialogContent, DialogTitle, Typography } from "@rebasepro/ui";
 import React from "react";
 import JSON5 from "json5";
@@ -7,17 +7,18 @@ import { Highlight, themes } from "prism-react-renderer"
 import { camelCase } from "./utils/strings";
 import { clone } from "@rebasepro/forms";
 import { isEmptyObject } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export function GetCodeDialog({
     collection,
     onOpenChange,
     open
-}: { onOpenChange: (open: boolean) => void, collection: CollectionConfig, open: boolean }) {
+}: { onOpenChange: (open: boolean) => void, collection: AdminCollection, open: boolean }) {
 
     const snackbarController = useSafeSnackbarController();
 
     const code = collection
-        ? "import { CollectionConfig } from \"@rebasepro/app\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:CollectionConfig = " + JSON5.stringify(collectionToCode({ ...collection }), null, "\t")
+        ? "import { AdminCollection } from \"@rebasepro/app\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:AdminCollection = " + JSON5.stringify(collectionToCode({ ...collection }), null, "\t")
         : "No collection selected";
     return <Dialog open={open}
         onOpenChange={onOpenChange}
@@ -78,7 +79,7 @@ export function GetCodeDialog({
     </Dialog>;
 }
 
-function collectionToCode(collection: CollectionConfig): object {
+function collectionToCode(collection: AdminCollection): object {
 
     const propertyCleanup = (value: unknown): unknown => {
         if (value === undefined || value === null) {

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

@@ -2,13 +2,14 @@
 import { FieldCaption } from "../../_cms_internals";
 import React, { useMemo, useRef, useState } from "react";
 import { useAuthController, useCustomizationController } from "@rebasepro/app";
-import { CollectionConfig, Property } from "@rebasepro/types";
+import { 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";
 import { useFormex } from "@rebasepro/forms";
 import { PropertyFormDialog } from "./PropertyEditView";
 import { unslugify } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export function KanbanConfigSection({
     className,
@@ -19,7 +20,7 @@ export function KanbanConfigSection({
 }) {
     const authController = useAuthController();
     const customizationController = useCustomizationController();
-    const { values, setFieldValue } = useFormex<CollectionConfig>();
+    const { values, setFieldValue } = useFormex<AdminCollection>();
     const panelRef = useRef<HTMLDivElement>(null);
     const [columnPropertyDialogOpen, setColumnPropertyDialogOpen] = useState(false);
 

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

@@ -6,7 +6,8 @@ import { Formex, FormexController, getIn, useCreateFormex } from "@rebasepro/for
 import { ConfirmationDialog } from "@rebasepro/app";
 import { DEFAULT_FIELD_CONFIGS, getFieldConfig, getFieldId } from "../../../components/field_configs";
 import { PropertyConfigBadge } from "../../../components/PropertyConfigBadge";
-import { CollectionConfig, Property, PropertyConfig, PropertyConfigId } from "@rebasepro/types";
+import { Property } from "@rebasepro/types";
+import { PropertyConfig, PropertyConfigId, AdminCollection } from "@rebasepro/admin-types";
 import type { PropertyTypePreset, PropertyType } from "../../extensibility_types";
 import { toSerializableProperty, toSerializableCollectionConfig } from "../../serializable_utils";
 import type { SerializableProperty, SerializableCollectionConfig } from "../../serializable_types";
@@ -93,7 +94,7 @@ export type PropertyFormProps = {
         property: SerializableProperty;
         collection: SerializableCollectionConfig;
     }) => React.ReactNode;
-    collectionValues?: CollectionConfig;
+    collectionValues?: AdminCollection;
 
 };
 
@@ -368,7 +369,7 @@ function PropertyEditFormFields({
     propertyTypePresets?: PropertyTypePreset[];
     hiddenPropertyTypes?: PropertyType[];
     renderExtraPropertyFields?: PropertyFormProps["renderExtraPropertyFields"];
-    collectionValues?: CollectionConfig;
+    collectionValues?: AdminCollection;
 
 } & FormexController<PropertyWithId>) {
 

package/src/collection_editor/ui/collection_editor/PropertyTree.tsx

@@ -3,7 +3,8 @@ import React from "react";
 import { deepEqual as equal } from "fast-equals"
 
 import { AIModifiedIndicator } from "@rebasepro/app";
-import { AdditionalFieldDelegate, Properties, Property } from "@rebasepro/types";
+import { Properties, Property } from "@rebasepro/types";
+import { AdditionalFieldDelegate } from "@rebasepro/admin-types";
 import { isPropertyBuilder } from "@rebasepro/common";
 import {
     ArrowDownToLineIcon,

package/src/collection_editor/ui/collection_editor/SubcollectionsEditTab.tsx

@@ -5,7 +5,8 @@ import {
     useCustomizationController
 } from "@rebasepro/app";
 import { resolveEntityView } from "../../_cms_internals";
-import { CollectionConfig, EntityCustomView, User } from "@rebasepro/types";
+import { User } from "@rebasepro/types";
+import { EntityCustomView, AdminCollection } from "@rebasepro/admin-types";
 import { getSubcollections } from "@rebasepro/common";
 import {
     Alert,
@@ -37,8 +38,8 @@ export function SubcollectionsEditTab({
     getUser,
     parentCollectionSlugs
 }: {
-    collection: CollectionConfig,
-    parentCollection?: CollectionConfig,
+    collection: AdminCollection,
+    parentCollection?: AdminCollection,
     configController: CollectionsConfigController;
     collectionInference?: CollectionInference;
     getUser?: (uid: string) => User | null;
@@ -59,9 +60,9 @@ export function SubcollectionsEditTab({
     const {
         values,
         setFieldValue
-    } = useFormex<CollectionConfig>();
+    } = useFormex<AdminCollection>();
 
-    const [subcollections, setSubcollections] = React.useState<CollectionConfig[]>(getSubcollections(collection) ?? []);
+    const [subcollections, setSubcollections] = React.useState<AdminCollection[]>(getSubcollections(collection) ?? []);
     const resolvedEntityViews = values.entityViews?.filter(e => typeof e === "string")
         .map(e => resolveEntityView(e, contextEntityViews))
         .filter(Boolean) as EntityCustomView[] ?? [];

package/src/collection_editor/ui/collection_editor/ViewModeSwitch.tsx

@@ -1,4 +1,4 @@
-import { ViewMode } from "@rebasepro/types";
+import { ViewMode } from "@rebasepro/admin-types";
 import {
     cls,
     KanbanIcon,

package/src/collection_editor/ui/collection_editor/import/CollectionEditorImportMapping.tsx

@@ -6,7 +6,8 @@ import { getIn, useFormex } from "@rebasepro/forms";
 
 import { getFieldConfig, getFieldId } from "../../../../components/field_configs";
 import { PropertyConfigBadge } from "../../../../components/PropertyConfigBadge";
-import { CollectionConfig, Properties, Property, PropertyConfig } from "@rebasepro/types";
+import { Properties, Property } from "@rebasepro/types";
+import { PropertyConfig, AdminCollection } from "@rebasepro/admin-types";
 import { cls, Container, Select, SelectItem, Tooltip, Typography } from "@rebasepro/ui";
 import React, { useState } from "react";
 import { OnPropertyChangedParams, PropertyFormDialog, PropertyWithId } from "../PropertyEditView";
@@ -36,7 +37,7 @@ export function CollectionEditorImportMapping({
         setFieldValue,
         setFieldTouched,
         values
-    } = useFormex<CollectionConfig>();
+    } = useFormex<AdminCollection>();
     const [selectedProperty, setSelectedProperty] = useState<PropertyWithId | undefined>(undefined);
 
     const currentPropertiesOrderRef = React.useRef<{

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

@@ -10,7 +10,8 @@ import {
     namespaceToPropertiesPath
 } from "../util";
 import { PropertyTree } from "../PropertyTree";
-import { ArrayProperty, PropertyConfig, Property } from "@rebasepro/types";
+import { ArrayProperty, Property } from "@rebasepro/types";
+import { PropertyConfig } from "@rebasepro/admin-types";
 
 export function BlockPropertyField({
     disabled,

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

@@ -1,7 +1,8 @@
 import { FieldCaption } from "../../../_cms_internals";
 import React, { useState } from "react";
 ;
-import { MapProperty, Property, PropertyConfig } from "@rebasepro/types";
+import { MapProperty, Property } from "@rebasepro/types";
+import { PropertyConfig } from "@rebasepro/admin-types";
 import { BooleanSwitchWithLabel, Button, Paper, PlusIcon, Typography } from "@rebasepro/ui";
 import { PropertyFormDialog } from "../PropertyEditView";
 import { getIn, useFormex } from "@rebasepro/forms";
@@ -111,7 +112,7 @@ export function MapPropertyField({ disabled, getData, allowDataInference, proper
                     size={"medium"}
                     label={t("spread_children_as_columns")}
                     onValueChange={(v) => setFieldValue("ui.spreadChildren", v)}
-                    value={values.ui?.spreadChildren ?? false}
+                    value={values.admin?.spreadChildren ?? false}
                 />
                 <FieldCaption>
                     Set this flag to true if you want to display the children of this group as individual columns. This

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

@@ -8,9 +8,10 @@ import {
     TextField,
     Typography
 } from "@rebasepro/ui";
-import { CollectionConfig, OnAction, RelationProperty } from "@rebasepro/types";
+import { OnAction, RelationProperty } from "@rebasepro/types";
 
 import { CollectionsSelect } from "./ReferencePropertyField";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 const ON_ACTION_OPTIONS: OnAction[] = ["cascade", "restrict", "no action", "set null", "set default"];
 
@@ -87,7 +88,7 @@ targetColumn: "" };
         }
     }, [targetSlug, relationName, setFieldValue]);
 
-    const collections: CollectionConfig[] = collectionRegistry?.collections ?? [];
+    const collections: AdminCollection[] = collectionRegistry?.collections ?? [];
 
     return (
         <>

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

@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import { getFieldConfig } from "../../../../components/field_configs";
-import { ArrayProperty, Property, PropertyConfig } from "@rebasepro/types";
+import { ArrayProperty, Property } from "@rebasepro/types";
+import { PropertyConfig } from "@rebasepro/admin-types";
 import { Button, Paper, Typography } from "@rebasepro/ui";
 import { Field, getIn, useFormex } from "@rebasepro/forms";
 import { PropertyFormDialog } from "../PropertyEditView";

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

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export const blogCollectionTemplate = {
     slug: "blog",
@@ -93,7 +93,7 @@ export const blogCollectionTemplate = {
         publish_date: {
             name: "Publish date",
             type: "date",
-            ui: { clearable: true }
+            admin: { clearable: true }
         },
         reviewed: {
             name: "Reviewed",
@@ -109,4 +109,4 @@ export const blogCollectionTemplate = {
             }
         }
     }
-} as unknown as CollectionConfig;
+} as unknown as AdminCollection;

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

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export const pagesCollectionTemplate = {
     slug: "pages",
@@ -176,8 +176,8 @@ export const pagesCollectionTemplate = {
         is_published: {
             type: "boolean",
             name: "Is Published",
-            ui: { columnWidth: 100 },
+            admin: { columnWidth: 100 },
             description: "Should this page be live on the site?"
         }
     }
-} as unknown as CollectionConfig;
+} as unknown as AdminCollection;

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

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export const productsCollectionTemplate = {
     slug: "products",
@@ -41,7 +41,7 @@ export const productsCollectionTemplate = {
         available: {
             type: "boolean",
             name: "Available",
-            ui: { columnWidth: 100 },
+            admin: { columnWidth: 100 },
             description: "Is this product available in the website"
         },
         price: {
@@ -55,7 +55,7 @@ export const productsCollectionTemplate = {
         images: {
             type: "array",
             name: "Images",
-            ui: { hideFromCollection: true },
+            admin: { hideFromCollection: true },
             of: {
                 type: "string",
                 storage: {
@@ -85,4 +85,4 @@ export const productsCollectionTemplate = {
             autoValue: "on_create"
         }
     }
-} as unknown as CollectionConfig;
+} as unknown as AdminCollection;

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

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 export const usersCollectionTemplate = {
     slug: "users",
@@ -39,4 +39,4 @@ export const usersCollectionTemplate = {
             url: "image"
         }
     }
-} as unknown as CollectionConfig;
+} as unknown as AdminCollection;

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

@@ -1,5 +1,5 @@
 import { DEFAULT_FIELD_CONFIGS } from "../../../../components/field_configs";
-import { PropertyConfigId, PropertyConfig } from "@rebasepro/types";
+import { PropertyConfigId, PropertyConfig } from "@rebasepro/admin-types";
 
 export const supportedFieldsIds: PropertyConfigId[] = [
     "text_field",

package/src/collection_editor/ui/collection_editor/utils/update_property_for_widget.ts

@@ -1,4 +1,5 @@
-import { ArrayProperty, BooleanProperty, DateProperty, MapProperty, NumberProperty, Property, PropertyConfig, StringProperty } from "@rebasepro/types";
+import { ArrayProperty, BooleanProperty, DateProperty, MapProperty, NumberProperty, Property, StringProperty } from "@rebasepro/types";
+import { PropertyConfig } from "@rebasepro/admin-types";
 import { mergeDeep } from "@rebasepro/utils";
 
 
@@ -14,7 +15,7 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "text_field",
                 storage: undefined,
-                ui: { multiline: undefined, markdown: undefined, url: undefined },
+                admin: { multiline: undefined, markdown: undefined, urlPreview: undefined },
                 email: undefined,
                 enum: undefined,
                 userSelect: undefined
@@ -27,7 +28,7 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "user_select",
                 storage: undefined,
-                ui: { multiline: undefined, markdown: undefined, url: undefined },
+                admin: { multiline: undefined, markdown: undefined, urlPreview: undefined },
                 email: undefined,
                 enum: undefined,
                 userSelect: true
@@ -39,7 +40,7 @@ export function updatePropertyFromWidget(propertyData: any,
             {
                 type: "string",
                 propertyConfig: "multiline",
-                ui: { multiline: true, markdown: undefined, url: undefined },
+                admin: { multiline: true, markdown: undefined, urlPreview: undefined },
                 storage: undefined,
                 email: undefined,
                 enum: undefined,
@@ -53,7 +54,7 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "markdown",
                 storage: undefined,
-                ui: { multiline: undefined, markdown: true, url: undefined },
+                admin: { multiline: undefined, markdown: true, urlPreview: undefined },
                 email: undefined,
                 userSelect: undefined
             } as StringProperty
@@ -65,7 +66,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "url",
                 storage: undefined,
-                ui: { multiline: undefined, markdown: undefined, url: true },
+                url: true,
+                admin: { multiline: undefined, markdown: undefined },
                 email: undefined,
                 enum: undefined,
                 userSelect: undefined
@@ -78,7 +80,7 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "email",
                 storage: undefined,
-                ui: { multiline: undefined, markdown: undefined, url: undefined },
+                admin: { multiline: undefined, markdown: undefined, urlPreview: undefined },
                 email: true,
                 enum: undefined,
                 userSelect: undefined
@@ -91,7 +93,7 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "select",
                 storage: undefined,
-                ui: { multiline: undefined, markdown: undefined, url: undefined },
+                admin: { multiline: undefined, markdown: undefined, urlPreview: undefined },
                 email: undefined,
                 enum: propertyData.enum ?? [],
                 userSelect: undefined

package/src/collection_editor/useJsonCollectionsConfigController.tsx

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { EngineProperties, CollectionConfig, NavigationGroupMapping, Property } from "@rebasepro/types";
+import type { EngineProperties, Property } from "@rebasepro/types";
+import type { NavigationGroupMapping, AdminCollection } from "@rebasepro/admin-types";
 import type {
     CollectionsConfigController,
     SaveCollectionParams,
@@ -55,7 +56,7 @@ export function useJsonCollectionsConfigController({
     readOnly = false,
     autoLoad = true,
 }: UseJsonCollectionsConfigControllerOptions): CollectionsConfigController {
-    const [collections, setCollections] = useState<CollectionConfig[]>([]);
+    const [collections, setCollections] = useState<AdminCollection[]>([]);
     const [loading, setLoading] = useState(autoLoad);
     const [navigationEntries, setNavigationEntries] = useState<NavigationGroupMapping[]>([]);
 
@@ -92,7 +93,7 @@ export function useJsonCollectionsConfigController({
     /**
      * Update local state and persist a collection to the store.
      */
-    const persistCollection = useCallback(async (collection: CollectionConfig) => {
+    const persistCollection = useCallback(async (collection: AdminCollection) => {
         const serializable = toSerializableCollectionConfig(collection);
         await storeRef.current.save(collection.slug, serializable);
     }, []);
@@ -100,7 +101,7 @@ export function useJsonCollectionsConfigController({
     /**
      * Find collection by id (slug).
      */
-    const getCollection = useCallback((id: string): CollectionConfig => {
+    const getCollection = useCallback((id: string): AdminCollection => {
         const found = collections.find(c => c.slug === id);
         if (found) return found;
         throw new Error(`Collection "${id}" not found`);
@@ -111,7 +112,7 @@ export function useJsonCollectionsConfigController({
     const saveCollection = useCallback(async <M extends Record<string, unknown>>(
         { id, collectionData }: SaveCollectionParams<M>
     ) => {
-        const collection = collectionData as CollectionConfig;
+        const collection = collectionData as AdminCollection;
         await persistCollection(collection);
         setCollections(prev => {
             const idx = prev.findIndex(c => c.slug === id);
@@ -132,7 +133,7 @@ export function useJsonCollectionsConfigController({
             const idx = prev.findIndex(c => c.slug === lookupId);
             if (idx < 0) return prev;
 
-            const merged = { ...prev[idx], ...collectionData } as CollectionConfig;
+            const merged = { ...prev[idx], ...collectionData } as AdminCollection;
             const next = [...prev];
             next[idx] = merged;
 
@@ -177,7 +178,7 @@ export function useJsonCollectionsConfigController({
             }
 
             const next = [...prev];
-            next[idx] = collection as CollectionConfig;
+            next[idx] = collection as AdminCollection;
 
             persistCollection(next[idx]).catch(e =>
                 console.error("useJsonCollectionsConfigController: failed to save property", e)
@@ -204,7 +205,7 @@ export function useJsonCollectionsConfigController({
             }
 
             const next = [...prev];
-            next[idx] = collection as CollectionConfig;
+            next[idx] = collection as AdminCollection;
 
             persistCollection(next[idx]).catch(e =>
                 console.error("useJsonCollectionsConfigController: failed to delete property", e)
@@ -221,7 +222,7 @@ export function useJsonCollectionsConfigController({
         const updated = {
             ...collection,
             propertiesOrder: newPropertiesOrder,
-        } as CollectionConfig;
+        } as AdminCollection;
 
         setCollections(prev => {
             const idx = prev.findIndex(c => c.slug === collection.slug);

package/src/collection_editor/useLocalCollectionsConfigController.tsx

@@ -1,12 +1,12 @@
 import { CollectionsConfigController, SaveCollectionParams, UpdateCollectionParams, DeleteCollectionParams, SavePropertyParams, DeletePropertyParams, UpdatePropertiesOrderParams } from "./types/config_controller";
-import { CollectionConfig, Properties } from "@rebasepro/types";
+import { Properties } from "@rebasepro/types";
 import { getSubcollections } from "@rebasepro/common";
 
-
 import React, { useMemo, useRef } from "react";
+import type { AdminCollection } from "@rebasepro/admin-types";
 export function useLocalCollectionsConfigController(
     clientOrUrl: any,
-    baseCollections: CollectionConfig[] = [],
+    baseCollections: AdminCollection[] = [],
     options?: {
         readOnly?: boolean;
         getAuthToken?: () => Promise<string | null>;
@@ -73,7 +73,7 @@ export function useLocalCollectionsConfigController(
         readOnlyReason: "Local collection editing is only available in development mode.",
         collections: parsedCollections,
         getCollection: (id: string) => {
-            const found = parsedCollections.find(c => (c as CollectionConfig & { id?: string }).id === id || c.slug === id);
+            const found = parsedCollections.find(c => (c as AdminCollection & { id?: string }).id === id || c.slug === id);
             if (found) return found;
             throw Error(`Collection ${id} not found in local mode`);
         },
@@ -109,7 +109,7 @@ collectionData: { propertiesOrder: newPropertiesOrder } });
         },
 
         updatePropertiesOrder: async ({ collection, fullPath, newPropertiesOrder }: UpdatePropertiesOrderParams) => {
-            const collectionId = (collection as CollectionConfig & { id?: string }).id || fullPath.split("/").pop();
+            const collectionId = (collection as AdminCollection & { id?: string }).id || fullPath.split("/").pop();
             await request("/collection/save", { collectionId,
 collectionData: { propertiesOrder: newPropertiesOrder } });
         },

package/src/collection_editor/validateCollectionJson.ts

@@ -1,5 +1,5 @@
-import { DataType, CollectionConfig } from "@rebasepro/types";
-
+import { DataType } from "@rebasepro/types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 /**
  * Valid dataType values for properties
@@ -18,7 +18,6 @@ const VALID_DATA_TYPES = [
     "binary"
 ] as const;
 
-
 /**
  * Validation error with path and message
  */
@@ -33,7 +32,7 @@ export interface CollectionValidationError {
 export interface CollectionValidationResult {
     valid: boolean;
     errors: CollectionValidationError[];
-    collection?: CollectionConfig;
+    collection?: AdminCollection;
 }
 
 /**
@@ -461,6 +460,6 @@ export function validateCollectionJson(jsonString: string): CollectionValidation
     return {
         valid: errors.length === 0,
         errors,
-        collection: errors.length === 0 ? parsed as unknown as CollectionConfig : undefined
+        collection: errors.length === 0 ? parsed as unknown as AdminCollection : undefined
     };
 }

package/src/components/AdminModeSyncer.tsx

@@ -1,4 +1,4 @@
-import type { AppView } from "@rebasepro/types";
+import type { AppView } from "@rebasepro/admin-types";
 import React, { useEffect } from "react";
 import { useLocation } from "react-router-dom";
 ;