@optimiser/common 1.0.381 → 1.0.383

package/dist/lib/utility.js

@@ -1860,7 +1860,7 @@ function CheckDataBeforeAdd(updateObj, objectSchema, db) {
                             switch (_c.label) {
                                 case 0:
                                     fieldSchema = objectSchema.Fields.find(function (x) { return x.Name == fldName; });
-                                    if (!fieldSchema) return [3 /*break*/, 9];
+                                    if (!fieldSchema) return [3 /*break*/, 7];
                                     cityfield = void 0;
                                     if (fieldSchema.LookupObject == "City") {
                                         cityfield = updateObj[fldName];
@@ -1901,14 +1901,7 @@ function CheckDataBeforeAdd(updateObj, objectSchema, db) {
                                     if (fieldSchema.UIDataType == 'formula')
                                         delete updateObj[fldName];
                                     _c.label = 7;
-                                case 7: 
-                                // QPC-9020 for State and Country Field Server Side Validation
-                                return [4 /*yield*/, ValidateStateCountryField(fieldSchema, updateObj, fldName, objectSchema, db, cityfield)];
-                                case 8:
-                                    // QPC-9020 for State and Country Field Server Side Validation
-                                    _c.sent();
-                                    _c.label = 9;
-                                case 9: return [2 /*return*/];
+                                case 7: return [2 /*return*/];
                             }
                         });
                     };
@@ -1944,10 +1937,10 @@ function CheckDataBeforeUpdate(updateObj, objectData, objectSchema, db) {
                                 case 0:
                                     if (!(fldName == '_id')) return [3 /*break*/, 1];
                                     delete updateObj[fldName];
-                                    return [3 /*break*/, 7];
+                                    return [3 /*break*/, 5];
                                 case 1:
                                     fieldSchema = objectSchema.Fields.find(function (x) { return x.Name == fldName; });
-                                    if (!fieldSchema) return [3 /*break*/, 7];
+                                    if (!fieldSchema) return [3 /*break*/, 5];
                                     cityfield = void 0;
                                     if (fieldSchema.LookupObject == "City") {
                                         cityfield = updateObj[fldName];
@@ -1975,14 +1968,7 @@ function CheckDataBeforeUpdate(updateObj, objectData, objectSchema, db) {
                                 case 4:
                                     _c.sent();
                                     _c.label = 5;
-                                case 5: 
-                                // QPC-9020 for State and Country Field Server Side Validation
-                                return [4 /*yield*/, ValidateStateCountryField(fieldSchema, updateObj, fldName, objectSchema, db, cityfield)];
-                                case 6:
-                                    // QPC-9020 for State and Country Field Server Side Validation
-                                    _c.sent();
-                                    _c.label = 7;
-                                case 7: return [2 /*return*/];
+                                case 5: return [2 /*return*/];
                             }
                         });
                     };
@@ -4803,13 +4789,14 @@ function ValidateUserInput(options) {
                                     }
                                     field = schemaFields.find(function (x) { return x.Name == fieldName; });
                                     if (!field) return [3 /*break*/, 58];
-                                    if (field.DisableValidateUserInput) {
-                                        return [2 /*return*/, "continue"];
-                                    }
-                                    if (IsStringValue(fieldData)) { //sanitizing Html
+                                    //sanitizing Html and added IgnoreSanitizeHtml condition so that it can be ignored for certain fields
+                                    if (!field.IgnoreSanitizeHtml && IsStringValue(fieldData)) {
                                         inputFields[fieldName] = (0, sanitize_html_1.default)(fieldData);
                                         fieldData = inputFields[fieldName];
                                     }
+                                    if (field.DisableValidateUserInput) {
+                                        return [2 /*return*/, "continue"];
+                                    }
                                     if ((field.UIDataType == 'date' || field.UIDataType == 'datetime') && IsStringValue(fieldData) && fieldData.trim() == '') {
                                         inputFields[fieldName] = null;
                                     }
@@ -5690,7 +5677,7 @@ function ValidateStateCountryField(fieldSchema, updateObj, fldName, objectSchema
                 case 0:
                     if (!((fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.LookupObject) === 'City')) return [3 /*break*/, 3];
                     if (!cityfield) return [3 /*break*/, 2];
-                    return [4 /*yield*/, db.collection('City').findOne({ _id: updateObj[fldName] })];
+                    return [4 /*yield*/, db.collection('City').findOne({ _id: cityfield })];
                 case 1:
                     cityDocument = _a.sent();
                     if (cityDocument) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.381",
+  "version": "1.0.383",
   "description": "",
   "main": "dist/index.js",
   "scripts": {