Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #7932 from ToolJet/appdef/component-general-properties-styles

Browse source 
[appdef] fixes: creating component general properties  and styles for versioning, import/export
This commit is contained in:
Arpit 2023-10-19 12:25:25 +05:30 committed by GitHub
commit 1f086a2c40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/data-migrations/1697473340856-MigrateAppsDefinitionSchemaTransition.ts
View file

@ -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);

3
server/src/services/app_import_export.service.ts
View file

@ -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);

3
server/src/services/apps.service.ts
View file

@ -533,6 +533,9 @@ export class AppsService {
newComponent.properties = component.properties;
newComponent.styles = component.styles;
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;

2
server/src/services/components.service.ts
View file

@ -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);
}