[ADF-1327] Fix group form field type to be treated as a container (#2225)

* Add group to container types

* Usage of FormFieldTypes.isReadOnlyType

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;
+    }
 }

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

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