@firecms/core 3.0.0-alpha.27 → 3.0.0-alpha.28

package/dist/types/datasource.d.ts

@@ -1,6 +1,6 @@
-import { Entity, EntityStatus, EntityValues } from "./entities";
+import { Entity, EntityReference, EntityStatus, EntityValues, GeoPoint } from "./entities";
 import { EntityCollection, FilterValues } from "./collections";
-import { ResolvedEntityCollection, ResolvedProperty } from "./resolved_entities";
+import { ResolvedEntityCollection } from "./resolved_entities";
 /**
  * @category Datasource
  */
@@ -131,7 +131,7 @@ export interface DataSource {
      * @param entityId
      * @return `true` if there are no other fields besides the given entity
      */
-    checkUniqueField(path: string, name: string, value: any, property: ResolvedProperty, entityId?: string): Promise<boolean>;
+    checkUniqueField(path: string, name: string, value: any, entityId?: string): Promise<boolean>;
     /**
      * Generate an id for a new entity
      */
@@ -142,12 +142,121 @@ export interface DataSource {
     countEntities<M extends Record<string, any> = any>(props: FetchCollectionProps<M>): Promise<number>;
     /**
      * Check if the given filter combination is valid
-     * @param params
-     */
-    isFilterCombinationValid?(params: {
-        path: string;
-        collection: EntityCollection<any>;
-        filterValues: FilterValues<any>;
-        sortBy?: [string, "asc" | "desc"];
-    }): boolean;
+     * @param props
+     */
+    isFilterCombinationValid?(props: FilterCombinationValidProps): boolean;
+}
+export type FilterCombinationValidProps = {
+    path: string;
+    collection: EntityCollection<any>;
+    filterValues: FilterValues<any>;
+    sortBy?: [string, "asc" | "desc"];
+};
+export type SaveEntityDelegateProps<M extends Record<string, any> = any> = Omit<SaveEntityProps<M>, "collection">;
+export type FetchCollectionDelegateProps<M extends Record<string, any> = any> = Omit<FetchCollectionProps<M>, "collection"> & {
+    isCollectionGroup?: boolean;
+};
+export type ListenCollectionDelegateProps<M extends Record<string, any> = any> = Omit<ListenCollectionProps<M>, "collection"> & {
+    isCollectionGroup?: boolean;
+};
+export interface DataSourceDelegate {
+    /**
+     * Fetch data from a collection
+     * @param path
+     * @param filter
+     * @param limit
+     * @param startAfter
+     * @param orderBy
+     * @param order
+     * @param searchString
+     * @return Function to cancel subscription
+     * @see useCollectionFetch if you need this functionality implemented as a hook
+     */
+    fetchCollection<M extends Record<string, any> = any>({ path, filter, limit, startAfter, orderBy, order, searchString }: FetchCollectionDelegateProps<M>): Promise<Entity<M>[]>;
+    /**
+     * Listen to a collection in a given path. If you don't implement this method
+     * `fetchCollection` will be used instead, with no real time updates.
+     * @param path
+     * @param onUpdate
+     * @param onError
+     * @param filter
+     * @param limit
+     * @param startAfter
+     * @param orderBy
+     * @param order
+     * @param searchString
+     * @return Function to cancel subscription
+     * @see useCollectionFetch if you need this functionality implemented as a hook
+     */
+    listenCollection?<M extends Record<string, any> = any>({ path, filter, limit, startAfter, searchString, orderBy, order, onUpdate, onError }: ListenCollectionDelegateProps<M>): () => void;
+    /**
+     * Retrieve an entity given a path and a collection
+     * @param path
+     * @param entityId
+     */
+    fetchEntity<M extends Record<string, any> = any>({ path, entityId, }: Omit<FetchEntityProps<M>, "collection">): Promise<Entity<M> | undefined>;
+    /**
+     * Get realtime updates on one entity.
+     * @param path
+     * @param entityId
+     * @param collection
+     * @param onUpdate
+     * @param onError
+     * @return Function to cancel subscription
+     */
+    listenEntity?<M extends Record<string, any> = any>({ path, entityId, onUpdate, onError }: Omit<ListenEntityProps<M>, "collection">): () => void;
+    /**
+     * Save entity to the specified path
+     * @param path
+     * @param id
+     * @param collection
+     * @param status
+     */
+    saveEntity<M extends Record<string, any> = any>({ path, entityId, values, status }: SaveEntityDelegateProps<M>): Promise<Entity<M>>;
+    /**
+     * Delete an entity
+     * @param entity
+     * @return was the whole deletion flow successful
+     */
+    deleteEntity<M extends Record<string, any> = any>({ entity }: DeleteEntityProps<M>): Promise<void>;
+    /**
+     * Check if the given property is unique in the given collection
+     * @param path Collection path
+     * @param name of the property
+     * @param value
+     * @param entityId
+     * @return `true` if there are no other fields besides the given entity
+     */
+    checkUniqueField(path: string, name: string, value: any, entityId?: string): Promise<boolean>;
+    /**
+     * Generate an id for a new entity
+     */
+    generateEntityId(path: string): string;
+    /**
+     * Count the number of entities in a collection
+     */
+    countEntities<M extends Record<string, any> = any>(props: FetchCollectionDelegateProps<M>): Promise<number>;
+    /**
+     * Check if the given filter combination is valid
+     * @param props
+     */
+    isFilterCombinationValid?(props: Omit<FilterCombinationValidProps, "collection">): boolean;
+    /**
+     * Convert a FireCMS reference to a reference that can be used by the datasource
+     * @param reference
+     */
+    buildReference: (reference: EntityReference) => any;
+    /**
+     * Convert a FireCMS GeoPoint to a GeoPoint that can be used by the datasource
+     * @param geoPoint
+     */
+    buildGeoPoint: (geoPoint: GeoPoint) => any;
+    /**
+     * Get the object to generate the current time in the datasource
+     */
+    currentTime(): any;
+    buildDate: (date: Date) => any;
+    buildDeleteFieldValue: () => any;
+    delegateToCMSModel: (data: any) => any;
+    setDateToMidnight: (input?: any) => any;
 }

package/dist/types/fields.d.ts

@@ -7,7 +7,7 @@ import { ResolvedEntityCollection, ResolvedProperty } from "./resolved_entities"
  *
  * @category Form custom fields
  */
-export interface FieldProps<T extends CMSType = CMSType, CustomProps = any, M extends Record<string, any> = any> {
+export interface FieldProps<T extends CMSType = any, CustomProps = any, M extends Record<string, any> = any> {
     /**
      * Key of the property
      * E.g. "user.name" for a property with path "user.name"

package/dist/types/firecms.d.ts

@@ -5,7 +5,7 @@ import { DataSource } from "./datasource";
 import { EntityCollection, EntityCustomView } from "./collections";
 import { CMSView } from "./navigation";
 import { FireCMSContext } from "./firecms_context";
-import { FieldConfig } from "./field_config";
+import { PropertyConfig } from "./property_config";
 import { Locale } from "./locales";
 import { StorageSource } from "./storage";
 import { EntityLinkBuilder } from "./entity_link_builder";
@@ -77,9 +77,9 @@ export type FireCMSProps<UserType extends User> = {
     /**
      * Record of custom form fields to be used in the CMS.
      * You can use the key to reference the custom field in
-     * the `fieldConfig` prop of a property in a collection.
+     * the `propertyConfig` prop of a property in a collection.
      */
-    fields?: Record<string, FieldConfig>;
+    fields?: Record<string, PropertyConfig>;
     /**
      * List of additional custom views for entities.
      * You can use the key to reference the custom view in

package/dist/types/firecms_context.d.ts

@@ -11,7 +11,7 @@ import { UserConfigurationPersistence } from "./local_config_persistence";
 import { SideDialogsController } from "./side_dialogs_controller";
 import { FireCMSPlugin } from "./plugins";
 import { CMSAnalyticsEvent } from "./analytics";
-import { FieldConfig } from "./field_config";
+import { PropertyConfig } from "./property_config";
 import { EntityCustomView } from "./collections";
 /**
  * Context that includes the internal controllers and contexts used by the app.
@@ -81,9 +81,9 @@ export type FireCMSContext<UserType extends User = User, AuthControllerType exte
     /**
      * Record of custom form fields to be used in the CMS.
      * You can use the key to reference the custom field in
-     * the `fieldConfig` prop of a property in a collection.
+     * the `propertyConfig` prop of a property in a collection.
      */
-    fields: Record<string, FieldConfig>;
+    fields: Record<string, PropertyConfig>;
     /**
      * List of additional custom views for entities.
      * You can use the key to reference the custom view in

package/dist/types/index.d.ts

@@ -10,7 +10,7 @@ export * from "./user";
 export * from "./colors";
 export * from "./storage";
 export * from "./fields";
-export * from "./field_config";
+export * from "./property_config";
 export * from "./datasource";
 export * from "./entity_link_builder";
 export * from "./side_entity_controller";

package/dist/types/properties.d.ts

@@ -44,7 +44,7 @@ export interface BaseProperty<T extends CMSType, CustomProps = any> {
      * All the configuration will be taken from the inherited config, and
      * overwritten by the current property config.
      */
-    fieldConfig?: string;
+    propertyConfig?: string;
     /**
      * Longer description of a field, displayed under a popover
      */

package/dist/types/{field_config.d.ts → property_config.d.ts}

@@ -1,14 +1,13 @@
 import React from "react";
 import { CMSType, PropertyOrBuilder } from "./properties";
 /**
- * This is the configuration object for the field component generated for a
- * property.
+ * This is the configuration object for a property.
  * These configs are generated by default for the properties defined in your
  * collections' configuration, but you can define your own to be used.
  */
-export type FieldConfig<T extends CMSType = any> = {
+export type PropertyConfig<T extends CMSType = any> = {
     /**
-     * Key used to identify this field type.
+     * Key used to identify this property config.
      */
     key: string;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firecms/core",
-  "version": "3.0.0-alpha.27",
+  "version": "3.0.0-alpha.28",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -133,7 +133,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "deb0ef4491986b9a599919a2cd581f40ac6920c1",
+  "gitHead": "aba9501b45cf2dc84dc172084510b90e417b42f1",
   "publishConfig": {
     "access": "public"
   }

package/src/components/Popover.tsx

@@ -22,6 +22,8 @@ export interface PopoverProps {
     hideWhenDetached?: boolean;
     avoidCollisions?: boolean;
     enabled?: boolean;
+    modal?: boolean;
+    className?: string;
 }
 
 export function Popover({
@@ -37,7 +39,9 @@ export function Popover({
                             sticky,
                             hideWhenDetached,
                             avoidCollisions,
-                            enabled = true
+                            enabled = true,
+                            modal = false,
+                            className
                         }: PopoverProps) {
 
     useInjectStyles("Popover", popoverStyles);
@@ -45,12 +49,15 @@ export function Popover({
     if (!enabled)
         return <>{trigger}</>;
 
-    return <PopoverPrimitive.Root open={open} onOpenChange={onOpenChange}>
+    return <PopoverPrimitive.Root open={open}
+                                  onOpenChange={onOpenChange}
+                                  modal={modal}
+    >
         <PopoverPrimitive.Trigger asChild>
             {trigger}
         </PopoverPrimitive.Trigger>
         <PopoverPrimitive.Portal>
-            <PopoverPrimitive.Content className={cn(paperMixin, "PopoverContent shadow z-50")}
+            <PopoverPrimitive.Content className={cn(paperMixin, "PopoverContent shadow z-40", className)}
                                       side={side}
                                       sideOffset={sideOffset}
                                       align={align}

package/src/components/TextareaAutosize.tsx

@@ -55,6 +55,7 @@ export const TextareaAutosize = React.forwardRef(function TextareaAutosize(
         onFocus,
         onBlur,
         sizeRef,
+        ignoreBoxSizing,
         ...other
     } = props;
 
@@ -124,7 +125,7 @@ export const TextareaAutosize = React.forwardRef(function TextareaAutosize(
         outerHeight = Math.max(outerHeight, singleRowHeight, minHeight);
 
         // Take the box sizing into account for applying this value as a style.
-        const outerHeightStyle = outerHeight + (!props.ignoreBoxSizing && boxSizing === "border-box" ? padding + border : 0);
+        const outerHeightStyle = outerHeight + (!ignoreBoxSizing && boxSizing === "border-box" ? padding + border : 0);
 
         const overflow = Math.abs(outerHeight - innerHeight) <= 1;
 

package/src/core/builders.ts

@@ -8,7 +8,7 @@ import {
     EntityCollection,
     EnumValueConfig,
     EnumValues,
-    FieldConfig,
+    PropertyConfig,
     GeopointProperty,
     MapProperty,
     NumberProperty,
@@ -130,11 +130,11 @@ export function buildAdditionalFieldDelegate<M extends Record<string, any>, Addi
 /**
  * Identity function we use to defeat the type system of Typescript and build
  * additional field delegates views with all its properties
- * @param fieldConfig
+ * @param propertyConfig
  * @category Builder
  */
 export function buildFieldConfig<T extends CMSType = CMSType>(
-    fieldConfig: FieldConfig<T>
-): FieldConfig<T> {
-    return fieldConfig;
+    propertyConfig: PropertyConfig<T>
+): PropertyConfig<T> {
+    return propertyConfig;
 }

package/src/core/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -433,8 +433,8 @@ function createFilterField({
                                filterValue,
                                setFilterValue,
                                column,
-                               popupOpen,
-                               setPopupOpen
+                               hidden,
+                               setHidden
                            }: FilterFormFieldProps<{
     resolvedProperty: ResolvedProperty,
     disabled: boolean,
@@ -459,8 +459,8 @@ function createFilterField({
                                      path={baseProperty.path}
                                      title={resolvedProperty?.name}
                                      previewProperties={baseProperty?.previewProperties}
-                                     popupOpen={popupOpen}
-                                     setPopupOpen={setPopupOpen}/>;
+                                     hidden={hidden}
+                                     setHidden={setHidden}/>;
     } else if (baseProperty.dataType === "number" || baseProperty.dataType === "string") {
         const name = baseProperty.name;
         const enumValues = baseProperty.enumValues ? enumToObjectEntries(baseProperty.enumValues) : undefined;

package/src/core/components/EntityCollectionTable/filters/ReferenceFilterField.tsx

@@ -15,8 +15,8 @@ interface ReferenceFilterFieldProps {
     path?: string;
     title?: string;
     previewProperties?: string[];
-    popupOpen: boolean;
-    setPopupOpen: (open: boolean) => void;
+    hidden: boolean;
+    setHidden: (hidden: boolean) => void;
 }
 
 const operationLabels = {
@@ -42,7 +42,7 @@ export function ReferenceFilterField({
                                          path,
                                          title,
                                          previewProperties,
-                                         setPopupOpen
+                                         setHidden
                                      }: ReferenceFilterFieldProps) {
 
     const possibleOperations: (keyof typeof operationLabels) [] = isArray
@@ -118,13 +118,13 @@ export function ReferenceFilterField({
             onMultipleEntitiesSelected,
             selectedEntityIds,
             onClose: () => {
-                setPopupOpen(true);
+                setHidden(false);
             }
         }
     );
 
     const doOpenDialog = () => {
-        setPopupOpen(false);
+        setHidden(true);
         referenceDialogController.open();
     };
 
@@ -148,6 +148,10 @@ export function ReferenceFilterField({
         );
     };
 
+    console.log("ReferenceFilterField", {
+        internalValue
+
+    })
     return (
 
         <div className="flex w-[440px] flex-row">
@@ -175,7 +179,8 @@ export function ReferenceFilterField({
                 </div>}
                 {(!internalValue || (Array.isArray(internalValue) && internalValue.length === 0)) &&
                     <Button onClick={doOpenDialog}
-                            className="h-full">
+                            variant={"outlined"}
+                            className="h-full w-full">
                         {multiple ? "Select references" : "Select reference"}
                     </Button>
                 }

package/src/core/components/EntityCollectionTable/internal/PropertyTableCell.tsx

@@ -375,7 +375,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                             hideOverflow = false;
                         }
                     } else if (arrayProperty.of.dataType === "reference") {
-                        if (typeof arrayProperty.of.key === "string") {
+                        if (typeof arrayProperty.of.path === "string") {
                             innerComponent =
                                 <TableReferenceField
                                     name={propertyKey as string}
@@ -384,7 +384,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                                     updateValue={updateValue}
                                     size={size}
                                     multiselect={true}
-                                    path={arrayProperty.of.key}
+                                    path={arrayProperty.of.path}
                                     previewProperties={arrayProperty.of.previewProperties}
                                     title={arrayProperty.of.name}
                                     forceFilter={arrayProperty.of.forceFilter}

package/src/core/components/EntityCollectionTable/internal/popup_field/PopupFormField.tsx

@@ -82,13 +82,16 @@ export function PopupFormFieldInternal<M extends Record<string, any>>({
                 path,
                 entityId,
                 collection: inputCollection,
-                onUpdate: setEntity
+                onUpdate: (e) => {
+                    setEntity(e);
+                    setInternalValue(e?.values);
+                }
             });
         } else {
             return () => {
             };
         }
-    }, [dataSource, entityId, inputCollection, path]);
+    }, [dataSource, entityId, inputCollection, path, open]);
 
     const [internalValue, setInternalValue] = useState<EntityValues<M> | undefined>(entity?.values);
 
@@ -221,6 +224,7 @@ export function PopupFormFieldInternal<M extends Record<string, any>>({
             className={`text-gray-900 dark:text-white overflow-auto rounded rounded-md bg-white dark:bg-gray-950 ${!open ? "hidden" : ""} cursor-grab max-w-[100vw]`}>
             <Formik
                 initialValues={(entity?.values ?? {}) as EntityValues<M>}
+                enableReinitialize={true}
                 validationSchema={validationSchema}
                 validateOnMount={true}
                 validate={(values) => console.debug("Validating", values)}

package/src/core/components/EntityCollectionView/EntityCollectionView.tsx

@@ -271,7 +271,7 @@ export const EntityCollectionView = React.memo(
                  value,
                  property,
                  entityId
-             }) => dataSource.checkUniqueField(fullPath, name, value, property, entityId),
+             }) => dataSource.checkUniqueField(fullPath, name, value, entityId),
             [fullPath]);
 
         const onValueChange: OnCellValueChange<any, any> = ({

package/src/core/components/FieldConfigBadge.tsx

@@ -1,14 +1,14 @@
 import { getIconForWidget } from "../util";
-import { FieldConfig } from "../../types";
+import { PropertyConfig } from "../../types";
 
-export function FieldConfigBadge({ fieldConfig }: { fieldConfig: FieldConfig | undefined }): React.ReactNode {
+export function FieldConfigBadge({ propertyConfig }: { propertyConfig: PropertyConfig | undefined }): React.ReactNode {
     const classes = "h-8 w-8 p-1 rounded-full shadow text-white";
 
     return <div
         className={classes}
         style={{
-            background: fieldConfig?.color ?? "#888"
+            background: propertyConfig?.color ?? "#888"
         }}>
-        {getIconForWidget(fieldConfig, "medium")}
+        {getIconForWidget(propertyConfig, "medium")}
     </div>
 }

package/src/core/components/VirtualTable/VirtualTableHeader.tsx

@@ -1,4 +1,4 @@
-import React, { RefObject, useCallback, useEffect, useState } from "react";
+import React, { RefObject, useCallback, useEffect, useRef, useState } from "react";
 import equal from "react-fast-compare";
 
 import { VirtualTableColumn, VirtualTableSort, VirtualTableWhereFilterOp } from "./VirtualTableProps";
@@ -13,8 +13,8 @@ interface FilterFormProps<T> {
     filter?: [VirtualTableWhereFilterOp, any];
     onHover: boolean,
     createFilterField: (props: FilterFormFieldProps<T>) => React.ReactNode;
-    popupOpen: boolean;
-    setPopupOpen: (open: boolean) => void;
+    hidden: boolean;
+    setHidden: (hidden: boolean) => void;
 }
 
 export type FilterFormFieldProps<CustomProps> = {
@@ -22,8 +22,8 @@ export type FilterFormFieldProps<CustomProps> = {
     filterValue: [VirtualTableWhereFilterOp, any] | undefined,
     setFilterValue: (filterValue?: [VirtualTableWhereFilterOp, any]) => void;
     column: VirtualTableColumn<CustomProps>;
-    popupOpen: boolean;
-    setPopupOpen: (open: boolean) => void;
+    hidden: boolean;
+    setHidden: (hidden: boolean) => void;
 };
 
 type VirtualTableHeaderProps<M extends Record<string, any>> = {
@@ -58,6 +58,7 @@ export const VirtualTableHeader = React.memo<VirtualTableHeaderProps<any>>(
         const [onHover, setOnHover] = useState(false);
 
         const [openFilter, setOpenFilter] = React.useState(false);
+        const [hidden, setHidden] = React.useState(false);
 
         const handleSettingsClick = useCallback((event: any) => {
             setOpenFilter(true);
@@ -145,6 +146,8 @@ export const VirtualTableHeader = React.memo<VirtualTableHeaderProps<any>>(
                             <Popover
                                 open={openFilter}
                                 onOpenChange={setOpenFilter}
+                                className={hidden ? "hidden" : undefined}
+                                modal={true}
                                 trigger={
                                     <IconButton
                                         className={onHover || openFilter ? "bg-white dark:bg-gray-950" : undefined}
@@ -153,17 +156,18 @@ export const VirtualTableHeader = React.memo<VirtualTableHeaderProps<any>>(
                                         <FilterListIcon size={"small"}/>
                                     </IconButton>}
                             >
-                                {column.filter &&
-                                    <FilterForm column={column}
-                                                filter={filter}
-                                                onHover={onHover}
-                                                onFilterUpdate={update}
-                                                createFilterField={createFilterField}
-                                                popupOpen={openFilter}
-                                                setPopupOpen={setOpenFilter}/>}
+                                <FilterForm column={column}
+                                            filter={filter}
+                                            onHover={onHover}
+                                            onFilterUpdate={update}
+                                            createFilterField={createFilterField}
+                                            hidden={hidden}
+                                            setHidden={setHidden}/>
+
                             </Popover>
 
                         </Badge>
+
                     </div>}
 
                     {column.resizable && <div
@@ -176,7 +180,6 @@ export const VirtualTableHeader = React.memo<VirtualTableHeaderProps<any>>(
                     />}
                 </div>
 
-
             </ErrorBoundary>
         );
     }, equal) as React.FunctionComponent<VirtualTableHeaderProps<any>>;
@@ -187,8 +190,8 @@ function FilterForm<M>({
                            filter,
                            onHover,
                            createFilterField,
-                           popupOpen,
-                           setPopupOpen,
+                           hidden,
+                           setHidden,
                        }: FilterFormProps<M>) {
 
     const id = column.key;
@@ -216,8 +219,8 @@ function FilterForm<M>({
         filterValue: filterInternal,
         setFilterValue: setFilterInternal,
         column,
-        popupOpen,
-        setPopupOpen
+        hidden,
+        setHidden
     });
 
     if (!filterField) return null;

package/src/core/form_field_configs.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { ArrayProperty, FieldConfig, FieldProps, Property, ResolvedProperty } from "../types";
+import { ArrayProperty, PropertyConfig, FieldProps, Property, ResolvedProperty } from "../types";
 import {
     ArrayCustomShapedFieldBinding,
     ArrayOfReferencesFieldBinding,
@@ -44,7 +44,7 @@ export function isDefaultFieldConfigId(id: string) {
     return Object.keys(DEFAULT_FIELD_CONFIGS).includes(id);
 }
 
-export const DEFAULT_FIELD_CONFIGS: Record<string, FieldConfig<any>> = {
+export const DEFAULT_FIELD_CONFIGS: Record<string, PropertyConfig<any>> = {
     text_field: {
         key: "text_field",
         name: "Text field",
@@ -313,7 +313,7 @@ export const DEFAULT_FIELD_CONFIGS: Record<string, FieldConfig<any>> = {
     }
 };
 
-export function getFieldConfig(property: Property | ResolvedProperty, customFields: Record<string, FieldConfig<any>>): FieldConfig | undefined {
+export function getFieldConfig(property: Property | ResolvedProperty, customFields: Record<string, PropertyConfig<any>>): PropertyConfig | undefined {
     const fieldId = getFieldId(property);
     const defaultFieldId = getDefaultFieldId(property);
     // console.log("fieldId", { fieldId });
@@ -386,7 +386,7 @@ export function getDefaultFieldId(property: Property | ResolvedProperty) {
 }
 
 export function getFieldId(property: Property | ResolvedProperty): string | undefined {
-    if (property.fieldConfig)
-        return property.fieldConfig;
+    if (property.propertyConfig)
+        return property.propertyConfig;
     return getDefaultFieldId(property);
 }