@firecms/collection_editor 3.0.0-canary.140 → 3.0.0-canary.142

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import { FieldCaption, SearchIconsView, toSnakeCase, singular, IconForView, ArrayContainer, serializeRegExp, useSnackbarController, resolveEnumValues, isPropertyBuilder, useCustomizationController, getFieldConfig, ErrorBoundary, PropertyConfigBadge, unslugify, useNavigationController, mergeDeep, DEFAULT_FIELD_CONFIGS, isValidRegExp, getFieldId, ConfirmationDialog, useLargeLayout, makePropertiesEditable, resolveEntityView, useSelectionController, CircularProgressCenter, EntityCollectionTable, slugify, useAuthController, randomString, removeUndefined, ErrorView, removeInitialAndTrailingSlashes, getDefaultPropertiesOrder, joinCollectionLists } from "@firecms/core";
+import { FieldCaption, SearchIconsView, toSnakeCase, singular, IconForView, ArrayContainer, serializeRegExp, useSnackbarController, resolveEnumValues, isPropertyBuilder, useCustomizationController, getFieldConfig, ErrorBoundary, PropertyConfigBadge, unslugify, useNavigationController, mergeDeep, DEFAULT_FIELD_CONFIGS, isValidRegExp, getFieldId, isEmptyObject, ConfirmationDialog, useLargeLayout, makePropertiesEditable, resolveEntityView, useSelectionController, CircularProgressCenter, EntityCollectionTable, slugify, useAuthController, randomString, removeUndefined, ErrorView, removeInitialAndTrailingSlashes, getDefaultPropertiesOrder, joinCollectionLists } from "@firecms/core";
 import * as React from "react";
 import React__default, { useContext, useState, useEffect, useMemo, useRef, useDeferredValue, useCallback } from "react";
 import equal from "react-fast-compare";
@@ -499,7 +499,10 @@ function EnumFormFields({
   const [inferring, setInferring] = React__default.useState(false);
   const inferredValuesRef = React__default.useRef(/* @__PURE__ */ new Set());
   const inferredValues = inferredValuesRef.current;
-  const buildEntry = (index, internalId) => {
+  const buildEntry = ({
+    index,
+    internalId
+  }) => {
     const justAdded = lastInternalIdAdded === internalId;
     const entryError = errors?.enumValues && errors?.enumValues[index];
     return /* @__PURE__ */ jsx(
@@ -1751,7 +1754,7 @@ function MapPropertyField({ disabled, getData, allowDataInference, propertyConfi
           value: values.spreadChildren ?? false
         }
       ),
-      /* @__PURE__ */ jsx(FieldCaption, { children: "Set this flag to true if you want to display the children of this group as individual columns." })
+      /* @__PURE__ */ jsx(FieldCaption, { children: "Set this flag to true if you want to display the children of this group as individual columns. This will only work for top level groups." })
     ] }),
     /* @__PURE__ */ jsx(
       PropertyFormDialog,
@@ -2122,7 +2125,7 @@ function BlockPropertyField({
             onPropertyMove: disabled ? void 0 : onPropertyMove
           }
         ),
-        !disabled && !values.oneOf?.propertiesOrder?.length && /* @__PURE__ */ jsx("div", { className: "h-full flex items-center justify-center p-4", children: "Add the first property to this block" })
+        !disabled && values.oneOf?.propertiesOrder?.length === 0 && /* @__PURE__ */ jsx("div", { className: "h-full flex items-center justify-center p-4", children: "Add the first property to this block" })
       ] })
     ] }),
     !disabled && /* @__PURE__ */ jsx(
@@ -3254,7 +3257,7 @@ function PropertyEditFormFields({
     }
   }, [deferredValues, includeIdAndTitle, propertyNamespace]);
   useEffect(() => {
-    if (values?.id && onError) {
+    if (values?.id && onError && !isEmptyObject(errors)) {
       onError(values?.id, propertyNamespace, errors);
     }
   }, [errors, propertyNamespace, values?.id]);
@@ -3774,21 +3777,34 @@ function GetCodeDialog({
   );
 }
 function collectionToCode(collection) {
-  const propertyCleanup = (property) => {
-    const updatedProperty = {
-      ...property
-    };
-    delete updatedProperty.fromBuilder;
-    delete updatedProperty.resolved;
-    delete updatedProperty.propertiesOrder;
-    delete updatedProperty.editable;
-    if (updatedProperty.type === "map") {
-      return {
-        ...updatedProperty,
-        properties: updatedProperty.properties.map(propertyCleanup)
-      };
+  const propertyCleanup = (value) => {
+    if (typeof value === "function") {
+      return value;
+    }
+    if (Array.isArray(value)) {
+      return value.map((v) => propertyCleanup(v));
+    }
+    if (typeof value === "object") {
+      if (value === null)
+        return value;
+      Object.keys(value).forEach((key) => {
+        if (!isEmptyObject(value)) {
+          const childRes = propertyCleanup(value[key]);
+          if (childRes !== null && childRes !== void 0 && childRes !== false && !isEmptyObject(childRes)) {
+            value[key] = childRes;
+          } else {
+            delete value[key];
+          }
+        }
+      });
     }
-    return updatedProperty;
+    delete value.fromBuilder;
+    delete value.resolved;
+    delete value.propertiesOrder;
+    delete value.propertyConfig;
+    delete value.resolvedProperties;
+    delete value.editable;
+    return value;
   };
   return {
     id: collection.id,
@@ -3803,7 +3819,9 @@ function collectionToCode(collection) {
     customId: collection.customId,
     initialFilter: collection.initialFilter,
     initialSort: collection.initialSort,
-    properties: Object.entries(collection.properties ?? {}).map(([key, value]) => ({
+    properties: Object.entries({
+      ...collection.properties ?? {}
+    }).map(([key, value]) => ({
       [key]: propertyCleanup(value)
     })).reduce((a, b) => ({ ...a, ...b }), {}),
     subcollections: (collection.subcollections ?? []).map(collectionToCode)