From 2f45015ec2ab443726c98bb74ce8697a6bb1133a Mon Sep 17 00:00:00 2001 From: arpitnath Date: Tue, 17 Oct 2023 16:52:24 +0530 Subject: [PATCH 1/5] fixes: creating components on cloning with general styles or properties --- server/src/services/components.service.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/services/components.service.ts b/server/src/services/components.service.ts index 52edd6b115..476137c20c 100644 --- a/server/src/services/components.service.ts +++ b/server/src/services/components.service.ts @@ -199,6 +199,8 @@ export class ComponentsService { transformedComponent.styles = componentData.styles || {}; transformedComponent.validation = componentData.validation || {}; transformedComponent.displayPreferences = componentData.others || null; + transformedComponent.general = componentData.general || null; + transformedComponent.generalStyles = componentData.generalStyles || null; transformedComponents.push(transformedComponent); } From 2f362ce0ce18d6b14ba6aa37aac39fedd60c1c29 Mon Sep 17 00:00:00 2001 From: arpitnath Date: Tue, 17 Oct 2023 16:54:32 +0530 Subject: [PATCH 2/5] fixes: creatinng general properties on version --- server/src/services/apps.service.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/services/apps.service.ts b/server/src/services/apps.service.ts index 92df0026d2..2d18fdc33e 100644 --- a/server/src/services/apps.service.ts +++ b/server/src/services/apps.service.ts @@ -533,6 +533,8 @@ export class AppsService { newComponent.properties = component.properties; newComponent.styles = component.styles; newComponent.validation = component.validation; + newComponent.general = component.general; + newComponent.generalStyles = component.generalStyles; newComponent.parent = component.parent ? parentId : null; newComponent.page = savedPage; From 90a5b6087b1c250b3249af38fd6ee8655c79803d Mon Sep 17 00:00:00 2001 From: arpitnath Date: Tue, 17 Oct 2023 17:02:42 +0530 Subject: [PATCH 3/5] fixes: imported app --- server/src/services/app_import_export.service.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts index 259ab9587a..7c82f29172 100644 --- a/server/src/services/app_import_export.service.ts +++ b/server/src/services/app_import_export.service.ts @@ -1508,6 +1508,9 @@ function transformComponentData(data: object, componentEvents: any[]): Component transformedComponent.properties = componentData.definition.properties || {}; transformedComponent.styles = componentData.definition.styles || {}; transformedComponent.validation = componentData.definition.validation || {}; + transformedComponent.general = componentData.definition.general || {}; + transformedComponent.generalStyles = componentData.definition.generalStyles || {}; + transformedComponent.displayPreferences = componentData.definition.others || {}; transformedComponent.parent = data[componentId].parent || null; transformedComponents.push(transformedComponent); From ff46eea157ce5dda7816b3981439e8cb25e0be1b Mon Sep 17 00:00:00 2001 From: arpitnath Date: Tue, 17 Oct 2023 17:03:30 +0530 Subject: [PATCH 4/5] fixes added to app migrations --- .../1697473340856-MigrateAppsDefinitionSchemaTransition.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts b/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts index d90faa240a..20169cd23a 100644 --- a/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts +++ b/server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts @@ -215,6 +215,9 @@ export class MigrateAppsDefinitionSchemaTransition1697473340856 implements Migra transformedComponent.properties = componentData.definition.properties || {}; transformedComponent.styles = componentData.definition.styles || {}; transformedComponent.validation = componentData.definition.validation || {}; + transformedComponent.general = componentData.definition.general || {}; + transformedComponent.generalStyles = componentData.definition.generalStyles || {}; + transformedComponent.displayPreferences = componentData.definition.others || {}; transformedComponent.parent = data[componentId].parent || null; transformedComponents.push(transformedComponent); From f83d4bc1b0fc15d90d4e41485e5ab5304054cebb Mon Sep 17 00:00:00 2001 From: arpitnath Date: Tue, 17 Oct 2023 17:35:52 +0530 Subject: [PATCH 5/5] fixes: mobile view --- server/src/services/apps.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/services/apps.service.ts b/server/src/services/apps.service.ts index 2d18fdc33e..220f3d0978 100644 --- a/server/src/services/apps.service.ts +++ b/server/src/services/apps.service.ts @@ -535,6 +535,7 @@ export class AppsService { newComponent.validation = component.validation; newComponent.general = component.general; newComponent.generalStyles = component.generalStyles; + newComponent.displayPreferences = component.displayPreferences; newComponent.parent = component.parent ? parentId : null; newComponent.page = savedPage;