From acef0c11592fd6f6324189b846e8e0cff3e78b6e Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Thu, 7 Sep 2017 11:24:55 +0100
Subject: [PATCH] fix wrapped field resolving (#2305)

check for the type property before resolving a wrapped field (addresses issue with empty field objects)
---
 .../src/components/form-field/form-field.component.ts  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.ts b/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.ts
index 918cec07f4..c305de9e72 100644
--- a/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.ts
@@ -104,8 +104,14 @@ export class FormFieldComponent implements OnInit, OnDestroy {
         }
     }
 
-    private getField() {
-        return (this.field.params && this.field.params.field) ? this.field.params.field : this.field;
+    private getField(): FormFieldModel {
+        if (this.field && this.field.params) {
+            const wrappedField = this.field.params.field;
+            if (wrappedField && wrappedField.type) {
+                return wrappedField;
+            }
+        }
+        return this.field;
     }
 
     private hasController(type: string): boolean {