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

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-canary.140",
+  "version": "3.0.0-canary.141",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/data_export": "^3.0.0-canary.140",
-    "@firecms/data_import": "^3.0.0-canary.140",
-    "@firecms/data_import_export": "^3.0.0-canary.140",
-    "@firecms/formex": "^3.0.0-canary.140",
-    "@firecms/schema_inference": "^3.0.0-canary.140",
-    "@firecms/ui": "^3.0.0-canary.140",
+    "@firecms/data_export": "^3.0.0-canary.141",
+    "@firecms/data_import": "^3.0.0-canary.141",
+    "@firecms/data_import_export": "^3.0.0-canary.141",
+    "@firecms/formex": "^3.0.0-canary.141",
+    "@firecms/schema_inference": "^3.0.0-canary.141",
+    "@firecms/ui": "^3.0.0-canary.141",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.4.0"
   },
@@ -50,15 +50,15 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.3.2",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "@vitejs/plugin-react": "^4.3.3",
     "jest": "^29.7.0",
-    "react-router": "^6.26.2",
-    "react-router-dom": "^6.26.2",
+    "react-router": "^6.27.0",
+    "react-router-dom": "^6.27.0",
     "ts-jest": "^29.2.5",
     "typescript": "^5.6.3",
-    "vite": "^5.4.8"
+    "vite": "^5.4.10"
   },
   "files": [
     "dist",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "112132e315d1ae63babf9f53500c00bc37a2d8e4"
+  "gitHead": "84beb9dab81946354e94b91d72a49889a2ca537c"
 }

package/src/ui/collection_editor/EnumForm.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import equal from "react-fast-compare"
 
-import { ArrayContainer, EnumValueConfig, EnumValues, FieldCaption, } from "@firecms/core";
+import { ArrayContainer, ArrayEntryParams, EnumValueConfig, EnumValues, FieldCaption, } from "@firecms/core";
 import {
     AutoAwesomeIcon,
     Badge,
@@ -121,7 +121,10 @@ function EnumFormFields({
     const inferredValuesRef = React.useRef(new Set());
     const inferredValues = inferredValuesRef.current;
 
-    const buildEntry = (index: number, internalId: number) => {
+    const buildEntry = ({
+                            index,
+                            internalId
+                        }:ArrayEntryParams) => {
         const justAdded = lastInternalIdAdded === internalId;
         const entryError = errors?.enumValues && errors?.enumValues[index];
         return <EnumEntry index={index}

package/src/ui/collection_editor/GetCodeDialog.tsx

@@ -1,4 +1,4 @@
-import { EntityCollection, useSnackbarController } from "@firecms/core";
+import { EntityCollection, isEmptyObject, useSnackbarController } from "@firecms/core";
 import { Button, ContentCopyIcon, Dialog, DialogActions, DialogContent, Typography, } from "@firecms/ui";
 import React from "react";
 import JSON5 from "json5";
@@ -78,24 +78,36 @@ export function GetCodeDialog({
 
 function collectionToCode(collection: EntityCollection): object {
 
-    const propertyCleanup = (property: any) => {
-
-        const updatedProperty = {
-            ...property
-        };
+    const propertyCleanup = (value: any): any => {
+        if (typeof value === "function") {
+            return value;
+        }
+        if (Array.isArray(value)) {
+            return value.map((v: any) => 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 !== undefined && childRes !== false && !isEmptyObject(childRes)) {
+                        value[key] = childRes;
+                    } else {
+                        delete value[key];
+                    }
+                }
+            });
+        }
 
-        delete updatedProperty.fromBuilder;
-        delete updatedProperty.resolved;
-        delete updatedProperty.propertiesOrder;
-        delete updatedProperty.editable;
+        delete value.fromBuilder;
+        delete value.resolved;
+        delete value.propertiesOrder;
+        delete value.propertyConfig;
+        delete value.resolvedProperties;
+        delete value.editable;
 
-        if (updatedProperty.type === "map") {
-            return {
-                ...updatedProperty,
-                properties: updatedProperty.properties.map(propertyCleanup)
-            }
-        }
-        return updatedProperty;
+        return value;
     }
 
     return {
@@ -111,7 +123,9 @@ function collectionToCode(collection: EntityCollection): object {
         customId: collection.customId,
         initialFilter: collection.initialFilter,
         initialSort: collection.initialSort,
-        properties: Object.entries(collection.properties ?? {})
+        properties: Object.entries({
+            ...(collection.properties ?? {})
+        })
             .map(([key, value]) => ({
                 [key]: propertyCleanup(value)
             }))

package/src/ui/collection_editor/PropertyEditView.tsx

@@ -6,7 +6,7 @@ import {
     ConfirmationDialog,
     DEFAULT_FIELD_CONFIGS,
     getFieldConfig,
-    getFieldId,
+    getFieldId, isEmptyObject,
     isPropertyBuilder,
     isValidRegExp,
     mergeDeep,
@@ -380,7 +380,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]);

package/src/ui/collection_editor/properties/BlockPropertyField.tsx

@@ -110,7 +110,7 @@ export function BlockPropertyField({
                             ? undefined
                             : onPropertyMove}/>
 
-                    {!disabled && !values.oneOf?.propertiesOrder?.length &&
+                    {!disabled && (values.oneOf?.propertiesOrder?.length === 0)&&
                         <div className="h-full flex items-center justify-center p-4">
                             Add the first property to this block
                         </div>}

package/src/ui/collection_editor/properties/MapPropertyField.tsx

@@ -113,7 +113,8 @@ export function MapPropertyField({ disabled, getData, allowDataInference, proper
                     value={values.spreadChildren ?? false}
                 />
                 <FieldCaption>
-                    Set this flag to true if you want to display the children of this group as individual columns.
+                    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.
                 </FieldCaption>
             </div>