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

package/src/editor/selectors/link-selector.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from "react";
 import { Button, CheckIcon, cls, focusedDisabled, iconSize, Popover, TextField, Trash2Icon } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { useProseMirrorContext } from "../hooks/useProseMirrorContext";
 import { getMarkAttributes, isMarkActive, setMark, unsetMark } from "../utils/prosemirror-utils";
 import { schema } from "../schema";

package/src/editor/selectors/node-selector.tsx

@@ -1,7 +1,7 @@
 
 import { EditorState, Transaction } from "prosemirror-state";
-import { EditorBubbleItem } from "../components";
-import { useTranslation } from "@rebasepro/core";
+import { EditorBubbleItem } from "../components/editor-bubble-item";
+import { useTranslation } from "@rebasepro/app";
 
 import {
     Button,

package/src/editor/selectors/text-buttons.tsx

@@ -1,6 +1,6 @@
 
 import { EditorState, Transaction } from "prosemirror-state";
-import { EditorBubbleItem } from "../components";
+import { EditorBubbleItem } from "../components/editor-bubble-item";
 import type { SelectorItem } from "./node-selector";
 import { BoldIcon, Button, cls, CodeIcon, ItalicIcon, StrikethroughIcon, UnderlineIcon } from "@rebasepro/ui";
 import { useProseMirrorContext } from "../hooks/useProseMirrorContext";

package/src/form/EntityForm.tsx

@@ -10,13 +10,16 @@ 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 { FormEntry } from "./components/FormEntry";
+import { FormLayout } from "./components/FormLayout";
+import { LabelWithIconAndTooltip } from "./components/LabelWithIconAndTooltip";
+import { PropertyFieldBinding } from "./PropertyFieldBinding";
+import { flattenKeys } from "@rebasepro/app";
 import { ErrorFocus } from "./components/ErrorFocus";
 import { CustomFieldValidator, getEntitySchema } from "./validation";
 import { EntityFormActions } from "./EntityFormActions";

package/src/form/EntityFormActions.tsx

@@ -16,7 +16,7 @@ import {
     Tooltip,
     Typography
 } from "@rebasepro/ui";
-import { FormexController } from "@rebasepro/formex";
+import { FormexController } from "@rebasepro/forms";
 
 export function EntityFormActions({
     path,

package/src/form/EntityFormBinding.tsx

@@ -15,18 +15,20 @@ 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, useSidePanel, useCMSContext } from "../index";
+import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
+import { useSidePanel } from "../hooks/useSidePanel";
+import { useCMSContext } from "../hooks/useCMSContext";
 import { EntityForm } from "./EntityForm";
 import {
     extractTouchedValues,

package/src/form/PropertyFieldBinding.tsx

@@ -4,15 +4,15 @@ import type { RebasePlugin, PluginFieldBuilderParams, Property } from "@rebasepr
 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";

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

@@ -2,13 +2,14 @@ import type { FieldProps } from "../../types/fields";
 import type { ArrayProperty, Property } from "@rebasepro/types";
 import React from "react";
 ;
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 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

@@ -5,15 +5,16 @@ import type { ArrayProperty, Property } from "@rebasepro/types";
 import React, { useCallback, useMemo } from "react";
 import { Entity, EntityReference } from "@rebasepro/types";
 import { ReferencePreview } from "../../preview";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 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";
+import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
 
 type ArrayOfReferencesFieldProps = FieldProps<ArrayProperty, EntityReference[]>;
 

package/src/form/field_bindings/BlockFieldBinding.tsx

@@ -2,9 +2,10 @@ 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 { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 import { EnumValuesChip } from "../../preview";
 
@@ -12,7 +13,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

@@ -4,8 +4,9 @@ import React from "react";
 
 ;
 
-import { FieldHelperText, LabelWithIcon } from "../components";
-import { useCustomizationController } from "@rebasepro/core";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
+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

@@ -4,7 +4,8 @@ import React, { useEffect, useState } from "react";
 import { DataType, GeoPoint } from "@rebasepro/types";
 
 import { ArrayContainer } from "../../components/ArrayContainer";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import {
     BooleanSwitchWithLabel,
     Button,
@@ -23,8 +24,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, {

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -2,12 +2,13 @@ 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";
 import { isHidden, isReadOnly } from "@rebasepro/common";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 import { cls, ExpandablePanel } from "@rebasepro/ui";
 

package/src/form/field_bindings/MarkdownEditorFieldBinding.tsx

@@ -1,7 +1,8 @@
 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 { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
+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/MultiSelectFieldBinding.tsx

@@ -3,7 +3,8 @@ import type { ArrayProperty, Property } from "@rebasepro/types";
 import React, { useCallback } from "react";
 
 ;
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { EnumValuesChip } from "../../preview";
 import { getIconForProperty } from "../../util/property_utils";
 import { enumToObjectEntries, getLabelOrConfigFrom } from "@rebasepro/common";

package/src/form/field_bindings/MultipleRelationFieldBinding.tsx

@@ -3,12 +3,13 @@ import type { FieldProps } from "../../types/fields";
 import type { RelationProperty } from "@rebasepro/types";
 import { Entity, getCollectionDataPath, getDataSourceCapabilities } from "@rebasepro/types";
 import React, { useCallback } from "react";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 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";
 

package/src/form/field_bindings/ReadOnlyFieldBinding.tsx

@@ -5,7 +5,8 @@ import React from "react";
 ;
 
 import { PropertyPreview } from "../../preview";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { getIconForProperty } from "../../util/property_utils";
 import { cls } from "@rebasepro/ui";

package/src/form/field_bindings/ReferenceFieldBinding.tsx

@@ -5,17 +5,18 @@ 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 { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 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";
 import { cls } from "@rebasepro/ui";
-import { useCollectionRegistryController } from "../../index";
+import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
 
 /**
  * Field that opens a reference selection dialog.

package/src/form/field_bindings/RelationFieldBinding.tsx

@@ -3,9 +3,10 @@ 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 { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { EntityPreviewContainer } from "../../components/EntityPreviewBinding";
-import { ErrorView, IconForView } from "@rebasepro/core";
+import { ErrorView, IconForView } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";
 import { getRelationFrom, normalizeToEntityRelation, resolveRelationProperty } from "@rebasepro/common";
 import { cls } from "@rebasepro/ui";

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -2,7 +2,8 @@ import type { FieldProps, PropertyFieldBindingProps } from "../../types/fields";
 import type { ArrayProperty } from "@rebasepro/types";
 import React, { useState } from "react";
 ;
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { getArrayResolvedProperties, getDefaultValueFor } from "@rebasepro/common";
@@ -10,7 +11,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/SelectFieldBinding.tsx

@@ -3,7 +3,8 @@ import type { NumberProperty, StringProperty } from "@rebasepro/types";
 import React, { useCallback } from "react";
 
 ;
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { EnumValuesChip } from "../../preview";
 import { getIconForProperty } from "../../util/property_utils";
 import { cls, IconButton, Select, SelectItem, XIcon } from "@rebasepro/ui";

package/src/form/field_bindings/StorageUploadFieldBinding.tsx

@@ -5,12 +5,13 @@ import React, { useCallback, useState } from "react";
 import { StorageConfig } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { useDropzone } from "react-dropzone";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 
 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 +29,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/field_bindings/SwitchFieldBinding.tsx

@@ -4,7 +4,8 @@ import React from "react";
 
 ;
 import { getIconForProperty } from "../../util/property_utils";
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { BooleanSwitchWithLabel } from "@rebasepro/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";

package/src/form/field_bindings/TextFieldBinding.tsx

@@ -13,7 +13,8 @@ import {
     XIcon
 } from "@rebasepro/ui";
 import { PreviewType } from "@rebasepro/types";
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { PropertyPreview } from "../../preview";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";

package/src/form/field_bindings/UserSelectFieldBinding.tsx

@@ -2,7 +2,8 @@ import type { FieldProps } from "../../types/fields";
 import type { StringProperty } from "@rebasepro/types";
 import React from "react";
 
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { getIconForProperty } from "../../util/property_utils";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";
 import { UserSelector } from "../../components/UserSelector";

package/src/form/field_bindings/VectorFieldBinding.tsx

@@ -11,7 +11,8 @@ import {
     TextField,
     Trash2Icon
 } from "@rebasepro/ui";
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";
 import { getIconForProperty } from "../../util/property_utils";

package/src/form/form_utils.ts

@@ -1,7 +1,7 @@
 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";

package/src/hooks/navigation/useNavigationResolution.ts

@@ -53,13 +53,20 @@ export function applyPluginModifyCollection(resolvedCollections: CollectionConfi
  * with `auth: true` or `auth: { enabled: true }`.
  *
  * Injections:
- * 1. **resetPasswordAction** — adds the entity action unless explicitly disabled
+ * 1. **resetPasswordAction** — adds the entity action unless explicitly disabled,
+ *    or unless the auth adapter reports no `adminPasswordReset` support. Custom
+ *    adapters mount their own admin routes and may not implement
+ *    `POST /admin/users/:userId/reset-password`; injecting the action anyway
+ *    would show a button that can only ever 404.
  * 2. **afterSave callback** — shows the `CreationResultDialog` when a new user
  *    is created with `invitationSent` or `temporaryPassword` in the response
  *
  * Skips injection if the collection already has the action/callback present.
  */
-function injectAuthCollectionConfig(collections: CollectionConfig[]): CollectionConfig[] {
+function injectAuthCollectionConfig(
+    collections: CollectionConfig[],
+    adminPasswordResetSupported: boolean
+): CollectionConfig[] {
     return collections.map((collection) => {
         const authProp = collection.auth;
         if (!authProp) return collection;
@@ -78,7 +85,11 @@ function injectAuthCollectionConfig(collections: CollectionConfig[]): Collection
         if (resetPref === false) {
             actionToInject = undefined;
         } else if (typeof resetPref === "object") {
+            // An explicitly supplied action is the collection author's own; they
+            // own its backend, so the adapter capability doesn't apply.
             actionToInject = resetPref;
+        } else if (!adminPasswordResetSupported) {
+            actionToInject = undefined;
         } else {
             actionToInject = resetPasswordAction;
         }
@@ -129,7 +140,8 @@ function injectAuthCollectionConfig(collections: CollectionConfig[]): Collection
                             isAnonymous: false
                         },
                         invitationSent: !!values.invitationSent,
-                        temporaryPassword: typeof values.temporaryPassword === "string" ? values.temporaryPassword : undefined
+                        temporaryPassword: typeof values.temporaryPassword === "string" ? values.temporaryPassword : undefined,
+                        emailDeliveryFailed: !!values.emailDeliveryFailed
                     };
 
                     const { closeDialog } = dialogsController.open({
@@ -179,7 +191,10 @@ export async function resolveCollections(
     }
 
     // Auto-inject auth entity actions and callbacks (resetPassword, creation dialog, etc.)
-    resolvedCollections = injectAuthCollectionConfig(resolvedCollections);
+    resolvedCollections = injectAuthCollectionConfig(
+        resolvedCollections,
+        authController.capabilities?.adminPasswordReset ?? true
+    );
 
     resolvedCollections = filterOutNotAllowedCollections(resolvedCollections, authController);
     return resolvedCollections;

package/src/hooks/useBuildSidePanel.tsx

@@ -7,11 +7,12 @@ import {
     getNavigationEntriesFromPath,
     NavigationViewInternal,
     removeInitialAndTrailingSlashes,
+    removeTrailingSlash,
     resolveDefaultSelectedView
 } from "@rebasepro/common";
 import { resolvedSelectedEntityView } from "../util/resolutions";
-import { ADDITIONAL_TAB_WIDTH, CONTAINER_FULL_WIDTH, FORM_CONTAINER_WIDTH } from "@rebasepro/core";
-import { useCustomizationController, useLargeLayout, useComponentOverride, CollectionScopeProvider } from "@rebasepro/core";
+import { ADDITIONAL_TAB_WIDTH, CONTAINER_FULL_WIDTH, FORM_CONTAINER_WIDTH } from "@rebasepro/app";
+import { useCustomizationController, useLargeLayout, useComponentOverride, CollectionScopeProvider } from "@rebasepro/app";
 import { JSON_TAB_VALUE, HISTORY_TAB_VALUE } from "../components/EditViewBinding";
 import React from "react";
 import { SidePanelBinding } from "../components/SidePanelBinding";
@@ -280,6 +281,13 @@ export function buildSidePanelsFromUrl(path: string, collections: CollectionConf
 
     }
 
+    // `edit` is not a registered view, so the navigation parser skips it. Pick it
+    // up from the raw path so that reloading an edit URL reopens the edit form
+    // rather than silently dropping the user back on the detail view.
+    if (sidePanel && !sidePanel.selectedTab && removeTrailingSlash(path).endsWith("/edit")) {
+        sidePanel.selectedTab = "edit";
+    }
+
     // When the URL doesn't contain a tab segment but the collection has a
     // defaultSelectedView, resolve it so the panel opens with the correct
     // width and the URL is updated on the next replace() cycle.

package/src/hooks/useCMSContext.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { useRebaseContext } from "@rebasepro/core";
+import { useRebaseContext } from "@rebasepro/app";
 import type {
     AuthController,
     RebaseContext,

package/src/hooks/useHistory.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
-import { useApiConfig } from "@rebasepro/core";
+import { useApiConfig } from "@rebasepro/app";
 
 export interface HistoryEntryData {
     id: string;

package/src/hooks/useResolvedNavigationFrom.tsx

@@ -86,11 +86,13 @@ export function resolveNavigationFrom<M extends Record<string, unknown>, USER ex
                     throw Error(`No collection defined in the navigation for the entity with path ${entry.slug}`);
                 }
                 // `context.data` is the flat SDK layer; re-wrap the row into the
-                // Entity view-model the navigation entry expects.
+                // Entity view-model the navigation entry expects. The address is
+                // the one we just fetched by — reading it back off the row would
+                // find nothing, since a row is only its columns.
                 return data.collection(entry.slug).findById(entry.entityId)
                     .then((row) => {
                         if (!row) return undefined;
-                        const entity = { id: row.id, path: entry.slug, values: row };
+                        const entity = { id: entry.entityId, path: entry.slug, values: row };
                         return { ...entry,
 entity };
                     });

package/src/hooks/useSelectionDialog.tsx

@@ -1,8 +1,8 @@
-import { SelectionProps, SelectionTableBinding } from "../components";
+import { SelectionProps, SelectionTableBinding } from "../components/ReferenceTable/SelectionTableBinding";
 import type { CollectionConfig } from "@rebasepro/types";
 import { useCallback, useMemo } from "react";
-import { useSideDialogsController } from "../index";
-import { useCollectionRegistryController } from "../index";
+import { useSideDialogsController } from "./useSideDialogsController";
+import { useCollectionRegistryController } from "./navigation/contexts/CollectionRegistryContext";
 
 /**
  * This hook is used to open a side dialog that allows the selection