@optimiser/common 1.0.382 → 1.0.384

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*/, 7];
+                                    if (!fieldSchema) return [3 /*break*/, 9];
                                     cityfield = void 0;
                                     if (fieldSchema.LookupObject == "City") {
                                         cityfield = updateObj[fldName];
@@ -1901,7 +1901,14 @@ function CheckDataBeforeAdd(updateObj, objectSchema, db) {
                                     if (fieldSchema.UIDataType == 'formula')
                                         delete updateObj[fldName];
                                     _c.label = 7;
-                                case 7: return [2 /*return*/];
+                                case 7: 
+                                // QPC-9020 for State and Country Field Server Side Validation
+                                return [4 /*yield*/, ValidateStateCountryField({ fieldSchema: fieldSchema, updateObj: updateObj, objectSchema: objectSchema, db: db, cityfield: cityfield })];
+                                case 8:
+                                    // QPC-9020 for State and Country Field Server Side Validation
+                                    _c.sent();
+                                    _c.label = 9;
+                                case 9: return [2 /*return*/];
                             }
                         });
                     };
@@ -1937,10 +1944,10 @@ function CheckDataBeforeUpdate(updateObj, objectData, objectSchema, db) {
                                 case 0:
                                     if (!(fldName == '_id')) return [3 /*break*/, 1];
                                     delete updateObj[fldName];
-                                    return [3 /*break*/, 5];
+                                    return [3 /*break*/, 7];
                                 case 1:
                                     fieldSchema = objectSchema.Fields.find(function (x) { return x.Name == fldName; });
-                                    if (!fieldSchema) return [3 /*break*/, 5];
+                                    if (!fieldSchema) return [3 /*break*/, 7];
                                     cityfield = void 0;
                                     if (fieldSchema.LookupObject == "City") {
                                         cityfield = updateObj[fldName];
@@ -1968,7 +1975,14 @@ function CheckDataBeforeUpdate(updateObj, objectData, objectSchema, db) {
                                 case 4:
                                     _c.sent();
                                     _c.label = 5;
-                                case 5: return [2 /*return*/];
+                                case 5: 
+                                // QPC-9020 for State and Country Field Server Side Validation
+                                return [4 /*yield*/, ValidateStateCountryField({ fieldSchema: fieldSchema, updateObj: updateObj, objectSchema: objectSchema, db: db, cityfield: cityfield })];
+                                case 6:
+                                    // QPC-9020 for State and Country Field Server Side Validation
+                                    _c.sent();
+                                    _c.label = 7;
+                                case 7: return [2 /*return*/];
                             }
                         });
                     };
@@ -4789,7 +4803,8 @@ function ValidateUserInput(options) {
                                     }
                                     field = schemaFields.find(function (x) { return x.Name == fieldName; });
                                     if (!field) return [3 /*break*/, 58];
-                                    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];
                                     }
@@ -5668,17 +5683,27 @@ function SyncTotalSlotRemaining(registrationID, db) {
     });
 }
 exports.SyncTotalSlotRemaining = SyncTotalSlotRemaining;
-function ValidateStateCountryField(fieldSchema, updateObj, fldName, objectSchema, db, cityfield) {
+/**
+ *
+ * @param param.fieldSchema  fieldSchema contain field related schema information
+ * @param param.updateObj updateObj contains the Updated Object data
+ * @param param.objectSchema objectSchema contains the ObjectSchema of the Object
+ * @param param.db database connection || Db
+ * @param param.cityfield cityfield contain the City Id
+ * @return return the updated State and Country field value based upon the City
+ */
+function ValidateStateCountryField(_a) {
+    var fieldSchema = _a.fieldSchema, updateObj = _a.updateObj, objectSchema = _a.objectSchema, db = _a.db, cityfield = _a.cityfield;
     return __awaiter(this, void 0, void 0, function () {
         var cityDocument, stateFieldSchema, countryFieldSchema, stateFieldSchema, countryFieldSchema;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 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();
+                    cityDocument = _b.sent();
                     if (cityDocument) {
                         stateFieldSchema = objectSchema.Fields.find(function (x) { return x.Name == fieldSchema.StateField; });
                         if (fieldSchema.StateField && ['add', 'edit', 'both'].includes(stateFieldSchema.DisableON)) {
@@ -5699,7 +5724,7 @@ function ValidateStateCountryField(fieldSchema, updateObj, fldName, objectSchema
                     if (fieldSchema.CountryField && ['add', 'edit', 'both'].includes(countryFieldSchema.DisableON)) {
                         updateObj[fieldSchema.CountryField] = null;
                     }
-                    _a.label = 3;
+                    _b.label = 3;
                 case 3: return [2 /*return*/];
             }
         });

package/dist/modals/utility.modal.d.ts

@@ -1,4 +1,4 @@
-import { ObjectId } from "mongodb";
+import { ObjectId, Db } from "mongodb";
 interface AnyObjectInterface {
     [key: string]: any;
 }
@@ -14,4 +14,11 @@ interface GetEncryptedURLOptions {
     fieldName: string;
     filterKey: string;
 }
-export { AnyObjectInterface, callBackInterface, GetEncryptedURLOptions };
+interface ValidateStateCountryOptions {
+    fieldSchema: AnyObjectInterface;
+    updateObj: AnyObjectInterface;
+    objectSchema: AnyObjectInterface;
+    db: Db;
+    cityfield: AnyObjectInterface;
+}
+export { AnyObjectInterface, callBackInterface, GetEncryptedURLOptions, ValidateStateCountryOptions };

package/package.json

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