@firecms/collection_editor 3.0.0-canary.145 → 3.0.0-canary.146

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-canary.145",
+  "version": "3.0.0-canary.146",
   "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.145",
-    "@firecms/data_import": "^3.0.0-canary.145",
-    "@firecms/data_import_export": "^3.0.0-canary.145",
-    "@firecms/formex": "^3.0.0-canary.145",
-    "@firecms/schema_inference": "^3.0.0-canary.145",
-    "@firecms/ui": "^3.0.0-canary.145",
+    "@firecms/data_export": "^3.0.0-canary.146",
+    "@firecms/data_import": "^3.0.0-canary.146",
+    "@firecms/data_import_export": "^3.0.0-canary.146",
+    "@firecms/formex": "^3.0.0-canary.146",
+    "@firecms/schema_inference": "^3.0.0-canary.146",
+    "@firecms/ui": "^3.0.0-canary.146",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.4.0"
   },
@@ -67,5 +67,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e5d660f00c5806e1b63839c013af3c973f3dd47e"
+  "gitHead": "601e622a79787f5b08f7ac27646d044787b972f1"
 }

package/src/types/persisted_collection.ts

@@ -2,7 +2,6 @@ import { EntityCollection, User } from "@firecms/core";
 
 export type PersistedCollection<M extends Record<string, any> = any, USER extends User = User>
     = Omit<EntityCollection<M, USER>, "subcollections"> & {
-    // properties: Properties<M>;
     ownerId?: string;
     subcollections?: PersistedCollection<any, any>[];
     editable?: boolean;

package/src/ui/collection_editor/CollectionEditorDialog.tsx

@@ -276,6 +276,7 @@ function CollectionEditorInternal<M extends Record<string, any>>({
 
     const saveCollection = (updatedCollection: PersistedCollection<M>): Promise<boolean> => {
         const id = updatedCollection.id || updatedCollection.path;
+
         return configController.saveCollection({
             id,
             collectionData: updatedCollection,
@@ -377,7 +378,7 @@ function CollectionEditorInternal<M extends Record<string, any>>({
 
             if (!isNewCollection) {
                 saveCollection(newCollectionState).then(() => {
-                    formexController.resetForm({ values: initialValues });
+                    formexController.resetForm();
                     handleClose(newCollectionState);
                 });
                 return;
@@ -466,7 +467,8 @@ function CollectionEditorInternal<M extends Record<string, any>>({
     const formController = useCreateFormex<PersistedCollection<M>>({
         initialValues,
         onSubmit,
-        validation
+        validation,
+        debugId: "COLLECTION_EDITOR"
     });
 
     const {

package/src/ui/collection_editor/CollectionPropertiesEditorForm.tsx

@@ -228,17 +228,13 @@ export function CollectionPropertiesEditorForm({
                                    namespace
                                }: OnPropertyChangedParams) => {
 
+        console.log("!!!!!! onPropertyChanged", property)
+
         const fullId = id ? getFullId(id, namespace) : undefined;
         const propertyPath = fullId ? idToPropertiesPath(fullId) : undefined;
 
         // If the id has changed we need to a little cleanup
         if (previousId && previousId !== id) {
-            console.debug("onPropertyChanged, id change", {
-                id,
-                property,
-                previousId,
-                namespace
-            })
 
             const previousFullId = getFullId(previousId, namespace);
             const previousPropertyPath = idToPropertiesPath(previousFullId);

package/src/ui/collection_editor/GetCodeDialog.tsx

@@ -4,6 +4,7 @@ import React from "react";
 import JSON5 from "json5";
 import { Highlight, themes } from "prism-react-renderer"
 import { camelCase } from "./utils/strings";
+import { clone } from "@firecms/formex";
 
 export function GetCodeDialog({
                                   collection,
@@ -14,7 +15,7 @@ export function GetCodeDialog({
     const snackbarController = useSnackbarController();
 
     const code = collection
-        ? "import { EntityCollection } from \"@firecms/core\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:EntityCollection = " + JSON5.stringify(collectionToCode(collection), null, "\t")
+        ? "import { EntityCollection } from \"@firecms/core\";\n\nconst " + (collection?.name ? camelCase(collection.name) : "my") + "Collection:EntityCollection = " + JSON5.stringify(collectionToCode({ ...collection }), null, "\t")
         : "No collection selected";
     return <Dialog open={open}
                    onOpenChange={onOpenChange}
@@ -79,35 +80,36 @@ export function GetCodeDialog({
 function collectionToCode(collection: EntityCollection): object {
 
     const propertyCleanup = (value: any): any => {
-        if (typeof value === "function") {
-            return value;
+        const valueCopy = clone(value);
+        if (typeof valueCopy === "function") {
+            return valueCopy;
         }
-        if (Array.isArray(value)) {
-            return value.map((v: any) => propertyCleanup(v));
+        if (Array.isArray(valueCopy)) {
+            return valueCopy.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 (typeof valueCopy === "object") {
+            if (valueCopy === null)
+                return valueCopy;
+            Object.keys(valueCopy).forEach((key) => {
+                if (!isEmptyObject(valueCopy)) {
+                    const childRes = propertyCleanup(valueCopy[key]);
                     if (childRes !== null && childRes !== undefined && childRes !== false && !isEmptyObject(childRes)) {
-                        value[key] = childRes;
+                        valueCopy[key] = childRes;
                     } else {
-                        delete value[key];
+                        delete valueCopy[key];
                     }
                 }
             });
         }
 
-        delete value.fromBuilder;
-        delete value.resolved;
-        delete value.propertiesOrder;
-        delete value.propertyConfig;
-        delete value.resolvedProperties;
-        delete value.editable;
+        delete valueCopy.fromBuilder;
+        delete valueCopy.resolved;
+        delete valueCopy.propertiesOrder;
+        delete valueCopy.propertyConfig;
+        delete valueCopy.resolvedProperties;
+        delete valueCopy.editable;
 
-        return value;
+        return valueCopy;
     }
 
     return {

package/src/ui/collection_editor/PropertyEditView.tsx

@@ -142,6 +142,7 @@ export const PropertyForm = React.memo(
         };
 
         const formexController = useCreateFormex<PropertyWithId>({
+            debugId: "PROPERTY_FORM",
             initialValues: property
                 ? { id: propertyKey, ...property } as PropertyWithId
                 : initialValue,