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

package/src/components/field_configs.tsx

@@ -1,6 +1,7 @@
 
 import type { DefaultFieldConfig } from "../types/fields";
-import type { ArrayProperty, NumberProperty, Property, PropertyConfig, StringProperty, VectorProperty } from "@rebasepro/types";
+import type { ArrayProperty, NumberProperty, Property, StringProperty, VectorProperty } from "@rebasepro/types";
+import type { PropertyConfig } from "@rebasepro/admin-types";
 import { ArrayCustomShapedFieldBinding } from "../form/field_bindings/ArrayCustomShapedFieldBinding";
 import { ArrayOfReferencesFieldBinding } from "../form/field_bindings/ArrayOfReferencesFieldBinding";
 import { BlockFieldBinding } from "../form/field_bindings/BlockFieldBinding";
@@ -68,7 +69,7 @@ export const DEFAULT_FIELD_CONFIGS: Record<DefaultFieldConfig, PropertyConfig> =
         color: "#2d7ff9",
         property: {
             type: "string",
-            ui: { get Field() { return TextFieldBinding; } }
+            admin: { get Field() { return TextFieldBinding; } }
         }
     },
     multiline: {
@@ -79,7 +80,7 @@ export const DEFAULT_FIELD_CONFIGS: Record<DefaultFieldConfig, PropertyConfig> =
         color: "#2d7ff9",
         property: {
             type: "string",
-            ui: { multiline: true,
+            admin: { multiline: true,
 get Field() { return TextFieldBinding; } }
         }
     },
@@ -91,7 +92,7 @@ get Field() { return TextFieldBinding; } }
         color: "#2d7ff9",
         property: {
             type: "string",
-            ui: { markdown: true,
+            admin: { markdown: true,
 get Field() { return MarkdownEditorFieldBinding; } }
         }
     },
@@ -103,8 +104,8 @@ get Field() { return MarkdownEditorFieldBinding; } }
         color: "#154fb3",
         property: {
             type: "string",
-            ui: { url: true,
-get Field() { return TextFieldBinding; } }
+            url: true,
+            admin: { get Field() { return TextFieldBinding; } }
         }
     },
     email: {
@@ -116,7 +117,7 @@ get Field() { return TextFieldBinding; } }
         property: {
             type: "string",
             email: true,
-            ui: { get Field() { return TextFieldBinding; } }
+            admin: { get Field() { return TextFieldBinding; } }
         }
     },
     switch: {
@@ -127,7 +128,7 @@ get Field() { return TextFieldBinding; } }
         color: "#20d9d2",
         property: {
             type: "boolean",
-            ui: { get Field() { return SwitchFieldBinding; } }
+            admin: { get Field() { return SwitchFieldBinding; } }
         }
     },
     select: {
@@ -139,7 +140,7 @@ get Field() { return TextFieldBinding; } }
         property: {
             type: "string",
             enum: [],
-            ui: { get Field() { return SelectFieldBinding; } }
+            admin: { get Field() { return SelectFieldBinding; } }
         }
     },
     multi_select: {
@@ -154,7 +155,7 @@ get Field() { return TextFieldBinding; } }
                 type: "string",
                 enum: []
             },
-            ui: { get Field() { return MultiSelectFieldBinding; } }
+            admin: { get Field() { return MultiSelectFieldBinding; } }
         }
     },
     user_select: {
@@ -164,7 +165,7 @@ get Field() { return TextFieldBinding; } }
         Icon: UserIcon,
         property: {
             type: "string",
-            ui: { get Field() { return UserSelectFieldBinding; } }
+            admin: { get Field() { return UserSelectFieldBinding; } }
         }
     },
     number_input: {
@@ -175,7 +176,7 @@ get Field() { return TextFieldBinding; } }
         color: "#bec920",
         property: {
             type: "number",
-            ui: { get Field() { return TextFieldBinding; } }
+            admin: { get Field() { return TextFieldBinding; } }
         }
     },
     number_select: {
@@ -187,7 +188,7 @@ get Field() { return TextFieldBinding; } }
         property: {
             type: "number",
             enum: [],
-            ui: { get Field() { return SelectFieldBinding; } }
+            admin: { get Field() { return SelectFieldBinding; } }
         }
     },
     multi_number_select: {
@@ -202,7 +203,7 @@ get Field() { return TextFieldBinding; } }
                 type: "number",
                 enum: []
             },
