Fix for collection editor get code dialog

firecmsco · Oct 25, 2024 · 82505c7 · 82505c7
1 parent 112132e
commit 82505c7
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 23 deletions.
diff --git a/packages/collection_editor/src/ui/collection_editor/GetCodeDialog.tsx b/packages/collection_editor/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,34 @@ 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.editable;
 
-        if (updatedProperty.type === "map") {
-            return {
-                ...updatedProperty,
-                properties: updatedProperty.properties.map(propertyCleanup)
-            }
-        }
-        return updatedProperty;
+        return value;
     }
 
     return {
@@ -111,7 +121,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)
             }))

diff --git a/packages/collection_editor/src/ui/collection_editor/PropertyEditView.tsx b/packages/collection_editor/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]);

diff --git a/packages/collection_editor/src/ui/collection_editor/properties/BlockPropertyField.tsx b/packages/collection_editor/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>}

diff --git a/packages/firecms_core/src/hooks/data/save.ts b/packages/firecms_core/src/hooks/data/save.ts
@@ -1,7 +1,6 @@
 import {
     DataSource,
     Entity,
-    EntityCallbacks,
     EntityCollection,
     EntityValues,
     FireCMSContext,
@@ -108,7 +107,7 @@ export async function saveEntityWithCallbacks<M extends Record<string, any>, Use
         updatedValues = values;
     }
 
-    console.log("Saving entity", {
+    console.debug("Saving entity", {
         entityId,
         updatedValues,
         collection

diff --git a/packages/firecms_core/src/util/objects.ts b/packages/firecms_core/src/util/objects.ts
@@ -125,6 +125,26 @@ export function removeUndefined(value: any, removeEmptyStrings?: boolean): any {
     return value;
 }
 
+export function removeNulls(value: any): any {
+    if (typeof value === "function") {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        return value.map((v: any) => removeNulls(v));
+    }
+    if (typeof value === "object") {
+        const res: object = {};
+        if (value === null)
+            return value;
+        Object.keys(value).forEach((key) => {
+            if (value[key] !== null)
+                (res as any)[key] = removeNulls(value[key]);
+        });
+        return res;
+    }
+    return value;
+}
+
 export function isEmptyObject(obj: object) {
     return obj &&
         Object.getPrototypeOf(obj) === Object.prototype &&