@churchillliving/se-ui-toolkit 6.53.63 → 6.53.68

package/bundles/churchillliving-se-ui-toolkit.umd.js

@@ -2735,7 +2735,6 @@
                     }
                     if (res) {
                         (_a = document.getElementById('lookUp_filter')) === null || _a === void 0 ? void 0 : _a.focus();
-                        localStorage.setItem('applyFilter', JSON.stringify(false));
                         var field = column.field;
                         var value = setDialogResponse(column, column === null || column === void 0 ? void 0 : column.lookupControl, res);
                         column.value = (value === null || value === void 0 ? void 0 : value.value) ? value.value : res[field.toLowerCase()];
@@ -4587,12 +4586,18 @@
         // check the validation of the field
         GridComponent.prototype.gridValidation = function (columns, row) {
             if (!this.gridService.checkValidity(columns, row)) {
+                var errorMessageDetails_1 = '';
+                columns === null || columns === void 0 ? void 0 : columns.forEach(function (column) {
+                    if (column.errorMessage) {
+                        errorMessageDetails_1 = errorMessageDetails_1 ? errorMessageDetails_1 + ' , ' + column.errorMessage : column.errorMessage;
+                    }
+                });
                 var isRequired = columns.some(function (column) { return column.errorMessage && !row[column.field]; });
                 if (isRequired) {
-                    this.alertService.error('Required fields are missing', 'REQUIRED FIELD');
+                    this.alertService.error(errorMessageDetails_1, 'REQUIRED FIELD');
                 }
                 else {
-                    this.alertService.error('Some fields are invalid', 'INVALID FIELD');
+                    this.alertService.error(errorMessageDetails_1, 'INVALID FIELD');
                 }
                 return false;
             }
@@ -5067,17 +5072,14 @@
         };
         GridComponent.prototype.setFilterFocusOut = function (col, filter, event) {
             var _this = this;
-            console.log('col:package ', col);
             this.gridFilterObj = { column: col, filter: filter, event: event };
-            console.log('gridFilterObj: package ', this.gridFilterObj);
             var newColumn = Object.assign({}, col);
-            console.log('newColumn: ', newColumn);
             //change filter calender format
             if (newColumn.type === 'date' && newColumn.value) {
                 newColumn.value = this.datePipe.transform(col.value.toString().trim(), 'yyyy-MM-dd');
             }
             setTimeout(function () {
-                _this.filterObj(col);
+                _this.filterObj(newColumn);
             }, newColumn.type === exports.EGridColumnType.LOOKUP_INPUT ? 250 : 0);
             localStorage.setItem('applyFilter', JSON.stringify(false));
         };
@@ -6454,15 +6456,22 @@
             var _this = this;
             var _a, _b, _c, _d, _e;
             var validity = true;
+            var errorMessageDetails = '';
             (_a = this.form.formSections) === null || _a === void 0 ? void 0 : _a.forEach(function (formSection) {
+                var _a;
                 if (formSection.fields) {
                     if (!_this.formService.checkValidity(formSection.fields)) {
+                        (_a = formSection.fields) === null || _a === void 0 ? void 0 : _a.forEach(function (formField) {
+                            if (formField.errorMessage) {
+                                errorMessageDetails = errorMessageDetails ? errorMessageDetails + " , " + formField.errorMessage : formField.errorMessage;
+                            }
+                        });
                         var field = formSection.fields.some(function (field) { return field.requiredField && field.errorMessage && !field.value; });
                         if (validity && field) {
-                            _this.alertService.error('Required fields are missing', 'REQUIRED FIELD');
+                            _this.alertService.error(errorMessageDetails, 'REQUIRED FIELD');
                         }
                         else {
-                            _this.alertService.error('Some fields are invalid', 'INVALID FIELD');
+                            _this.alertService.error(errorMessageDetails, 'INVALID FIELD');
                         }
                         validity = false;
                     }