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

package/src/form/EntityForm.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection, EntityCustomViewParams, AdditionalFieldDelegateProps } from "@rebasepro/types";
+import type { CollectionConfig, EntityCustomViewParams, AdditionalFieldDelegateProps } from "@rebasepro/types";
 import type { FormContext, PropertyFieldBindingProps } from "../types/fields";
 import type { PropertyConfig } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -10,13 +10,13 @@ import { ErrorBoundary } from "@rebasepro/ui";
 import { AlignLeftIcon, CheckIcon, LoaderIcon, PencilIcon, useDebouncedCallback } from "@rebasepro/ui";
 import { getDefaultValuesFor, isHidden, isReadOnly } from "@rebasepro/common";
 
-import { useCustomizationController } from "@rebasepro/core";
-import { getFormFieldKeys } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
+import { getFormFieldKeys } from "@rebasepro/app";
 import { Alert, Button, Chip, cls, Dialog, DialogActions, DialogContent, DialogTitle, iconSize, paperMixin, Tooltip, Typography } from "@rebasepro/ui";
-import { Formex, FormexController, useCreateFormex } from "@rebasepro/formex";
+import { Formex, FormexController, useCreateFormex } from "@rebasepro/forms";
 
 import { FormEntry, FormLayout, LabelWithIconAndTooltip, PropertyFieldBinding } from "../form";
-import { flattenKeys } from "@rebasepro/core";
+import { flattenKeys } from "@rebasepro/app";
 import { ErrorFocus } from "./components/ErrorFocus";
 import { CustomFieldValidator, getEntitySchema } from "./validation";
 import { EntityFormActions } from "./EntityFormActions";
