From d6b15110b90a2e4dc84206ae2da75518cac8a27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Popovics=20Andr=C3=A1s?= Date: Wed, 16 Aug 2017 22:08:34 +0200 Subject: [PATCH] [ADF-1327] Fix group form field type to be treated as a container (#2225) * Add group to container types * Usage of FormFieldTypes.isReadOnlyType --- .../widgets/core/form-field-types.ts | 4 ++++ .../widgets/core/form-field.model.spec.ts | 19 +++++++++++++++++++ .../widgets/core/form-field.model.ts | 4 ++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts index aa1c677cf9..2049d114fe 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts @@ -47,4 +47,8 @@ export class FormFieldTypes { static isReadOnlyType(type: string) { return FormFieldTypes.READONLY_TYPES.indexOf(type) > -1; } + + static isContainerType(type: string) { + return type === FormFieldTypes.CONTAINER || type === FormFieldTypes.GROUP; + } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts index 432529219f..d51d8359bf 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts @@ -356,4 +356,23 @@ describe('FormFieldModel', () => { expect(field.hasOptions()).toBeFalsy(); }); + it('should calculate the columns in case of container type', () => { + let form = new FormModel(); + let field = new FormFieldModel(form, { + type: FormFieldTypes.CONTAINER, + numberOfColumns: 888 + }); + + expect(field.numberOfColumns).toBe(888); + }); + + it('should calculate the columns in case of group type', () => { + let form = new FormModel(); + let field = new FormFieldModel(form, { + type: FormFieldTypes.GROUP, + numberOfColumns: 999 + }); + + expect(field.numberOfColumns).toBe(999); + }); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts index 2037aef007..86d54ebba9 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts @@ -166,13 +166,13 @@ export class FormFieldModel extends FormWidgetModel { this.placeholder = json.placeholder; } - if (json.type === 'readonly') { + if (FormFieldTypes.isReadOnlyType(json.type)) { if (json.params && json.params.field && json.params.field.responseVariable) { this.value = this.getVariablesValue(json.params.field.name, form); } } - if (json.type === 'container') { + if (FormFieldTypes.isContainerType(json.type)) { this.containerFactory(json, form); } }