-            ui: { get Field() { return MultiSelectFieldBinding; } }
+            admin: { get Field() { return MultiSelectFieldBinding; } }
         }
     },
     file_upload: {
@@ -216,7 +217,7 @@ get Field() { return TextFieldBinding; } }
             storage: {
                 storagePath: "{path}"
             },
-            ui: { get Field() { return StorageUploadFieldBinding; } }
+            admin: { get Field() { return StorageUploadFieldBinding; } }
         }
     },
     multi_file_upload: {
@@ -233,7 +234,7 @@ get Field() { return TextFieldBinding; } }
                     storagePath: "{path}"
                 }
             },
-            ui: { get Field() { return StorageUploadFieldBinding; } }
+            admin: { get Field() { return StorageUploadFieldBinding; } }
         }
     },
     reference: {
@@ -244,7 +245,7 @@ get Field() { return TextFieldBinding; } }
         color: "#ff0042",
         property: {
             type: "reference",
-            ui: { get Field() { return ReferenceFieldBinding; } }
+            admin: { get Field() { return ReferenceFieldBinding; } }
         }
     },
     multi_references: {
@@ -258,7 +259,7 @@ get Field() { return TextFieldBinding; } }
             of: {
                 type: "reference"
             },
-            ui: { get Field() { return ArrayOfReferencesFieldBinding; } }
+            admin: { get Field() { return ArrayOfReferencesFieldBinding; } }
         }
     },
     relation: {
@@ -270,7 +271,7 @@ get Field() { return TextFieldBinding; } }
         property: {
             relationName: "",
             type: "relation",
-            ui: { get Field() { return RelationFieldBinding; } }
+            admin: { get Field() { return RelationFieldBinding; } }
         }
     },
     date_time: {
@@ -281,7 +282,7 @@ get Field() { return TextFieldBinding; } }
         color: "#8b46ff",
         property: {
             type: "date",
-            ui: { get Field() { return DateTimeFieldBinding; } }
+            admin: { get Field() { return DateTimeFieldBinding; } }
         }
     },
     group: {
@@ -293,7 +294,7 @@ get Field() { return TextFieldBinding; } }
         property: {
             type: "map",
             properties: {},
-            ui: { get Field() { return MapFieldBinding; } }
+            admin: { get Field() { return MapFieldBinding; } }
         }
     },
     key_value: {
@@ -305,7 +306,7 @@ get Field() { return TextFieldBinding; } }
         property: {
             type: "map",
             keyValue: true,
-            ui: { get Field() { return KeyValueFieldBinding; } }
+            admin: { get Field() { return KeyValueFieldBinding; } }
         }
     },
     repeat: {
@@ -319,7 +320,7 @@ get Field() { return TextFieldBinding; } }
             of: {
                 type: "string"
             },
-            ui: { get Field() { return RepeatFieldBinding; } }
+            admin: { get Field() { return RepeatFieldBinding; } }
         }
     },
     custom_array: {
@@ -330,7 +331,7 @@ get Field() { return TextFieldBinding; } }
         color: "#ff9408",
         property: {
             type: "array",
-            ui: { get Field() { return ArrayCustomShapedFieldBinding; } }
+            admin: { get Field() { return ArrayCustomShapedFieldBinding; } }
         }
     },
     block: {
@@ -344,7 +345,7 @@ get Field() { return TextFieldBinding; } }
             oneOf: {
                 properties: {}
             },
-            ui: { get Field() { return BlockFieldBinding; } }
+            admin: { get Field() { return BlockFieldBinding; } }
         }
     },
     vector_input: {
@@ -356,7 +357,7 @@ get Field() { return TextFieldBinding; } }
         property: {
             type: "vector",
             dimensions: 1536,
-            ui: { get Field() { return VectorFieldBinding; } }
+            admin: { get Field() { return VectorFieldBinding; } }
         }
     }
 };
