@optimiser/common 1.0.320 → 1.0.322

package/dist/lib/event.js

@@ -69,7 +69,9 @@ var Event = /** @class */ (function () {
                                     }
                                     _a.label = 2;
                                 case 2:
-                                    if (userId && data.SocketObj && !data.SocketObj.userId) {
+                                    // if (userId && data.SocketObj && !data.SocketObj.userId) {
+                                    //QPC-7064, Ankush changes added    
+                                    if (userId && data.SocketObj && data.SocketObj.userId != userId) {
                                         data.SocketObj["userId"] = userId;
                                     }
                                     uniqueID = uuid_1.v4() + "-" + Math.floor(Math.random() * 100000000);

package/dist/lib/utility.js

@@ -1456,6 +1456,24 @@ function SyncUserInOtherCollection(options, db, callback, next) {
     }
 }
 exports.SyncUserInOtherCollection = SyncUserInOtherCollection;
+function GetObjectByString(o, s) {
+    s = s.replace(/\[(\w+)\]/g, '.$1'); // convert indexes to properties
+    s = s.replace(/^\./, ''); // strip a leading dot
+    var a = s.split('.');
+    for (var i = 0, n = a.length; i < n; ++i) {
+        var k = a[i];
+        if (k in o) {
+            if (o[k] != null)
+                o = o[k];
+            else
+                o = '';
+        }
+        else {
+            return '';
+        }
+    }
+    return o;
+}
 //Build _LookupDataField before save
 function BuildLookupDataField(fieldSchema, updateObj, db) {
     return new Promise(function (resolve, reject) {
@@ -1529,8 +1547,8 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                                         if (fieldSchema.ExcludeLookupFieldsOnSearch && fieldSchema.ExcludeLookupFieldsOnSearch.filter(function (x) { return x == fieldSchema.LookupFields[j]; }).length != 0) {
                                             return "continue";
                                         }
-                                        if (fldLookupData_1[fieldSchema.LookupFields[j]] != undefined)
-                                            result += fldLookupData_1[fieldSchema.LookupFields[j]].toString() + ' ';
+                                        if (GetObjectByString(fldLookupData_1, fieldSchema.LookupFields[j]) != undefined)
+                                            result += GetObjectByString(fldLookupData_1, fieldSchema.LookupFields[j]).toString() + ' ';
                                     };
                                     for (var j = 0; j < fieldSchema.LookupFields.length; j++) {
                                         _loop_10(j);
@@ -1573,8 +1591,8 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                                     var lookupRecord = data[i];
                                     if (fieldSchema.LookupFields != undefined) {
                                         for (var j = 0; j < fieldSchema.LookupFields.length; j++) {
-                                            if (lookupRecord[fieldSchema.LookupFields[j]] != undefined)
-                                                result += lookupRecord[fieldSchema.LookupFields[j]].toString() + ' ';
+                                            if (GetObjectByString(lookupRecord, fieldSchema.LookupFields[j]) != undefined)
+                                                result += GetObjectByString(lookupRecord, fieldSchema.LookupFields[j]).toString() + ' ';
                                         }
                                     }
                                 }
@@ -1599,8 +1617,8 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                                     var result = '';
                                     if (fieldSchema.LookupFields != undefined) {
                                         for (var j = 0; j < fieldSchema.LookupFields.length; j++) {
-                                            if (fldLookupData_1[fieldSchema.LookupFields[j]] != undefined)
-                                                result += fldLookupData_1[fieldSchema.LookupFields[j]].toString() + ' ';
+                                            if (GetObjectByString(fldLookupData_1, fieldSchema.LookupFields[j]) != undefined)
+                                                result += GetObjectByString(fldLookupData_1, fieldSchema.LookupFields[j]).toString() + ' ';
                                         }
                                     }
                                     updateObj[searchAlias_1] = result === null || result === void 0 ? void 0 : result.trim();
@@ -1652,8 +1670,8 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
                                         var lookupRecord = data[i];
                                         if (fieldSchema.LookupFields != undefined) {
                                             for (var j = 0; j < fieldSchema.LookupFields.length; j++) {
-                                                if (lookupRecord[fieldSchema.LookupFields[j]] != undefined)
-                                                    result += lookupRecord[fieldSchema.LookupFields[j]].toString() + ' ';
+                                                if (GetObjectByString(lookupRecord, fieldSchema.LookupFields[j]) != undefined)
+                                                    result += GetObjectByString(lookupRecord, fieldSchema.LookupFields[j]).toString() + ' ';
                                             }
                                         }
                                     }

package/package.json

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