kwikid-forms 0.6.21 → 0.6.23

package/bundles/kwikid-forms.umd.js

@@ -847,6 +847,7 @@
               others: {
                   isFrontCamera: false,
                   isWatermark: false,
+                  isWatermarkForImageUpload: false,
                   flipHorizontal: false,
                   mask: {
                       shape: ""
@@ -3442,7 +3443,6 @@
                       case 8:
                           value = convertFormFieldValueToKwikUIFormat(field, value);
                           validators = new FormValidation().getFormFieldValidators(field);
-                          console.log("FORMKEYYYY", field);
                           formGroup.addControl(field.key, new i3.FormControl({ value: value, disabled: field.disabled }, { validators: validators }));
                           _b.label = 9;
                       case 9:
@@ -4408,11 +4408,11 @@
           (function () { return __awaiter(_this, void 0, void 0, function () {
               var res;
               var _this = this;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0: return [4 /*yield*/, this.initFormConfig(this.formConfig)];
                       case 1:
-                          res = _k.sent();
+                          res = _o.sent();
                           if (res) {
                               this.loading = false;
                               this.cameraRecordingTimerSubcription = this.cameraRecordService
@@ -4435,7 +4435,7 @@
       };
       KwikIDFormViewComponent.prototype.ngAfterViewInit = function () { };
       KwikIDFormViewComponent.prototype.ngOnChanges = function (changes) {
-          var _k;
+          var _o, _p, _q;
           var _this = this;
           var _a, _b, _c, _d;
           var verifyChange = function (key) {
@@ -4457,9 +4457,9 @@
                       ? changes.popupFormCallback.currentValue.popupFormData["data"]
                       : changes.popupFormCallback.currentValue.popupFormData;
                   var popupFormConfig = changes.popupFormCallback.currentValue.popupFormConfig;
-                  this.popupFormData = kwikidToolkit.mergeObjects(this.popupFormData, (_k = {},
-                      _k[popupFormConfig.key] = popupFormData,
-                      _k));
+                  this.popupFormData = kwikidToolkit.mergeObjects(this.popupFormData, (_o = {},
+                      _o[popupFormConfig.key] = popupFormData,
+                      _o));
                   this.formData = kwikidToolkit.mergeObjects(this.formData, this.popupFormData);
                   if (kwikidToolkit.checkObjectKeyExists(changes.popupFormCallback.currentValue, "stopTaskExecution")) {
                       this.stopTaskExecution =
@@ -4494,13 +4494,19 @@
                       if (response) {
                           this.resetCamera();
                           var image = response === null || response === void 0 ? void 0 : response.image_url;
-                          this.mediaFiles[this.apiCallResponse.key] = kwikidToolkit.getObjectDeepCopy([
-                              image
-                          ]);
-                          this.formGroup.controls[this.apiCallResponse.key].setValue(kwikidToolkit.getObjectDeepCopy([image]), {
+                          this.formData[field_1.key] = kwikidToolkit.getObjectDeepCopy([image]);
+                          this.mediaFiles[field_1.key] = kwikidToolkit.getObjectDeepCopy([image]);
+                          this.formGroup.controls[field_1.key].patchValue(kwikidToolkit.getObjectDeepCopy([image]), {
+                              emitEvent: false,
+                              onlySelf: false
+                          });
+                          this.formGroup.patchValue((_p = {},
+                              _p[field_1.key] = kwikidToolkit.getObjectDeepCopy([image]),
+                              _p), { emitEvent: false });
+                          this.formGroup.controls[field_1.key].updateValueAndValidity({
                               emitEvent: false
                           });
-                          this.formGroup.controls[this.apiCallResponse.key].updateValueAndValidity({
+                          this.formGroup.updateValueAndValidity({
                               emitEvent: false
                           });
                           this.getUnsavedDataState.emit(true);
@@ -4516,11 +4522,11 @@
                                   ALL_FORMS_DATA: this.allFormsData
                               }, this.takeAction.bind(this));
                               (function () { return __awaiter(_this, void 0, void 0, function () {
-                                  return __generator(this, function (_k) {
-                                      switch (_k.label) {
+                                  return __generator(this, function (_o) {
+                                      switch (_o.label) {
                                           case 0: return [4 /*yield*/, validations_1.validate(field_1.validation)];
                                           case 1:
-                                              _k.sent();
+                                              _o.sent();
                                               return [2 /*return*/];
                                       }
                                   });
@@ -4543,13 +4549,19 @@
                       if (response) {
                           this.resetCamera();
                           var video = response === null || response === void 0 ? void 0 : response.video_url;
-                          this.mediaFiles[this.apiCallResponse.key] = kwikidToolkit.getObjectDeepCopy([
-                              video
-                          ]);
-                          this.formGroup.controls[this.apiCallResponse.key].setValue(kwikidToolkit.getObjectDeepCopy([video]), {
+                          this.formData[field_1.key] = kwikidToolkit.getObjectDeepCopy([video]);
+                          this.mediaFiles[field_1.key] = kwikidToolkit.getObjectDeepCopy([video]);
+                          this.formGroup.controls[field_1.key].patchValue(kwikidToolkit.getObjectDeepCopy([video]), {
+                              emitEvent: false,
+                              onlySelf: false
+                          });
+                          this.formGroup.patchValue((_q = {},
+                              _q[field_1.key] = kwikidToolkit.getObjectDeepCopy([video]),
+                              _q), { emitEvent: false });
+                          this.formGroup.controls[field_1.key].updateValueAndValidity({
                               emitEvent: false
                           });
-                          this.formGroup.controls[this.apiCallResponse.key].updateValueAndValidity({
+                          this.formGroup.updateValueAndValidity({
                               emitEvent: false
                           });
                           this.getUnsavedDataState.emit(true);
@@ -4565,11 +4577,11 @@
                                   ALL_FORMS_DATA: this.allFormsData
                               }, this.takeAction.bind(this));
                               (function () { return __awaiter(_this, void 0, void 0, function () {
-                                  return __generator(this, function (_k) {
-                                      switch (_k.label) {
+                                  return __generator(this, function (_o) {
+                                      switch (_o.label) {
                                           case 0: return [4 /*yield*/, validations_2.validate(field_1.validation)];
                                           case 1:
-                                              _k.sent();
+                                              _o.sent();
                                               return [2 /*return*/];
                                       }
                                   });
@@ -4621,11 +4633,11 @@
                               ALL_FORMS_DATA: this.allFormsData
                           }, this.takeAction.bind(this));
                           (function () { return __awaiter(_this, void 0, void 0, function () {
-                              return __generator(this, function (_k) {
-                                  switch (_k.label) {
+                              return __generator(this, function (_o) {
+                                  switch (_o.label) {
                                       case 0: return [4 /*yield*/, validations_3.validate(field_2.validation)];
                                       case 1:
-                                          _k.sent();
+                                          _o.sent();
                                           return [2 /*return*/];
                                   }
                               });
@@ -4640,11 +4652,11 @@
           if (verifyChange("formConfig")) {
               this.formConfig = changes.formConfig.currentValue;
               (function () { return __awaiter(_this, void 0, void 0, function () {
-                  return __generator(this, function (_k) {
-                      switch (_k.label) {
+                  return __generator(this, function (_o) {
+                      switch (_o.label) {
                           case 0: return [4 /*yield*/, this.initFormConfig(this.formConfig)];
                           case 1:
-                              _k.sent();
+                              _o.sent();
                               return [2 /*return*/];
                       }
                   });
@@ -4661,11 +4673,11 @@
       };
       KwikIDFormViewComponent.prototype.initFormConfig = function (formConfig) {
           return __awaiter(this, void 0, void 0, function () {
-              var _k, _l, preTask, task, e_1_1, _m, _loop_1, this_1, _o, _p, field, _q, _r, field, validations, e_2_1;
-              var e_1, _s, e_3, _t, e_2, _u;
+              var _o, _p, preTask, task, e_1_1, _q, _loop_1, this_1, _r, _s, field, _t, _u, field, validations, e_2_1;
+              var e_1, _v, e_3, _w, e_2, _x;
               var _this = this;
-              return __generator(this, function (_v) {
-                  switch (_v.label) {
+              return __generator(this, function (_y) {
+                  switch (_y.label) {
                       case 0:
                           formConfig = new Converter().convertFormConfig(formConfig);
                           formConfig = new Converter().updateFormConfigProperties(formConfig);
@@ -4674,14 +4686,14 @@
                           this.setFormDataFromAllFormsData();
                           if (!(kwikidToolkit.checkObjectKeyExists(this.formConfig, "tasks") &&
                               kwikidToolkit.checkObjectKeyExists(this.formConfig.tasks, "pre"))) return [3 /*break*/, 10];
-                          _v.label = 1;
+                          _y.label = 1;
                       case 1:
-                          _v.trys.push([1, 7, 8, 9]);
-                          _k = __values(this.formConfig.tasks.pre), _l = _k.next();
-                          _v.label = 2;
+                          _y.trys.push([1, 7, 8, 9]);
+                          _o = __values(this.formConfig.tasks.pre), _p = _o.next();
+                          _y.label = 2;
                       case 2:
-                          if (!!_l.done) return [3 /*break*/, 6];
-                          preTask = _l.value;
+                          if (!!_p.done) return [3 /*break*/, 6];
+                          preTask = _p.value;
                           task = new Tasks(preTask, {
                               FORM_CONFIG: this.formConfig,
                               FORM_FIELDS: this.formFields,
@@ -4699,7 +4711,7 @@
                           }
                           return [4 /*yield*/, task.execute()];
                       case 3:
-                          _v.sent();
+                          _y.sent();
                           // Wait for ngOnChanges to be called before continuing to the next task
                           return [4 /*yield*/, new Promise(function (resolve) {
                                   var intervalId = setInterval(function () {
@@ -4711,36 +4723,36 @@
                               })];
                       case 4:
                           // Wait for ngOnChanges to be called before continuing to the next task
-                          _v.sent();
+                          _y.sent();
                           if (this.stopTaskExecution) {
                               return [3 /*break*/, 6];
                           }
-                          _v.label = 5;
+                          _y.label = 5;
                       case 5:
-                          _l = _k.next();
+                          _p = _o.next();
                           return [3 /*break*/, 2];
                       case 6: return [3 /*break*/, 9];
                       case 7:
-                          e_1_1 = _v.sent();
+                          e_1_1 = _y.sent();
                           e_1 = { error: e_1_1 };
                           return [3 /*break*/, 9];
                       case 8:
                           try {
-                              if (_l && !_l.done && (_s = _k.return)) _s.call(_k);
+                              if (_p && !_p.done && (_v = _o.return)) _v.call(_o);
                           }
                           finally { if (e_1) throw e_1.error; }
                           return [7 /*endfinally*/];
                       case 9:
                           this.formData = kwikidToolkit.mergeObjects(this.formData, this.popupFormData);
-                          _v.label = 10;
+                          _y.label = 10;
                       case 10:
                           if (this.stopTaskExecution) {
                               return [2 /*return*/, false];
                           }
-                          _m = this;
+                          _q = this;
                           return [4 /*yield*/, this.formViewService.createFormGroup(this.formFields, this.formData, this.previousFormData, this.allFormsData, this.takeAction.bind(this))];
                       case 11:
-                          _m.formGroup = _v.sent();
+                          _q.formGroup = _y.sent();
                           /**
                            * For some reason if their a field of type 'IMAGE' then
                            * formData is adding a 'undefined' key with last image's value from the array.
@@ -4750,10 +4762,10 @@
                               delete this.formData["undefined"];
                           }
                           _loop_1 = function (field) {
-                              var _w, _x;
+                              var _z, _0;
                               if (field.isFormElement) {
-                                  this_1.previousFormData = Object.assign(Object.assign({}, this_1.previousFormData), (_w = {}, _w[field.key] = convertFormFieldValueToStandardFormat(field, this_1.formGroup.controls[field.key].value), _w));
-                                  this_1.formData = Object.assign(Object.assign({}, this_1.formData), (_x = {}, _x[field.key] = convertFormFieldValueToStandardFormat(field, this_1.formGroup.controls[field.key].value), _x));
+                                  this_1.previousFormData = Object.assign(Object.assign({}, this_1.previousFormData), (_z = {}, _z[field.key] = convertFormFieldValueToStandardFormat(field, this_1.formGroup.controls[field.key].value), _z));
+                                  this_1.formData = Object.assign(Object.assign({}, this_1.formData), (_0 = {}, _0[field.key] = convertFormFieldValueToStandardFormat(field, this_1.formGroup.controls[field.key].value), _0));
                                   if (field.type === EFieldType.FILE) {
                                       this_1.files[field.key] = this_1.formGroup.controls[field.key].value;
                                   }
@@ -4767,11 +4779,11 @@
                                   }
                                   this_1.formGroup.controls[field.key].valueChanges
                                       .pipe(operators.pairwise())
-                                      .subscribe(function (_k) {
-                                      var _l, _m;
-                                      var _o = __read(_k, 2), previousValue = _o[0], currentValue = _o[1];
-                                      _this.previousFormData = Object.assign(Object.assign({}, _this.previousFormData), (_l = {}, _l[field.key] = convertFormFieldValueToStandardFormat(field, previousValue), _l));
-                                      _this.formData = Object.assign(Object.assign({}, _this.formData), (_m = {}, _m[field.key] = convertFormFieldValueToStandardFormat(field, currentValue), _m));
+                                      .subscribe(function (_o) {
+                                      var _p, _q;
+                                      var _r = __read(_o, 2), previousValue = _r[0], currentValue = _r[1];
+                                      _this.previousFormData = Object.assign(Object.assign({}, _this.previousFormData), (_p = {}, _p[field.key] = convertFormFieldValueToStandardFormat(field, previousValue), _p));
+                                      _this.formData = Object.assign(Object.assign({}, _this.formData), (_q = {}, _q[field.key] = convertFormFieldValueToStandardFormat(field, currentValue), _q));
                                       if (field.type === EFieldType.FILE) {
                                           _this.files[field.key] = currentValue;
                                       }
@@ -4788,26 +4800,26 @@
                           };
                           this_1 = this;
                           try {
-                              for (_o = __values(this.formFields), _p = _o.next(); !_p.done; _p = _o.next()) {
-                                  field = _p.value;
+                              for (_r = __values(this.formFields), _s = _r.next(); !_s.done; _s = _r.next()) {
+                                  field = _s.value;
                                   _loop_1(field);
                               }
                           }
                           catch (e_3_1) { e_3 = { error: e_3_1 }; }
                           finally {
                               try {
-                                  if (_p && !_p.done && (_t = _o.return)) _t.call(_o);
+                                  if (_s && !_s.done && (_w = _r.return)) _w.call(_r);
                               }
                               finally { if (e_3) throw e_3.error; }
                           }
-                          _v.label = 12;
+                          _y.label = 12;
                       case 12:
-                          _v.trys.push([12, 18, 19, 20]);
-                          _q = __values(this.formFields), _r = _q.next();
-                          _v.label = 13;
+                          _y.trys.push([12, 18, 19, 20]);
+                          _t = __values(this.formFields), _u = _t.next();
+                          _y.label = 13;
                       case 13:
-                          if (!!_r.done) return [3 /*break*/, 17];
-                          field = _r.value;
+                          if (!!_u.done) return [3 /*break*/, 17];
+                          field = _u.value;
                           if (!field.isFormElement) return [3 /*break*/, 16];
                           if (!kwikidToolkit.checkObjectKeyExists(field, "validation")) return [3 /*break*/, 15];
                           if (!field.validation.triggers.includes("ON_INIT")) return [3 /*break*/, 15];
@@ -4821,8 +4833,8 @@
                           }, this.takeAction.bind(this));
                           return [4 /*yield*/, validations.validate(field.validation)];
                       case 14:
-                          _v.sent();
-                          _v.label = 15;
+                          _y.sent();
+                          _y.label = 15;
                       case 15:
                           if (kwikidToolkit.checkObjectKeyExists(field, "connectedElements")) {
                               this.handleConnectedElements({
@@ -4830,18 +4842,18 @@
                                   value: this.formGroup.controls[field.key].value
                               }, "ON_INIT");
                           }
-                          _v.label = 16;
+                          _y.label = 16;
                       case 16:
-                          _r = _q.next();
+                          _u = _t.next();
                           return [3 /*break*/, 13];
                       case 17: return [3 /*break*/, 20];
                       case 18:
-                          e_2_1 = _v.sent();
+                          e_2_1 = _y.sent();
                           e_2 = { error: e_2_1 };
                           return [3 /*break*/, 20];
                       case 19:
                           try {
-                              if (_r && !_r.done && (_u = _q.return)) _u.call(_q);
+                              if (_u && !_u.done && (_x = _t.return)) _x.call(_t);
                           }
                           finally { if (e_2) throw e_2.error; }
                           return [7 /*endfinally*/];
@@ -4879,10 +4891,10 @@
       };
       KwikIDFormViewComponent.prototype.handleConnectedElementFieldGroupActions = function (childFieldGroupConfig, parentField) {
           return __awaiter(this, void 0, void 0, function () {
-              var rulesMapping, _k, _l, action, conditionSuccess, actions, e_4_1;
-              var e_4, _m;
-              return __generator(this, function (_o) {
-                  switch (_o.label) {
+              var rulesMapping, _o, _p, action, conditionSuccess, actions, e_4_1;
+              var e_4, _q;
+              return __generator(this, function (_r) {
+                  switch (_r.label) {
                       case 0:
                           if (!kwikidToolkit.checkObjectKeyExists(childFieldGroupConfig, "rules")) return [3 /*break*/, 8];
                           rulesMapping = new kwikidToolkit.Rule(childFieldGroupConfig.rules, {
@@ -4892,14 +4904,14 @@
                               PREVIOUS_FORM_DATA: this.previousFormData,
                               ALL_FORMS_DATA: this.allFormsData
                           }).mapping();
-                          _o.label = 1;
+                          _r.label = 1;
                       case 1:
-                          _o.trys.push([1, 6, 7, 8]);
-                          _k = __values(childFieldGroupConfig.actions), _l = _k.next();
-                          _o.label = 2;
+                          _r.trys.push([1, 6, 7, 8]);
+                          _o = __values(childFieldGroupConfig.actions), _p = _o.next();
+                          _r.label = 2;
                       case 2:
-                          if (!!_l.done) return [3 /*break*/, 5];
-                          action = _l.value;
+                          if (!!_p.done) return [3 /*break*/, 5];
+                          action = _p.value;
                           conditionSuccess = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                           if (!conditionSuccess) return [3 /*break*/, 4];
                           actions = new kwikidToolkit.Action(action, rulesMapping, {
@@ -4912,19 +4924,19 @@
                           }, this.takeActionOnFieldGroup.bind(this));
                           return [4 /*yield*/, actions.execute()];
                       case 3:
-                          _o.sent();
-                          _o.label = 4;
+                          _r.sent();
+                          _r.label = 4;
                       case 4:
-                          _l = _k.next();
+                          _p = _o.next();
                           return [3 /*break*/, 2];
                       case 5: return [3 /*break*/, 8];
                       case 6:
-                          e_4_1 = _o.sent();
+                          e_4_1 = _r.sent();
                           e_4 = { error: e_4_1 };
                           return [3 /*break*/, 8];
                       case 7:
                           try {
-                              if (_l && !_l.done && (_m = _k.return)) _m.call(_k);
+                              if (_p && !_p.done && (_q = _o.return)) _q.call(_o);
                           }
                           finally { if (e_4) throw e_4.error; }
                           return [7 /*endfinally*/];
@@ -4935,15 +4947,15 @@
       };
       KwikIDFormViewComponent.prototype.handleConnectedElementFieldGroup = function (currentField, connectedFieldGroupConfig, eventType) {
           return __awaiter(this, void 0, void 0, function () {
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           if (!kwikidToolkit.checkObjectKeyExists(connectedFieldGroupConfig, "triggers")) return [3 /*break*/, 2];
                           if (!connectedFieldGroupConfig.triggers.includes(eventType)) return [3 /*break*/, 2];
                           return [4 /*yield*/, this.handleConnectedElementFieldGroupActions(connectedFieldGroupConfig, currentField)];
                       case 1:
-                          _k.sent();
-                          _k.label = 2;
+                          _o.sent();
+                          _o.label = 2;
                       case 2: return [2 /*return*/];
                   }
               });
@@ -4951,10 +4963,10 @@
       };
       KwikIDFormViewComponent.prototype.handleConnectedElementFieldActions = function (connectedFieldConfig, connectedField) {
           return __awaiter(this, void 0, void 0, function () {
-              var rulesMapping, _k, _l, action, conditionSuccess, actions, e_5_1;
-              var e_5, _m;
-              return __generator(this, function (_o) {
-                  switch (_o.label) {
+              var rulesMapping, _o, _p, action, conditionSuccess, actions, e_5_1;
+              var e_5, _q;
+              return __generator(this, function (_r) {
+                  switch (_r.label) {
                       case 0:
                           if (!kwikidToolkit.checkObjectKeyExists(connectedFieldConfig, "rules")) return [3 /*break*/, 8];
                           rulesMapping = new kwikidToolkit.Rule(connectedFieldConfig.rules, {
@@ -4964,14 +4976,14 @@
                               PREVIOUS_FORM_DATA: this.previousFormData,
                               ALL_FORMS_DATA: this.allFormsData
                           }).mapping();
-                          _o.label = 1;
+                          _r.label = 1;
                       case 1:
-                          _o.trys.push([1, 6, 7, 8]);
-                          _k = __values(connectedFieldConfig.actions), _l = _k.next();
-                          _o.label = 2;
+                          _r.trys.push([1, 6, 7, 8]);
+                          _o = __values(connectedFieldConfig.actions), _p = _o.next();
+                          _r.label = 2;
                       case 2:
-                          if (!!_l.done) return [3 /*break*/, 5];
-                          action = _l.value;
+                          if (!!_p.done) return [3 /*break*/, 5];
+                          action = _p.value;
                           conditionSuccess = new kwikidToolkit.Condition(action.condition, rulesMapping).evaluate();
                           if (!conditionSuccess) return [3 /*break*/, 4];
                           actions = new kwikidToolkit.Action(action, rulesMapping, {
@@ -4984,19 +4996,19 @@
                           }, this.takeAction.bind(this));
                           return [4 /*yield*/, actions.execute()];
                       case 3:
-                          _o.sent();
-                          _o.label = 4;
+                          _r.sent();
+                          _r.label = 4;
                       case 4:
-                          _l = _k.next();
+                          _p = _o.next();
                           return [3 /*break*/, 2];
                       case 5: return [3 /*break*/, 8];
                       case 6:
-                          e_5_1 = _o.sent();
+                          e_5_1 = _r.sent();
                           e_5 = { error: e_5_1 };
                           return [3 /*break*/, 8];
                       case 7:
                           try {
-                              if (_l && !_l.done && (_m = _k.return)) _m.call(_k);
+                              if (_p && !_p.done && (_q = _o.return)) _q.call(_o);
                           }
                           finally { if (e_5) throw e_5.error; }
                           return [7 /*endfinally*/];
@@ -5008,16 +5020,16 @@
       KwikIDFormViewComponent.prototype.handleConnectedElementFields = function (currentField, connectedFieldConfig, eventType, nested) {
           return __awaiter(this, void 0, void 0, function () {
               var connectedField;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           connectedField = getFormFieldByKey(this.formFields, connectedFieldConfig["key"]);
                           if (!kwikidToolkit.checkObjectKeyExists(connectedFieldConfig, "triggers")) return [3 /*break*/, 2];
                           if (!connectedFieldConfig.triggers.includes(eventType)) return [3 /*break*/, 2];
                           return [4 /*yield*/, this.handleConnectedElementFieldActions(connectedFieldConfig, connectedField)];
                       case 1:
-                          connectedField = _k.sent();
-                          _k.label = 2;
+                          connectedField = _o.sent();
+                          _o.label = 2;
                       case 2:
                           if (kwikidToolkit.checkObjectKeyExists(connectedFieldConfig, "handleNestedFields")) {
                               if (connectedFieldConfig.handleNestedFields) {
@@ -5032,67 +5044,67 @@
       KwikIDFormViewComponent.prototype.handleConnectedElements = function (e, eventType) {
           return __awaiter(this, void 0, void 0, function () {
               var currentField, connectedFieldGroups, connectedFieldGroups_1, connectedFieldGroups_1_1, connectedFieldGroupConfig, e_6_1, connectedFields, connectedFields_1, connectedFields_1_1, connectedFieldConfig, e_7_1;
-              var e_6, _k, e_7, _l;
-              return __generator(this, function (_m) {
-                  switch (_m.label) {
+              var e_6, _o, e_7, _p;
+              return __generator(this, function (_q) {
+                  switch (_q.label) {
                       case 0:
                           currentField = getFormFieldByKey(this.formFields, e.key);
                           if (!(currentField !== undefined)) return [3 /*break*/, 17];
                           if (!kwikidToolkit.checkObjectKeyExists(currentField, "connectedElements")) return [3 /*break*/, 16];
                           if (!kwikidToolkit.checkObjectKeyExists(currentField.connectedElements, "connectedFieldGroups")) return [3 /*break*/, 8];
                           connectedFieldGroups = currentField.connectedElements.connectedFieldGroups;
-                          _m.label = 1;
+                          _q.label = 1;
                       case 1:
-                          _m.trys.push([1, 6, 7, 8]);
+                          _q.trys.push([1, 6, 7, 8]);
                           connectedFieldGroups_1 = __values(connectedFieldGroups), connectedFieldGroups_1_1 = connectedFieldGroups_1.next();
-                          _m.label = 2;
+                          _q.label = 2;
                       case 2:
                           if (!!connectedFieldGroups_1_1.done) return [3 /*break*/, 5];
                           connectedFieldGroupConfig = connectedFieldGroups_1_1.value;
                           return [4 /*yield*/, this.handleConnectedElementFieldGroup(currentField, connectedFieldGroupConfig, eventType)];
                       case 3:
-                          _m.sent();
-                          _m.label = 4;
+                          _q.sent();
+                          _q.label = 4;
                       case 4:
                           connectedFieldGroups_1_1 = connectedFieldGroups_1.next();
                           return [3 /*break*/, 2];
                       case 5: return [3 /*break*/, 8];
                       case 6:
-                          e_6_1 = _m.sent();
+                          e_6_1 = _q.sent();
                           e_6 = { error: e_6_1 };
                           return [3 /*break*/, 8];
                       case 7:
                           try {
-                              if (connectedFieldGroups_1_1 && !connectedFieldGroups_1_1.done && (_k = connectedFieldGroups_1.return)) _k.call(connectedFieldGroups_1);
+                              if (connectedFieldGroups_1_1 && !connectedFieldGroups_1_1.done && (_o = connectedFieldGroups_1.return)) _o.call(connectedFieldGroups_1);
                           }
                           finally { if (e_6) throw e_6.error; }
                           return [7 /*endfinally*/];
                       case 8:
                           if (!kwikidToolkit.checkObjectKeyExists(currentField.connectedElements, "connectedFields")) return [3 /*break*/, 16];
                           connectedFields = currentField.connectedElements.connectedFields;
-                          _m.label = 9;
+                          _q.label = 9;
                       case 9:
-                          _m.trys.push([9, 14, 15, 16]);
+                          _q.trys.push([9, 14, 15, 16]);
                           connectedFields_1 = __values(connectedFields), connectedFields_1_1 = connectedFields_1.next();
-                          _m.label = 10;
+                          _q.label = 10;
                       case 10:
                           if (!!connectedFields_1_1.done) return [3 /*break*/, 13];
                           connectedFieldConfig = connectedFields_1_1.value;
                           return [4 /*yield*/, this.handleConnectedElementFields(currentField, connectedFieldConfig, eventType, eventType)];
                       case 11:
-                          currentField = _m.sent();
-                          _m.label = 12;
+                          currentField = _q.sent();
+                          _q.label = 12;
                       case 12:
                           connectedFields_1_1 = connectedFields_1.next();
                           return [3 /*break*/, 10];
                       case 13: return [3 /*break*/, 16];
                       case 14:
-                          e_7_1 = _m.sent();
+                          e_7_1 = _q.sent();
                           e_7 = { error: e_7_1 };
                           return [3 /*break*/, 16];
                       case 15:
                           try {
-                              if (connectedFields_1_1 && !connectedFields_1_1.done && (_l = connectedFields_1.return)) _l.call(connectedFields_1);
+                              if (connectedFields_1_1 && !connectedFields_1_1.done && (_p = connectedFields_1.return)) _p.call(connectedFields_1);
                           }
                           finally { if (e_7) throw e_7.error; }
                           return [7 /*endfinally*/];
@@ -5104,23 +5116,23 @@
           });
       };
       KwikIDFormViewComponent.prototype.handleRemovedFile = function (e) {
-          var _k;
+          var _o;
           this.showApiLoader();
           if (this.formGroup["controls"][e.key].enabled) {
               this.files[e.key] = e.files;
               this.formData[e.key] = filterDuplicatesFiles(this.files[e.key]);
-              this.formGroup.patchValue((_k = {},
-                  _k[e.key] = this.formData[e.key],
-                  _k), { emitEvent: false });
+              this.formGroup.patchValue((_o = {},
+                  _o[e.key] = this.formData[e.key],
+                  _o), { emitEvent: false });
           }
           this.hideApiLoader();
       };
       KwikIDFormViewComponent.prototype.handleGetKeyValueFile = function (e) {
           return __awaiter(this, void 0, void 0, function () {
               var field, values, values_1, values_1_1, value, e_8_1, _loop_2, this_2, values_2, values_2_1, value, e_9_1;
-              var e_8, _k, e_9, _l;
-              return __generator(this, function (_m) {
-                  switch (_m.label) {
+              var e_8, _o, e_9, _p;
+              return __generator(this, function (_q) {
+                  switch (_q.label) {
                       case 0:
                           this.showApiLoader();
                           field = getFormFieldByKey(this.formFields, e.key);
@@ -5128,41 +5140,41 @@
                           if (!(kwikidToolkit.checkObjectKeyExists(field, "properties") &&
                               kwikidToolkit.checkObjectKeyExists(field.properties, "uploadFileToServer") &&
                               field.properties.uploadFileToServer)) return [3 /*break*/, 9];
-                          _m.label = 1;
+                          _q.label = 1;
                       case 1:
-                          _m.trys.push([1, 6, 7, 8]);
+                          _q.trys.push([1, 6, 7, 8]);
                           values_1 = __values(values), values_1_1 = values_1.next();
-                          _m.label = 2;
+                          _q.label = 2;
                       case 2:
                           if (!!values_1_1.done) return [3 /*break*/, 5];
                           value = values_1_1.value;
                           return [4 /*yield*/, this.uploadFile(field, value)];
                       case 3:
-                          _m.sent();
-                          _m.label = 4;
+                          _q.sent();
+                          _q.label = 4;
                       case 4:
                           values_1_1 = values_1.next();
                           return [3 /*break*/, 2];
                       case 5: return [3 /*break*/, 8];
                       case 6:
-                          e_8_1 = _m.sent();
+                          e_8_1 = _q.sent();
                           e_8 = { error: e_8_1 };
                           return [3 /*break*/, 8];
                       case 7:
                           try {
-                              if (values_1_1 && !values_1_1.done && (_k = values_1.return)) _k.call(values_1);
+                              if (values_1_1 && !values_1_1.done && (_o = values_1.return)) _o.call(values_1);
                           }
                           finally { if (e_8) throw e_8.error; }
                           return [7 /*endfinally*/];
                       case 8: return [3 /*break*/, 18];
                       case 9:
                           _loop_2 = function (value) {
-                              var updatedFile, _o;
-                              return __generator(this, function (_p) {
-                                  switch (_p.label) {
+                              var updatedFile, _r;
+                              return __generator(this, function (_s) {
+                                  switch (_s.label) {
                                       case 0:
                                           this_2.updateFiles(value, "LOADING", e.key);
-                                          _o = kwikidToolkit.getObjectDeepCopy;
+                                          _r = kwikidToolkit.getObjectDeepCopy;
                                           return [4 /*yield*/, new Promise(function (resolve) {
                                                   setTimeout(function () {
                                                       resolve({
@@ -5176,42 +5188,42 @@
                                                   }, 300); // 1000 ms = 1 sec
                                               })];
                                       case 1:
-                                          updatedFile = _o.apply(void 0, [_p.sent()]);
+                                          updatedFile = _r.apply(void 0, [_s.sent()]);
                                           this_2.updateFiles(updatedFile, "NORMAL", e.key);
                                           return [2 /*return*/];
                                   }
                               });
                           };
                           this_2 = this;
-                          _m.label = 10;
+                          _q.label = 10;
                       case 10:
-                          _m.trys.push([10, 15, 16, 17]);
+                          _q.trys.push([10, 15, 16, 17]);
                           values_2 = __values(values), values_2_1 = values_2.next();
-                          _m.label = 11;
+                          _q.label = 11;
                       case 11:
                           if (!!values_2_1.done) return [3 /*break*/, 14];
                           value = values_2_1.value;
                           return [5 /*yield**/, _loop_2(value)];
                       case 12:
-                          _m.sent();
-                          _m.label = 13;
+                          _q.sent();
+                          _q.label = 13;
                       case 13:
                           values_2_1 = values_2.next();
                           return [3 /*break*/, 11];
                       case 14: return [3 /*break*/, 17];
                       case 15:
-                          e_9_1 = _m.sent();
+                          e_9_1 = _q.sent();
                           e_9 = { error: e_9_1 };
                           return [3 /*break*/, 17];
                       case 16:
                           try {
-                              if (values_2_1 && !values_2_1.done && (_l = values_2.return)) _l.call(values_2);
+                              if (values_2_1 && !values_2_1.done && (_p = values_2.return)) _p.call(values_2);
                           }
                           finally { if (e_9) throw e_9.error; }
                           return [7 /*endfinally*/];
                       case 17:
                           this.hideApiLoader();
-                          _m.label = 18;
+                          _q.label = 18;
                       case 18: return [2 /*return*/];
                   }
               });
@@ -5219,31 +5231,31 @@
       };
       /** Methods for Camera related fields like 'CAPTURE' or  'RECORD' */
       KwikIDFormViewComponent.prototype.handleOnClickGetRemovedMediaFile = function (e) {
-          var _k;
+          var _o;
           this.showApiLoader();
           if (this.formGroup["controls"][e.key].enabled) {
               this.resetCamera();
               this.mediaFiles[e.key] = e.mediaFiles;
               this.formData[e.key] = filterDuplicatesMediaFiles(this.mediaFiles[e.key]);
-              this.formGroup.patchValue((_k = {},
-                  _k[e.key] = this.formData[e.key],
-                  _k), { emitEvent: false });
+              this.formGroup.patchValue((_o = {},
+                  _o[e.key] = this.formData[e.key],
+                  _o), { emitEvent: false });
           }
           this.hideApiLoader();
       };
       KwikIDFormViewComponent.prototype.handleOnClickInputCamera = function (e, field) {
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e, _f;
           return __awaiter(this, void 0, void 0, function () {
-              var fieldKey, fieldcameraConfig, _k, cameraHelper, _l, _m;
-              return __generator(this, function (_o) {
-                  switch (_o.label) {
+              var fieldKey, fieldcameraConfig, _o, cameraHelper, _p, _q;
+              return __generator(this, function (_r) {
+                  switch (_r.label) {
                       case 0:
                           fieldKey = field.key;
                           fieldcameraConfig = (_b = (_a = field === null || field === void 0 ? void 0 : field.properties) === null || _a === void 0 ? void 0 : _a.cameraConfig) !== null && _b !== void 0 ? _b : {};
                           this.cameraType = (field === null || field === void 0 ? void 0 : field.type.toUpperCase()) || "";
                           this.cameraFieldKey = fieldKey;
-                          _k = this.cameraType;
-                          switch (_k) {
+                          _o = this.cameraType;
+                          switch (_o) {
                               case "CAPTURE": return [3 /*break*/, 1];
                               case "RECORD": return [3 /*break*/, 5];
                           }
@@ -5253,18 +5265,19 @@
                               FIELD_PROPERTIES.capture.cameraConfig,
                               fieldcameraConfig
                           ]);
-                          if (!((_d = (_c = this.cameraConfig) === null || _c === void 0 ? void 0 : _c.others) === null || _d === void 0 ? void 0 : _d.isWatermark)) return [3 /*break*/, 3];
+                          if (!(((_d = (_c = this.cameraConfig) === null || _c === void 0 ? void 0 : _c.others) === null || _d === void 0 ? void 0 : _d.isWatermark) ||
+                              ((_f = (_e = this.cameraConfig) === null || _e === void 0 ? void 0 : _e.others) === null || _f === void 0 ? void 0 : _f.isWatermarkForImageUpload))) return [3 /*break*/, 3];
                           cameraHelper = new CameraHelper(field, this.formFields, this.allFormsData, this.formData, this.previousFormData);
-                          _l = this;
-                          _m = {};
+                          _p = this;
+                          _q = {};
                           return [4 /*yield*/, cameraHelper.getCameraWatermarkData()];
                       case 2:
-                          _l.cameraData = (_m.watermark = _o.sent(),
-                              _m);
+                          _p.cameraData = (_q.watermark = _r.sent(),
+                              _q);
                           return [3 /*break*/, 4];
                       case 3:
                           this.cameraData = undefined;
-                          _o.label = 4;
+                          _r.label = 4;
                       case 4: return [3 /*break*/, 7];
                       case 5:
                           this.cameraConfig = kwikidToolkit.mergeObjectsDeep([
@@ -5290,9 +5303,10 @@
       KwikIDFormViewComponent.prototype.setCameraMedia = function (media) {
           return __awaiter(this, void 0, void 0, function () {
               var field, validations_4;
+              var _o;
               var _this = this;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_p) {
+                  switch (_p.label) {
                       case 0:
                           field = getFormFieldByKey(this.formFields, this.cameraFieldKey);
                           if (!(kwikidToolkit.checkObjectKeyExists(field, "properties") &&
@@ -5300,17 +5314,25 @@
                               field.properties.uploadFileToServer)) return [3 /*break*/, 2];
                           return [4 /*yield*/, this.uploadFile(field, media)];
                       case 1:
-                          _k.sent();
+                          _p.sent();
                           return [3 /*break*/, 3];
                       case 2:
                           this.resetCamera();
+                          this.formData[field.key] = kwikidToolkit.getObjectDeepCopy([media]);
                           this.mediaFiles[field.key] = kwikidToolkit.getObjectDeepCopy([media]);
-                          this.formGroup.controls[field.key].setValue(kwikidToolkit.getObjectDeepCopy([media]), {
-                              emitEvent: false
+                          this.formGroup.controls[field.key].patchValue(kwikidToolkit.getObjectDeepCopy([media]), {
+                              emitEvent: false,
+                              onlySelf: false
                           });
+                          this.formGroup.patchValue((_o = {},
+                              _o[field.key] = kwikidToolkit.getObjectDeepCopy([media]),
+                              _o), { emitEvent: false });
                           this.formGroup.controls[field.key].updateValueAndValidity({
                               emitEvent: false
                           });
+                          this.formGroup.updateValueAndValidity({
+                              emitEvent: false
+                          });
                           this.getUnsavedDataState.emit(true);
                           if (field.isFormElement &&
                               kwikidToolkit.checkObjectKeyExists(field, "validation") &&
@@ -5324,11 +5346,11 @@
                                   ALL_FORMS_DATA: this.allFormsData
                               }, this.takeAction.bind(this));
                               (function () { return __awaiter(_this, void 0, void 0, function () {
-                                  return __generator(this, function (_k) {
-                                      switch (_k.label) {
+                                  return __generator(this, function (_o) {
+                                      switch (_o.label) {
                                           case 0: return [4 /*yield*/, validations_4.validate(field.validation)];
                                           case 1:
-                                              _k.sent();
+                                              _o.sent();
                                               return [2 /*return*/];
                                       }
                                   });
@@ -5341,7 +5363,7 @@
                                   value: this.formGroup.controls[field.key].value
                               }, "ON_CHANGE");
                           }
-                          _k.label = 3;
+                          _p.label = 3;
                       case 3: return [2 /*return*/];
                   }
               });
@@ -5436,7 +5458,7 @@
        * This method is used to update the files array with the new file and it's state and response from the api of uploading the file.
        */
       KwikIDFormViewComponent.prototype.updateFiles = function (file, state, key) {
-          var _k;
+          var _o;
           var _this = this;
           var _a;
           var fileWithState = kwikidToolkit.mergeObjects(file, { state: state });
@@ -5464,9 +5486,9 @@
               emitEvent: false,
               onlySelf: false
           });
-          this.formGroup.patchValue((_k = {},
-              _k[key] = normalFiles,
-              _k), { emitEvent: false });
+          this.formGroup.patchValue((_o = {},
+              _o[key] = normalFiles,
+              _o), { emitEvent: false });
           this.getUnsavedDataState.emit(true);
           if (field.isFormElement &&
               kwikidToolkit.checkObjectKeyExists(field, "validation") &&
@@ -5480,11 +5502,11 @@
                   ALL_FORMS_DATA: this.allFormsData
               }, this.takeAction.bind(this));
               (function () { return __awaiter(_this, void 0, void 0, function () {
-                  return __generator(this, function (_k) {
-                      switch (_k.label) {
+                  return __generator(this, function (_o) {
+                      switch (_o.label) {
                           case 0: return [4 /*yield*/, validations_5.validate(field.validation)];
                           case 1:
-                              _k.sent();
+                              _o.sent();
                               return [2 /*return*/];
                       }
                   });
@@ -5503,7 +5525,7 @@
        */
       KwikIDFormViewComponent.prototype.uploadFile = function (field, file) {
           return __awaiter(this, void 0, void 0, function () {
-              return __generator(this, function (_k) {
+              return __generator(this, function (_o) {
                   switch (field.type) {
                       case EFieldType.FILE:
                           this.updateFiles(file, "LOADING", field.key);
@@ -5564,11 +5586,11 @@
           });
       };
       KwikIDFormViewComponent.prototype.handleOnClickFormFieldButton = function (field) {
-          var e_10, _k;
+          var e_10, _o;
           var formData = this.formGroup.getRawValue();
           try {
-              for (var _l = __values(this.formFields), _m = _l.next(); !_m.done; _m = _l.next()) {
-                  var field_3 = _m.value;
+              for (var _p = __values(this.formFields), _q = _p.next(); !_q.done; _q = _p.next()) {
+                  var field_3 = _q.value;
                   if (field_3.isFormElement) {
                       if (field_3.hidden) {
                           delete formData[field_3.key];
@@ -5582,22 +5604,22 @@
           catch (e_10_1) { e_10 = { error: e_10_1 }; }
           finally {
               try {
-                  if (_m && !_m.done && (_k = _l.return)) _k.call(_l);
+                  if (_q && !_q.done && (_o = _p.return)) _o.call(_p);
               }
               finally { if (e_10) throw e_10.error; }
           }
           var extendedFormData = this.formFields.reduce(function (result, field, index) {
-              var _k;
+              var _o;
               if (field.isFormElement && !field.hidden) {
-                  var fieldData = (_k = {},
-                      _k[field.key] = {
+                  var fieldData = (_o = {},
+                      _o[field.key] = {
                           key: field.key,
                           label: field.label,
                           value: kwikidToolkit.isEmptyValue(formData[field.key]) ? "" : formData[field.key],
                           type: field.type,
                           index: index
                       },
-                      _k);
+                      _o);
                   result[field.key] = fieldData[field.key];
               }
               return result;
@@ -5610,11 +5632,11 @@
       };
       // DOM Event Handlers
       KwikIDFormViewComponent.prototype.handleGetKeyValue = function (e) {
-          var _k;
+          var _o;
           var _this = this;
-          this.formGroup.patchValue((_k = {},
-              _k[e.key] = e.value,
-              _k), { emitEvent: false });
+          this.formGroup.patchValue((_o = {},
+              _o[e.key] = e.value,
+              _o), { emitEvent: false });
           var field = getFormFieldByKey(this.formFields, e.key);
           this.formData[e.key] = convertFormFieldValueToStandardFormat(field, e.value);
           this.getUnsavedDataState.emit(true);
@@ -5630,11 +5652,11 @@
                   ALL_FORMS_DATA: this.allFormsData
               }, this.takeAction.bind(this));
               (function () { return __awaiter(_this, void 0, void 0, function () {
-                  return __generator(this, function (_k) {
-                      switch (_k.label) {
+                  return __generator(this, function (_o) {
+                      switch (_o.label) {
                           case 0: return [4 /*yield*/, validations_6.validate(field.validation)];
                           case 1:
-                              _k.sent();
+                              _o.sent();
                               return [2 /*return*/];
                       }
                   });
@@ -5653,27 +5675,27 @@
           return __awaiter(this, void 0, void 0, function () {
               var resetFormFields, BYPASS_RESET_CONFIRM, CONFIRM_RESET;
               var _this = this;
-              return __generator(this, function (_k) {
+              return __generator(this, function (_o) {
                   resetFormFields = function () { return __awaiter(_this, void 0, void 0, function () {
-                      var _k, _l, f, _m, _o, action, resetField, actions, e_11_1, e_12_1;
-                      var e_12, _p, e_11, _q;
-                      return __generator(this, function (_r) {
-                          switch (_r.label) {
+                      var _o, _p, f, _q, _r, action, resetField, actions, e_11_1, e_12_1;
+                      var e_12, _s, e_11, _t;
+                      return __generator(this, function (_u) {
+                          switch (_u.label) {
                               case 0:
-                                  _r.trys.push([0, 11, 12, 13]);
-                                  _k = __values(field.reset.fields), _l = _k.next();
-                                  _r.label = 1;
+                                  _u.trys.push([0, 11, 12, 13]);
+                                  _o = __values(field.reset.fields), _p = _o.next();
+                                  _u.label = 1;
                               case 1:
-                                  if (!!_l.done) return [3 /*break*/, 10];
-                                  f = _l.value;
-                                  _r.label = 2;
+                                  if (!!_p.done) return [3 /*break*/, 10];
+                                  f = _p.value;
+                                  _u.label = 2;
                               case 2:
-                                  _r.trys.push([2, 7, 8, 9]);
-                                  _m = (e_11 = void 0, __values(f.actions)), _o = _m.next();
-                                  _r.label = 3;
+                                  _u.trys.push([2, 7, 8, 9]);
+                                  _q = (e_11 = void 0, __values(f.actions)), _r = _q.next();
+                                  _u.label = 3;
                               case 3:
-                                  if (!!_o.done) return [3 /*break*/, 6];
-                                  action = _o.value;
+                                  if (!!_r.done) return [3 /*break*/, 6];
+                                  action = _r.value;
                                   resetField = getFormFieldByKey(this.formFields, action.props.fieldKey);
                                   actions = new kwikidToolkit.Action(action, {}, {
                                       FIELD_CONFIG: resetField,
@@ -5685,33 +5707,33 @@
                                   }, this.takeAction.bind(this));
                                   return [4 /*yield*/, actions.execute()];
                               case 4:
-                                  _r.sent();
-                                  _r.label = 5;
+                                  _u.sent();
+                                  _u.label = 5;
                               case 5:
-                                  _o = _m.next();
+                                  _r = _q.next();
                                   return [3 /*break*/, 3];
                               case 6: return [3 /*break*/, 9];
                               case 7:
-                                  e_11_1 = _r.sent();
+                                  e_11_1 = _u.sent();
                                   e_11 = { error: e_11_1 };
                                   return [3 /*break*/, 9];
                               case 8:
                                   try {
-                                      if (_o && !_o.done && (_q = _m.return)) _q.call(_m);
+                                      if (_r && !_r.done && (_t = _q.return)) _t.call(_q);
                                   }
                                   finally { if (e_11) throw e_11.error; }
                                   return [7 /*endfinally*/];
                               case 9:
-                                  _l = _k.next();
+                                  _p = _o.next();
                                   return [3 /*break*/, 1];
                               case 10: return [3 /*break*/, 13];
                               case 11:
-                                  e_12_1 = _r.sent();
+                                  e_12_1 = _u.sent();
                                   e_12 = { error: e_12_1 };
                                   return [3 /*break*/, 13];
                               case 12:
                                   try {
-                                      if (_l && !_l.done && (_p = _k.return)) _p.call(_k);
+                                      if (_p && !_p.done && (_s = _o.return)) _s.call(_o);
                                   }
                                   finally { if (e_12) throw e_12.error; }
                                   return [7 /*endfinally*/];
@@ -5736,9 +5758,9 @@
       KwikIDFormViewComponent.prototype.handleFieldApiCall = function (field, api) {
           return __awaiter(this, void 0, void 0, function () {
               var apis;
-              var _k, _l;
-              return __generator(this, function (_m) {
-                  switch (_m.label) {
+              var _o, _p;
+              return __generator(this, function (_q) {
+                  switch (_q.label) {
                       case 0: return [4 /*yield*/, this.executeApiCall(api, {
                               FIELD_CONFIG: field,
                               API_CONFIG: api,
@@ -5749,13 +5771,13 @@
                               ALL_FORMS_DATA: this.allFormsData
                           })];
                       case 1:
-                          api = _m.sent();
+                          api = _q.sent();
                           if (!this.isValidRequestHeadersAndBody(api)) return [3 /*break*/, 3];
                           if (kwikidToolkit.checkObjectKeyExists(field.api, "request")) {
-                              this.formData = Object.assign(Object.assign({}, this.formData), (_k = {}, _k[field.key] = api.response.value, _k));
-                              this.formGroup.patchValue((_l = {},
-                                  _l[field.key] = api.response.value,
-                                  _l), { emitEvent: false });
+                              this.formData = Object.assign(Object.assign({}, this.formData), (_o = {}, _o[field.key] = api.response.value, _o));
+                              this.formGroup.patchValue((_p = {},
+                                  _p[field.key] = api.response.value,
+                                  _p), { emitEvent: false });
                           }
                           apis = new Apis({
                               FIELD_CONFIG: field,
@@ -5769,14 +5791,14 @@
                           }, this.takeAction.bind(this));
                           return [4 /*yield*/, apis.validateResponse()];
                       case 2:
-                          api = _m.sent();
+                          api = _q.sent();
                           return [3 /*break*/, 4];
                       case 3:
                           setTimeout(function () {
                               field["api"]["status"]["value"] = EApiStatusType.FAILED;
                               field["showLoader"] = false;
                           }, 500);
-                          _m.label = 4;
+                          _q.label = 4;
                       case 4: return [2 /*return*/, { field: field, api: api }];
                   }
               });
@@ -5785,8 +5807,8 @@
       KwikIDFormViewComponent.prototype.handleApiCall = function (api) {
           return __awaiter(this, void 0, void 0, function () {
               var apis;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0: return [4 /*yield*/, this.executeApiCall(api, {
                               FORM_CONFIG: this.formConfig,
                               API_CONFIG: api,
@@ -5797,7 +5819,7 @@
                               ALL_FORMS_DATA: this.allFormsData
                           })];
                       case 1:
-                          api = _k.sent();
+                          api = _o.sent();
                           apis = new Apis({
                               FORM_CONFIG: this.formConfig,
                               API_CONFIG: api,
@@ -5810,38 +5832,38 @@
                           if (!this.isValidRequestHeadersAndBody(api)) return [3 /*break*/, 3];
                           return [4 /*yield*/, apis.validateResponse()];
                       case 2:
-                          api = _k.sent();
-                          _k.label = 3;
+                          api = _o.sent();
+                          _o.label = 3;
                       case 3: return [2 /*return*/, { api: api }];
                   }
               });
           });
       };
       KwikIDFormViewComponent.prototype.executeApiCall = function (api, object) {
-          var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+          var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
           return __awaiter(this, void 0, void 0, function () {
-              var apis, apiCallResponse, apiCallResponseStatusCode, url, method, headers, body, response, err_1, response, err_2;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              var apis, apiCallResponse, apiCallResponseStatusCode, url, method, headers, response, err_1, body, isSecure, response, isSecure_1, encryptedResponse, decryptedResponse, err_2;
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           apis = new Apis(object, this.takeAction.bind(this));
                           return [4 /*yield*/, apis.setUrl()];
                       case 1:
-                          api = _k.sent();
+                          api = _o.sent();
                           return [4 /*yield*/, apis.setRequestHeaders()];
                       case 2:
-                          api = _k.sent();
+                          api = _o.sent();
                           return [4 /*yield*/, apis.validateRequestHeaders()];
                       case 3:
-                          api = _k.sent();
+                          api = _o.sent();
                           return [4 /*yield*/, apis.setRequestBody()];
                       case 4:
-                          api = _k.sent();
+                          api = _o.sent();
                           return [4 /*yield*/, apis.validateRequestBody()];
                       case 5:
-                          api = _k.sent();
+                          api = _o.sent();
                           apiCallResponse = {};
-                          if (!this.isValidRequestHeadersAndBody(api)) return [3 /*break*/, 18];
+                          if (!this.isValidRequestHeadersAndBody(api)) return [3 /*break*/, 22];
                           if (!(api.request.url.hasOwnProperty("type") &&
                               api.request.url.type === EApiRequestUrlType.MOCK)) return [3 /*break*/, 7];
                           return [4 /*yield*/, new Promise(function (resolve) {
@@ -5850,53 +5872,69 @@
                                   }, 1000); // 1000 ms = 1 sec
                               })];
                       case 6:
-                          apiCallResponse = _k.sent();
+                          apiCallResponse = _o.sent();
                           apiCallResponseStatusCode = (_b = (_a = api.request.url.props) === null || _a === void 0 ? void 0 : _a.statusCode) !== null && _b !== void 0 ? _b : 200; // Default Status Code for Mocked APIs
-                          return [3 /*break*/, 17];
+                          return [3 /*break*/, 21];
                       case 7:
                           url = api.request.url.value;
                           method = (_d = (_c = api.request) === null || _c === void 0 ? void 0 : _c.method) !== null && _d !== void 0 ? _d : "POST";
                           headers = Object.assign({ "Content-Type": "application/json" }, (((_f = (_e = api.request) === null || _e === void 0 ? void 0 : _e.headers) === null || _f === void 0 ? void 0 : _f.value) || {}));
-                          body = (_j = (_h = (_g = api.request) === null || _g === void 0 ? void 0 : _g.body) === null || _h === void 0 ? void 0 : _h.value) !== null && _j !== void 0 ? _j : null;
                           if (!(method === "GET")) return [3 /*break*/, 13];
-                          _k.label = 8;
+                          _o.label = 8;
                       case 8:
-                          _k.trys.push([8, 11, , 12]);
+                          _o.trys.push([8, 11, , 12]);
                           return [4 /*yield*/, fetch(url, {
                                   method: method,
                                   headers: Object.assign({}, headers)
                               })];
                       case 9:
-                          response = _k.sent();
+                          response = _o.sent();
                           return [4 /*yield*/, response.json()];
                       case 10:
-                          apiCallResponse = _k.sent();
+                          apiCallResponse = _o.sent();
                           apiCallResponseStatusCode = response.status;
                           return [3 /*break*/, 12];
                       case 11:
-                          err_1 = _k.sent();
+                          err_1 = _o.sent();
                           apiCallResponse = {};
                           return [3 /*break*/, 12];
-                      case 12: return [3 /*break*/, 17];
+                      case 12: return [3 /*break*/, 21];
                       case 13:
-                          _k.trys.push([13, 16, , 17]);
+                          body = JSON.stringify((_j = (_h = (_g = api === null || api === void 0 ? void 0 : api.request) === null || _g === void 0 ? void 0 : _g.body) === null || _h === void 0 ? void 0 : _h.value) !== null && _j !== void 0 ? _j : {});
+                          isSecure = (_l = (_k = api === null || api === void 0 ? void 0 : api.request) === null || _k === void 0 ? void 0 : _k.body) === null || _l === void 0 ? void 0 : _l.isSecure;
+                          if (isSecure) {
+                              body = kwikidToolkit.encryptWithAES(body);
+                          }
+                          _o.label = 14;
+                      case 14:
+                          _o.trys.push([14, 20, , 21]);
                           return [4 /*yield*/, fetch(url, {
                                   method: method,
                                   headers: Object.assign({}, headers),
-                                  body: JSON.stringify(body)
+                                  body: body
                               })];
-                      case 14:
-                          response = _k.sent();
-                          return [4 /*yield*/, response.json()];
                       case 15:
-                          apiCallResponse = _k.sent();
-                          apiCallResponseStatusCode = response.status;
-                          return [3 /*break*/, 17];
+                          response = _o.sent();
+                          isSecure_1 = (_m = api === null || api === void 0 ? void 0 : api.response) === null || _m === void 0 ? void 0 : _m.isSecure;
+                          if (!isSecure_1) return [3 /*break*/, 17];
+                          return [4 /*yield*/, response.text()];
                       case 16:
-                          err_2 = _k.sent();
+                          encryptedResponse = _o.sent();
+                          decryptedResponse = kwikidToolkit.decryptWithAES(encryptedResponse);
+                          apiCallResponse = JSON.parse(decryptedResponse);
+                          return [3 /*break*/, 19];
+                      case 17: return [4 /*yield*/, response.json()];
+                      case 18:
+                          apiCallResponse = _o.sent();
+                          _o.label = 19;
+                      case 19:
+                          apiCallResponseStatusCode = response.status;
+                          return [3 /*break*/, 21];
+                      case 20:
+                          err_2 = _o.sent();
                           apiCallResponse = {};
-                          return [3 /*break*/, 17];
-                      case 17:
+                          return [3 /*break*/, 21];
+                      case 21:
                           api.response = kwikidToolkit.setValueToObjectPath(api.response, "value", apiCallResponse);
                           api.response = kwikidToolkit.setValueToObjectPath(api.response, "status", apiCallResponseStatusCode);
                           this.getLogs.emit({
@@ -5907,8 +5945,8 @@
                                   response: api.response
                               }
                           });
-                          _k.label = 18;
-                      case 18: return [2 /*return*/, api];
+                          _o.label = 22;
+                      case 22: return [2 /*return*/, api];
                   }
               });
           });
@@ -5945,8 +5983,8 @@
       KwikIDFormViewComponent.prototype.handleOnClickApiCall = function (e) {
           return __awaiter(this, void 0, void 0, function () {
               var field, apis;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           field = getFormFieldByKey(this.formFields, e.key);
                           if (!(field.type === EFieldType.API)) return [3 /*break*/, 5];
@@ -5957,7 +5995,7 @@
                           if (!kwikidToolkit.checkObjectKeyExists(field.api, "request")) return [3 /*break*/, 2];
                           return [4 /*yield*/, this.handleFieldApiCall(field, field.api)];
                       case 1:
-                          _k.sent();
+                          _o.sent();
                           return [3 /*break*/, 4];
                       case 2:
                           apis = new Apis({
@@ -5971,11 +6009,11 @@
                           }, this.takeAction.bind(this));
                           return [4 /*yield*/, apis.callNextApi(field.api.entrypoint)];
                       case 3:
-                          _k.sent();
-                          _k.label = 4;
+                          _o.sent();
+                          _o.label = 4;
                       case 4:
                           this.hideApiLoader();
-                          _k.label = 5;
+                          _o.label = 5;
                       case 5: return [2 /*return*/];
                   }
               });
@@ -6020,11 +6058,11 @@
       };
       KwikIDFormViewComponent.prototype.handleOnClickSaveForm = function (e) {
           return __awaiter(this, void 0, void 0, function () {
-              var controls, firstFieldWithError, controls_1, controls_1_1, control, _k, _l, field, validations, e_13_1, formData, _m, _o, field, extendedFormData, _p, _q, postTask, task, e_14_1;
-              var e_15, _r, e_13, _s, e_16, _t, e_14, _u;
+              var controls, firstFieldWithError, controls_1, controls_1_1, control, _o, _p, field, validations, e_13_1, formData, _q, _r, field, extendedFormData, _s, _t, postTask, task, e_14_1;
+              var e_15, _u, e_13, _v, e_16, _w, e_14, _x;
               var _this = this;
-              return __generator(this, function (_v) {
-                  switch (_v.label) {
+              return __generator(this, function (_y) {
+                  switch (_y.label) {
                       case 0:
                           controls = new FormValidation().getFormFieldsInvalidControls(this.formGroup);
                           firstFieldWithError = "";
@@ -6040,7 +6078,7 @@
                           catch (e_15_1) { e_15 = { error: e_15_1 }; }
                           finally {
                               try {
-                                  if (controls_1_1 && !controls_1_1.done && (_r = controls_1.return)) _r.call(controls_1);
+                                  if (controls_1_1 && !controls_1_1.done && (_u = controls_1.return)) _u.call(controls_1);
                               }
                               finally { if (e_15) throw e_15.error; }
                           }
@@ -6051,14 +6089,14 @@
                               }, 3000);
                               return [2 /*return*/];
                           }
-                          _v.label = 1;
+                          _y.label = 1;
                       case 1:
-                          _v.trys.push([1, 6, 7, 8]);
-                          _k = __values(this.formFields), _l = _k.next();
-                          _v.label = 2;
+                          _y.trys.push([1, 6, 7, 8]);
+                          _o = __values(this.formFields), _p = _o.next();
+                          _y.label = 2;
                       case 2:
-                          if (!!_l.done) return [3 /*break*/, 5];
-                          field = _l.value;
+                          if (!!_p.done) return [3 /*break*/, 5];
+                          field = _p.value;
                           if (!(field.isFormElement &&
                               !field.hidden &&
                               kwikidToolkit.checkObjectKeyExists(field, "validation") &&
@@ -6073,7 +6111,7 @@
                           }, this.takeAction.bind(this));
                           return [4 /*yield*/, validations.validate(field.validation)];
                       case 3:
-                          _v.sent();
+                          _y.sent();
                           if (!field.validation.is_valid) {
                               this.toggleErrorNotification(true);
                               setTimeout(function () {
@@ -6081,26 +6119,26 @@
                               }, 3000);
                               return [2 /*return*/];
                           }
-                          _v.label = 4;
+                          _y.label = 4;
                       case 4:
-                          _l = _k.next();
+                          _p = _o.next();
                           return [3 /*break*/, 2];
                       case 5: return [3 /*break*/, 8];
                       case 6:
-                          e_13_1 = _v.sent();
+                          e_13_1 = _y.sent();
                           e_13 = { error: e_13_1 };
                           return [3 /*break*/, 8];
                       case 7:
                           try {
-                              if (_l && !_l.done && (_s = _k.return)) _s.call(_k);
+                              if (_p && !_p.done && (_v = _o.return)) _v.call(_o);
                           }
                           finally { if (e_13) throw e_13.error; }
                           return [7 /*endfinally*/];
                       case 8:
                           formData = this.formGroup.getRawValue();
                           try {
-                              for (_m = __values(this.formFields), _o = _m.next(); !_o.done; _o = _m.next()) {
-                                  field = _o.value;
+                              for (_q = __values(this.formFields), _r = _q.next(); !_r.done; _r = _q.next()) {
+                                  field = _r.value;
                                   if (field.isFormElement) {
                                       if (field.hidden) {
                                           delete formData[field.key];
@@ -6114,22 +6152,22 @@
                           catch (e_16_1) { e_16 = { error: e_16_1 }; }
                           finally {
                               try {
-                                  if (_o && !_o.done && (_t = _m.return)) _t.call(_m);
+                                  if (_r && !_r.done && (_w = _q.return)) _w.call(_q);
                               }
                               finally { if (e_16) throw e_16.error; }
                           }
                           extendedFormData = this.formFields.reduce(function (result, field, index) {
-                              var _k;
+                              var _o;
                               if (field.isFormElement && !field.hidden) {
-                                  var fieldData = (_k = {},
-                                      _k[field.key] = {
+                                  var fieldData = (_o = {},
+                                      _o[field.key] = {
                                           key: field.key,
                                           label: field.label,
                                           value: kwikidToolkit.isEmptyValue(formData[field.key]) ? "" : formData[field.key],
                                           type: field.type,
                                           index: index
                                       },
-                                      _k);
+                                      _o);
                                   result[field.key] = fieldData[field.key];
                               }
                               return result;
@@ -6141,14 +6179,14 @@
                           });
                           if (!(kwikidToolkit.checkObjectKeyExists(this.formConfig, "tasks") &&
                               kwikidToolkit.checkObjectKeyExists(this.formConfig.tasks, "post"))) return [3 /*break*/, 18];
-                          _v.label = 9;
+                          _y.label = 9;
                       case 9:
-                          _v.trys.push([9, 15, 16, 17]);
-                          _p = __values(this.formConfig.tasks.post), _q = _p.next();
-                          _v.label = 10;
+                          _y.trys.push([9, 15, 16, 17]);
+                          _s = __values(this.formConfig.tasks.post), _t = _s.next();
+                          _y.label = 10;
                       case 10:
-                          if (!!_q.done) return [3 /*break*/, 14];
-                          postTask = _q.value;
+                          if (!!_t.done) return [3 /*break*/, 14];
+                          postTask = _t.value;
                           task = new Tasks(postTask, {
                               FORM_CONFIG: this.formConfig,
                               FORM_FIELDS: this.formFields,
@@ -6166,7 +6204,7 @@
                           }
                           return [4 /*yield*/, task.execute()];
                       case 11:
-                          _v.sent();
+                          _y.sent();
                           // Wait for ngOnChanges to be called before continuing to the next task
                           return [4 /*yield*/, new Promise(function (resolve) {
                                   var intervalId = setInterval(function () {
@@ -6178,22 +6216,22 @@
                               })];
                       case 12:
                           // Wait for ngOnChanges to be called before continuing to the next task
-                          _v.sent();
+                          _y.sent();
                           if (this.stopTaskExecution) {
                               return [3 /*break*/, 14];
                           }
-                          _v.label = 13;
+                          _y.label = 13;
                       case 13:
-                          _q = _p.next();
+                          _t = _s.next();
                           return [3 /*break*/, 10];
                       case 14: return [3 /*break*/, 17];
                       case 15:
-                          e_14_1 = _v.sent();
+                          e_14_1 = _y.sent();
                           e_14 = { error: e_14_1 };
                           return [3 /*break*/, 17];
                       case 16:
                           try {
-                              if (_q && !_q.done && (_u = _p.return)) _u.call(_p);
+                              if (_t && !_t.done && (_x = _s.return)) _x.call(_s);
                           }
                           finally { if (e_14) throw e_14.error; }
                           return [7 /*endfinally*/];
@@ -6215,7 +6253,7 @@
                               data: kwikidToolkit.mergeObjects(formData, this.popupFormData, this.taskData),
                               extendedData: extendedFormData
                           });
-                          _v.label = 19;
+                          _y.label = 19;
                       case 19: return [2 /*return*/];
                   }
               });
@@ -6234,17 +6272,17 @@
           this.formGroup.updateValueAndValidity();
       };
       KwikIDFormViewComponent.prototype.fieldGroupHide = function (fieldGroup) {
-          var e_17, _k;
+          var e_17, _o;
           try {
-              for (var _l = __values(this.fieldGroups[fieldGroup]), _m = _l.next(); !_m.done; _m = _l.next()) {
-                  var fieldKey = _m.value;
+              for (var _p = __values(this.fieldGroups[fieldGroup]), _q = _p.next(); !_q.done; _q = _p.next()) {
+                  var fieldKey = _q.value;
                   this.fieldHide(fieldKey);
               }
           }
           catch (e_17_1) { e_17 = { error: e_17_1 }; }
           finally {
               try {
-                  if (_m && !_m.done && (_k = _l.return)) _k.call(_l);
+                  if (_q && !_q.done && (_o = _p.return)) _o.call(_p);
               }
               finally { if (e_17) throw e_17.error; }
           }
@@ -6258,17 +6296,17 @@
           this.formGroup.updateValueAndValidity();
       };
       KwikIDFormViewComponent.prototype.fieldGroupShow = function (fieldGroup) {
-          var e_18, _k;
+          var e_18, _o;
           try {
-              for (var _l = __values(this.fieldGroups[fieldGroup]), _m = _l.next(); !_m.done; _m = _l.next()) {
-                  var fieldKey = _m.value;
+              for (var _p = __values(this.fieldGroups[fieldGroup]), _q = _p.next(); !_q.done; _q = _p.next()) {
+                  var fieldKey = _q.value;
                   this.fieldShow(fieldKey);
               }
           }
           catch (e_18_1) { e_18 = { error: e_18_1 }; }
           finally {
               try {
-                  if (_m && !_m.done && (_k = _l.return)) _k.call(_l);
+                  if (_q && !_q.done && (_o = _p.return)) _o.call(_p);
               }
               finally { if (e_18) throw e_18.error; }
           }
@@ -6292,17 +6330,17 @@
           }
       };
       KwikIDFormViewComponent.prototype.fieldGroupDisable = function (fieldGroup) {
-          var e_19, _k;
+          var e_19, _o;
           try {
-              for (var _l = __values(this.fieldGroups[fieldGroup]), _m = _l.next(); !_m.done; _m = _l.next()) {
-                  var fieldKey = _m.value;
+              for (var _p = __values(this.fieldGroups[fieldGroup]), _q = _p.next(); !_q.done; _q = _p.next()) {
+                  var fieldKey = _q.value;
                   this.fieldDisable(fieldKey);
               }
           }
           catch (e_19_1) { e_19 = { error: e_19_1 }; }
           finally {
               try {
-                  if (_m && !_m.done && (_k = _l.return)) _k.call(_l);
+                  if (_q && !_q.done && (_o = _p.return)) _o.call(_p);
               }
               finally { if (e_19) throw e_19.error; }
           }
@@ -6326,23 +6364,23 @@
           }
       };
       KwikIDFormViewComponent.prototype.fieldGroupEnable = function (fieldGroup) {
-          var e_20, _k;
+          var e_20, _o;
           try {
-              for (var _l = __values(this.fieldGroups[fieldGroup]), _m = _l.next(); !_m.done; _m = _l.next()) {
-                  var fieldKey = _m.value;
+              for (var _p = __values(this.fieldGroups[fieldGroup]), _q = _p.next(); !_q.done; _q = _p.next()) {
+                  var fieldKey = _q.value;
                   this.fieldEnable(fieldKey);
               }
           }
           catch (e_20_1) { e_20 = { error: e_20_1 }; }
           finally {
               try {
-                  if (_m && !_m.done && (_k = _l.return)) _k.call(_l);
+                  if (_q && !_q.done && (_o = _p.return)) _o.call(_p);
               }
               finally { if (e_20) throw e_20.error; }
           }
       };
       KwikIDFormViewComponent.prototype.fieldReset = function (fieldKey) {
-          var _k;
+          var _o;
           // Find the field and its index in the formFields array
           var field = getFormFieldByKey(this.formFields, fieldKey);
           var fieldIndex = getFormFieldIndexByKey(this.formFields, fieldKey);
@@ -6353,9 +6391,9 @@
               emitEvent: false,
               onlySelf: true
           });
-          this.formGroup.patchValue((_k = {},
-              _k[field.key] = resetValue,
-              _k), { emitEvent: false });
+          this.formGroup.patchValue((_o = {},
+              _o[field.key] = resetValue,
+              _o), { emitEvent: false });
           this.formGroup.controls[field.key].updateValueAndValidity({
               emitEvent: true
           });
@@ -6423,13 +6461,13 @@
       KwikIDFormViewComponent.prototype.setValue = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, source.getValueFromSource(action.props.value.source)];
                       case 1:
-                          sourceValue = _k.sent();
+                          sourceValue = _o.sent();
                           source.setValueToSource(action.props.value.destination, sourceValue);
                           object.FIELD_CONFIG = source.object.FIELD_CONFIG;
                           this.formData = source.object.FORM_DATA;
@@ -6444,13 +6482,13 @@
       KwikIDFormViewComponent.prototype.setFieldDefaultValue = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, source.getValueFromSource(action.props.value.source)];
                       case 1:
-                          sourceValue = _k.sent();
+                          sourceValue = _o.sent();
                           source.setValueToSource({
                               key: kwikidToolkit.ESourceKey.OBJECT,
                               props: {
@@ -6482,7 +6520,7 @@
       KwikIDFormViewComponent.prototype.setApiStatus = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
+              return __generator(this, function (_o) {
                   source = new kwikidToolkit.Source(object);
                   sourceValue = action.props.status;
                   source.setValueToSource({
@@ -6502,13 +6540,13 @@
       KwikIDFormViewComponent.prototype.setApiHeaderValue = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, source.getValueFromSource(action.props.source)];
                       case 1:
-                          sourceValue = _k.sent();
+                          sourceValue = _o.sent();
                           source.setValueToSource({
                               key: kwikidToolkit.ESourceKey.OBJECT,
                               props: {
@@ -6527,7 +6565,7 @@
       KwikIDFormViewComponent.prototype.setApiHeaderValidity = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
+              return __generator(this, function (_o) {
                   source = new kwikidToolkit.Source(object);
                   sourceValue = action.props.valid;
                   source.setValueToSource({
@@ -6547,13 +6585,13 @@
       KwikIDFormViewComponent.prototype.setApiBodyValue = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, source.getValueFromSource(action.props.source)];
                       case 1:
-                          sourceValue = _k.sent();
+                          sourceValue = _o.sent();
                           source.setValueToSource({
                               key: kwikidToolkit.ESourceKey.OBJECT,
                               props: {
@@ -6572,7 +6610,7 @@
       KwikIDFormViewComponent.prototype.setApiBodyValidity = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
+              return __generator(this, function (_o) {
                   source = new kwikidToolkit.Source(object);
                   sourceValue = action.props.valid;
                   source.setValueToSource({
@@ -6592,7 +6630,7 @@
       KwikIDFormViewComponent.prototype.setFieldValidity = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue;
-              return __generator(this, function (_k) {
+              return __generator(this, function (_o) {
                   source = new kwikidToolkit.Source(object);
                   sourceValue = action.props.valid;
                   source.setValueToSource({
@@ -6612,18 +6650,18 @@
       KwikIDFormViewComponent.prototype.setDropdownOptions = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var source, sourceValue, appendToPath, appendToPathStr, optionsPath;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, source.getValueFromSource(action.props.value.source)];
                       case 1:
-                          sourceValue = _k.sent();
+                          sourceValue = _o.sent();
                           if (!kwikidToolkit.checkObjectKeyExists(action.props, "options")) return [3 /*break*/, 4];
                           if (!kwikidToolkit.checkObjectKeyExists(action.props.options, "appendToPath")) return [3 /*break*/, 3];
                           return [4 /*yield*/, source.getValueFromSource(action.props.options.appendToPath.source)];
                       case 2:
-                          appendToPath = _k.sent();
+                          appendToPath = _o.sent();
                           if (kwikidToolkit.isNotEmptyValue(appendToPath)) {
                               appendToPathStr = kwikidToolkit.replaceString(appendToPath.match("" + action.props.options.appendToPath.filterSourceValue)[0], "[^a-zA-Z0-9_]", "_");
                               optionsPath = "" + action.props.options.path + appendToPathStr;
@@ -6632,7 +6670,7 @@
                           return [3 /*break*/, 4];
                       case 3:
                           sourceValue = kwikidToolkit.getObjectValueFromPath(sourceValue, action.props.options.path);
-                          _k.label = 4;
+                          _o.label = 4;
                       case 4:
                           source.setValueToSource(action.props.value.destination, sourceValue);
                           object.FIELD_CONFIG = source.object.FIELD_CONFIG;
@@ -6647,19 +6685,19 @@
       KwikIDFormViewComponent.prototype.apiCall = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var apiConfig, response;
-              var _k;
-              return __generator(this, function (_l) {
-                  switch (_l.label) {
+              var _o;
+              return __generator(this, function (_p) {
+                  switch (_p.label) {
                       case 0:
                           apiConfig = this.formConfig.apis[action.props.formApiKey];
                           return [4 /*yield*/, this.handleApiCall(apiConfig)];
                       case 1:
-                          response = _l.sent();
+                          response = _p.sent();
                           apiConfig = response.api;
                           this.formConfig = kwikidToolkit.setValueToObjectPath(this.formConfig, "apis." + action.props.formApiKey, apiConfig);
-                          this.formData = kwikidToolkit.mergeObjects(this.formData, (_k = {},
-                              _k[action.props.formApiKey] = apiConfig.response.value,
-                              _k));
+                          this.formData = kwikidToolkit.mergeObjects(this.formData, (_o = {},
+                              _o[action.props.formApiKey] = apiConfig.response.value,
+                              _o));
                           return [2 /*return*/, apiConfig];
                   }
               });
@@ -6668,13 +6706,13 @@
       KwikIDFormViewComponent.prototype.fieldApiCall = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var apiConfig;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           this.showApiLoader();
                           return [4 /*yield*/, this.apiCall(action, object)];
                       case 1:
-                          apiConfig = _k.sent();
+                          apiConfig = _o.sent();
                           this.hideApiLoader();
                           return [2 /*return*/];
                   }
@@ -6684,8 +6722,8 @@
       KwikIDFormViewComponent.prototype.fieldMultipleApiCalls = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var entrypointApiKey, field, endpoints, nextApiIndex, apiConfig, response;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           entrypointApiKey = action.props.apiKey;
                           field = getFormFieldByKey(this.formFields, action.props.fieldKey);
@@ -6694,7 +6732,7 @@
                           apiConfig = endpoints[nextApiIndex];
                           return [4 /*yield*/, this.handleFieldApiCall(field, apiConfig)];
                       case 1:
-                          response = _k.sent();
+                          response = _o.sent();
                           field = response.field;
                           field.api.endpoints[nextApiIndex] = response.api;
                           return [2 /*return*/];
@@ -6705,15 +6743,15 @@
       KwikIDFormViewComponent.prototype.fieldMultipleApiCallsEnd = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var field, multipleApiCallResponses;
-              var _k;
-              return __generator(this, function (_l) {
+              var _o;
+              return __generator(this, function (_p) {
                   field = getFormFieldByKey(this.formFields, action.props.fieldKey);
                   multipleApiCallResponses = {};
                   field.api.endpoints.map(function (api) {
                       if (kwikidToolkit.checkObjectKeyExists(api.response, "value"))
                           multipleApiCallResponses = kwikidToolkit.setValueToObjectPath(multipleApiCallResponses, "" + api.apiKey, api.response.value);
                   });
-                  this.formData = Object.assign(Object.assign({}, this.formData), (_k = {}, _k[field.key] = multipleApiCallResponses, _k));
+                  this.formData = Object.assign(Object.assign({}, this.formData), (_o = {}, _o[field.key] = multipleApiCallResponses, _o));
                   this.patchFormGroup(this.formData);
                   return [2 /*return*/];
               });
@@ -6722,17 +6760,17 @@
       KwikIDFormViewComponent.prototype.taskApiCall = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var apiConfig;
-              var _k;
-              return __generator(this, function (_l) {
-                  switch (_l.label) {
+              var _o;
+              return __generator(this, function (_p) {
+                  switch (_p.label) {
                       case 0:
                           this.showApiLoader();
                           return [4 /*yield*/, this.apiCall(action, object)];
                       case 1:
-                          apiConfig = _l.sent();
-                          this.taskData = kwikidToolkit.mergeObjects(this.taskData, (_k = {},
-                              _k[action.props.formApiKey] = apiConfig.response.value,
-                              _k));
+                          apiConfig = _p.sent();
+                          this.taskData = kwikidToolkit.mergeObjects(this.taskData, (_o = {},
+                              _o[action.props.formApiKey] = apiConfig.response.value,
+                              _o));
                           this.waitingForChanges = false;
                           this.hideApiLoader();
                           return [2 /*return*/];
@@ -6743,8 +6781,8 @@
       KwikIDFormViewComponent.prototype.taskMultipleApiCalls = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var multipleApiConfig, entrypointApiKey_1, endpoints, nextApiIndex, apiConfig, response, apis;
-              return __generator(this, function (_k) {
-                  switch (_k.label) {
+              return __generator(this, function (_o) {
+                  switch (_o.label) {
                       case 0:
                           this.showApiLoader();
                           multipleApiConfig = this.formConfig.apis[action.props.formApiKey];
@@ -6755,7 +6793,7 @@
                           apiConfig = endpoints[nextApiIndex];
                           return [4 /*yield*/, this.handleApiCall(apiConfig)];
                       case 1:
-                          response = _k.sent();
+                          response = _o.sent();
                           multipleApiConfig.endpoints[nextApiIndex] = response.api;
                           this.formConfig = kwikidToolkit.setValueToObjectPath(this.formConfig, "apis." + action.props.formApiKey, multipleApiConfig);
                           this.hideApiLoader();
@@ -6772,8 +6810,8 @@
                           }, this.takeAction.bind(this));
                           return [4 /*yield*/, apis.callNextApi(multipleApiConfig.entrypoint)];
                       case 3:
-                          _k.sent();
-                          _k.label = 4;
+                          _o.sent();
+                          _o.label = 4;
                       case 4: return [2 /*return*/];
                   }
               });
@@ -6782,15 +6820,15 @@
       KwikIDFormViewComponent.prototype.taskMultipleApiCallsEnd = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
               var multipleApiConfig, multipleApiCallResponses;
-              var _k;
-              return __generator(this, function (_l) {
+              var _o;
+              return __generator(this, function (_p) {
                   multipleApiConfig = this.formConfig.apis[action.props.formApiKey];
                   multipleApiCallResponses = {};
                   multipleApiConfig.endpoints.map(function (api) {
                       if (kwikidToolkit.checkObjectKeyExists(api.response, "value"))
                           multipleApiCallResponses = kwikidToolkit.setValueToObjectPath(multipleApiCallResponses, "" + api.apiKey, api.response.value);
                   });
-                  this.taskData = Object.assign(Object.assign({}, this.taskData), (_k = {}, _k[action.props.formApiKey] = multipleApiCallResponses, _k));
+                  this.taskData = Object.assign(Object.assign({}, this.taskData), (_o = {}, _o[action.props.formApiKey] = multipleApiCallResponses, _o));
                   this.waitingForChanges = false;
                   this.hideApiLoader();
                   return [2 /*return*/];
@@ -6972,7 +7010,7 @@
       };
       KwikIDFormViewComponent.prototype.takeActionOnFieldGroup = function (action, object) {
           return __awaiter(this, void 0, void 0, function () {
-              return __generator(this, function (_k) {
+              return __generator(this, function (_o) {
                   switch (action.key) {
                       case EActionKey.FIELD_GROUP_HIDE:
                           this.fieldGroupHide(action.props.groupKey);
@@ -6996,12 +7034,12 @@
       KwikIDFormViewComponent.prototype.takeAction = function (action, object) {
           var _a, _b, _c, _d, _e, _f;
           return __awaiter(this, void 0, void 0, function () {
-              var _k, fieldErrorShow_Source, fieldErrorShowSourceValue, fieldErrorHide_Source, fieldErrorHideSourceValue, redirectToUrl_Source, redirectToUrlSourceValue, previewErrorShow_Source, previewErrorShowSourceValue;
-              return __generator(this, function (_l) {
-                  switch (_l.label) {
+              var _o, fieldErrorShow_Source, fieldErrorShowSourceValue, fieldErrorHide_Source, fieldErrorHideSourceValue, redirectToUrl_Source, redirectToUrlSourceValue, previewErrorShow_Source, previewErrorShowSourceValue;
+              return __generator(this, function (_p) {
+                  switch (_p.label) {
                       case 0:
-                          _k = action.key;
-                          switch (_k) {
+                          _o = action.key;
+                          switch (_o) {
                               case EActionKey.FIELD_HIDE: return [3 /*break*/, 1];
                               case EActionKey.FIELD_SHOW: return [3 /*break*/, 2];
                               case EActionKey.FIELD_DISABLE: return [3 /*break*/, 3];
@@ -7062,7 +7100,7 @@
                           fieldErrorShow_Source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, fieldErrorShow_Source.getValueFromSource(action.props.message.source)];
                       case 7:
-                          fieldErrorShowSourceValue = _l.sent();
+                          fieldErrorShowSourceValue = _p.sent();
                           if (typeof fieldErrorShowSourceValue == "string" ||
                               typeof fieldErrorShowSourceValue == "number") {
                               fieldErrorShowSourceValue = String(fieldErrorShowSourceValue);
@@ -7071,7 +7109,7 @@
                               fieldErrorShowSourceValue = "";
                           }
                           action = kwikidToolkit.setValueToObjectPath(action, "props.message.message", fieldErrorShowSourceValue);
-                          _l.label = 8;
+                          _p.label = 8;
                       case 8:
                           action.props.message.message = updateLanguage(action.props.message.message, getLanguage());
                           this.fieldErrorShow(action.props.fieldKey, action.props.message);
@@ -7081,7 +7119,7 @@
                           fieldErrorHide_Source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, fieldErrorHide_Source.getValueFromSource(action.props.message.source)];
                       case 10:
-                          fieldErrorHideSourceValue = _l.sent();
+                          fieldErrorHideSourceValue = _p.sent();
                           if (typeof fieldErrorHideSourceValue == "string" ||
                               typeof fieldErrorHideSourceValue == "number") {
                               fieldErrorHideSourceValue = String(fieldErrorHideSourceValue);
@@ -7090,7 +7128,7 @@
                               fieldErrorHideSourceValue = "";
                           }
                           action = kwikidToolkit.setValueToObjectPath(action, "props.message.message", fieldErrorHideSourceValue);
-                          _l.label = 11;
+                          _p.label = 11;
                       case 11:
                           this.fieldErrorHide(action.props.fieldKey, action.props.message);
                           return [3 /*break*/, 63];
@@ -7102,81 +7140,81 @@
                           return [3 /*break*/, 63];
                       case 14: return [4 /*yield*/, this.setValue(action, object)];
                       case 15:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 16: return [4 /*yield*/, this.setFieldDefaultValue(action, object)];
                       case 17:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 18: return [4 /*yield*/, this.setApiStatus(action, object)];
                       case 19:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 20: return [4 /*yield*/, this.setApiHeaderValue(action, object)];
                       case 21:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 22: return [4 /*yield*/, this.setApiHeaderValidity(action, object)];
                       case 23:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 24: return [4 /*yield*/, this.setApiBodyValue(action, object)];
                       case 25:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 26: return [4 /*yield*/, this.setApiBodyValidity(action, object)];
                       case 27:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 28: return [4 /*yield*/, this.setDropdownOptions(action, object)];
                       case 29:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 30: return [4 /*yield*/, this.setFieldValidity(action, object)];
                       case 31:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 32:
                           this.handleConnectedElements({ key: action.props.fieldKey }, "ON_ACTION");
                           return [3 /*break*/, 63];
                       case 33: return [4 /*yield*/, this.fieldApiCall(action, object)];
                       case 34:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 35: return [4 /*yield*/, this.fieldMultipleApiCalls(action, object)];
                       case 36:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 37: return [4 /*yield*/, this.fieldMultipleApiCallsEnd(action, object)];
                       case 38:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 39: return [4 /*yield*/, this.taskApiCall(action, object)];
                       case 40:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 41: return [4 /*yield*/, this.taskMultipleApiCalls(action, object)];
                       case 42:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 43: return [4 /*yield*/, this.taskMultipleApiCallsEnd(action, object)];
                       case 44:
-                          _l.sent();
+                          _p.sent();
                           return [3 /*break*/, 63];
                       case 45:
                           if (!kwikidToolkit.checkObjectKeyExists(action.props.url, "source")) return [3 /*break*/, 47];
                           redirectToUrl_Source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, redirectToUrl_Source.getValueFromSource(action.props.url.source)];
                       case 46:
-                          redirectToUrlSourceValue = _l.sent();
+                          redirectToUrlSourceValue = _p.sent();
                           if (kwikidToolkit.isEmptyString(redirectToUrlSourceValue)) {
                               redirectToUrlSourceValue = "";
                           }
                           action = kwikidToolkit.setValueToObjectPath(action, "props.url.url", redirectToUrlSourceValue);
-                          _l.label = 47;
+                          _p.label = 47;
                       case 47:
                           this.redirectToUrl(action);
-                          _l.label = 48;
+                          _p.label = 48;
                       case 48:
                           this.showPreview(action.props);
                           return [3 /*break*/, 63];
@@ -7185,7 +7223,7 @@
                           previewErrorShow_Source = new kwikidToolkit.Source(object);
                           return [4 /*yield*/, previewErrorShow_Source.getValueFromSource(action.props.message.source)];
                       case 50:
-                          previewErrorShowSourceValue = _l.sent();
+                          previewErrorShowSourceValue = _p.sent();
                           if (typeof previewErrorShowSourceValue == "string" ||
                               typeof previewErrorShowSourceValue == "number") {
                               previewErrorShowSourceValue = String(previewErrorShowSourceValue);
@@ -7194,7 +7232,7 @@
                               previewErrorShowSourceValue = "";
                           }
                           action = kwikidToolkit.setValueToObjectPath(action, "props.message.message", previewErrorShowSourceValue);
-                          _l.label = 51;
+                          _p.label = 51;
                       case 51:
                           this.showErrorPreview(action.props);
                           return [3 /*break*/, 63];