From aab824f2c6854d5141e71bc490b44608e57026ca Mon Sep 17 00:00:00 2001
From: mohamedsalem401 <salemmohamed780@gmail.com>
Date: Thu, 30 Jan 2025 19:14:58 +0200
Subject: [PATCH] Fix updating records issue

---
 .../ComponentDataCollection.ts                | 50 ++++++++++++++-----
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/data_sources/model/data_collection/ComponentDataCollection.ts b/packages/core/src/data_sources/model/data_collection/ComponentDataCollection.ts
index b9b3f2368..508b14e58 100644
--- a/packages/core/src/data_sources/model/data_collection/ComponentDataCollection.ts
+++ b/packages/core/src/data_sources/model/data_collection/ComponentDataCollection.ts
@@ -1,7 +1,7 @@
 import DataVariable, { DataVariableType } from '../DataVariable';
 import { isArray } from 'underscore';
 import Component from '../../../dom_components/model/Component';
-import { ComponentDefinition, ComponentOptions } from '../../../dom_components/model/types';
+import { ComponentDefinition, ComponentDefinitionDefined, ComponentOptions } from '../../../dom_components/model/types';
 import { toLowerCase } from '../../../utils/mixins';
 import DataSource from '../DataSource';
 import { ObjectAny } from '../../../common';
@@ -68,9 +68,7 @@ export default class ComponentDataCollection extends Component {
 
   toJSON(opts?: ObjectAny) {
     const json = super.toJSON.call(this, opts) as ComponentDataCollectionDefinition;
-
-    const firstChildJSON = this.getComponentDef();
-    json[keyCollectionDefinition].componentDef = firstChildJSON ?? this.get(keyCollectionDefinition);
+    json[keyCollectionDefinition].componentDef = this.getComponentDef();
 
     delete json.components;
     delete json.droppable;
@@ -79,7 +77,8 @@ export default class ComponentDataCollection extends Component {
 
   private getComponentDef() {
     const firstChild = this.components().at(0);
-    const firstChildJSON = firstChild?.toJSON();
+
+    const firstChildJSON = firstChild ? this.deepToJSON(firstChild) : this.get(keyCollectionDefinition).componentDef;
     delete firstChildJSON?.draggable;
 
     return firstChildJSON;
@@ -99,16 +98,31 @@ export default class ComponentDataCollection extends Component {
       em: em,
       dataVariable,
       updateValueFromDataVariable: () => {
-        const collectionItems = getCollectionItems(
-          em,
-          this.get(keyCollectionDefinition),
-          parentCollectionStateMap,
-          opt,
-        );
+        const collectionDef = {
+          ...this.get(keyCollectionDefinition),
+          componentDef: this.getComponentDef(),
+        };
+
+        const collectionItems = getCollectionItems(em, collectionDef, parentCollectionStateMap, opt);
+
         this.components().reset(collectionItems);
       },
     });
   }
+
+  private deepToJSON(component: Component) {
+    const componentJSON: Partial<ComponentDefinitionDefined> = {
+      ...component.toJSON(),
+      components: component.components().map((cmp) => this.deepToJSON(cmp)),
+    };
+    const hasNoChildren = component.components().length === 0;
+    const isCollectionComponent = component.get(keyCollectionDefinition);
+    if (hasNoChildren || isCollectionComponent) {
+      delete componentJSON.components;
+    }
+
+    return componentJSON;
+  }
 }
 
 function getCollectionItems(
@@ -176,7 +190,7 @@ function getCollectionItems(
 
       blockSymbolMain = new model(
         {
-          ...componentDef,
+          ...deepClone(componentDef),
           draggable: false,
         },
         opt,
@@ -325,3 +339,15 @@ function listDataSourceVariables(dataSource_id: string, em: EditorModel) {
     path: dataSource_id + '.' + key,
   }));
 }
+
+function deepClone(obj: ObjectAny) {
+  if (obj === null || typeof obj !== 'object') return obj;
+
+  const clone = Array.isArray(obj) ? [] : {};
+
+  Object.keys(obj).forEach((key) => {
+    (clone as any)[key] = deepClone((obj as any)[key]);
+  });
+
+  return clone;
+}