@openmrs/ngx-formentry 3.1.2-pre.183 → 3.1.2-pre.189

package/bundles/openmrs-ngx-formentry.umd.js

@@ -1358,7 +1358,9 @@
         });
         AfeFormControl.prototype.disable = function (param) {
             _super.prototype.disable.call(this, param);
-            _super.prototype.setValue.call(this, '');
+            if (this.disablers.some(function (disabler) { return disabler.resetValueOnDisable === true; })) {
+                _super.prototype.setValue.call(this, '');
+            }
         };
         AfeFormControl.prototype.hide = function () {
             this.hiderHelper.hideControl(this);
@@ -1445,7 +1447,9 @@
         };
         AfeFormGroup.prototype.disable = function (param) {
             _super.prototype.disable.call(this, param);
-            _super.prototype.setValue.call(this, {});
+            if (this.disablers.some(function (disabler) { return disabler.resetValueOnDisable === true; })) {
+                _super.prototype.setValue.call(this, {});
+            }
         };
         AfeFormGroup.prototype.setHidingFn = function (newHider) {
             this.hiderHelper.setHiderForControl(this, newHider);
@@ -1524,7 +1528,9 @@
         };
         AfeFormArray.prototype.disable = function (param) {
             _super.prototype.disable.call(this, param);
-            _super.prototype.setValue.call(this, []);
+            if (this.disablers.some(function (disabler) { return disabler.resetValueOnDisable === true; })) {
+                _super.prototype.setValue.call(this, []);
+            }
         };
         AfeFormArray.prototype.setHidingFn = function (newHider) {
             this.hiderHelper.setHiderForControl(this, newHider);
@@ -2267,7 +2273,11 @@
                 if (control.hidden) {
                     return null;
                 }
-                if (control.value && control.value.length !== 0) {
+                // Case 1: control.value is a number
+                // all the numbers should be passed for validation
+                // Case 2: control.value is not a number:
+                // if its empty string or null or undefined it will return false else it will pass through for validation
+                if (typeof control.value === 'number' || control.value) {
                     var v = control.value;
                     return v >= min
                         ? null
@@ -2287,7 +2297,11 @@
                 if (control.hidden) {
                     return null;
                 }
-                if (control.value && control.value.length !== 0) {
+                // Case 1: control.value is a number
+                // all the numbers should be passed for validation
+                // Case 2: control.value is not a number:
+                // if its empty string or null or undefined it will return false else it will pass through for validation
+                if (typeof control.value === 'number' || control.value) {
                     var v = control.value;
                     return v <= max
                         ? null
@@ -2642,6 +2656,7 @@
             var disabler = {
                 toDisable: false,
                 disableWhenExpression: question.disable,
+                resetValueOnDisable: question.resetValueOnDisable,
                 reEvaluateDisablingExpression: function () {
                     var result = runnable.run();
                     disabler.toDisable = result;
@@ -10210,7 +10225,9 @@
             }
         };
         FormRendererComponent.prototype.hasErrors = function () {
-            return this.node.control.touched && !this.node.control.valid;
+            return (this.node.control.touched &&
+                !this.node.control.valid &&
+                this.node.control.disablers.length === 0);
         };
         FormRendererComponent.prototype.errors = function () {
             return this.getErrors(this.node);
@@ -13555,7 +13572,8 @@
             question.renderingType = 'remote-select';
             question.validators = this.addValidators(schemaQuestion);
             question.extras = schemaQuestion;
-            question.dataSource = schemaQuestion.questionOptions.dataSource || 'diagnoses';
+            question.dataSource =
+                schemaQuestion.questionOptions.dataSource || 'diagnoses';
             var mappings = {
                 label: 'label',
                 required: 'required',
@@ -13847,6 +13865,14 @@
             if (typeof schemaQuestion.disable === 'object') {
                 question.disable = schemaQuestion.disable.disableWhenExpression;
             }
+            if (schemaQuestion.disable) {
+                //if resetValueOnDisable doesn't exist on the config or no value is provided the default value will be passed (true)
+                question.resetValueOnDisable =
+                    !schemaQuestion.hasOwnProperty('resetValueOnDisable') ||
+                        this.isEmpty(schemaQuestion.resetValueOnDisable)
+                        ? true
+                        : schemaQuestion.resetValueOnDisable;
+            }
             if (!!schemaQuestion.hide) {
                 question.hide = schemaQuestion.hide;
             }
@@ -13867,6 +13893,12 @@
             }
             return '_' + s;
         };
+        QuestionFactory.prototype.isEmpty = function (value) {
+            if (value === '' || value === null || value === undefined) {
+                return true;
+            }
+            return false;
+        };
         return QuestionFactory;
     }());
     QuestionFactory.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.17", ngImport: i0__namespace, type: QuestionFactory, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });