@mtna/web-form-angular 1.0.6-SNAPSHOT.3 → 1.0.6-SNAPSHOT.5

package/bundles/mtna-web-form-angular.umd.js

@@ -3264,8 +3264,6 @@
       return coreTs.isType(something, 'className') && something.className === 'FormStep';
   }
 
-  var MTNA_WF_API_TOKEN = new i0.InjectionToken('mtnaWfApiConfig');
-
   var CUSTOM_MAT_DATE_FORMAT = {
       parse: {
           dateInput: 'YYYY/MM/DD',
@@ -6020,20 +6018,24 @@
                   }]
           }] });
 
-  var MtnaWfApiService = /** @class */ (function () {
-      function MtnaWfApiService(apiConfig, http) {
-          this.apiConfig = apiConfig;
-          this.http = http;
-          this.API_URL = "" + this.apiConfig.baseUrl;
-          this.FORM_URL = this.API_URL + "/form";
-          this.TEMPLATE_URL = this.API_URL + "/template";
-          this.NEW_TEMPLATE_URL = this.TEMPLATE_URL + "/new";
-          this.NEW_SECTION_URL = this.TEMPLATE_URL + "/section";
-          this.ITEMS_URL = this.TEMPLATE_URL + "/items";
-          this.ITEM_INSTANCE_URL = this.TEMPLATE_URL + "/item";
-          this.TEMPLATE_SAVE_URL = this.TEMPLATE_URL + "/save";
-          this.TEMPLATE_DELETE_URL = this.TEMPLATE_URL + "/delete";
-          this.ALL_TEMPLATES_URL = this.API_URL + "/templates";
+  var MtnaWfApiService = /** @class */ (function (_super) {
+      __extends(MtnaWfApiService, _super);
+      function MtnaWfApiService(apiConfig, http, logger) {
+          var _this = _super.call(this, apiConfig, http, logger) || this;
+          _this.apiConfig = apiConfig;
+          _this.http = http;
+          _this.logger = logger;
+          _this.API_URL = "" + _this.BASE_URL;
+          _this.FORM_URL = _this.API_URL + "/form";
+          _this.TEMPLATE_URL = _this.API_URL + "/template";
+          _this.NEW_TEMPLATE_URL = _this.TEMPLATE_URL + "/new";
+          _this.NEW_SECTION_URL = _this.TEMPLATE_URL + "/section";
+          _this.ITEMS_URL = _this.TEMPLATE_URL + "/items";
+          _this.ITEM_INSTANCE_URL = _this.TEMPLATE_URL + "/item";
+          _this.TEMPLATE_SAVE_URL = _this.TEMPLATE_URL + "/save";
+          _this.TEMPLATE_DELETE_URL = _this.TEMPLATE_URL + "/delete";
+          _this.ALL_TEMPLATES_URL = _this.API_URL + "/templates";
+          return _this;
       }
       /**
        * Download a web form
@@ -6048,8 +6050,8 @@
        * @param formInstanceId template ID of the mtna form
        * @param itemId repeatableTemplateId of the requesting RepeatableItem
        */
-      MtnaWfApiService.prototype.getRepeatableItem = function (formInstanceId, itemId) {
-          return this.http.get(this.FORM_URL + "/" + formInstanceId + "/new/item/" + itemId);
+      MtnaWfApiService.prototype.getRepeatableItem = function (templateId, itemTemplateId) {
+          return this.http.get(this.FORM_URL + "/" + templateId + "/item/" + itemTemplateId);
       };
       MtnaWfApiService.prototype.getNewTemplate = function () {
           return this.http.get(this.NEW_TEMPLATE_URL);
@@ -6079,8 +6081,8 @@
           return this.http.post(this.ITEM_INSTANCE_URL + "/convert", templateItem);
       };
       return MtnaWfApiService;
-  }());
-  MtnaWfApiService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaWfApiService, deps: [{ token: MTNA_WF_API_TOKEN }, { token: i1__namespace$3.HttpClient }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+  }(i1$2.BaseUrlService));
+  MtnaWfApiService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaWfApiService, deps: [{ token: i1$2.MTNA_API_CONFIG }, { token: i1__namespace$3.HttpClient }, { token: i1__namespace$1.MtnaLogger }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
   MtnaWfApiService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaWfApiService, providedIn: 'root' });
   i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaWfApiService, decorators: [{
               type: i0.Injectable,
@@ -6088,8 +6090,8 @@
           }], ctorParameters: function () {
           return [{ type: undefined, decorators: [{
                           type: i0.Inject,
-                          args: [MTNA_WF_API_TOKEN]
-                      }] }, { type: i1__namespace$3.HttpClient }];
+                          args: [i1$2.MTNA_API_CONFIG]
+                      }] }, { type: i1__namespace$3.HttpClient }, { type: i1__namespace$1.MtnaLogger }];
       } });
 
   /**
@@ -6376,7 +6378,7 @@
           }
           else {
               this.apiService
-                  .getRepeatableItem(this._mtnaForm.instanceId, change.id)
+                  .getRepeatableItem(this._mtnaForm.templateId, change.templateId)
                   .pipe(operators.take(1))
                   .subscribe(function (newItem) {
                   var newFormControl = _this.serializeMtnaFormItem(newItem);
@@ -6464,18 +6466,18 @@
           if (!!this.itemToggleQue && !!this.itemToggleQue.length) {
               // The form needs time to rerender, so we push this loop to the end of the stack
               setTimeout(function () {
-                  var e_1, _b;
+                  var e_1, _c;
                   if (_this.itemToggleQue) {
                       try {
-                          for (var _c = __values(_this.itemToggleQue), _d = _c.next(); !_d.done; _d = _c.next()) {
-                              var change = _d.value;
+                          for (var _d = __values(_this.itemToggleQue), _e = _d.next(); !_e.done; _e = _d.next()) {
+                              var change = _e.value;
                               _this.uiService.toggleFormItems(change.enabledItems, change.disabledItems, !!change.enable, change.enablerId, true);
                           }
                       }
                       catch (e_1_1) { e_1 = { error: e_1_1 }; }
                       finally {
                           try {
-                              if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                              if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
                           }
                           finally { if (e_1) throw e_1.error; }
                       }
@@ -6633,15 +6635,16 @@
        * @param change The change that recently occurred in the mtnaForm
        */
       MtnaWfManagerService.prototype._modifyFormItemConditions = function (form, change) {
-          var e_2, _b;
+          var e_2, _c;
+          var _a, _b;
           var newForm = form;
           if (change.conditionChanges) {
               var formItems = {};
               var _loop_1 = function (cc) {
-                  var e_3, _e;
+                  var e_3, _f;
                   try {
-                      for (var _f = (e_3 = void 0, __values(__spreadArray(__spreadArray([], __read(cc.enabledItems)), __read(cc.disabledItems)))), _g = _f.next(); !_g.done; _g = _f.next()) {
-                          var toggledId = _g.value;
+                      for (var _g = (e_3 = void 0, __values(__spreadArray(__spreadArray([], __read(cc.enabledItems)), __read(cc.disabledItems)))), _h = _g.next(); !_h.done; _h = _g.next()) {
+                          var toggledId = _h.value;
                           var formItem = formItems[toggledId];
                           var formItemComponent = this_1.uiService.getItem(toggledId);
                           if (!formItem && (formItemComponent === null || formItemComponent === void 0 ? void 0 : formItemComponent.item)) {
@@ -6652,7 +6655,8 @@
                               var itemIds = change.actionType === 'ADD'
                                   ? __spreadArray(__spreadArray([], __read(itemConditionItemIds)), [cc.enablerId]) : itemConditionItemIds.filter(function (i) { return i !== cc.enablerId; });
                               var newItem = Object.assign(Object.assign({}, formItem), { condition: Object.assign(Object.assign({}, formItem.condition), { itemIds: itemIds }) });
-                              var newChange = new webFormTs.MtnaWfFormItemChange(newItem.instanceId, (formItemComponent === null || formItemComponent === void 0 ? void 0 : formItemComponent.parentIds) || [], 'REPLACE');
+                              var templateId = (_b = (_a = formItem) === null || _a === void 0 ? void 0 : _a.templateId) !== null && _b !== void 0 ? _b : newItem.instanceId;
+                              var newChange = new webFormTs.MtnaWfFormItemChange(newItem.instanceId, templateId, (formItemComponent === null || formItemComponent === void 0 ? void 0 : formItemComponent.parentIds) || [], 'REPLACE');
                               newForm = this_1._modifyFormItem(newForm, newChange, newItem);
                               formItems[toggledId] = newItem;
                           }
@@ -6661,7 +6665,7 @@
                   catch (e_3_1) { e_3 = { error: e_3_1 }; }
                   finally {
                       try {
-                          if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                          if (_h && !_h.done && (_f = _g.return)) _f.call(_g);
                       }
                       finally { if (e_3) throw e_3.error; }
                   }
@@ -6671,15 +6675,15 @@
               };
               var this_1 = this;
               try {
-                  for (var _c = __values(change.conditionChanges), _d = _c.next(); !_d.done; _d = _c.next()) {
-                      var cc = _d.value;
+                  for (var _d = __values(change.conditionChanges), _e = _d.next(); !_e.done; _e = _d.next()) {
+                      var cc = _e.value;
                       _loop_1(cc);
                   }
               }
               catch (e_2_1) { e_2 = { error: e_2_1 }; }
               finally {
                   try {
-                      if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                      if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
                   }
                   finally { if (e_2) throw e_2.error; }
               }
@@ -6692,7 +6696,7 @@
        * @param idMap map of the item's internal instanceIds
        */
       MtnaWfManagerService.prototype._buildInternalIdsMap = function (item, idMap) {
-          var e_4, _b;
+          var e_4, _c;
           idMap[item.instanceId] = true;
           if (coreTs.isType(item, 'items')) {
               var items = item.items;
@@ -6705,7 +6709,7 @@
               catch (e_4_1) { e_4 = { error: e_4_1 }; }
               finally {
                   try {
-                      if (items_1_1 && !items_1_1.done && (_b = items_1.return)) _b.call(items_1);
+                      if (items_1_1 && !items_1_1.done && (_c = items_1.return)) _c.call(items_1);
                   }
                   finally { if (e_4) throw e_4.error; }
               }
@@ -6727,7 +6731,7 @@
        * @param action Whether the item was added or removed
        */
       MtnaWfManagerService.prototype._buildConditionChangeArray = function (item, changes, internalIdMap, action) {
-          var e_5, _b, e_6, _c;
+          var e_5, _c, e_6, _d;
           if (webFormTs.isOptionItemImpl(item)) {
               var enable = !!action && action === 'ADD' ? item.option.selected || item.value === item.option.option.id : false;
               this._pushConditionToArray(item.instanceId, item.option.enabledItems, item.option.disabledItems, changes, internalIdMap, enable);
@@ -6740,15 +6744,15 @@
               };
               var this_2 = this;
               try {
-                  for (var _d = __values(item.options), _e = _d.next(); !_e.done; _e = _d.next()) {
-                      var option = _e.value;
+                  for (var _e = __values(item.options), _f = _e.next(); !_f.done; _f = _e.next()) {
+                      var option = _f.value;
                       _loop_2(option);
                   }
               }
               catch (e_5_1) { e_5 = { error: e_5_1 }; }
               finally {
                   try {
-                      if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
+                      if (_f && !_f.done && (_c = _e.return)) _c.call(_e);
                   }
                   finally { if (e_5) throw e_5.error; }
               }
@@ -6765,7 +6769,7 @@
               catch (e_6_1) { e_6 = { error: e_6_1 }; }
               finally {
                   try {
-                      if (items_2_1 && !items_2_1.done && (_c = items_2.return)) _c.call(items_2);
+                      if (items_2_1 && !items_2_1.done && (_d = items_2.return)) _d.call(items_2);
                   }
                   finally { if (e_6) throw e_6.error; }
               }
@@ -6823,7 +6827,7 @@
        * Revalidate form controls that previously had errors or have new errors now.
        */
       MtnaWfManagerService.prototype._updateServerSideErrors = function () {
-          var e_7, _b, e_8, _c;
+          var e_7, _c, e_8, _d;
           var _a;
           // Keep track of IDs for each control that needs to be revalidated
           var controlIdsToRevalidate = new Set();
@@ -6839,8 +6843,8 @@
           this._formItemValidationResults = {};
           if ((_a = this._mtnaForm) === null || _a === void 0 ? void 0 : _a.validationResult) {
               try {
-                  for (var _d = __values(this._mtnaForm.validationResult.formItemValidationResults), _e = _d.next(); !_e.done; _e = _d.next()) {
-                      var result = _e.value;
+                  for (var _e = __values(this._mtnaForm.validationResult.formItemValidationResults), _f = _e.next(); !_f.done; _f = _e.next()) {
+                      var result = _f.value;
                       if (result.validationStatus === 'ERRORS') {
                           // Store errors so that the validationResultValidator can validate each control
                           this._formItemValidationResults[result.id] = result;
@@ -6852,7 +6856,7 @@
               catch (e_7_1) { e_7 = { error: e_7_1 }; }
               finally {
                   try {
-                      if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
+                      if (_f && !_f.done && (_c = _e.return)) _c.call(_e);
                   }
                   finally { if (e_7) throw e_7.error; }
               }
@@ -6872,7 +6876,7 @@
               catch (e_8_1) { e_8 = { error: e_8_1 }; }
               finally {
                   try {
-                      if (controlIdsToRevalidate_1_1 && !controlIdsToRevalidate_1_1.done && (_c = controlIdsToRevalidate_1.return)) _c.call(controlIdsToRevalidate_1);
+                      if (controlIdsToRevalidate_1_1 && !controlIdsToRevalidate_1_1.done && (_d = controlIdsToRevalidate_1.return)) _d.call(controlIdsToRevalidate_1);
                   }
                   finally { if (e_8) throw e_8.error; }
               }
@@ -6912,11 +6916,15 @@
               type: i0.Injectable
           }] });
 
-  var MtnaTemplateTransformationService = /** @class */ (function () {
-      function MtnaTemplateTransformationService(apiConfig, http) {
-          this.apiConfig = apiConfig;
-          this.http = http;
-          this.API_URL = this.apiConfig.baseUrl + "/api";
+  var MtnaTemplateTransformationService = /** @class */ (function (_super) {
+      __extends(MtnaTemplateTransformationService, _super);
+      function MtnaTemplateTransformationService(apiConfig, http, logger) {
+          var _this = _super.call(this, apiConfig, http, logger) || this;
+          _this.apiConfig = apiConfig;
+          _this.http = http;
+          _this.logger = logger;
+          _this.API_URL = "" + _this.BASE_URL;
+          return _this;
       }
       MtnaTemplateTransformationService.prototype.convertTemplateToForm = function (request) {
           // return this.http.post<Form>(`${this.API_URL}/template/convert`, request);
@@ -6924,8 +6932,8 @@
           return rxjs.of(undefined);
       };
       return MtnaTemplateTransformationService;
-  }());
-  MtnaTemplateTransformationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaTemplateTransformationService, deps: [{ token: MTNA_WF_API_TOKEN }, { token: i1__namespace$3.HttpClient }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+  }(i1$2.BaseUrlService));
+  MtnaTemplateTransformationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaTemplateTransformationService, deps: [{ token: i1$2.MTNA_API_CONFIG }, { token: i1__namespace$3.HttpClient }, { token: i1__namespace$1.MtnaLogger }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
   MtnaTemplateTransformationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaTemplateTransformationService, providedIn: 'root' });
   i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: MtnaTemplateTransformationService, decorators: [{
               type: i0.Injectable,
@@ -6933,8 +6941,8 @@
           }], ctorParameters: function () {
           return [{ type: undefined, decorators: [{
                           type: i0.Inject,
-                          args: [MTNA_WF_API_TOKEN]
-                      }] }, { type: i1__namespace$3.HttpClient }];
+                          args: [i1$2.MTNA_API_CONFIG]
+                      }] }, { type: i1__namespace$3.HttpClient }, { type: i1__namespace$1.MtnaLogger }];
       } });
 
   var _BaseFormComponent = i1$2.mixinDestroyNotifier(/** @class */ (function () {
@@ -8791,11 +8799,11 @@
           return _this;
       }
       MtnaWfRepeatableItemContainerComponent.prototype.addItem = function () {
-          this.manager.changeMtnaFormItem(new webFormTs.MtnaWfFormItemChange(this.item.repeatableTemplateId, this.parentIds, 'ADD'));
+          this.manager.changeMtnaFormItem(new webFormTs.MtnaWfFormItemChange(this.item.repeatableTemplateId, this.item.repeatableTemplateId, this.parentIds, 'ADD'));
       };
       MtnaWfRepeatableItemContainerComponent.prototype.removeItem = function (item) {
           var conditionChanges = this.manager.generateConditionChangeArray(item, 'REMOVE');
-          this.manager.changeMtnaFormItem(new webFormTs.MtnaWfFormItemChange(item.instanceId, this.parentIds, 'REMOVE', conditionChanges));
+          this.manager.changeMtnaFormItem(new webFormTs.MtnaWfFormItemChange(item.instanceId, item.templateId, this.parentIds, 'REMOVE', conditionChanges));
       };
       return MtnaWfRepeatableItemContainerComponent;
   }(MtnaWfBaseParentValueItem));
@@ -12489,7 +12497,6 @@
   exports.I18nTextResponseItemTemplateMapper = I18nTextResponseItemTemplateMapper;
   exports.ISO_8601_DATE_DISPLAY_VALUE = ISO_8601_DATE_DISPLAY_VALUE;
   exports.LONG_DATE_DISPLAY_VALUE = LONG_DATE_DISPLAY_VALUE;
-  exports.MTNA_WF_API_TOKEN = MTNA_WF_API_TOKEN;
   exports.MTNA_WF_DEFAULT_YEAR_RANGE = MTNA_WF_DEFAULT_YEAR_RANGE;
   exports.MTNA_WF_EXPAND_COLLAPSE = MTNA_WF_EXPAND_COLLAPSE;
   exports.MTNA_WF_FORM_ITEM_VALIDATION_RESULT_ERROR_NAME = MTNA_WF_FORM_ITEM_VALIDATION_RESULT_ERROR_NAME;