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

fixes: general properties of widgets are not getting saved (#7638)

Browse source
This commit is contained in:
Arpit 2023-10-06 16:36:03 +05:30 committed by GitHub
parent b3625d6cef
commit 139967132b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/_helpers/appUtils.js
View file

@ -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 = {

5
server/migrations/1691006952074-CreateComponentTable.ts
View file

@ -37,6 +37,11 @@ export class CreateComponentTable1691006952074 implements MigrationInterface {
type: 'json',
isNullable: true,
},
{
name: 'general_properties',
type: 'json',
isNullable: true,
},
{
name: 'styles',
type: 'json',

3
server/src/entities/component.entity.ts
View file

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

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

@ -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,