@rebasepro/admin 0.9.0 → 0.9.1-canary.0de22e0

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

@@ -5,7 +5,7 @@ import React from "react";
 import JSON5 from "json5";
 import { Highlight, themes } from "prism-react-renderer"
 import { camelCase } from "./utils/strings";
-import { clone } from "@rebasepro/formex";
+import { clone } from "@rebasepro/forms";
 import { isEmptyObject } from "@rebasepro/utils";
 
 export function GetCodeDialog({
@@ -17,7 +17,7 @@ export function GetCodeDialog({
     const snackbarController = useSafeSnackbarController();
 
     const code = collection
-        ? "import { CollectionConfig } from \"@rebasepro/core\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:CollectionConfig = " + JSON5.stringify(collectionToCode({ ...collection }), null, "\t")
+        ? "import { CollectionConfig } from \"@rebasepro/app\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:CollectionConfig = " + JSON5.stringify(collectionToCode({ ...collection }), null, "\t")
         : "No collection selected";
     return <Dialog open={open}
         onOpenChange={onOpenChange}

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

@@ -1,12 +1,12 @@
 
 import { FieldCaption } from "../../_cms_internals";
 import React, { useMemo, useRef, useState } from "react";
-import { useAuthController, useCustomizationController } from "@rebasepro/core";
+import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { CollectionConfig, 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/formex";
+import { useFormex } from "@rebasepro/forms";
 import { PropertyFormDialog } from "./PropertyEditView";
 import { unslugify } from "@rebasepro/utils";
 

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

@@ -2,8 +2,8 @@
 import React, { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } from "react";
 import { deepEqual as equal } from "fast-equals"
 
-import { Formex, FormexController, getIn, useCreateFormex } from "@rebasepro/formex";
-import { ConfirmationDialog } from "@rebasepro/core";
+import { Formex, FormexController, getIn, useCreateFormex } from "@rebasepro/forms";
+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";

package/src/collection_editor/ui/collection_editor/PropertyFieldPreview.tsx

@@ -1,4 +1,4 @@
-import { useCustomizationController } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
 import { getFieldConfig } from "../../../components/field_configs";
 import { PropertyConfigBadge } from "../../../components/PropertyConfigBadge";
 import { ErrorBoundary } from "@rebasepro/ui";

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

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

package/src/collection_editor/ui/collection_editor/RouterCollectionStudioView.tsx

@@ -12,7 +12,7 @@
 import React from "react";
 import { useNavigate } from "react-router-dom";
 import { useUrlController } from "../../_cms_internals";
-import { useSnackbarController } from "@rebasepro/core";
+import { useSnackbarController } from "@rebasepro/app";
 import { CollectionStudioView, CollectionStudioViewProps } from "./CollectionStudioView";
 
 export type RouterCollectionStudioViewProps = Omit<CollectionStudioViewProps, "onSave" | "onCancel">;

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

@@ -3,7 +3,7 @@ import React from "react";
 import {
     ConfirmationDialog,
     useCustomizationController
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { resolveEntityView } from "../../_cms_internals";
 import { CollectionConfig, EntityCustomView, User } from "@rebasepro/types";
 import { getSubcollections } from "@rebasepro/common";
@@ -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,

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,6 +1,6 @@
 import { useCollectionRegistryController } from "../../../_cms_internals";
 import { convertDataToEntity, ImportConfig } from "../../../_cms_internals";
-import { useAuthController } from "@rebasepro/core";
+import { useAuthController } from "@rebasepro/app";
 import { CollectionTableBinding } from "../../../../components/CollectionTableBinding/CollectionTableBinding";
 import { useSelectionController } from "../../../../components/CollectionViewBinding/useSelectionController";
 import { CircularProgressCenter } from "@rebasepro/ui";

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

@@ -2,7 +2,7 @@ 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";
@@ -13,7 +13,7 @@ import { OnPropertyChangedParams, PropertyFormDialog, PropertyWithId } from "../
 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,

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 type { 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";
@@ -9,7 +9,7 @@ import { EnumForm } from "../EnumForm";
 import { StringPropertyValidation } from "./validation/StringPropertyValidation";
 import { ArrayPropertyValidation } from "./validation/ArrayPropertyValidation";
 import { ValidationPanel } from "./validation/ValidationPanel";
-import { PropertyWithId } from "../PropertyEditView";
+import type { PropertyWithId } from "../PropertyEditView";
 
 export function EnumPropertyField({
     multiselect,

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,

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/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/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,

package/src/components/CollectionPanel.tsx

@@ -3,7 +3,7 @@ import React, { useMemo } from "react";
 import { CollectionViewBinding } from "./CollectionViewBinding/CollectionViewBinding";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 import { Typography } from "@rebasepro/ui";
-import { useComponentOverride, CollectionScopeProvider } from "@rebasepro/core";
+import { useComponentOverride, CollectionScopeProvider } from "@rebasepro/app";
 
 /**
  * Props for the {@link CollectionPanel} component.

package/src/components/CollectionTableBinding/CollectionRowActions.tsx

@@ -14,10 +14,10 @@ import {
     Skeleton,
     Tooltip
 } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
-import { getEntityFromCache } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
+import { getEntityFromCache } from "@rebasepro/app";
 import { getLocalChangesBackup } from "@rebasepro/common";
-import { useCMSContext } from "../../index";
+import { useCMSContext } from "../../hooks/useCMSContext";
 
 /**
  *

package/src/components/CollectionTableBinding/CollectionTableBinding.tsx

@@ -3,7 +3,7 @@ import React, { useCallback, useMemo, useRef } from "react";
 import { CollectionSize, Entity, RebaseContext, User, Property } from "@rebasepro/types";
 import { PropertyTableCell } from "./PropertyTableCell";
 import { ErrorBoundary } from "@rebasepro/ui";
-import { useRebaseContext, useLargeLayout } from "@rebasepro/core";
+import { useRebaseContext, useLargeLayout } from "@rebasepro/app";
 import { CellRendererParams, VirtualTableColumn } from "@rebasepro/ui";
 import { CollectionRowActions } from "./CollectionRowActions";
 import { CollectionTableToolbar } from "./internal/CollectionTableToolbar";
@@ -12,10 +12,10 @@ import { EntityTableCell } from "./internal/EntityTableCell";
 import { CustomFieldValidator } from "../../form/validation";
 import { renderSkeletonText } from "../../preview";
 import { propertiesToColumns } from "./column_utils";
-import { ErrorView } from "@rebasepro/core";
+import { ErrorView } from "@rebasepro/app";
 import { SelectableTable } from "../SelectableTable/SelectableTable";
 import { cls } from "@rebasepro/ui";
-import { getRowHeight } from "@rebasepro/core";
+import { getRowHeight } from "@rebasepro/app";
 import { getValueInPath } from "@rebasepro/utils";
 
 /**

package/src/components/CollectionTableBinding/CollectionTableBindingProps.tsx

@@ -3,7 +3,7 @@ import type { AdditionalFieldDelegate } from "@rebasepro/types";
 import type { Property } from "@rebasepro/types";
 import React from "react";
 import { CollectionSize, Entity, EntityTableController, FilterValues, SelectionController, User } from "@rebasepro/types";
-import { OnCellValueChange, OnColumnResizeParams, UniqueFieldValidator } from "@rebasepro/core";
+import { OnCellValueChange, OnColumnResizeParams, UniqueFieldValidator } from "@rebasepro/app";
 import { VirtualTableColumn } from "@rebasepro/ui";
 
 /**

package/src/components/CollectionTableBinding/PropertyTableCell.tsx

@@ -17,7 +17,7 @@ import { EntityTableCellActions } from "./internal/EntityTableCellActions";
 
 import { useSelectableTableController } from "../SelectableTable/SelectableTableContext";
 import { useClearRestoreValue } from "../../form/useClearRestoreValue";
-import { getRowHeight } from "@rebasepro/core";
+import { getRowHeight } from "@rebasepro/app";
 import { isReadOnly } from "@rebasepro/common";
 import { TableRelationField } from "./fields/TableRelationField";
 import { TableRelationSelectorField } from "./fields/TableRelationSelectorField";

package/src/components/CollectionTableBinding/column_utils.tsx

@@ -4,7 +4,7 @@ import { getTableCellAlignment, getTablePropertyColumnWidth } from "./internal/c
 import { FilterValues } from "@rebasepro/types";
 import { VirtualTableColumn } from "@rebasepro/ui";
 import { getIconForProperty, getResolvedPropertyInPath } from "../../util/property_utils";
-import { getColumnKeysForProperty } from "@rebasepro/core";
+import { getColumnKeysForProperty } from "@rebasepro/app";
 
 export function buildIdColumn(largeLayout?: boolean): VirtualTableColumn {
     return {

package/src/components/CollectionTableBinding/fields/TableMultipleRelationField.tsx

@@ -9,8 +9,8 @@ import { getRelationFrom, normalizeToEntityRelation } from "@rebasepro/common";
 
 import { RelationPreview } from "../../../preview";
 import { CollectionSize, Entity, EntityRelation, FilterValues, Relation } from "@rebasepro/types";
-import { } from "@rebasepro/core";
-import { ErrorView } from "@rebasepro/core";
+import { } from "@rebasepro/app";
+import { ErrorView } from "@rebasepro/app";
 import { EntityPreviewContainer } from "../../EntityPreviewBinding";
 
 type TableMultipleRelationFieldProps = {

package/src/components/CollectionTableBinding/fields/TableReferenceField.tsx

@@ -7,11 +7,11 @@ import { ReferencePreview } from "../../../preview";
 import { CollectionSize, Entity, EntityReference, FilterValues } from "@rebasepro/types";
 
 import { getPreviewSizeFrom } from "../../../preview/util";
-import { useComponentOverride, ErrorView, CollectionScopeProvider } from "@rebasepro/core";
+import { useComponentOverride, ErrorView, CollectionScopeProvider } from "@rebasepro/app";
 import { cls, PencilIcon } from "@rebasepro/ui";
 import { EntityPreviewContainer } from "../../EntityPreviewBinding";
 import { getReferenceFrom } from "@rebasepro/common";
-import { useCollectionRegistryController } from "../../../index";
+import { useCollectionRegistryController } from "../../../hooks/navigation/contexts/CollectionRegistryContext";
 
 type TableReferenceFieldProps = {
     name: string;

package/src/components/CollectionTableBinding/fields/TableRelationField.tsx

@@ -8,8 +8,8 @@ import { RelationPreview } from "../../../preview";
 import { CollectionSize, Entity, EntityRelation, FilterValues, Relation } from "@rebasepro/types";
 
 import { getPreviewSizeFrom } from "../../../preview/util";
-import { } from "@rebasepro/core";
-import { ErrorView } from "@rebasepro/core";
+import { } from "@rebasepro/app";
+import { ErrorView } from "@rebasepro/app";
 import { cls, PencilIcon } from "@rebasepro/ui";
 import { EntityPreviewContainer } from "../../EntityPreviewBinding";
 import { getRelationFrom, normalizeToEntityRelation } from "@rebasepro/common";

package/src/components/CollectionTableBinding/fields/TableStorageUpload.tsx

@@ -8,7 +8,7 @@ import { useDropzone } from "react-dropzone";
 import { PropertyPreview } from "../../../preview";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { cls, IconButton, PencilIcon, Typography } from "@rebasepro/ui";
-import { useSnackbarController, useStorageSource, useTranslation, StorageFieldItem, useStorageUploadController, StorageSourceContext } from "@rebasepro/core";
+import { useSnackbarController, useStorageSource, useTranslation, StorageFieldItem, useStorageUploadController, StorageSourceContext } from "@rebasepro/app";
 import { getThumbnailMeasure } from "../../../preview/util";
 import { StorageUploadProgress } from "../../../form/components/StorageUploadProgress";
 import { EntityTableCellActions } from "../internal/EntityTableCellActions";

package/src/components/CollectionTableBinding/internal/CollectionTableToolbar.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 
 import { CircularProgress, cls, defaultBorderMixin, SearchBar } from "@rebasepro/ui";
-import { useLargeLayout, useTranslation } from "@rebasepro/core";
+import { useLargeLayout, useTranslation } from "@rebasepro/app";
 
 interface CollectionTableToolbarProps {
     loading: boolean;

package/src/components/CollectionTableBinding/internal/EntityTableCell.tsx

@@ -4,8 +4,8 @@ import useMeasure from "react-use-measure";
 
 import { cls, Tooltip, iconSize } from "@rebasepro/ui";
 import { ErrorBoundary, MinusCircleIcon } from "@rebasepro/ui";
-import { getRowHeight, TableSize } from "@rebasepro/core";
-import { ErrorTooltip } from "@rebasepro/core";
+import { getRowHeight, TableSize } from "@rebasepro/app";
+import { ErrorTooltip } from "@rebasepro/app";
 
 interface EntityTableCellProps {
     children: React.ReactNode;

package/src/components/CollectionTableBinding/internal/EntityTableCellActions.tsx

@@ -1,5 +1,5 @@
 import { AlertCircleIcon, IconButton } from "@rebasepro/ui";
-import { ErrorTooltip } from "@rebasepro/core";
+import { ErrorTooltip } from "@rebasepro/app";
 import { useCallback, useEffect, useRef } from "react";
 
 export interface EntityTableCellActionsProps {

package/src/components/CollectionTableBinding/internal/popup_field/PopupFormField.tsx

@@ -7,15 +7,15 @@ import React, { useCallback, useEffect, useLayoutEffect, useMemo, useState } fro
 import { Button, DialogActions, IconButton, Portal, Typography, XIcon } from "@rebasepro/ui";
 
 import { Entity, EntityValues } from "@rebasepro/types";
-import { PluginProviderStack } from "@rebasepro/core";
-import { Formex, FormexController, useCreateFormex } from "@rebasepro/formex";
+import { PluginProviderStack } from "@rebasepro/app";
+import { Formex, FormexController, useCreateFormex } from "@rebasepro/forms";
 import { useDraggable } from "./useDraggable";
 import { CustomFieldValidator, getEntitySchema } from "../../../../form/validation";
 import { useWindowSize } from "./useWindowSize";
 import { getPropertyInPath } from "../../../../util/property_utils";
 import { PropertyFieldBinding, zodToFormErrors } from "../../../../form";
-import { useAuthController, useCustomizationController, useData, useRebaseContext } from "@rebasepro/core";
-import type { OnCellValueChangeParams } from "@rebasepro/core";
+import { useAuthController, useCustomizationController, useData, useRebaseContext } from "@rebasepro/app";
+import type { OnCellValueChangeParams } from "@rebasepro/app";
 import { isReadOnly } from "@rebasepro/common";
 
 interface PopupFormFieldProps<M extends Record<string, unknown>> {