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

package/src/form/field_bindings/ArrayCustomShapedFieldBinding.tsx

@@ -6,7 +6,8 @@ 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 { getArrayResolvedProperties } from "@rebasepro/common";
+import { isReadOnly } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { useAuthController } from "@rebasepro/app";
@@ -35,7 +36,7 @@ export function ArrayCustomShapedFieldBinding({
 }: FieldProps<ArrayProperty | ArrayProperty>) {
 
     const authController = useAuthController();
-    const minimalistView = minimalistViewProp || property.ui?.minimalistView;
+    const minimalistView = minimalistViewProp || property.admin?.minimalistView;
 
     const resolvedProperties: Property[] | undefined = getArrayResolvedProperties({
         propertyValue: value,
@@ -45,7 +46,7 @@ export function ArrayCustomShapedFieldBinding({
         authController
     })
 
-    const expanded = property.ui?.expanded === undefined ? true : property.ui?.expanded;
+    const expanded = property.admin?.expanded === undefined ? true : property.admin?.expanded;
 
     useClearRestoreValue({
         property,
@@ -64,7 +65,7 @@ export function ArrayCustomShapedFieldBinding({
     </>);
 
     const body = (resolvedProperties ?? []).map((childProperty, index) => {
-        const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.ui?.disabled);
+        const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.admin?.disabled);
         const fieldProps = {
             propertyKey: `${propertyKey}[${index}]`,
             disabled: disabled || thisDisabled,

package/src/form/field_bindings/ArrayOfReferencesFieldBinding.tsx

@@ -1,5 +1,5 @@
 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";
@@ -15,6 +15,7 @@ import { useTranslation, ErrorView } from "@rebasepro/app";
 import { Button, cls, ExpandablePanel, fieldBackgroundMixin, PencilIcon, Typography } from "@rebasepro/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 type ArrayOfReferencesFieldProps = FieldProps<ArrayProperty, EntityReference[]>;
 
@@ -39,7 +40,7 @@ export function ArrayOfReferencesFieldBinding({
     setFieldValue
 }: ArrayOfReferencesFieldProps) {
 
-    const minimalistView = minimalistViewProp || property.ui?.minimalistView;
+    const minimalistView = minimalistViewProp || property.admin?.minimalistView;
     const { t } = useTranslation();
 
     const ofProperty = property.of as Property;
@@ -47,7 +48,7 @@ export function ArrayOfReferencesFieldBinding({
         throw Error("ArrayOfReferencesField expected a property containing references");
     }
 
-    const expanded = property.ui?.expanded === undefined ? true : property.ui?.expanded;
+    const expanded = property.admin?.expanded === undefined ? true : property.admin?.expanded;
     const selectedEntityIds = value && Array.isArray(value) ? value.map((ref) => ref.id) : [];
 
     useClearRestoreValue({
@@ -57,7 +58,7 @@ export function ArrayOfReferencesFieldBinding({
     });
 
     const collectionRegistryController = useCollectionRegistryController();
-    const collection: CollectionConfig | undefined = useMemo(() => {
+    const collection: AdminCollection | undefined = useMemo(() => {
         return ofProperty.path ? collectionRegistryController.getCollection(ofProperty.path) : undefined;
     }, [ofProperty.path]);
 
@@ -98,7 +99,7 @@ export function ArrayOfReferencesFieldBinding({
             <ReferencePreview
                 key={internalId}
                 disabled={!ofProperty.path}
-                previewProperties={ofProperty.ui?.previewProperties}
+                previewProperties={ofProperty.admin?.previewProperties}
                 size={"medium"}
                 onClick={onEntryClick}
                 hover={!disabled}
@@ -107,7 +108,7 @@ export function ArrayOfReferencesFieldBinding({
                 includeEntityLink={ofProperty.includeEntityLink}
             />
         );
-    }, [ofProperty.path, ofProperty.ui?.previewProperties, value]);
+    }, [ofProperty.path, ofProperty.admin?.previewProperties, value]);
 
     const title = (<>
         <LabelWithIconAndTooltip

package/src/form/field_bindings/BlockFieldBinding.tsx

@@ -42,13 +42,13 @@ export function BlockFieldBinding({
                                       disabled
                                   }: FieldProps<ArrayProperty>) {
 
-    const minimalistView = minimalistViewProp || property.ui?.minimalistView;
+    const minimalistView = minimalistViewProp || property.admin?.minimalistView;
     const { t } = useTranslation();
 
     if (!property.oneOf)
         throw Error("ArrayOneOfField misconfiguration. Property `oneOf` not set");
 
-    const expanded = property.ui?.expanded === undefined ? true : property.ui?.expanded;
+    const expanded = property.admin?.expanded === undefined ? true : property.admin?.expanded;
     useClearRestoreValue({
         property,
         value,
@@ -94,8 +94,8 @@ export function BlockFieldBinding({
                                  addLabel={property.name ? t("add_to_field", { fieldName: property.name }) : t("add_entry")}
                                  buildEntry={buildEntry}
                                  onInternalIdAdded={setLastAddedId}
-                                 disabled={isSubmitting || Boolean(property.ui?.disabled)}
-                                 canAddElements={!property.ui?.disabled}
+                                 disabled={isSubmitting || Boolean(property.admin?.disabled)}
+                                 canAddElements={!property.admin?.disabled}
                                  onValueChange={(value) => setFieldValue(propertyKey, value)}
                                  newDefaultEntry={{
                                      [property.oneOf!.typeField ?? DEFAULT_ONE_OF_TYPE]: firstOneOfKey,

package/src/form/field_bindings/DateTimeFieldBinding.tsx

@@ -50,7 +50,7 @@ export function DateTimeFieldBinding({
                     value={internalValue}
                     onChange={(dateValue) => setValue(dateValue)}
                     mode={property.mode}
-                    clearable={property.ui?.clearable}
+                    clearable={property.admin?.clearable}
                     locale={locale}
                     error={showError}
                     disabled={disabled}

package/src/form/field_bindings/KeyValueFieldBinding.tsx

@@ -53,7 +53,7 @@ export function KeyValueFieldBinding({
                                          context
                                      }: FieldProps<MapProperty>) {
 
-    const expanded = (property.ui?.expanded === undefined ? true : property.ui?.expanded) || autoFocus;
+    const expanded = (property.admin?.expanded === undefined ? true : property.admin?.expanded) || autoFocus;
 
     if (!property.keyValue) {
         throw Error(`Your property ${propertyKey} needs to have the 'keyValue' prop in order to use this field binding`);

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from "@rebasepro/app";
 
 import { ErrorBoundary } from "@rebasepro/ui";
 import { getIconForProperty } from "../../util/property_utils";
-import { isHidden, isReadOnly } from "@rebasepro/common";
+import { isHidden, isReadOnly } from "@rebasepro/app";
 import { FieldHelperText } from "../components/FieldHelperText";
 import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
@@ -34,8 +34,8 @@ export function MapFieldBinding({
     onPropertyChange
 }: FieldProps<MapProperty>) {
 
-    const expanded = property.ui?.expanded === undefined ? true : property.ui?.expanded;
-    const minimalistView = minimalistViewProp || property.ui?.minimalistView;
+    const expanded = property.admin?.expanded === undefined ? true : property.admin?.expanded;
+    const minimalistView = minimalistViewProp || property.admin?.minimalistView;
     const { t } = useTranslation();
 
     if (!property.properties) {
@@ -46,11 +46,11 @@ export function MapFieldBinding({
 
     const mapFormView = <>
         <div
-            className={cls("py-1 flex flex-col space-y-2", minimalistView && property.ui?.widthPercentage !== undefined ? "mt-8" : undefined)}>
+            className={cls("py-1 flex flex-col space-y-2", minimalistView && property.admin?.widthPercentage !== undefined ? "mt-8" : undefined)}>
             {Object.entries(mapProperties)
                 .filter(([_, property]) => !isHidden(property))
                 .map(([entryKey, childProperty], index) => {
-                    const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.ui?.disabled);
+                    const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.admin?.disabled);
                     const fieldBindingProps: PropertyFieldBindingProps<Record<string, unknown>> = {
                         propertyKey: `${propertyKey}.${entryKey}`,
                         disabled: disabled || thisDisabled,
@@ -92,11 +92,11 @@ export function MapFieldBinding({
             {!minimalistView && <ExpandablePanel initiallyExpanded={expanded}
                 onExpandedChange={(expanded: boolean) => {
                     onPropertyChange?.({
-                        ui: { ...property.ui,
+                        admin: { ...property.admin,
 expanded }
                     });
                 }}
-                className={property.ui?.widthPercentage !== undefined ? "mt-8" : undefined}
+                className={property.admin?.widthPercentage !== undefined ? "mt-8" : undefined}
                 innerClassName={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2 bg-white dark:bg-surface-900"}
                 title={<LabelWithIconAndTooltip
                     propertyKey={propertyKey}

package/src/form/field_bindings/MarkdownEditorFieldBinding.tsx

@@ -223,7 +223,7 @@ export function MarkdownEditorFieldBinding({
                     title={property.name ?? propertyKey}
                     className={"h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"}/>
                 <div className="flex-grow"/>
-                {property.ui?.clearable && !disabled && (
+                {property.admin?.clearable && !disabled && (
                     <IconButton
                         size="small"
                         onClick={(e) => {

package/src/form/field_bindings/MultipleRelationFieldBinding.tsx

@@ -87,7 +87,7 @@ export function MultipleRelationFieldBinding({
         return (
             <RelationPreview
                 key={internalId}
-                previewProperties={property.ui?.previewProperties}
+                previewProperties={property.admin?.previewProperties}
                 size={"medium"}
                 onClick={onEntryClick}
                 hover={!disabled}
@@ -96,7 +96,7 @@ export function MultipleRelationFieldBinding({
                 includeEntityLink={property.includeEntityLink}
             />
         );
-    }, [relation, property.ui?.previewProperties, value]);
+    }, [relation, property.admin?.previewProperties, value]);
 
     const title = (<>
         <LabelWithIconAndTooltip

package/src/form/field_bindings/ReferenceFieldBinding.tsx

@@ -1,5 +1,5 @@
 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";
@@ -17,6 +17,7 @@ import { getReferenceFrom } from "@rebasepro/common";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { cls } from "@rebasepro/ui";
 import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 /**
  * Field that opens a reference selection dialog.
@@ -65,7 +66,7 @@ function ReferenceFieldBindingInternal({
     const validValue = refValue && typeof refValue === "object" && "isEntityReference" in refValue && refValue.isEntityReference();
 
     const collectionRegistryController = useCollectionRegistryController();
-    const collection: CollectionConfig | undefined = useMemo(() => {
+    const collection: AdminCollection | undefined = useMemo(() => {
         return property.path ? collectionRegistryController.getCollection(property.path) : undefined;
     }, [property.path]);
 
@@ -109,7 +110,7 @@ function ReferenceFieldBindingInternal({
 
                 {refValue && <ReferencePreview
                     disabled={!property.path}
-                    previewProperties={property.ui?.previewProperties}
+                    previewProperties={property.admin?.previewProperties}
                     hover={!disabled}
                     size={size}
                     onClick={disabled || isSubmitting ? undefined : onEntryClick}

package/src/form/field_bindings/RelationFieldBinding.tsx

@@ -29,7 +29,7 @@ export function RelationFieldBinding(props: FieldProps<RelationProperty>) {
     const relation = resolvedProperty.relation;
 
     const manyRelation = relation?.cardinality === "many";
-    const widget = property.ui?.widget ?? "select";
+    const widget = property.admin?.widget ?? "select";
 
     if (widget === "select" && relation) {
         return <RelationSelectorBinding {...props} relation={relation} manyRelation={manyRelation} />;
@@ -153,7 +153,7 @@ function SingleRelationFieldBinding({
 
                 {usedRelation && <RelationPreview
                     disabled={!usedRelation}
-                    previewProperties={property.ui?.previewProperties}
+                    previewProperties={property.admin?.previewProperties}
                     hover={!disabled}
                     size={size}
                     onClick={disabled || isSubmitting ? undefined : onEntryClick}

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -44,7 +44,7 @@ export function RepeatFieldBinding({
         throw Error("RepeatFieldBinding misconfiguration. Property `type` is not `array`");
     }
 
-    const minimalistView = minimalistViewProp || property.ui?.minimalistView;
+    const minimalistView = minimalistViewProp || property.admin?.minimalistView;
 
     if (!property.of)
         throw Error("RepeatFieldBinding misconfiguration. Property `of` not set");
@@ -57,7 +57,7 @@ export function RepeatFieldBinding({
         authController
     })
 
-    const expanded = property.ui?.expanded === undefined ? true : property.ui?.expanded;
+    const expanded = property.admin?.expanded === undefined ? true : property.admin?.expanded;
     const ofProperty = property.of;
 
     const [lastAddedId, setLastAddedId] = useState<number | undefined>();
@@ -92,19 +92,19 @@ export function RepeatFieldBinding({
         </ErrorBoundary>;
     };
 
-    const canAddElements = !property.ui?.disabled && !isSubmitting && !disabled && (property.canAddElements || property.canAddElements === undefined);
+    const canAddElements = !property.admin?.disabled && !isSubmitting && !disabled && (property.canAddElements || property.canAddElements === undefined);
     const sortable = property.sortable === undefined ? true : property.sortable;
     const arrayContainer = <ArrayContainer droppableId={propertyKey}
         addLabel={property.name ? t("add_to_field", { fieldName: property.name }) : t("add_entry")}
         value={(value as unknown[]) ?? []}
         buildEntry={buildEntry}
         onInternalIdAdded={setLastAddedId}
-        disabled={isSubmitting || Boolean(property.ui?.disabled)}
+        disabled={isSubmitting || Boolean(property.admin?.disabled)}
         canAddElements={canAddElements}
         sortable={sortable}
         newDefaultEntry={getDefaultValueFor(property.of)}
         onValueChange={(value) => setFieldValue(propertyKey, value)}
-        className={property.ui?.widthPercentage !== undefined ? "mt-8" : undefined}
+        className={property.admin?.widthPercentage !== undefined ? "mt-8" : undefined}
     />;
 
     const title = (<>

package/src/form/field_bindings/SelectFieldBinding.tsx

@@ -68,7 +68,7 @@ export function SelectFieldBinding({
                         />
                     </PropertyIdCopyTooltip>}
                 endAdornment={
-                    property.ui?.clearable && !disabled && <IconButton
+                    property.admin?.clearable && !disabled && <IconButton
                         size="small"
                         onClick={handleClearClick}>
                         <XIcon/>

package/src/form/field_bindings/StorageUploadFieldBinding.tsx

@@ -8,7 +8,7 @@ import { useDropzone } from "react-dropzone";
 import { FieldHelperText } from "../components/FieldHelperText";
 import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 
-import { isReadOnly } from "@rebasepro/common";
+import { isReadOnly } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";
 import { useAuthController, useSnackbarController, useStorageSource, useTranslation } from "@rebasepro/app";
 import { StorageSourceContext } from "@rebasepro/app";
@@ -65,7 +65,7 @@ export function StorageUploadFieldBinding({
     const authController = useAuthController();
 
     const storageSource = useStorageSource();
-    const disabled = isReadOnly(property) || !!property.ui?.disabled || isSubmitting || context.disabled;
+    const disabled = isReadOnly(property) || !!property.admin?.disabled || isSubmitting || context.disabled;
 
     const {
         internalValue,

package/src/form/field_bindings/SwitchFieldBinding.tsx

@@ -44,7 +44,7 @@ export const SwitchFieldBinding = function SwitchFieldBinding({
                     value={value as boolean | null}
                     onValueChange={(v) => setValue(v)}
                     error={showError}
-                    className={property.ui?.widthPercentage !== undefined ? "mt-8" : undefined}
+                    className={property.admin?.widthPercentage !== undefined ? "mt-8" : undefined}
                     label={<LabelWithIcon
                         icon={getIconForProperty(property, "small")}
                         required={property.validation?.required}

package/src/form/field_bindings/TextFieldBinding.tsx

@@ -12,7 +12,7 @@ import {
     TextField,
     XIcon
 } from "@rebasepro/ui";
-import { PreviewType } from "@rebasepro/types";
+import { PreviewType } from "@rebasepro/admin-types";
 import { FieldHelperText } from "../components/FieldHelperText";
 import { LabelWithIcon } from "../components/LabelWithIcon";
 import { PropertyPreview } from "../../preview";
@@ -42,8 +42,8 @@ export function TextFieldBinding<T extends string | number>({
     let multiline: boolean | undefined;
     let url: boolean | PreviewType | undefined;
     if (property.type === "string") {
-        multiline = property.ui?.multiline;
-        url = property.ui?.url;
+        multiline = property.admin?.multiline;
+        url = property.admin?.urlPreview;
     }
 
     useClearRestoreValue({
@@ -82,7 +82,7 @@ export function TextFieldBinding<T extends string | number>({
         inputType = "number";
     } else if (property.type === "string") {
         if (property.email) inputType = "email";
-        else if (property.ui?.url) inputType = "url";
+        else if (property.admin?.urlPreview) inputType = "url";
     }
 
     const label = (
@@ -99,7 +99,7 @@ export function TextFieldBinding<T extends string | number>({
                         fieldBackgroundMixin,
                         fieldBackgroundHoverMixin,
                         showError && error ? "border border-red-500 dark:border-red-600" : "",
-                        property.ui?.widthPercentage !== undefined ? "mt-8" : undefined
+                        property.admin?.widthPercentage !== undefined ? "mt-8" : undefined
                     )}>
                         <div
                             className="pointer-events-none absolute top-1 text-xs font-medium px-3 text-text-secondary dark:text-text-secondary-dark">
@@ -116,7 +116,7 @@ export function TextFieldBinding<T extends string | number>({
                                 showError && error ? "text-red-500 dark:text-red-600" : ""
                             )}
                         />
-                        {property.ui?.clearable && (
+                        {property.admin?.clearable && (
                             <div
                                 className="flex flex-row justify-center items-center absolute h-full right-0 top-0 mr-4">
                                 <IconButton onClick={handleClearClick}>
@@ -131,7 +131,7 @@ export function TextFieldBinding<T extends string | number>({
                         value={displayValue}
                         onChange={onChange}
                         autoFocus={autoFocus}
-                        className={property.ui?.widthPercentage !== undefined ? "mt-8" : undefined}
+                        className={property.admin?.widthPercentage !== undefined ? "mt-8" : undefined}
                         label={<LabelWithIcon
                             icon={getIconForProperty(property, "small")}
                             required={property.validation?.required || property.isId === true}
@@ -139,7 +139,7 @@ export function TextFieldBinding<T extends string | number>({
                         type={inputType}
                         disabled={disabled}
                         endAdornment={
-                            property.ui?.clearable && <IconButton
+                            property.admin?.clearable && <IconButton
                                 onClick={handleClearClick}>
                                 <XIcon/>
                             </IconButton>

package/src/form/field_bindings/UserSelectFieldBinding.tsx

@@ -52,7 +52,7 @@ export function UserSelectFieldBinding({
                     setValue(userId);
                 }}
                 disabled={disabled}
-                clearable={property.ui?.clearable}
+                clearable={property.admin?.clearable}
                 size={selectorSize}
             />
 

package/src/form/form_utils.ts

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

package/src/form/useClearRestoreValue.tsx

@@ -22,7 +22,7 @@ export function useClearRestoreValue<T>({
 
     const clearedValueRef = useRef<T | null>(null);
     useEffect(() => {
-        const shouldClearValueIfDisabled = typeof property.ui?.disabled === "object" && Boolean(property.ui?.disabled.clearOnDisabled);
+        const shouldClearValueIfDisabled = typeof property.admin?.disabled === "object" && Boolean(property.admin?.disabled.clearOnDisabled);
         if (shouldClearValueIfDisabled) {
             if (value != null) {
                 clearedValueRef.current = value;

package/src/form/validation.ts

@@ -191,7 +191,7 @@ function getZodStringSchema({
             (value: unknown) => value == null || (typeof value === "string" && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)),
             { message: `${property.name} must be an email` }
         );
-        if (property.ui?.url) {
+        if (property.url) {
             if (!property.storage || property.storage?.storeUrl) {
                 schema = schema.refine(
                     (value: unknown) => {

package/src/hooks/index.ts

@@ -2,6 +2,7 @@ export * from "./useSidePanel";
 export * from "./useSelectionDialog";
 export * from "./useBuildSidePanel";
 export * from "./useResolvedNavigationFrom";
+export * from "./useResolvedUsers";
 export * from "./useHistory";
 export * from "./navigation/contexts";
 export * from "./navigation/useBuildCollectionRegistryController";

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

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

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

@@ -1,4 +1,4 @@
-import type { NavigationStateController } from "@rebasepro/types";
+import type { NavigationStateController } from "@rebasepro/admin-types";
 import React, { createContext } from "react";
 
 

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

@@ -1,4 +1,4 @@
-import type { UrlController } from "@rebasepro/types";
+import type { UrlController } from "@rebasepro/admin-types";
 import React, { createContext } from "react";
 
 

package/src/hooks/navigation/useBuildCollectionRegistryController.tsx

@@ -1,7 +1,9 @@
-import type { CollectionConfig, DataSourceDefinition } from "@rebasepro/types";
+import type { DataSourceDefinition } from "@rebasepro/types";
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
-import { CollectionRegistry, getParentReferencesFromPath as commonGetParentReferencesFromPath, removeInitialAndTrailingSlashes, getSubcollections } from "@rebasepro/common";
-import { EntityReference, UserConfigurationPersistence, CollectionRegistryController } from "@rebasepro/types";
+import { CollectionRegistry, getSubcollections } from "@rebasepro/common";
+import { getParentReferencesFromPath as commonGetParentReferencesFromPath, removeInitialAndTrailingSlashes } from "@rebasepro/app";
+import { EntityReference, CollectionRegistryController } from "@rebasepro/types";
+import { UserConfigurationPersistence, resolveAdminCollection, AdminCollection } from "@rebasepro/admin-types";
 import { mergeDeep } from "@rebasepro/utils";
 
 export function useBuildCollectionRegistryController(props: {
@@ -21,7 +23,7 @@ export function useBuildCollectionRegistryController(props: {
     const getCollection = useCallback((
         slugOrPath: string,
         includeUserOverride = false
-    ): CollectionConfig | undefined => {
+    ): AdminCollection | undefined => {
 
         const registry = collectionRegistryRef.current;
 
@@ -38,7 +40,7 @@ export function useBuildCollectionRegistryController(props: {
 
         if (!collectionPath) return undefined;
 
-        let collection: CollectionConfig | undefined;
+        let collection: AdminCollection | undefined;
         try {
             collection = registry.resolvePathToCollections(collectionPath).finalCollection;
         } catch (e) {
@@ -50,13 +52,12 @@ export function useBuildCollectionRegistryController(props: {
             return undefined;
         }
 
-
         const userOverride = includeUserOverride ? userConfigPersistence?.getCollectionConfig(slugOrPath) : undefined;
         const overriddenCollection = collection ? mergeDeep(collection, userOverride ?? {}) : undefined;
 
         if (!overriddenCollection) return undefined;
 
-        let result: Partial<CollectionConfig> | undefined = overriddenCollection;
+        let result: Partial<AdminCollection> | undefined = overriddenCollection;
         const subcollections = "subcollections" in overriddenCollection ? overriddenCollection.subcollections : undefined;
         const callbacks = overriddenCollection.callbacks;
         result = {
@@ -68,12 +69,15 @@ export function useBuildCollectionRegistryController(props: {
             (result as Record<string, unknown>).subcollections = (result as Record<string, unknown>).subcollections ?? subcollections;
         }
 
-        return { ...overriddenCollection,
-...result } as CollectionConfig;
+        // Flatten the admin block: everything downstream of here is the panel's
+        // view model, not the authoring shape. Applied after the user-override
+        // merge so an override of a presentation field still wins.
+        return resolveAdminCollection({ ...overriddenCollection,
+...result } as AdminCollection);
 
     }, [userConfigPersistence]);
 
-    const getRawCollection = useCallback((slugOrPath: string): CollectionConfig | undefined => {
+    const getRawCollection = useCallback((slugOrPath: string): AdminCollection | undefined => {
         const registry = collectionRegistryRef.current;
         if (registry === undefined) return undefined;
 
@@ -82,7 +86,7 @@ export function useBuildCollectionRegistryController(props: {
 
         const pathSegments = cleanedPath.split("/");
 
-        return registry.getRaw(pathSegments.join("/")) as CollectionConfig | undefined;
+        return registry.getRaw(pathSegments.join("/")) as AdminCollection | undefined;
     }, []);
 
     const getParentReferencesFromPath = useCallback((path: string): EntityReference[] => {
@@ -115,7 +119,7 @@ export function useBuildCollectionRegistryController(props: {
             result.push(oddPathSegments.slice(0, i));
         }
 
-        const getCollectionFromPaths = (pathSegments: string[]): CollectionConfig | undefined => {
+        const getCollectionFromPaths = (pathSegments: string[]): AdminCollection | undefined => {
             if (!pathSegments?.length) return undefined;
             const testPath = pathSegments.reduce((acc, segment, idx) => {
                 if (idx === 0) return segment;
@@ -144,11 +148,11 @@ export function useBuildCollectionRegistryController(props: {
     const convertIdsToPaths = useCallback((ids: string[]): string[] => {
         const registry = collectionRegistryRef.current;
         if (!registry) return [];
-        let currentCollections: CollectionConfig[] = registry.getCollections();
+        let currentCollections: AdminCollection[] = registry.getCollections();
         const paths: string[] = [];
         for (let i = 0; i < ids.length; i++) {
             const id = ids[i];
-            const collection: CollectionConfig | undefined = currentCollections.find(c => c.slug === id);
+            const collection: AdminCollection | undefined = currentCollections.find(c => c.slug === id);
             if (!collection)
                 throw Error(`Collection with id ${id} not found`);
             paths.push(collection.slug);
@@ -157,7 +161,7 @@ export function useBuildCollectionRegistryController(props: {
         return paths;
     }, []);
 
-    const collections = collectionRegistryRef.current.getCollections();
+    const collections = collectionRegistryRef.current.getCollections().map(resolveAdminCollection);
 
     // Determine initialised automatically based on whether collections exist,
     // though the NavigationStateController also plays a role in overall init