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

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

@@ -3,9 +3,9 @@ import React from "react";
 import {
     ConfirmationDialog,
     useCustomizationController
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { resolveEntityView } from "../../_cms_internals";
-import { EntityCollection, EntityCustomView, User } from "@rebasepro/types";
+import { CollectionConfig, EntityCustomView, User } from "@rebasepro/types";
 import { getSubcollections } from "@rebasepro/common";
 import {
     Alert,
@@ -27,7 +27,7 @@ import { CollectionEditorDialog } from "./CollectionEditorDialog";
 import { CollectionsConfigController } from "../../types/config_controller";
 import { CollectionInference } from "../../types/collection_inference";
 import { EntityCustomViewsSelectDialog } from "./EntityCustomViewsSelectDialog";
-import { useFormex } from "@rebasepro/formex";
+import { useFormex } from "@rebasepro/forms";
 
 export function SubcollectionsEditTab({
     collection,
@@ -37,8 +37,8 @@ export function SubcollectionsEditTab({
     getUser,
     parentCollectionSlugs
 }: {
-    collection: EntityCollection,
-    parentCollection?: EntityCollection,
+    collection: CollectionConfig,
+    parentCollection?: CollectionConfig,
     configController: CollectionsConfigController;
     collectionInference?: CollectionInference;
     getUser?: (uid: string) => User | null;
@@ -59,9 +59,9 @@ export function SubcollectionsEditTab({
     const {
         values,
         setFieldValue
-    } = useFormex<EntityCollection>();
+    } = useFormex<CollectionConfig>();
 
-    const [subcollections, setSubcollections] = React.useState<EntityCollection[]>(getSubcollections(collection) ?? []);
+    const [subcollections, setSubcollections] = React.useState<CollectionConfig[]>(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/SwitchControl.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 
 import { BooleanSwitchWithLabel, Tooltip } from "@rebasepro/ui";
-import { FormexFieldProps } from "@rebasepro/formex";
+import { FormexFieldProps } from "@rebasepro/forms";
 
 export function SwitchControl({
     field,

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

@@ -1,8 +1,8 @@
 import { useCollectionRegistryController } from "../../../_cms_internals";
 import { convertDataToEntity, ImportConfig } from "../../../_cms_internals";
-import { useAuthController } from "@rebasepro/core";
-import { EntityCollectionTable } from "../../../../components/EntityCollectionTable/EntityCollectionTable";
-import { useSelectionController } from "../../../../components/EntityCollectionView/useSelectionController";
+import { useAuthController } from "@rebasepro/app";
+import { CollectionTableBinding } from "../../../../components/CollectionTableBinding/CollectionTableBinding";
+import { useSelectionController } from "../../../../components/CollectionViewBinding/useSelectionController";
 import { CircularProgressCenter } from "@rebasepro/ui";
 import { Properties } from "@rebasepro/types";
 import { useEffect, useState } from "react";
@@ -42,7 +42,7 @@ export function CollectionEditorImportDataPreview({
     if (loading)
         return <CircularProgressCenter/>
 
-    return <EntityCollectionTable
+    return <CollectionTableBinding
         title={<div>
             <Typography variant={"subtitle2"}>Imported data preview</Typography>
             <Typography variant={"caption"}>Entities with the same id will be overwritten</Typography>

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

@@ -2,18 +2,18 @@ import { DataNewPropertiesMapping } from "../../../../data_import/components/Dat
 import { getInferenceType } from "../../../../data_import/utils/get_import_inference_type";
 import { ImportConfig } from "../../../../data_import/types";
 import { ImportNewPropertyFieldPreview } from "../../../../data_import/components/ImportNewPropertyFieldPreview";
-import { getIn, useFormex } from "@rebasepro/formex";
+import { getIn, useFormex } from "@rebasepro/forms";
 
 import { getFieldConfig, getFieldId } from "../../../../components/field_configs";
 import { PropertyConfigBadge } from "../../../../components/PropertyConfigBadge";
-import { EntityCollection, Properties, Property, PropertyConfig } from "@rebasepro/types";
+import { CollectionConfig, Properties, Property, PropertyConfig } from "@rebasepro/types";
 import { cls, Container, Select, SelectItem, Tooltip, Typography } from "@rebasepro/ui";
 import React, { useState } from "react";
 import { OnPropertyChangedParams, PropertyFormDialog, PropertyWithId } from "../PropertyEditView";
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath } from "../util";
 import { updatePropertyFromWidget } from "../utils/update_property_for_widget";
 import { supportedFields } from "../utils/supported_fields";
-import { buildPropertyFromData } from "@rebasepro/schema-inference";
+import { buildPropertyFromData } from "@rebasepro/inference";
 
 export function CollectionEditorImportMapping({
     importConfig,
@@ -36,7 +36,7 @@ export function CollectionEditorImportMapping({
         setFieldValue,
         setFieldTouched,
         values
-    } = useFormex<EntityCollection>();
+    } = useFormex<CollectionConfig>();
     const [selectedProperty, setSelectedProperty] = useState<PropertyWithId | undefined>(undefined);
 
     const currentPropertiesOrderRef = React.useRef<{

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

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Button, Paper, PlusIcon, Typography } from "@rebasepro/ui";
-import { getIn, useFormex } from "@rebasepro/formex";
+import { getIn, useFormex } from "@rebasepro/forms";
 import { OnPropertyChangedParams, PropertyFormDialog } from "../PropertyEditView";
 import {
     getFullId,

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/formex";
+import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/forms";
 
 import { GeneralPropertyValidation } from "./validation/GeneralPropertyValidation";
 import { ValidationPanel } from "./validation/ValidationPanel";

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

@@ -1,9 +1,9 @@
 import { FieldCaption } from "../../../_cms_internals";
-import { Field, getIn, useFormex } from "@rebasepro/formex";
+import { Field, getIn, useFormex } from "@rebasepro/forms";
 import { DebouncedTextField } from "@rebasepro/ui";
 import { PropertyWithId } from "../PropertyEditView";
 import React from "react";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 ;
 import { prettifyIdentifier, toSnakeCase } from "@rebasepro/utils";
 

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

@@ -1,10 +1,10 @@
 import { FieldCaption } from "../../../_cms_internals";
 import React from "react";
-import { getIn, useFormex } from "@rebasepro/formex";
+import { getIn, useFormex } from "@rebasepro/forms";
 ;
 import { NumberProperty, StringProperty } from "@rebasepro/types";
 import { Select, SelectItem } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { GeneralPropertyValidation } from "./validation/GeneralPropertyValidation";
 import { ValidationPanel } from "./validation/ValidationPanel";
 

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

@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
-import { getIn, useFormex } from "@rebasepro/formex";
-import { useTranslation } from "@rebasepro/core";
+import { getIn, useFormex } from "@rebasepro/forms";
+import { useTranslation } from "@rebasepro/app";
 import { useSafeSnackbarController } from "../../../useSafeSnackbarController";
 import { EnumValueConfig, EnumValues } from "@rebasepro/types";
 import { resolveEnumValues } from "@rebasepro/common";

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

@@ -4,8 +4,8 @@ import React, { useState } from "react";
 import { MapProperty, Property, PropertyConfig } from "@rebasepro/types";
 import { BooleanSwitchWithLabel, Button, Paper, PlusIcon, Typography } from "@rebasepro/ui";
 import { PropertyFormDialog } from "../PropertyEditView";
-import { getIn, useFormex } from "@rebasepro/formex";
-import { useTranslation } from "@rebasepro/core";
+import { getIn, useFormex } from "@rebasepro/forms";
+import { useTranslation } from "@rebasepro/app";
 import { PropertyTree } from "../PropertyTree";
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath, namespaceToPropertiesPath } from "../util";
 

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

@@ -2,8 +2,8 @@
 import React, { useCallback } from "react";
 import { StringPropertyValidation } from "./validation/StringPropertyValidation";
 import { ValidationPanel } from "./validation/ValidationPanel";
-import { Field, getIn, useFormex } from "@rebasepro/formex";
-import { useTranslation } from "@rebasepro/core";
+import { Field, getIn, useFormex } from "@rebasepro/forms";
+import { useTranslation } from "@rebasepro/app";
 
 import {
     BooleanSwitchWithLabel,

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

@@ -4,8 +4,8 @@ import { NumberPropertyValidation } from "./validation/NumberPropertyValidation"
 import { ValidationPanel } from "./validation/ValidationPanel";
 ;
 import { Select, SelectItem, TextField } from "@rebasepro/ui";
-import { getIn, useFormex } from "@rebasepro/formex";
-import { useTranslation } from "@rebasepro/core";
+import { getIn, useFormex } from "@rebasepro/forms";
+import { useTranslation } from "@rebasepro/app";
 
 export function NumberPropertyField({ disabled }: {
     disabled: boolean;

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

@@ -1,7 +1,7 @@
-import { IconForView, useTranslation } from "@rebasepro/core";
+import { IconForView, useTranslation } from "@rebasepro/app";
 import { FieldCaption, useCollectionRegistryController } from "../../../_cms_internals";
 import React from "react";
-import { Field, getIn, useFormex } from "@rebasepro/formex";
+import { Field, getIn, useFormex } from "@rebasepro/forms";
 ;
 import { NumberProperty, StringProperty } from "@rebasepro/types";
 import { CircularProgress, Select, SelectItem, Typography } from "@rebasepro/ui";

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

@@ -1,6 +1,6 @@
 import { FieldCaption, useCollectionRegistryController } from "../../../_cms_internals";
 import React, { useCallback, useEffect } from "react";
-import { useFormex } from "@rebasepro/formex";
+import { useFormex } from "@rebasepro/forms";
 ;
 import {
     Select,
@@ -8,7 +8,7 @@ import {
     TextField,
     Typography
 } from "@rebasepro/ui";
-import { EntityCollection, OnAction, RelationProperty } from "@rebasepro/types";
+import { CollectionConfig, OnAction, RelationProperty } from "@rebasepro/types";
 
 import { CollectionsSelect } from "./ReferencePropertyField";
 
@@ -87,7 +87,7 @@ targetColumn: "" };
         }
     }, [targetSlug, relationName, setFieldValue]);
 
-    const collections: EntityCollection[] = collectionRegistry?.collections ?? [];
+    const collections: CollectionConfig[] = collectionRegistry?.collections ?? [];
 
     return (
         <>

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

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

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

@@ -12,8 +12,8 @@ import {
     UploadCloudIcon
 } from "@rebasepro/ui";
 
-import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/formex";
-import { useStorageSources, useTranslation } from "@rebasepro/core";
+import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/forms";
+import { useStorageSources, useTranslation } from "@rebasepro/app";
 import { DEFAULT_STORAGE_SOURCE_KEY } from "@rebasepro/types";
 import { GeneralPropertyValidation } from "./validation/GeneralPropertyValidation";
 import { ArrayPropertyValidation } from "./validation/ArrayPropertyValidation";

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

@@ -2,8 +2,8 @@ import { FieldCaption } from "../../../_cms_internals";
 import React from "react";
 import { StringPropertyValidation } from "./validation/StringPropertyValidation";
 import { ValidationPanel } from "./validation/ValidationPanel";
-import { getIn, useFormex } from "@rebasepro/formex";
-import { useTranslation } from "@rebasepro/core";
+import { getIn, useFormex } from "@rebasepro/forms";
+import { useTranslation } from "@rebasepro/app";
 ;
 import { Select, SelectItem, TextField } from "@rebasepro/ui";
 

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

@@ -1,7 +1,7 @@
 import React from "react";
 import { StringPropertyValidation } from "./validation/StringPropertyValidation";
 import { ValidationPanel } from "./validation/ValidationPanel";
-import { getIn, useFormex } from "@rebasepro/formex";
+import { getIn, useFormex } from "@rebasepro/forms";
 
 import { Select, SelectItem, TextField } from "@rebasepro/ui";
 

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

@@ -1,7 +1,7 @@
 import { FieldCaption } from "../../../_cms_internals";
 import React from "react";
 import { TextField } from "@rebasepro/ui";
-import { getIn, useFormex } from "@rebasepro/formex";
+import { getIn, useFormex } from "@rebasepro/forms";
 
 export function VectorPropertyField({ disabled }: {
     disabled: boolean;

package/src/collection_editor/ui/collection_editor/properties/advanced/AdvancedPropertyValidation.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Field, FormexFieldProps } from "@rebasepro/formex";
+import { Field, FormexFieldProps } from "@rebasepro/forms";
 import { SwitchControl } from "../../SwitchControl";
 
 export function AdvancedPropertyValidation({ disabled }: {

package/src/collection_editor/ui/collection_editor/properties/conditions/ConditionsEditor.tsx

@@ -1,6 +1,6 @@
 
 import React from "react";
-import { useFormex } from "@rebasepro/formex";
+import { useFormex } from "@rebasepro/forms";
 import {
     BooleanSwitchWithLabel,
     Button,

package/src/collection_editor/ui/collection_editor/properties/conditions/EnumConditionsEditor.tsx

@@ -1,6 +1,6 @@
 
 import React from "react";
-import { useFormex } from "@rebasepro/formex";
+import { useFormex } from "@rebasepro/forms";
 import {
     BooleanSwitchWithLabel,
     cls,

package/src/collection_editor/ui/collection_editor/properties/validation/ArrayPropertyValidation.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
-import { getIn, useFormex } from "@rebasepro/formex";
+import { getIn, useFormex } from "@rebasepro/forms";
 import { DebouncedTextField } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { GeneralPropertyValidation } from "./GeneralPropertyValidation";
 
 export function ArrayPropertyValidation({

package/src/collection_editor/ui/collection_editor/properties/validation/GeneralPropertyValidation.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
-import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/formex";
+import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/forms";
 import { DebouncedTextField } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { SwitchControl } from "../../SwitchControl";
 
 export function GeneralPropertyValidation({ disabled }: {

package/src/collection_editor/ui/collection_editor/properties/validation/NumberPropertyValidation.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
-import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/formex";
+import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/forms";
 import { DebouncedTextField } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { GeneralPropertyValidation } from "./GeneralPropertyValidation";
 import { SwitchControl } from "../../SwitchControl";
 

package/src/collection_editor/ui/collection_editor/properties/validation/StringPropertyValidation.tsx

@@ -1,10 +1,10 @@
 import { FieldCaption } from "../../../../_cms_internals";
 import React from "react";
 
-import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/formex";
+import { Field, FormexFieldProps, getIn, useFormex } from "@rebasepro/forms";
 ;
 import { DebouncedTextField } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { GeneralPropertyValidation } from "./GeneralPropertyValidation";
 import { SwitchControl } from "../../SwitchControl";
 import { serializeRegExp } from "@rebasepro/utils";

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

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 
 export const blogCollectionTemplate = {
     slug: "blog",
@@ -109,4 +109,4 @@ export const blogCollectionTemplate = {
             }
         }
     }
-} as unknown as EntityCollection;
+} as unknown as CollectionConfig;

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

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 
 export const pagesCollectionTemplate = {
     slug: "pages",
@@ -180,4 +180,4 @@ export const pagesCollectionTemplate = {
             description: "Should this page be live on the site?"
         }
     }
-} as unknown as EntityCollection;
+} as unknown as CollectionConfig;

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

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 
 export const productsCollectionTemplate = {
     slug: "products",
@@ -85,4 +85,4 @@ export const productsCollectionTemplate = {
             autoValue: "on_create"
         }
     }
-} as unknown as EntityCollection;
+} as unknown as CollectionConfig;

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

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

package/src/collection_editor/useJsonCollectionsConfigController.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { EngineProperties, EntityCollection, NavigationGroupMapping, Property } from "@rebasepro/types";
+import type { EngineProperties, CollectionConfig, NavigationGroupMapping, Property } from "@rebasepro/types";
 import type {
     CollectionsConfigController,
     SaveCollectionParams,
@@ -10,8 +10,8 @@ import type {
     UpdatePropertiesOrderParams,
     UpdateKanbanColumnsOrderParams,
 } from "./types/config_controller";
-import type { JsonCollectionStore, SerializableCollection } from "./serializable_types";
-import { toSerializableCollection, toSerializableProperty, fromSerializableCollection } from "./serializable_utils";
+import type { JsonCollectionStore, SerializableCollectionConfig } from "./serializable_types";
+import { toSerializableCollectionConfig, toSerializableProperty, fromSerializableCollectionConfig } from "./serializable_utils";
 
 export interface UseJsonCollectionsConfigControllerOptions {
     /**
@@ -55,7 +55,7 @@ export function useJsonCollectionsConfigController({
     readOnly = false,
     autoLoad = true,
 }: UseJsonCollectionsConfigControllerOptions): CollectionsConfigController {
-    const [collections, setCollections] = useState<EntityCollection[]>([]);
+    const [collections, setCollections] = useState<CollectionConfig[]>([]);
     const [loading, setLoading] = useState(autoLoad);
     const [navigationEntries, setNavigationEntries] = useState<NavigationGroupMapping[]>([]);
 
@@ -75,7 +75,7 @@ export function useJsonCollectionsConfigController({
                     storeRef.current.loadNavigationEntries?.() ?? Promise.resolve([]),
                 ]);
                 if (cancelled) return;
-                setCollections(serialized.map(fromSerializableCollection));
+                setCollections(serialized.map(fromSerializableCollectionConfig));
                 setNavigationEntries(navEntries);
             } catch (e) {
                 console.error("useJsonCollectionsConfigController: failed to load collections", e);
@@ -92,15 +92,15 @@ export function useJsonCollectionsConfigController({
     /**
      * Update local state and persist a collection to the store.
      */
-    const persistCollection = useCallback(async (collection: EntityCollection) => {
-        const serializable = toSerializableCollection(collection);
+    const persistCollection = useCallback(async (collection: CollectionConfig) => {
+        const serializable = toSerializableCollectionConfig(collection);
         await storeRef.current.save(collection.slug, serializable);
     }, []);
 
     /**
      * Find collection by id (slug).
      */
-    const getCollection = useCallback((id: string): EntityCollection => {
+    const getCollection = useCallback((id: string): CollectionConfig => {
         const found = collections.find(c => c.slug === id);
         if (found) return found;
         throw new Error(`Collection "${id}" not found`);
@@ -111,7 +111,7 @@ export function useJsonCollectionsConfigController({
     const saveCollection = useCallback(async <M extends Record<string, unknown>>(
         { id, collectionData }: SaveCollectionParams<M>
     ) => {
-        const collection = collectionData as EntityCollection;
+        const collection = collectionData as CollectionConfig;
         await persistCollection(collection);
         setCollections(prev => {
             const idx = prev.findIndex(c => c.slug === id);
@@ -132,7 +132,7 @@ export function useJsonCollectionsConfigController({
             const idx = prev.findIndex(c => c.slug === lookupId);
             if (idx < 0) return prev;
 
-            const merged = { ...prev[idx], ...collectionData } as EntityCollection;
+            const merged = { ...prev[idx], ...collectionData } as CollectionConfig;
             const next = [...prev];
             next[idx] = merged;
 
@@ -177,7 +177,7 @@ export function useJsonCollectionsConfigController({
             }
 
             const next = [...prev];
-            next[idx] = collection as EntityCollection;
+            next[idx] = collection as CollectionConfig;
 
             persistCollection(next[idx]).catch(e =>
                 console.error("useJsonCollectionsConfigController: failed to save property", e)
@@ -204,7 +204,7 @@ export function useJsonCollectionsConfigController({
             }
 
             const next = [...prev];
-            next[idx] = collection as EntityCollection;
+            next[idx] = collection as CollectionConfig;
 
             persistCollection(next[idx]).catch(e =>
                 console.error("useJsonCollectionsConfigController: failed to delete property", e)
@@ -221,7 +221,7 @@ export function useJsonCollectionsConfigController({
         const updated = {
             ...collection,
             propertiesOrder: newPropertiesOrder,
-        } as EntityCollection;
+        } as CollectionConfig;
 
         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 { EntityCollection, Properties } from "@rebasepro/types";
+import { CollectionConfig, Properties } from "@rebasepro/types";
 import { getSubcollections } from "@rebasepro/common";
 
 
 import React, { useMemo, useRef } from "react";
 export function useLocalCollectionsConfigController(
     clientOrUrl: any,
-    baseCollections: EntityCollection[] = [],
+    baseCollections: CollectionConfig[] = [],
     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 EntityCollection & { id?: string }).id === id || c.slug === id);
+            const found = parsedCollections.find(c => (c as CollectionConfig & { 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 EntityCollection & { id?: string }).id || fullPath.split("/").pop();
+            const collectionId = (collection as CollectionConfig & { id?: string }).id || fullPath.split("/").pop();
             await request("/collection/save", { collectionId,
 collectionData: { propertiesOrder: newPropertiesOrder } });
         },

package/src/collection_editor/useSafeSnackbarController.ts

@@ -1,4 +1,4 @@
-import { useSnackbarController } from "@rebasepro/core";
+import { useSnackbarController } from "@rebasepro/app";
 
 export function useSafeSnackbarController(): ReturnType<typeof useSnackbarController> | undefined {
     try {

package/src/collection_editor/validateCollectionJson.ts

@@ -1,4 +1,4 @@
-import { DataType, EntityCollection } from "@rebasepro/types";
+import { DataType, CollectionConfig } from "@rebasepro/types";
 
 
 /**
@@ -33,7 +33,7 @@ export interface CollectionValidationError {
 export interface CollectionValidationResult {
     valid: boolean;
     errors: CollectionValidationError[];
-    collection?: EntityCollection;
+    collection?: CollectionConfig;
 }
 
 /**
@@ -461,6 +461,6 @@ export function validateCollectionJson(jsonString: string): CollectionValidation
     return {
         valid: errors.length === 0,
         errors,
-        collection: errors.length === 0 ? parsed as unknown as EntityCollection : undefined
+        collection: errors.length === 0 ? parsed as unknown as CollectionConfig : undefined
     };
 }

package/src/components/AdminModeSyncer.tsx

@@ -3,7 +3,7 @@ import React, { useEffect } from "react";
 import { useLocation } from "react-router-dom";
 ;
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
-import { useAdminModeController } from "@rebasepro/core";
+import { useAdminModeController } from "@rebasepro/app";
 export interface AdminModeSyncerProps {
     /**
      * Map of views designated as 'Studio' views.

package/src/components/ArrayContainer.tsx

@@ -29,7 +29,7 @@ import {
     Tooltip,
     useOutsideAlerter
 } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { getHashValue } from "@rebasepro/utils";
 
 export type ArrayEntryParams = {

package/src/components/ClearFilterSortButton.tsx

@@ -1,6 +1,6 @@
 import { Button, FilterXIcon, iconSize, Tooltip } from "@rebasepro/ui";
 import { EntityTableController } from "@rebasepro/types";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 export function ClearFilterSortButton({
     tableController,