diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js index 2f6e91a40f..b0fc20be54 100644 --- a/frontend/src/_helpers/appUtils.js +++ b/frontend/src/_helpers/appUtils.js @@ -1736,9 +1736,9 @@ export const buildComponentMetaDefinition = (components = {}) => { ...componentMeta.definition.generalStyles, ...currentComponentData?.component.definition.generalStyles, }, - validations: { - ...componentMeta.definition.validations, - ...currentComponentData?.component.definition.validations, + validation: { + ...componentMeta.definition.validation, + ...currentComponentData?.component.definition.validation, }, others: { ...componentMeta.definition.others, diff --git a/server/data-migrations/1695914619976-MigrateAppsDefinitionSchemaTransition.ts b/server/data-migrations/1695914619976-MigrateAppsDefinitionSchemaTransition.ts index 3939ba8e62..bf3d5a9471 100644 --- a/server/data-migrations/1695914619976-MigrateAppsDefinitionSchemaTransition.ts +++ b/server/data-migrations/1695914619976-MigrateAppsDefinitionSchemaTransition.ts @@ -196,7 +196,7 @@ export class MigrateAppsDefinitionSchemaTransition1695914619976 implements Migra transformedComponent.styles = componentData.definition.styles || {}; - transformedComponent.validations = componentData.definition.validation || {}; + transformedComponent.validation = componentData.definition.validation || {}; transformedComponent.parent = data[componentId].parent || null; diff --git a/server/migrations/1691006952074-CreateComponentTable.ts b/server/migrations/1691006952074-CreateComponentTable.ts index 9c525ba886..5bcfd18b88 100644 --- a/server/migrations/1691006952074-CreateComponentTable.ts +++ b/server/migrations/1691006952074-CreateComponentTable.ts @@ -58,7 +58,7 @@ export class CreateComponentTable1691006952074 implements MigrationInterface { isNullable: true, }, { - name: 'validations', + name: 'validation', type: 'json', isNullable: true, }, diff --git a/server/src/entities/component.entity.ts b/server/src/entities/component.entity.ts index 1b8fe745c1..04f93ec79f 100644 --- a/server/src/entities/component.entity.ts +++ b/server/src/entities/component.entity.ts @@ -46,7 +46,7 @@ export class Component { displayPreferences: any; @Column('simple-json') - validations: any; + validation: any; @CreateDateColumn({ default: () => 'now()', name: 'created_at' }) createdAt: Date; diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts index 083401672f..d9decca543 100644 --- a/server/src/services/app_import_export.service.ts +++ b/server/src/services/app_import_export.service.ts @@ -603,7 +603,7 @@ export class AppImportExportService { newComponent.type = component.type; newComponent.properties = component.properties; newComponent.styles = component.styles; - newComponent.validations = component.validations; + newComponent.validation = component.validation; newComponent.parent = component.parent || null; newComponent.page = pageCreated; @@ -1423,7 +1423,7 @@ function transformComponentData(data: object, componentEvents: any[]): Component transformedComponent.type = componentData.component; transformedComponent.properties = componentData.definition.properties || {}; transformedComponent.styles = componentData.definition.styles || {}; - transformedComponent.validations = componentData.definition.validation || {}; + transformedComponent.validation = componentData.definition.validation || {}; transformedComponent.parent = data[componentId].parent || null; transformedComponents.push(transformedComponent); diff --git a/server/src/services/apps.service.ts b/server/src/services/apps.service.ts index b9163a2286..bca36716e4 100644 --- a/server/src/services/apps.service.ts +++ b/server/src/services/apps.service.ts @@ -502,7 +502,7 @@ export class AppsService { newComponent.pageId = savedPage.id; newComponent.properties = component.properties; newComponent.styles = component.styles; - newComponent.validations = component.validations; + newComponent.validation = component.validation; newComponent.parent = component.parent ? oldComponentToNewComponentMapping[component.parent] : null; newComponent.page = savedPage; diff --git a/server/src/services/components.service.ts b/server/src/services/components.service.ts index 1fdff1c739..5f7655c263 100644 --- a/server/src/services/components.service.ts +++ b/server/src/services/components.service.ts @@ -199,7 +199,7 @@ export class ComponentsService { transformedComponent.parent = componentData.parent || null; transformedComponent.properties = componentData.properties || {}; transformedComponent.styles = componentData.styles || {}; - transformedComponent.validations = componentData.validation || {}; + transformedComponent.validation = componentData.validation || {}; transformedComponent.displayPreferences = componentData.others || null; transformedComponents.push(transformedComponent); @@ -209,7 +209,7 @@ export class ComponentsService { } createComponentWithLayout(componentData: Component, layoutData = []) { - const { id, name, properties, styles, generalStyles, validations, parent, displayPreferences, general } = + const { id, name, properties, styles, generalStyles, validation, parent, displayPreferences, general } = componentData; const layouts = {}; @@ -234,7 +234,7 @@ export class ComponentsService { properties, styles, generalStyles, - validations, + validation, general, others: displayPreferences, },