@@ -33,7 +33,7 @@ import {
 /**
  * Headless entity form component.
  *
- * Renders a form for an entity collection without any CMS or backend dependencies.
+ * Renders a form for a entity collection without any CMS or backend dependencies.
  * All backend concerns (save, caching, analytics, plugin slots) are provided via
  * callback props. For CMS-connected usage, use {@link EntityFormBinding} instead.
  *

package/src/form/EntityFormActions.tsx

@@ -1,5 +1,5 @@
 
-import { type EntityCollection, getCollectionDataPath } from "@rebasepro/types";
+import { type CollectionConfig, getCollectionDataPath } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
 import type { EntityAction } from "@rebasepro/types";
 import React from "react";
@@ -16,7 +16,7 @@ import {
     Tooltip,
     Typography
 } from "@rebasepro/ui";
-import { FormexController } from "@rebasepro/formex";
+import { FormexController } from "@rebasepro/forms";
 
 export function EntityFormActions({
     path,
@@ -81,7 +81,7 @@ type ActionsViewProps<M extends Record<string, unknown>> = {
     savingError: Error | undefined,
     entity: Entity<M> | undefined,
     formActions?: EntityAction[],
-    collection: EntityCollection,
+    collection: CollectionConfig,
     disabled: boolean,
     status: "new" | "existing" | "copy",
     pluginActions?: React.ReactNode[],
@@ -130,7 +130,7 @@ function buildBottomActions<M extends Record<string, unknown>>({
                                 path: path ?? getCollectionDataPath(collection),
                                 collection: collection,
                                 context: undefined,
-                                sideEntityController: undefined,
+                                sidePanelController: undefined,
                                 openEntityMode: openEntityMode,
                                 navigateBack,
                                 formContext

package/src/form/EntityFormBinding.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection, PluginFormActionProps } from "@rebasepro/types";
+import type { CollectionConfig, PluginFormActionProps } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
 import React, { useCallback, useMemo, useState } from "react";
 import { AnalyticsEvent, Entity, EntityStatus, EntityValues } from "@rebasepro/types";
@@ -15,18 +15,18 @@ import {
     useSnackbarController,
     useTranslation,
     useSlot
-} from "@rebasepro/core";
-import { FormexController } from "@rebasepro/formex";
-import { useAnalyticsController } from "@rebasepro/core";
+} from "@rebasepro/app";
+import { FormexController } from "@rebasepro/forms";
+import { useAnalyticsController } from "@rebasepro/app";
 
 import {
     getEntityFromCache,
     removeEntityFromCache,
     removeEntityFromMemoryCache,
     saveEntityToCache
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 
-import { useCollectionRegistryController, useSideEntityController, useCMSContext } from "../index";
+import { useCollectionRegistryController, useSidePanel, useCMSContext } from "../index";
 import { EntityForm } from "./EntityForm";
 import {
     extractTouchedValues,
@@ -92,7 +92,7 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
 }: EntityFormBindingProps<M>) {
 
     const { t } = useTranslation();
-    const sideEntityController = useSideEntityController();
+    const sidePanelController = useSidePanel();
     const collectionRegistryController = useCollectionRegistryController();
     const authController = useAuthController();
     const dataClient = useData();
@@ -153,11 +153,11 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
             return;
         }
         if (openEntityMode === "side_panel" || openEntityMode === "dialog") {
-            sideEntityController.close();
+            sidePanelController.close();
         } else {
             window.history.back();
         }
-    }, [navigateBackProp, openEntityMode, sideEntityController]);
+    }, [navigateBackProp, openEntityMode, sidePanelController]);
 
     // --- Cache operations ---
     const clearDirtyCache = useCallback(() => {
@@ -276,7 +276,7 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
         parentEntityIds,
         path,
         status,
-        collection: collection as EntityCollection,
+        collection: collection as CollectionConfig,
         context,
         formContext: undefined as unknown as FormContext<Record<string, unknown>>,
         openEntityMode,

package/src/form/PropertyFieldBinding.tsx

@@ -1,18 +1,18 @@
-import type { EntityCollection, FieldProps as CoreFieldProps } from "@rebasepro/types";
+import type { CollectionConfig, FieldProps as CoreFieldProps } from "@rebasepro/types";
 import type { FieldProps, PropertyFieldBindingProps } from "../types/fields";
 import type { RebasePlugin, PluginFieldBuilderParams, Property } from "@rebasepro/types";
 import React, { ComponentType, ReactElement, Suspense, useCallback, useRef } from "react";
 import { deepEqual as equal } from "fast-equals"
 
-import { resolveComponentRef } from "@rebasepro/core";
+import { resolveComponentRef } from "@rebasepro/app";
 
-import { Field, FormexFieldProps, getIn } from "@rebasepro/formex";
+import { Field, FormexFieldProps, getIn } from "@rebasepro/forms";
 
 ;
 import { ReadOnlyFieldBinding } from "./field_bindings/ReadOnlyFieldBinding";
 
 import { isHidden, isPropertyBuilder, isReadOnly, resolveProperty } from "@rebasepro/common";
-import { useAuthController, useCustomizationController } from "@rebasepro/core";
+import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { Typography } from "@rebasepro/ui";
 import { getFieldConfig, getFieldId } from "../components/field_configs";
 import { ErrorBoundary } from "@rebasepro/ui";
@@ -29,7 +29,7 @@ import { ErrorBoundary } from "@rebasepro/ui";
  *
  * Please note that if you build a custom field in a component, the
  * **validation** passed in the property will have no effect. You need to set
- * the validation in the `EntityCollection` definition.
+ * the validation in the `CollectionConfig` definition.
  *
  * @param propertyKey You can use nested names such as `address.street` or `friends[2]`
  * @param property
@@ -292,7 +292,7 @@ const shouldPropertyReRender = (property: Property, plugins?: RebasePlugin[]): b
 
 interface UseWrappedComponentParams<M extends Record<string, unknown> = Record<string, unknown>> {
     path?: string,
-    collection?: EntityCollection<M>,
+    collection?: CollectionConfig<M>,
     propertyKey: string,
     property: Property,
     Component: ComponentType<FieldProps<Property, unknown, M>>,
@@ -323,7 +323,7 @@ function useWrappedComponent<T, M extends Record<string, unknown> = Record<strin
                         Field: Component as unknown as ComponentType<CoreFieldProps<Property, unknown, Record<string, unknown>>>,
                         plugin,
                         path,
-                        collection: collection as EntityCollection | undefined
+                        collection: collection as CollectionConfig | undefined
                     };
                     const enabled = plugin.fieldBuilder.enabled?.(params);
                     if (enabled === undefined || enabled)

package/src/form/components/ErrorFocus.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from "react";
-import { useFormex } from "@rebasepro/formex";
+import { useFormex } from "@rebasepro/forms";
 
 export const ErrorFocus = ({ containerRef }:
     {

package/src/form/components/LocalChangesMenu.tsx

@@ -18,9 +18,9 @@ import {
     Typography,
     XCircleIcon
 } from "@rebasepro/ui";
-import { FormexController } from "@rebasepro/formex";
-import { useSnackbarController, useTranslation } from "@rebasepro/core";
-import { flattenKeys, removeEntityFromCache } from "@rebasepro/core";
+import { FormexController } from "@rebasepro/forms";
+import { useSnackbarController, useTranslation } from "@rebasepro/app";
+import { flattenKeys, removeEntityFromCache } from "@rebasepro/app";
 ;
 import { PropertyCollectionView } from "../../components/PropertyCollectionView";
 import { mergeDeep } from "@rebasepro/utils";

package/src/form/components/StorageItemPreview.tsx

@@ -6,7 +6,7 @@ import { PropertyPreview } from "../../preview";
 
 import { cls, IconButton, paperMixin, Tooltip } from "@rebasepro/ui";
 import { ErrorBoundary, FileTextIcon, MinusIcon } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 interface StorageItemPreviewProps {
     name: string;

package/src/form/components/StorageUploadProgress.tsx

@@ -1,8 +1,8 @@
 import React, { useCallback } from "react";
 
-import { useSnackbarController, useStorageSource } from "@rebasepro/core";
-import { StorageFieldItem } from "@rebasepro/core";
-import { ErrorView } from "@rebasepro/core";
+import { useSnackbarController, useStorageSource } from "@rebasepro/app";
+import { StorageFieldItem } from "@rebasepro/app";
+import { ErrorView } from "@rebasepro/app";
 import type { StorageSource } from "@rebasepro/types";
 import { cls, paperMixin, Skeleton } from "@rebasepro/ui";
 

package/src/form/field_bindings/ArrayCustomShapedFieldBinding.tsx

@@ -8,7 +8,7 @@ import { ExpandablePanel, Typography } from "@rebasepro/ui";
 import { getArrayResolvedProperties, isReadOnly } from "@rebasepro/common";
 import { getIconForProperty } from "../../util/property_utils";
 import { useClearRestoreValue } from "../useClearRestoreValue";
-import { useAuthController } from "@rebasepro/core";
+import { useAuthController } from "@rebasepro/app";
 
 /**
  * Array field used for custom

package/src/form/field_bindings/ArrayOfReferencesFieldBinding.tsx

@@ -1,5 +1,5 @@
-import { useEntitySelectionDialog } from "../../hooks/useEntitySelectionDialog";
-import type { EntityCollection } from "@rebasepro/types";
+import { useSelectionDialog } from "../../hooks/useSelectionDialog";
+import type { CollectionConfig } from "@rebasepro/types";
 import type { FieldProps } from "../../types/fields";
 import type { ArrayProperty, Property } from "@rebasepro/types";
 import React, { useCallback, useMemo } from "react";
@@ -10,7 +10,7 @@ import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContaine
 import { getIconForProperty } from "../../util/property_utils";
 import { getReferenceFrom } from "@rebasepro/common";
 
-import { useTranslation, ErrorView } from "@rebasepro/core";
+import { useTranslation, ErrorView } from "@rebasepro/app";
 import { Button, cls, ExpandablePanel, fieldBackgroundMixin, PencilIcon, Typography } from "@rebasepro/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { useCollectionRegistryController } from "../../index";
@@ -56,7 +56,7 @@ export function ArrayOfReferencesFieldBinding({
     });
 
     const collectionRegistryController = useCollectionRegistryController();
-    const collection: EntityCollection | undefined = useMemo(() => {
+    const collection: CollectionConfig | undefined = useMemo(() => {
         return ofProperty.path ? collectionRegistryController.getCollection(ofProperty.path) : undefined;
     }, [ofProperty.path]);
 
@@ -69,7 +69,7 @@ export function ArrayOfReferencesFieldBinding({
         setValue(refs);
     }, [setValue]);
 
-    const referenceDialogController = useEntitySelectionDialog({
+    const referenceDialogController = useSelectionDialog({
         multiselect: true,
         path: ofProperty.path,
         collection,

package/src/form/field_bindings/BlockFieldBinding.tsx

@@ -2,7 +2,7 @@ import type { FieldProps, FormContext, PropertyFieldBindingProps } from "../../t
 import type { ArrayProperty, Property } from "@rebasepro/types";
 import React, { useEffect, useState } from "react";
 
-import { Field, useFormex } from "@rebasepro/formex";
+import { Field, useFormex } from "@rebasepro/forms";
 
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
@@ -12,7 +12,7 @@ import { EnumValuesChip } from "../../preview";
 import { DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE, getDefaultValueFor } from "@rebasepro/common";
 import { getIconForProperty } from "../../util/property_utils";
 import { cls, ExpandablePanel, paperMixin, Select, SelectItem, Typography } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 import { mergeDeep } from "@rebasepro/utils";

package/src/form/field_bindings/DateTimeFieldBinding.tsx

@@ -5,7 +5,7 @@ import React from "react";
 ;
 
 import { FieldHelperText, LabelWithIcon } from "../components";
-import { useCustomizationController } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";
 import { DateTimeField } from "@rebasepro/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";

package/src/form/field_bindings/KeyValueFieldBinding.tsx

@@ -23,8 +23,8 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { getIconForProperty } from "../../util/property_utils";
-import { useCustomizationController, useTranslation } from "@rebasepro/core";
-import { getIn } from "@rebasepro/formex";
+import { useCustomizationController, useTranslation } from "@rebasepro/app";
+import { getIn } from "@rebasepro/forms";
 import { getDefaultValueFortype } from "@rebasepro/common";
 
 type MapEditViewRowState = [number, {
@@ -134,13 +134,13 @@ function MapEditView<T extends Record<string, unknown>>({
         setInternalState(newRowIds);
     }, [value]);
 
-    const updatetype = (rowId: number, type: DataType) => {
-        if (!rowId) {
+    const updatetype = (id: number, type: DataType) => {
+        if (!id) {
             console.warn("No key selected for data type update");
             return;
         }
         setInternalState(internalState.map((row) => {
-            if (row[0] === rowId) {
+            if (row[0] === id) {
                 return [row[0], {
                     key: row[1].key,
                     type
@@ -150,27 +150,27 @@ function MapEditView<T extends Record<string, unknown>>({
         }));
         setValue({
             ...(value ?? {} as T),
-            [internalState.find((row) => row[0] === rowId)?.[1].key ?? ""]: getDefaultValueFortype(type)
+            [internalState.find((row) => row[0] === id)?.[1].key ?? ""]: getDefaultValueFortype(type)
         })
     };
 
     return <div className="py-1 flex flex-col gap-1">
         {internalState
-            .map(([rowId, {
+            .map(([id, {
                     key: fieldKey,
                     type
                 }], index) => {
                     const entryValue = fieldKey ? value?.[fieldKey] : "";
                     const onFieldKeyChange = (newKey: string) => {
 
-                        setInternalState(internalState.map((currentRowId) => {
-                            if (currentRowId[0] === rowId) {
-                                return [rowId, {
+                        setInternalState(internalState.map((currentId) => {
+                            if (currentId[0] === id) {
+                                return [id, {
                                     key: newKey ?? "",
-                                    type: currentRowId[1].type
+                                    type: currentId[1].type
                                 }];
                             }
-                            return currentRowId;
+                            return currentId;
                         }));
 
                         if (typeof value === "object" && newKey in value) {
@@ -189,8 +189,8 @@ function MapEditView<T extends Record<string, unknown>>({
                             [newKey ?? ""]: entryValue
                         });
                     };
-                    return <MapKeyValueRow rowId={rowId}
-                                           key={rowId}
+                    return <MapKeyValueRow id={id}
+                                           key={id}
                                            fieldKey={fieldKey}
                                            value={value ?? {} as T}
                                            onDeleteClick={() => {
@@ -200,7 +200,7 @@ function MapEditView<T extends Record<string, unknown>>({
                                                } else {
                                                    delete (newValue as Record<string, unknown>)[fieldKey];
                                                }
-                                               setInternalState(internalState.filter((currentRowId) => currentRowId[0] !== rowId));
+                                               setInternalState(internalState.filter((currentId) => currentId[0] !== id));
                                                setValue({
                                                    ...newValue
                                                });
@@ -238,7 +238,7 @@ function MapEditView<T extends Record<string, unknown>>({
 }
 
 function MapKeyValueRow<T extends Record<string, unknown>>({
-                                                               rowId,
+                                                               id,
                                                                fieldKey,
                                                                value,
                                                                onFieldKeyChange,
@@ -249,7 +249,7 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
                                                                updatetype,
                                                                disabled
                                                            }: {
-    rowId: number,
+    id: number,
     fieldKey: string,
     value: T,
     onFieldKeyChange: (newKey: string) => void,
@@ -258,7 +258,7 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
     entryValue: unknown,
     type: DataType,
     disabled?: boolean,
-    updatetype: (rowId: number, type: DataType) => void
+    updatetype: (id: number, type: DataType) => void
 }) {
 
     const { locale } = useCustomizationController();
@@ -327,7 +327,7 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
                 className={cls(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
                 <ArrayContainer value={arrayValue}
                                 newDefaultEntry={""}
-                                droppableId={rowId.toString()}
+                                droppableId={id.toString()}
                                 addLabel={fieldKey ? t("add_to_field", { fieldName: fieldKey }) : t("add")}
                                 size={"small"}
                                 disabled={disabled || !fieldKey}
@@ -379,11 +379,11 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
     }
 
     function doUpdatetype(type: DataType) {
-        updatetype(rowId, type);
+        updatetype(id, type);
     }
 
     return (<>
-            <Typography key={rowId.toString()}
+            <Typography key={id.toString()}
                         component={"div"}
                         className="font-mono flex flex-row gap-1">
                 <div className="w-[300px] max-w-[30%]">

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -2,7 +2,7 @@ import type { FieldProps, PropertyFieldBindingProps } from "../../types/fields";
 import type { MapProperty } from "@rebasepro/types";
 import React from "react";
 ;
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 import { ErrorBoundary } from "@rebasepro/ui";
 import { getIconForProperty } from "../../util/property_utils";

package/src/form/field_bindings/MarkdownEditorFieldBinding.tsx

@@ -1,7 +1,7 @@
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
-import { useAuthController, useStorageSource } from "@rebasepro/core";
-import { useStorageSources } from "@rebasepro/core";
+import { useAuthController, useStorageSource } from "@rebasepro/app";
+import { useStorageSources } from "@rebasepro/app";
 import { resolveStorageSource } from "@rebasepro/common";
 import { getIconForProperty } from "../../util/property_utils";
 import type { FieldProps } from "../../types/fields";

package/src/form/field_bindings/MultipleRelationFieldBinding.tsx

@@ -1,4 +1,4 @@
-import { useEntitySelectionDialog } from "../../hooks/useEntitySelectionDialog";
+import { useSelectionDialog } from "../../hooks/useSelectionDialog";
 import type { FieldProps } from "../../types/fields";
 import type { RelationProperty } from "@rebasepro/types";
 import { Entity, getCollectionDataPath, getDataSourceCapabilities } from "@rebasepro/types";
@@ -8,7 +8,7 @@ import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContaine
 import { getIconForProperty } from "../../util/property_utils";
 import { getRelationFrom, resolveRelationProperty } from "@rebasepro/common";
 
-import { ErrorView, useTranslation } from "@rebasepro/core";
+import { ErrorView, useTranslation } from "@rebasepro/app";
 import { Button, cls, ExpandablePanel, fieldBackgroundMixin, PencilIcon, Typography } from "@rebasepro/ui";
 import { RelationPreview } from "../../preview";
 
@@ -59,7 +59,7 @@ export function MultipleRelationFieldBinding({
         setValue(entities.map(e => getRelationFrom(e)));
     }, [setValue]);
 
-    const referenceDialogController = useEntitySelectionDialog({
+    const referenceDialogController = useSelectionDialog({
         multiselect: true,
         path: getCollectionDataPath(collection),
         collection,

package/src/form/field_bindings/ReferenceFieldBinding.tsx

@@ -1,16 +1,16 @@
-import { useEntitySelectionDialog } from "../../hooks/useEntitySelectionDialog";
-import type { EntityCollection } from "@rebasepro/types";
+import { useSelectionDialog } from "../../hooks/useSelectionDialog";
+import type { CollectionConfig } from "@rebasepro/types";
 import type { FieldProps } from "../../types/fields";
 import type { Property, ReferenceProperty } from "@rebasepro/types";
 import React, { useCallback, useMemo } from "react";
 
 import { Entity, EntityReference } from "@rebasepro/types";
-import { ErrorView } from "@rebasepro/core";
+import { ErrorView } from "@rebasepro/app";
 import { ReadOnlyFieldBinding } from "./ReadOnlyFieldBinding";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
-import { EntityPreviewContainer } from "../../components/EntityPreview";
+import { EntityPreviewContainer } from "../../components/EntityPreviewBinding";
 import { ReferencePreview } from "../../preview";
-import { IconForView } from "@rebasepro/core";
+import { IconForView } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";
 import { getReferenceFrom } from "@rebasepro/common";
 import { useClearRestoreValue } from "../useClearRestoreValue";
@@ -64,7 +64,7 @@ function ReferenceFieldBindingInternal({
     const validValue = refValue && typeof refValue === "object" && "isEntityReference" in refValue && refValue.isEntityReference();
 
     const collectionRegistryController = useCollectionRegistryController();
-    const collection: EntityCollection | undefined = useMemo(() => {
+    const collection: CollectionConfig | undefined = useMemo(() => {
         return property.path ? collectionRegistryController.getCollection(property.path) : undefined;
     }, [property.path]);
 
@@ -77,7 +77,7 @@ function ReferenceFieldBindingInternal({
         setValue(ref);
     }, [setValue, propertyKey]);
 
-    const referenceDialogController = useEntitySelectionDialog({
+    const referenceDialogController = useSelectionDialog({
         multiselect: false,
         path: property.path,
         collection,

package/src/form/field_bindings/RelationFieldBinding.tsx

@@ -1,11 +1,11 @@
-import { useEntitySelectionDialog } from "../../hooks/useEntitySelectionDialog";
+import { useSelectionDialog } from "../../hooks/useSelectionDialog";
 import type { FieldProps } from "../../types/fields";
 import type { RelationProperty } from "@rebasepro/types";
 import { Entity, getCollectionDataPath, getDataSourceCapabilities, Relation } from "@rebasepro/types";
 import React, { useCallback } from "react";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
-import { EntityPreviewContainer } from "../../components/EntityPreview";
-import { ErrorView, IconForView } from "@rebasepro/core";
+import { EntityPreviewContainer } from "../../components/EntityPreviewBinding";
+import { ErrorView, IconForView } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";
 import { getRelationFrom, normalizeToEntityRelation, resolveRelationProperty } from "@rebasepro/common";
 import { cls } from "@rebasepro/ui";
@@ -120,7 +120,7 @@ function SingleRelationFieldBinding({
         setValue(e ? getRelationFrom(e) : null);
     }, [setValue]);
 
-    const referenceDialogController = useEntitySelectionDialog({
+    const referenceDialogController = useSelectionDialog({
         multiselect: false,
         path: getCollectionDataPath(collection),
         collection,

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -10,7 +10,7 @@ import { getIconForProperty } from "../../util/property_utils";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 import { ExpandablePanel, Typography } from "@rebasepro/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
-import { useAuthController, useTranslation } from "@rebasepro/core";
+import { useAuthController, useTranslation } from "@rebasepro/app";
 import { mergeDeep } from "@rebasepro/utils";
 
 /**

package/src/form/field_bindings/StorageUploadFieldBinding.tsx

@@ -9,8 +9,8 @@ import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 
 import { isReadOnly } from "@rebasepro/common";
 import { getIconForProperty } from "../../util/property_utils";
-import { useAuthController, useSnackbarController, useStorageSource, useTranslation } from "@rebasepro/core";
-import { StorageSourceContext } from "@rebasepro/core";
+import { useAuthController, useSnackbarController, useStorageSource, useTranslation } from "@rebasepro/app";
+import { StorageSourceContext } from "@rebasepro/app";
 import {
     closestCenter,
     DndContext,
@@ -28,7 +28,7 @@ import {
     useSortable
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { StorageFieldItem, useStorageUploadController } from "@rebasepro/core";
+import { StorageFieldItem, useStorageUploadController } from "@rebasepro/app";
 import { StorageUploadProgress } from "../components/StorageUploadProgress";
 import { StorageItemPreview } from "../components/StorageItemPreview";
 import {

package/src/form/form_utils.ts

@@ -1,7 +1,7 @@
-import type { EntityCollection, PropertyConfig } from "@rebasepro/types";
+import type { CollectionConfig, PropertyConfig } from "@rebasepro/types";
 import type { AuthController, Entity, EntityStatus, EntityValues } from "@rebasepro/types";
 import { deepEqual as equal } from "fast-equals";
-import { getIn, setIn } from "@rebasepro/formex";
+import { getIn, setIn } from "@rebasepro/forms";
 import { getDefaultValuesFor } from "@rebasepro/common";
 import { isObject, mergeDeep } from "@rebasepro/utils";
 import { z } from "zod";
@@ -114,7 +114,7 @@ export function getChanges<T extends object>(source: Partial<T>, comparison: Par
 
 export function getInitialEntityValues<M extends Record<string, unknown>>(
     authController: AuthController,
-    collection: EntityCollection,
+    collection: CollectionConfig,
     path: string,
     status: "new" | "existing" | "copy",
     entity: Entity<M> | undefined,

package/src/hooks/index.ts

@@ -1,8 +1,8 @@
-export * from "./useSideEntityController";
-export * from "./useEntitySelectionDialog";
-export * from "./useBuildSideEntityController";
+export * from "./useSidePanel";
+export * from "./useSelectionDialog";
+export * from "./useBuildSidePanel";
 export * from "./useResolvedNavigationFrom";
-export * from "./useEntityHistory";
+export * from "./useHistory";
 export * from "./navigation/contexts";
 export * from "./navigation/useBuildCollectionRegistryController";
 export * from "./navigation/useBuildNavigationStateController";

package/src/hooks/navigation/contexts/CollectionRegistryContext.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { createContext } from "react";
 import { CollectionRegistryController } from "@rebasepro/types";
 
@@ -12,7 +12,7 @@ export const CollectionRegistryContext = createContext<CollectionRegistryControl
     initialised: false
 });
 
-export function useCollectionRegistryController<DB = Record<string, unknown>, EC extends EntityCollection = EntityCollection>(): CollectionRegistryController<DB, EC> {
+export function useCollectionRegistryController<DB = Record<string, unknown>, EC extends CollectionConfig = CollectionConfig>(): CollectionRegistryController<DB, EC> {
     const context = React.useContext(CollectionRegistryContext);
     if (context === undefined) {
         throw new Error("useCollectionRegistryController must be used within a CollectionRegistryContext.Provider");