@bnsights/bbsf-controls 1.0.51 → 1.0.52

package/bundles/bnsights-bbsf-controls.umd.js

@@ -4507,6 +4507,9 @@
             // this.group.addControl(this.options.Name, new FormControl(''));
             // this.TagInputControl = this.group.controls[this.options.Name]; //  new FormControl('',validationRules);
             this.TagsFormControl.setValue(this.options.Value);
+            if (this.options.IsRequired) {
+                this.validationRules.push(forms.Validators.required);
+            }
             if (this.options.CustomValidation.length > 0) {
                 var Validations = this.options.CustomValidation;
                 for (var index = 0; index < Validations.length; index++) {
@@ -4514,9 +4517,6 @@
                     this.validationRules.push(Validation.functionBody);
                 }
             }
-            if (this.options.IsRequired) {
-                this.validationRules.push(forms.Validators.required);
-            }
             this.TagsFormControl.setValidators(this.validationRules);
             this.TagsFormControl.setAsyncValidators(this.validationRulesasync);
             if (this.options.IsDisabled) {
@@ -4525,7 +4525,7 @@
             if (this.options.Value != undefined && this.options.Value != []) {
                 for (var index = 0; index < this.options.Value.length; index++) {
                     var element = this.options.Value[index];
-                    this.SelectedId.push(element.key);
+                    this.SelectedId.push(element.id);
                 }
                 this.tags = this.options.Value;
                 this.TagsFormControl.setValue(this.options.Value);
@@ -4559,7 +4559,7 @@
             this.controlUtility.CopyInputMessage(inputElement);
         };
         TagsInputComponent.prototype.searchFunctionFactory = function (Text) {
-            var Url = this.options.ActionURL + "?" + this.options.QueryParamName + "=" + Text + "&" + this.options.SelectedItemsParamName + "=" + this.SelectedId;
+            var Url = this.options.ActionURL + "?" + this.options.QueryParamName + "=" + encodeURIComponent(Text) + "&" + this.options.SelectedItemsParamName + "=" + this.SelectedId;
             if (this.options.ExtraFilters)
                 Url = Url + ("&" + this.options.ExtraFilters);
             var requestOptionsModel = new bbsfUtilities.RequestOptionsModel();
@@ -4569,7 +4569,7 @@
             return Model;
         };
         TagsInputComponent.prototype.AddTag = function (event, key) {
-            if (this.IsNoMatch == true && this.options.AllowNewSelection == false && (key.selected != null || key.selected != "")) {
+            if (this.IsNoMatch == true && this.options.AllowNewSelection == false && key.selected) {
                 this.TagsFormControl.setErrors({ "errorMassage": this.options.NoResultText });
                 this.TagsFormControl.markAsTouched();
                 this.TagsFormControl.invalid;
@@ -4581,28 +4581,39 @@
             }
             else if (this.IsNoMatch == true && event == "Enter" && this.options.AllowNewSelection && key.selected) {
                 if (!(this.tags.length >= this.options.MaxNumberTags)) {
-                    this.tags.push({ key: "", value: key.selected });
-                    key.selected = null;
+                    this.tags.push({ name: key.selected });
+                    this.group.get(this.options.Name).setValue(this.tags);
+                    this.group.get(this.options.Name).markAllAsTouched();
+                    this.group.updateValueAndValidity();
+                    if (this.group.get(this.options.Name).valid) {
+                        key.selected = null;
+                        return;
+                    }
+                    else
+                        this.tags.pop();
                 }
             }
         };
         TagsInputComponent.prototype.onTagsChanged = function (result) {
             //console.log(this.tags)
             if (result["change"] == "add") {
-                this.SelectedId.push(result.tag.key);
+                this.SelectedId.push(result.tag.id);
             }
             if (result["change"] == "remove") {
-                this.SelectedId = this.SelectedId.filter(function (item) { return item != result.tag.key; });
+                this.SelectedId = this.SelectedId.filter(function (item) { return item != result.tag.id; });
                 if (this.SelectedId.length == 0 && this.options.IsRequired == true) {
                     this.TagsFormControl.setErrors({ required: "" });
                     this.TagsFormControl.markAsTouched();
                     this.TagsFormControl.invalid;
                 }
             }
-            var originalValue = this.TagsFormControl.value.map(function (a) { return a.key; });
+            var originalValue = this.TagsFormControl.value.map(function (a) { return a.id; });
             if (this.options.PatchFunction && this.options.PatchPath && this.TagsFormControl.valid) {
                 this.controlUtility.patchControlValue(originalValue, this.options.PatchFunction, this.options.PatchPath);
             }
+            this.group.get(this.options.Name).setValue(this.tags);
+            this.TagsFormControl.updateValueAndValidity();
+            this.group.updateValueAndValidity();
             this.OnChange.emit(originalValue);
         };
         TagsInputComponent.prototype.onNoOptionsMatch = function (event) {
@@ -6129,12 +6140,11 @@
         //Modal confirmation submit function
         ConfirmationModalComponent.prototype.submit = function () {
             var _this = this;
-            console.log("options in submit function");
-            console.log(this.options);
             var submitModel = this.options.ServiceSubmitModel;
             var submittedService = this.options.ServiceSubmitFunction.apply(null, submitModel);
             submittedService.subscribe(function (result) {
-                _this.modalService.dismissAll();
+                if (!_this.options.DisableModalDismiss)
+                    _this.modalService.dismissAll();
                 if (!_this.options.DisableSuccessNotification) {
                     if (!_this.options.SuccessNotificationMessage)
                         _this.options.SuccessNotificationMessage = _this.utilityService.getResourceValue("DeletedSuccessfully");
@@ -8168,6 +8178,8 @@
             this.DisableSuccessNotification = false;
             //If ="true" disable notification after submission error
             this.DisableErrorNotification = false;
+            //If ="true" disable prevent modal from dismiss automatically 
+            this.DisableModalDismiss = false;
         }
         return ConfirmationModalOptions;
     }());