From 139967132bdf84d7181df2ba73cfa568e8882830 Mon Sep 17 00:00:00 2001
From: Arpit <arpitnath42@gmail.com>
Date: Fri, 6 Oct 2023 16:36:03 +0530
Subject: [PATCH] fixes: general properties of widgets are not getting saved
 (#7638)

---
 frontend/src/_helpers/appUtils.js                       | 4 ++++
 server/migrations/1691006952074-CreateComponentTable.ts | 5 +++++
 server/src/entities/component.entity.ts                 | 3 +++
 server/src/services/components.service.ts               | 6 ++++--
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js
index b6a45aae03..4cbd06dc3c 100644
--- a/frontend/src/_helpers/appUtils.js
+++ b/frontend/src/_helpers/appUtils.js
@@ -1709,6 +1709,10 @@ export const buildComponentMetaDefinition = (components = {}) => {
         ...componentMeta.definition.others,
         ...currentComponentData?.component.definition.others,
       },
+      general: {
+        ...componentMeta.definition.general,
+        ...currentComponentData?.component.definition.general,
+      },
     };
 
     const mergedComponent = {
diff --git a/server/migrations/1691006952074-CreateComponentTable.ts b/server/migrations/1691006952074-CreateComponentTable.ts
index ed4a5097d8..9c525ba886 100644
--- a/server/migrations/1691006952074-CreateComponentTable.ts
+++ b/server/migrations/1691006952074-CreateComponentTable.ts
@@ -37,6 +37,11 @@ export class CreateComponentTable1691006952074 implements MigrationInterface {
             type: 'json',
             isNullable: true,
           },
+          {
+            name: 'general_properties',
+            type: 'json',
+            isNullable: true,
+          },
           {
             name: 'styles',
             type: 'json',
diff --git a/server/src/entities/component.entity.ts b/server/src/entities/component.entity.ts
index f2ddd7e475..1b8fe745c1 100644
--- a/server/src/entities/component.entity.ts
+++ b/server/src/entities/component.entity.ts
@@ -33,6 +33,9 @@ export class Component {
   @Column('simple-json')
   properties: any;
 
+  @Column('simple-json', { name: 'general_properties', nullable: true })
+  general: any;
+
   @Column('simple-json')
   styles: any;
 
diff --git a/server/src/services/components.service.ts b/server/src/services/components.service.ts
index 47b4612e79..cb02761391 100644
--- a/server/src/services/components.service.ts
+++ b/server/src/services/components.service.ts
@@ -208,8 +208,9 @@ export class ComponentsService {
     return transformedComponents;
   }
 
-  createComponentWithLayout(componentData, layoutData) {
-    const { id, name, properties, styles, generalStyles, validations, parent, displayPreferences } = componentData;
+  createComponentWithLayout(componentData: Component, layoutData) {
+    const { id, name, properties, styles, generalStyles, validations, parent, displayPreferences, general } =
+      componentData;
     const { type, top, left, width, height } = layoutData;
     const componentWithLayout = {
       [id]: {
@@ -221,6 +222,7 @@ export class ComponentsService {
             styles,
             generalStyles,
             validations,
+            general,
             others: displayPreferences,
           },
           parent,