@@ -384,13 +385,13 @@ export function getFieldConfig(property: Property, propertyConfigs: Record<strin
 
 export function getDefaultFieldId(property: Property) {
     if (property.type === "string") {
-        if (property.ui?.markdown) {
+        if (property.admin?.markdown) {
             return "markdown";
-        } else if (property.ui?.multiline) {
+        } else if (property.admin?.multiline) {
             return "multiline";
         } else if (property.storage) {
             return "file_upload";
-        } else if (property.ui?.url) {
+        } else if (property.admin?.urlPreview) {
             return "url";
         } else if (property.email) {
             return "email";

package/src/components/history/EntityHistoryEntry.tsx

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import type { Property } from "@rebasepro/types";
 import * as React from "react";
 
@@ -11,6 +11,7 @@ import { useAuthController } from "@rebasepro/app";
 import { UserChip } from "./UserChip";
 import { HistoryEntryData } from "../../hooks";
 import { getValueInPath } from "@rebasepro/utils";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 /**
  * Recursive deep equality for primitives, arrays and plain objects.
@@ -39,7 +40,7 @@ function deepEqual(a: unknown, b: unknown): boolean {
 export type EntityHistoryEntryProps = {
     size: PreviewSize;
     actions?: React.ReactNode;
-    collection?: CollectionConfig;
+    collection?: AdminCollection;
     hover?: boolean;
     entry: HistoryEntryData;
     onClick?: (e: React.SyntheticEvent) => void;

package/src/components/history/EntityHistoryView.tsx

@@ -1,5 +1,5 @@
 
-import type { EntityCustomViewParams } from "@rebasepro/types";
+import type { EntityCustomViewParams } from "@rebasepro/admin-types";
 import { useRef, useEffect } from "react";
 import { cls, IconButton, Label, Tooltip, Typography } from "@rebasepro/ui";
 import { ErrorBoundary, HistoryIcon } from "@rebasepro/ui";

package/src/components/history/LastEditedByFormAction.tsx

@@ -1,4 +1,4 @@
-import type { PluginFormActionProps } from "@rebasepro/types";
+import type { PluginFormActionProps } from "@rebasepro/admin-types";
 import React from "react";
 ;
 import { LastEditedByIndicator } from "./LastEditedByIndicator";

package/src/components/history/LastEditedByIndicator.tsx

@@ -1,9 +1,10 @@
-import type { CollectionConfig } from "@rebasepro/types";
+
 import React, { useEffect, useState, useCallback } from "react";
 ;
 import { useApiConfig } from "@rebasepro/app";
 import { useAuthController } from "@rebasepro/app";
 import { HistoryEntryData } from "../../hooks";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
 function getRelativeTimeString(date: Date): string {
     const now = new Date();
@@ -31,7 +32,7 @@ export function LastEditedByIndicator({
 }: {
     path: string;
     entityId: string;
-    collection: CollectionConfig;
+    collection: AdminCollection;
 }) {
     const apiConfig = useApiConfig();
     const authController = useAuthController();

package/src/contexts/BreacrumbsContext.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useState } from "react";
-import type { BreadcrumbEntry, BreadcrumbsController } from "@rebasepro/types";
+import type { BreadcrumbEntry, BreadcrumbsController } from "@rebasepro/admin-types";
 
 const DEFAULT_BREADCRUMBS_CONTROLLER: BreadcrumbsController = {
     breadcrumbs: [],

package/src/contexts/SideDialogsControllerContext.tsx

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

package/src/contexts/SidePanelControllerContext.tsx

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

package/src/data_export/export/ExportCollectionAction.tsx

@@ -8,7 +8,8 @@ import {
     useTranslation
 } from "@rebasepro/app";
 import { useCMSContext } from "../../hooks";
-import { CollectionActionsProps, Entity, CollectionConfig, ExportConfig, RebaseContext, User } from "@rebasepro/types";
+import { Entity, User } from "@rebasepro/types";
+import { CollectionActionsProps, ExportConfig, RebaseContext, AdminCollection } from "@rebasepro/admin-types";
 import { getDefaultValuesFor } from "@rebasepro/common";
 import {
     Alert,
@@ -38,8 +39,8 @@ export function ExportCollectionAction<M extends Record<string, unknown>, USER e
     onAnalyticsEvent,
     exportAllowed,
     notAllowedView
-}: CollectionActionsProps<M, USER, CollectionConfig<M>> & {
-    exportAllowed?: (props: { collectionEntitiesCount: number, path: string, collection: CollectionConfig }) => boolean;
+}: CollectionActionsProps<M, USER, AdminCollection<M>> & {
+    exportAllowed?: (props: { collectionEntitiesCount: number, path: string, collection: AdminCollection }) => boolean;
     notAllowedView?: React.ReactNode;
     onAnalyticsEvent?: (event: string, params?: any) => void;
 }) {
@@ -115,7 +116,7 @@ export function ExportCollectionAction<M extends Record<string, unknown>, USER e
         return [...resolvedExportColumnsValues, ...resolvedColumnsValues];
     }, [exportConfig?.additionalFields]);
 
-    const doDownload = useCallback(async (collection: CollectionConfig<M>,
+    const doDownload = useCallback(async (collection: AdminCollection<M>,
         exportConfig: ExportConfig<any> | undefined) => {
 
         onAnalyticsEvent?.("export_collection", {

package/src/data_import/components/ImportSaveInProgress.tsx

@@ -1,11 +1,12 @@
 import { useData } from "@rebasepro/app";
-import { Entity, CollectionConfig } from "@rebasepro/types";
+import { Entity } from "@rebasepro/types";
 import { RebaseData } from "@rebasepro/types";
 import { Button, CenteredView, CircularProgress, Typography } from "@rebasepro/ui";
 import { useEffect, useRef, useState } from "react";
 import { ImportConfig } from "../types";
+import type { AdminCollection } from "@rebasepro/admin-types";
 
-export function ImportSaveInProgress<C extends CollectionConfig<any>>
+export function ImportSaveInProgress<C extends AdminCollection<any>>
     ({
         path,
         importConfig,
@@ -95,7 +96,7 @@ export function ImportSaveInProgress<C extends CollectionConfig<any>>
 }
 
 function saveDataBatch(dataClient: RebaseData,
-    collection: CollectionConfig,
+    collection: AdminCollection,
     path: string,
     data: Partial<Entity<any>>[],
     offset = 0,

package/src/data_import/import/ImportCollectionAction.tsx

@@ -5,7 +5,8 @@ import {
     useSnackbarController
 } from "@rebasepro/app";
 import { getPropertiesWithPropertiesOrder, getPropertyInPath } from "../../util";
-import { CollectionActionsProps, Properties, Property, User, CollectionConfig } from "@rebasepro/types";
+import { Properties, Property, User } from "@rebasepro/types";
+import { CollectionActionsProps, AdminCollection } from "@rebasepro/admin-types";
 import { getFieldConfig } from "../../components/field_configs";
 import { PropertyConfigBadge } from "../../components/PropertyConfigBadge";
 import { useSelectionController } from "../../components/CollectionViewBinding/useSelectionController";
@@ -176,7 +177,7 @@ export function ImportCollectionAction<M extends Record<string, unknown>, USER e
 
                 {step === "import_data_saving" && importConfig &&
                     <ImportSaveInProgress importConfig={importConfig}
-                        collection={collection as CollectionConfig}
+                        collection={collection as AdminCollection}
                         path={path}
                         onImportSuccess={(importedCollection) => {
                             handleClose();

package/src/data_import/utils/data.ts

@@ -1,5 +1,6 @@
 import { getPropertyInPath } from "../../util";
-import { AuthController, Entity, CollectionConfig, EntityReference, CollectionRegistryController, Properties, Property, Vector } from "@rebasepro/types";
+import { Entity, EntityReference, CollectionRegistryController, Properties, Property, Vector } from "@rebasepro/types";
+import { AuthController, AdminCollection } from "@rebasepro/admin-types";
 import { isPropertyBuilder } from "@rebasepro/common";
 import { unflattenObject } from "./file_to_json";
 import { getIn } from "@rebasepro/forms";
@@ -148,7 +149,7 @@ export function processValueMapping(authController: AuthController, value: any,
 
         // If no explicit database was provided in the string, try to get it from the collection
         if (databaseId === undefined) {
-            const targetCollection: CollectionConfig<any> | undefined = navigation.getCollection(path);
+            const targetCollection: AdminCollection<any> | undefined = navigation.getCollection(path);
             databaseId = targetCollection?.databaseId;
         }
 

package/src/form/EntityForm.tsx

@@ -1,6 +1,7 @@
-import type { CollectionConfig, EntityCustomViewParams, AdditionalFieldDelegateProps } from "@rebasepro/types";
+
+import type { EntityCustomViewParams, AdditionalFieldDelegateProps, AdminCollection } from "@rebasepro/admin-types";
 import type { FormContext, PropertyFieldBindingProps } from "../types/fields";
-import type { PropertyConfig } from "@rebasepro/types";
+import type { PropertyConfig } from "@rebasepro/admin-types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Entity, EntityStatus, EntityValues } from "@rebasepro/types";
 import type { EntityFormProps, OnUpdateParams } from "../types/components/EntityFormProps";
@@ -8,7 +9,8 @@ import { deepEqual as equal } from "fast-equals";
 
 import { ErrorBoundary } from "@rebasepro/ui";
 import { AlignLeftIcon, CheckIcon, LoaderIcon, PencilIcon, useDebouncedCallback } from "@rebasepro/ui";
-import { getDefaultValuesFor, isHidden, isReadOnly } from "@rebasepro/common";
+import { getDefaultValuesFor } from "@rebasepro/common";
+import { isHidden, isReadOnly } from "@rebasepro/app";
 
 import { useCustomizationController } from "@rebasepro/app";
 import { getFormFieldKeys } from "@rebasepro/app";
@@ -26,7 +28,8 @@ import { EntityFormActions } from "./EntityFormActions";
 import type { EntityFormActionsProps } from "../types/components/EntityFormActionsProps";
 import { LocalChangesMenu } from "./components/LocalChangesMenu";
 
-import { getEntityTitlePropertyKey, resolveTitleToString } from "../util/previews";
+import { getEntityTitlePropertyKeyForEntity, isUserSelectProperty, resolveTitleToString } from "../util/previews";
+import { getUserLabel, useResolvedUser } from "../hooks/useResolvedUsers";
 import { getValueInPath, mergeDeep } from "@rebasepro/utils";
 import {
     getChanges,
@@ -313,11 +316,17 @@ export function EntityForm<M extends Record<string, unknown>>({
 
     const actionsDisabled = disabled || formex.isSubmitting || (status === "existing" && !formex.dirty) || Boolean(disabledProp);
 
-    const titlePropertyKey = getEntityTitlePropertyKey(collection, customizationController.propertyConfigs);
+    const titlePropertyKey = getEntityTitlePropertyKeyForEntity(collection, formex.values as Record<string, unknown> | undefined, entityId);
     const rawTitle = formex.values && titlePropertyKey ? getValueInPath(formex.values, titlePropertyKey) : undefined;
-    const title = rawTitle !== undefined && rawTitle !== null
-        ? resolveTitleToString(rawTitle)
-        : (collection.singularName ?? collection.name);
+    // A user picker stores an id: resolve it to the person, like a relation.
+    const titleUser = useResolvedUser(isUserSelectProperty(collection, titlePropertyKey) && typeof rawTitle === "string"
+        ? rawTitle
+        : undefined);
+    const title = titleUser
+        ? getUserLabel(titleUser)
+        : (rawTitle !== undefined && rawTitle !== null
+            ? resolveTitleToString(rawTitle)
+            : (collection.singularName ?? collection.name));
 
     const modified = formex.dirty;
 
@@ -387,10 +396,10 @@ export function EntityForm<M extends Record<string, unknown>>({
                         const isNew = status === "new" || status === "copy";
                         const isStringOrNumber = property.type === "string" || property.type === "number";
                         const isIdAndAuto = isStringOrNumber && "isId" in property && typeof property.isId === "string" && property.isId !== "manual";
-                        const disabled = disabledProp || (!autoSave && formex.isSubmitting) || isReadOnly(property) || Boolean(property.ui?.disabled) || (!isNew && "isId" in property && Boolean(property.isId)) || (isNew && isIdAndAuto);
+                        const disabled = disabledProp || (!autoSave && formex.isSubmitting) || isReadOnly(property) || Boolean(property.admin?.disabled) || (!isNew && "isId" in property && Boolean(property.isId)) || (isNew && isIdAndAuto);
                         const hidden = isHidden(property);
                         if (hidden) return null;
-                        const widthPercentage = property.ui?.widthPercentage ?? 100;
+                        const widthPercentage = property.admin?.widthPercentage ?? 100;
 
                         const shouldAutoFocus = isNewEntity && !disabled && firstFocusableIndex === -1;
                         if (shouldAutoFocus) firstFocusableIndex = 0;

package/src/form/EntityFormActions.tsx

@@ -1,7 +1,7 @@
 
-import { type CollectionConfig, getCollectionDataPath } from "@rebasepro/types";
+import { getCollectionDataPath } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
-import type { EntityAction } from "@rebasepro/types";
+import type { EntityAction, AdminCollection } from "@rebasepro/admin-types";
 import React from "react";
 import { Entity } from "@rebasepro/types";
 import type { EntityFormActionsProps } from "../types/components/EntityFormActionsProps";
@@ -81,7 +81,7 @@ type ActionsViewProps<M extends Record<string, unknown>> = {
     savingError: Error | undefined,
     entity: Entity<M> | undefined,
     formActions?: EntityAction[],
-    collection: CollectionConfig,
+    collection: AdminCollection,
     disabled: boolean,
     status: "new" | "existing" | "copy",
     pluginActions?: React.ReactNode[],

package/src/form/EntityFormBinding.tsx

@@ -1,11 +1,13 @@
-import type { CollectionConfig, PluginFormActionProps } from "@rebasepro/types";
+
+import type { PluginFormActionProps, AdminCollection } from "@rebasepro/admin-types";
 import type { FormContext } from "../types/fields";
 import React, { useCallback, useMemo, useState } from "react";
-import { AnalyticsEvent, Entity, EntityStatus, EntityValues } from "@rebasepro/types";
+import { Entity, EntityStatus, EntityValues } from "@rebasepro/types";
+import { AnalyticsEvent } from "@rebasepro/admin-types";
 import type { EntityFormProps, OnUpdateParams } from "../types/components/EntityFormProps";
 import type { EntityFormActionsProps } from "../types/components/EntityFormActionsProps";
 
-import { getLocalChangesBackup } from "@rebasepro/common";
+import { getLocalChangesBackup } from "@rebasepro/app";
 
 import {
     saveEntityWithCallbacks,
@@ -278,7 +280,7 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
         parentEntityIds,
         path,
         status,
-        collection: collection as CollectionConfig,
+        collection: collection as AdminCollection,
         context,
         formContext: undefined as unknown as FormContext<Record<string, unknown>>,
         openEntityMode,

package/src/form/PropertyFieldBinding.tsx

@@ -1,6 +1,8 @@
-import type { CollectionConfig, FieldProps as CoreFieldProps } from "@rebasepro/types";
+
+import type { FieldProps as CoreFieldProps, AdminCollection } from "@rebasepro/admin-types";
 import type { FieldProps, PropertyFieldBindingProps } from "../types/fields";
-import type { RebasePlugin, PluginFieldBuilderParams, Property } from "@rebasepro/types";
+import type { Property } from "@rebasepro/types";
+import type { RebasePlugin, PluginFieldBuilderParams } from "@rebasepro/admin-types";
 import React, { ComponentType, ReactElement, Suspense, useCallback, useRef } from "react";
 import { deepEqual as equal } from "fast-equals"
 
@@ -11,7 +13,8 @@ import { Field, FormexFieldProps, getIn } from "@rebasepro/forms";
 ;
 import { ReadOnlyFieldBinding } from "./field_bindings/ReadOnlyFieldBinding";
 
-import { isHidden, isPropertyBuilder, isReadOnly, resolveProperty } from "@rebasepro/common";
+import { isPropertyBuilder, resolveProperty } from "@rebasepro/common";
+import { isHidden, isReadOnly } from "@rebasepro/app";
 import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { Typography } from "@rebasepro/ui";
 import { getFieldConfig, getFieldId } from "../components/field_configs";
@@ -29,7 +32,7 @@ import { ErrorBoundary } from "@rebasepro/ui";
  *
  * Please note that if you build a custom field in a component, the
  * **validation** passed in the property will have no effect. You need to set
- * the validation in the `CollectionConfig` definition.
+ * the validation in the `AdminCollection` definition.
  *
  * @param propertyKey You can use nested names such as `address.street` or `friends[2]`
  * @param property
@@ -109,14 +112,14 @@ function PropertyFieldBindingInternal<M extends Record<string, unknown> = Record
                 }) as Property | null;
 
                 const readOnly = resolvedProperty ? isReadOnly(resolvedProperty) : true;
-                const disabled = disabledProp || readOnly || Boolean(resolvedProperty?.ui?.disabled) || context.disabled;
+                const disabled = disabledProp || readOnly || Boolean(resolvedProperty?.admin?.disabled) || context.disabled;
 
                 if (resolvedProperty === null || isHidden(resolvedProperty)) {
                     return <></>;
                 } else if (readOnly) {
                     Component = ReadOnlyFieldBinding;
-                } else if (resolvedProperty.ui?.Field) {
-                    const resolved = resolveComponentRef(resolvedProperty.ui.Field);
+                } else if (resolvedProperty.admin?.Field) {
+                    const resolved = resolveComponentRef(resolvedProperty.admin.Field);
                     if (resolved) {
                         Component = resolved as ComponentType<FieldProps<Property, any, any>>;
                     }
@@ -135,7 +138,7 @@ function PropertyFieldBindingInternal<M extends Record<string, unknown> = Record
                         index,
                         authController
                     }) as Property | null;
-                    Component = resolveComponentRef(configProperty?.ui?.Field) as ComponentType<FieldProps<Property, any, any>> | undefined;
+                    Component = resolveComponentRef(configProperty?.admin?.Field) as ComponentType<FieldProps<Property, any, any>> | undefined;
                 }
                 if (!Component) {
                     console.warn(`No field component found for property ${propertyKey}`);
@@ -205,7 +208,7 @@ function FieldInternal<CustomProps, M extends Record<string, unknown>>
 
     const { plugins } = useCustomizationController();
 
-    const customFieldProps: unknown = property.ui?.customProps;
+    const customFieldProps: unknown = property.admin?.customProps;
     const value = formexFieldProps.field.value;
     const error = getIn(formexFieldProps.form.errors, propertyKey) as string | string[] | undefined;
     const touched = getIn(formexFieldProps.form.touched, propertyKey) as boolean | undefined;
@@ -282,7 +285,7 @@ const shouldPropertyReRender = (property: Property, plugins?: RebasePlugin[]): b
         return true;
     }
     const defAProperty = property as Property;
-    const rerenderThisProperty = Boolean(defAProperty.ui?.Field);
+    const rerenderThisProperty = Boolean(defAProperty.admin?.Field);
     if (defAProperty.type === "map" && defAProperty.properties) {
         return Boolean(rerenderThisProperty || Object.values(defAProperty.properties).some((childProperty) => shouldPropertyReRender(childProperty as Property, plugins)));
     } else {
@@ -292,7 +295,7 @@ const shouldPropertyReRender = (property: Property, plugins?: RebasePlugin[]): b
 
 interface UseWrappedComponentParams<M extends Record<string, unknown> = Record<string, unknown>> {
     path?: string,
-    collection?: CollectionConfig<M>,
+    collection?: AdminCollection<M>,
     propertyKey: string,
     property: Property,
     Component: ComponentType<FieldProps<Property, unknown, M>>,
@@ -323,7 +326,7 @@ function useWrappedComponent<T, M extends Record<string, unknown> = Record<strin
                         Field: Component as unknown as ComponentType<CoreFieldProps<Property, unknown, Record<string, unknown>>>,
                         plugin,
                         path,
-                        collection: collection as CollectionConfig | undefined
+                        collection: collection as AdminCollection | undefined
                     };
                     const enabled = plugin.fieldBuilder.enabled?.(params);
                     if (enabled === undefined || enabled)

package/src/form/components/FieldHelperText.tsx

@@ -71,7 +71,7 @@ export function FieldHelperText<T>({
         </Typography>
     }
 
-    const disabledTooltip: string | undefined = typeof property.ui?.disabled === "object" ? property.ui?.disabled.disabledMessage : undefined;
+    const disabledTooltip: string | undefined = typeof property.admin?.disabled === "object" ? property.admin?.disabled.disabledMessage : undefined;
 
     return <div className={"flex ml-3.5 mt-1"}>
         <Typography variant={"caption"}