@optimiser/common 1.0.245 → 1.0.249

package/dist/lib/memoryserverclient.d.ts

@@ -7,6 +7,7 @@ declare class MemoryDBConnect {
     private host;
     private isConnected;
     private messages;
+    private memBuffObj;
     /**
      * @param masterConfig Master Connectivity Object
      * @param redisClient Redisclient

package/dist/lib/memoryserverclient.js

@@ -59,6 +59,42 @@ exports.MemoryDBConnect = void 0;
 //var net = require('net');
 var net = __importStar(require("net"));
 var crypto = __importStar(require("crypto"));
+var MessageBuffer = /** @class */ (function () {
+    function MessageBuffer(delimiter) {
+        this.delimiter = delimiter;
+        this.buffer = "";
+    }
+    MessageBuffer.prototype.isFinished = function () {
+        if (this.buffer.length === 0 ||
+            this.buffer.indexOf(this.delimiter) === -1) {
+            return true;
+        }
+        return false;
+    };
+    MessageBuffer.prototype.push = function (data) {
+        this.buffer += data;
+    };
+    MessageBuffer.prototype.getMessage = function () {
+        var delimiterIndex = this.buffer.indexOf(this.delimiter);
+        if (delimiterIndex !== -1) {
+            var message = this.buffer.slice(0, delimiterIndex);
+            this.buffer = this.buffer.replace(message + this.delimiter, "");
+            return message;
+        }
+        return null;
+    };
+    MessageBuffer.prototype.handleData = function () {
+        /**
+         * Try to accumulate the buffer with messages
+         *
+         * If the server isnt sending delimiters for some reason
+         * then nothing will ever come back for these requests
+         */
+        var message = this.getMessage();
+        return message;
+    };
+    return MessageBuffer;
+}());
 var MemoryDBConnect = /** @class */ (function () {
     /**
      * @param masterConfig Master Connectivity Object
@@ -71,6 +107,7 @@ var MemoryDBConnect = /** @class */ (function () {
         this.host = "";
         this.isConnected = false;
         this.messages = {};
+        this.memBuffObj = new MessageBuffer("##message_response##");
         this.portNo = portNumber;
         this.host = hostName;
         // this.Initialize().then(([error, result]) => {
@@ -97,12 +134,31 @@ var MemoryDBConnect = /** @class */ (function () {
                 }
             });
             _this.client.on('data', function (data) {
+                console.log("Data from MemServer", (data || "").toString());
                 //console.log("")
-                data = JSON.parse(data);
-                var message = _this.messages[data.id];
-                if (message) {
-                    delete _this.messages[data.id];
-                    message(data);
+                // let message = null;
+                try {
+                    // data = JSON.parse(data);
+                    // message = this.messages[data.id];
+                    // if (message) {
+                    //     delete this.messages[data.id];
+                    //     message(data);
+                    // }
+                    _this.memBuffObj.push(data);
+                    while (!_this.memBuffObj.isFinished()) {
+                        var message = _this.memBuffObj.handleData();
+                        // console.log(message);
+                        // console.log(JSON.parse(message))                      
+                        if (message) {
+                            message = JSON.parse(message);
+                            var messageCallbackFn = _this.messages[message.id];
+                            delete _this.messages[message.id];
+                            messageCallbackFn(message);
+                        }
+                    }
+                }
+                catch (error) {
+                    console.log("Error in parsing MemServer data", error);
                 }
             });
             _this.client.on('close', function () {
@@ -150,9 +206,9 @@ var MemoryDBConnect = /** @class */ (function () {
                         resolve([new Error("REQUEST_TIMEDOUT"), undefined]);
                         message_1.status = "-1";
                     }
-                }, 30000);
+                }, 60000);
                 if (_this.client && _this.isConnected) {
-                    _this.client.write(JSON.stringify(message_1));
+                    _this.client.write(JSON.stringify(message_1) + "##message##");
                 }
                 else {
                     //to avoid again resolve by set timeout

package/dist/lib/utility.d.ts

@@ -15,6 +15,7 @@ declare function GetPageFieldData(pageName: string, db: any, mdb: any, msp_d: an
 declare function GetPageObjectSchema(pageName: string, db: Db, next: NextFunction, callback: callBackInterface): void;
 declare function GetFieldDetail(objectName: string, fieldName: string, db: any, callback: callBackInterface, next: NextFunction): void;
 declare function UpdateRecentViewObject(objectName: string, objectID: ObjectID, userID: ObjectID, db: Db): void;
+declare function UpdateRecentViewFields(objectName: string, fieldID: string, userID: ObjectID, db: Db): void;
 declare function SyncChildObjectData(pageData: AnyObjectInterface, objectID: ObjectID, db: Db): Promise<void>;
 declare function SyncParentObjectData(pageData: AnyObjectInterface, objectID: ObjectID, db: Db): Promise<void>;
 /**
@@ -38,6 +39,12 @@ declare function FilterConditions(condition: AnyObjectInterface, match: AnyObjec
 declare function GirdHeaderFilters(filters: AnyObjectInterface, fields: AnyObjectInterface): {
     $and: AnyObjectInterface[];
 };
+declare function FieldsGridHeaderFilters(filters: AnyObjectInterface, fields: AnyObjectInterface): {
+    $and: AnyObjectInterface[];
+    lookupConditions: {
+        [x: number]: RegExp;
+    }[];
+};
 /** @desc:{
     objectName: It's a name of Collection.
     logAction: Add | Modify | Delete
@@ -198,4 +205,4 @@ declare function ValidateSanitizeUserInput(inputFields: AnyObjectInterface, page
  * @return N/A
  */
 declare function CreateBanquetingVATSettingsData(msp_d: AnyObjectInterface, db: Db, sdata: AnyObjectInterface, next: NextFunction): Promise<void>;
-export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, BuildLookupDataField, CheckDataBeforeAdd, CheckDataBeforeUpdate, BuildGridFieldProjection, BuildFieldProjection, BuildLookupFieldProjection, FilterConditions, GirdHeaderFilters, AddLog, CheckFilterFieldsProjection, VerifyEmailPassword, GetMyTeamUsers, ExtractChildUsersTree, GetMaxKeyValueListSchema, VerifyAWSEmailConfig, GenerateId, SyncUserDetailsWithMasterDB, SignoutUserFromAllDevices, SignoutUsersWithPromise, SignoutMultipleUsersFromAllDevices, UserLicenseConsumeCalculate, sendMailWithUserAccount, GetEmailClientConfigs, GetCompanyEncryptionKey, ExecuteDynamicDMLQuery, ExecuteDynamicDQLQuery, GetUserProfilePermissions, MakeUserPasswordInvalid, ConvertJsonToXLXS, SendResetPasswordMail, SendMailToSupport, MailTemplateStructure, SendMailToCustomer, parseMSPCookie, GetIPDetailsFromReq, isEmptyObj, SyncListSchemaFieldInOtherCollection, UpdateTagCountAfterDelete, SyncTagCountAfterUpdate, ReactivateFieldInOtherCollection, SyncUserLicenceConsumedCount, BroadCastEventToAllCompanyUsers, CheckDataPermission, SyncCompanyLicenceInMasterCompanyAfterAdd, NextServiceDateForDashboard, CheckDateNotInPast, GetWeekDayByDayAndOccurance, GetInterValFromOccurance, GetWeekDayInfoInMonth, GetDayIndex, RemoveFieldsFromFilters, GetUserProfile, CheckPageAuthentication, ErrorHandlerForServices, CheckCaptcha, ValidateSanitizeUserInput, CreateBanquetingVATSettingsData };
+export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, UpdateRecentViewFields, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, BuildLookupDataField, CheckDataBeforeAdd, CheckDataBeforeUpdate, BuildGridFieldProjection, BuildFieldProjection, BuildLookupFieldProjection, FilterConditions, GirdHeaderFilters, FieldsGridHeaderFilters, AddLog, CheckFilterFieldsProjection, VerifyEmailPassword, GetMyTeamUsers, ExtractChildUsersTree, GetMaxKeyValueListSchema, VerifyAWSEmailConfig, GenerateId, SyncUserDetailsWithMasterDB, SignoutUserFromAllDevices, SignoutUsersWithPromise, SignoutMultipleUsersFromAllDevices, UserLicenseConsumeCalculate, sendMailWithUserAccount, GetEmailClientConfigs, GetCompanyEncryptionKey, ExecuteDynamicDMLQuery, ExecuteDynamicDQLQuery, GetUserProfilePermissions, MakeUserPasswordInvalid, ConvertJsonToXLXS, SendResetPasswordMail, SendMailToSupport, MailTemplateStructure, SendMailToCustomer, parseMSPCookie, GetIPDetailsFromReq, isEmptyObj, SyncListSchemaFieldInOtherCollection, UpdateTagCountAfterDelete, SyncTagCountAfterUpdate, ReactivateFieldInOtherCollection, SyncUserLicenceConsumedCount, BroadCastEventToAllCompanyUsers, CheckDataPermission, SyncCompanyLicenceInMasterCompanyAfterAdd, NextServiceDateForDashboard, CheckDateNotInPast, GetWeekDayByDayAndOccurance, GetInterValFromOccurance, GetWeekDayInfoInMonth, GetDayIndex, RemoveFieldsFromFilters, GetUserProfile, CheckPageAuthentication, ErrorHandlerForServices, CheckCaptcha, ValidateSanitizeUserInput, CreateBanquetingVATSettingsData };

package/dist/lib/utility.js

@@ -80,7 +80,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateBanquetingVATSettingsData = exports.ValidateSanitizeUserInput = exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.CheckPageAuthentication = exports.GetUserProfile = exports.RemoveFieldsFromFilters = exports.GetDayIndex = exports.GetWeekDayInfoInMonth = exports.GetInterValFromOccurance = exports.GetWeekDayByDayAndOccurance = exports.CheckDateNotInPast = exports.NextServiceDateForDashboard = exports.SyncCompanyLicenceInMasterCompanyAfterAdd = exports.CheckDataPermission = exports.BroadCastEventToAllCompanyUsers = exports.SyncUserLicenceConsumedCount = exports.ReactivateFieldInOtherCollection = exports.SyncTagCountAfterUpdate = exports.UpdateTagCountAfterDelete = exports.SyncListSchemaFieldInOtherCollection = exports.isEmptyObj = exports.GetIPDetailsFromReq = exports.parseMSPCookie = exports.SendMailToCustomer = exports.MailTemplateStructure = exports.SendMailToSupport = exports.SendResetPasswordMail = exports.ConvertJsonToXLXS = exports.MakeUserPasswordInvalid = exports.GetUserProfilePermissions = exports.ExecuteDynamicDQLQuery = exports.ExecuteDynamicDMLQuery = exports.GetCompanyEncryptionKey = exports.GetEmailClientConfigs = exports.sendMailWithUserAccount = exports.UserLicenseConsumeCalculate = exports.SignoutMultipleUsersFromAllDevices = exports.SignoutUsersWithPromise = exports.SignoutUserFromAllDevices = exports.SyncUserDetailsWithMasterDB = exports.GenerateId = exports.VerifyAWSEmailConfig = exports.GetMaxKeyValueListSchema = exports.ExtractChildUsersTree = exports.GetMyTeamUsers = exports.VerifyEmailPassword = exports.CheckFilterFieldsProjection = exports.AddLog = exports.GirdHeaderFilters = exports.FilterConditions = exports.BuildLookupFieldProjection = exports.BuildFieldProjection = exports.BuildGridFieldProjection = exports.CheckDataBeforeUpdate = exports.CheckDataBeforeAdd = exports.BuildLookupDataField = exports.SyncUserInOtherCollection = exports.SyncFieldInOtherCollection = exports.SyncFieldInSameCollectionByObjectIDWithPromise = exports.SyncFieldInSameCollectionByObjectID = exports.SyncFieldInSameCollection = exports.DeleteFieldInOtherCollection = exports.SyncParentObjectData = exports.SyncChildObjectData = exports.UpdateRecentViewObject = exports.GetFieldDetail = exports.GetPageObjectSchema = exports.GetPageFieldData = exports.CheckUserProfileField = exports.IsEqualValue = exports.IsEqualArrays = exports.GetObjectByKeyValueFromList = exports.ConvertFileByteSize = exports.ReturnJsonResponse = exports.CheckForWhiteListedDomain = void 0;
+exports.CreateBanquetingVATSettingsData = exports.ValidateSanitizeUserInput = exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.CheckPageAuthentication = exports.GetUserProfile = exports.RemoveFieldsFromFilters = exports.GetDayIndex = exports.GetWeekDayInfoInMonth = exports.GetInterValFromOccurance = exports.GetWeekDayByDayAndOccurance = exports.CheckDateNotInPast = exports.NextServiceDateForDashboard = exports.SyncCompanyLicenceInMasterCompanyAfterAdd = exports.CheckDataPermission = exports.BroadCastEventToAllCompanyUsers = exports.SyncUserLicenceConsumedCount = exports.ReactivateFieldInOtherCollection = exports.SyncTagCountAfterUpdate = exports.UpdateTagCountAfterDelete = exports.SyncListSchemaFieldInOtherCollection = exports.isEmptyObj = exports.GetIPDetailsFromReq = exports.parseMSPCookie = exports.SendMailToCustomer = exports.MailTemplateStructure = exports.SendMailToSupport = exports.SendResetPasswordMail = exports.ConvertJsonToXLXS = exports.MakeUserPasswordInvalid = exports.GetUserProfilePermissions = exports.ExecuteDynamicDQLQuery = exports.ExecuteDynamicDMLQuery = exports.GetCompanyEncryptionKey = exports.GetEmailClientConfigs = exports.sendMailWithUserAccount = exports.UserLicenseConsumeCalculate = exports.SignoutMultipleUsersFromAllDevices = exports.SignoutUsersWithPromise = exports.SignoutUserFromAllDevices = exports.SyncUserDetailsWithMasterDB = exports.GenerateId = exports.VerifyAWSEmailConfig = exports.GetMaxKeyValueListSchema = exports.ExtractChildUsersTree = exports.GetMyTeamUsers = exports.VerifyEmailPassword = exports.CheckFilterFieldsProjection = exports.AddLog = exports.FieldsGridHeaderFilters = exports.GirdHeaderFilters = exports.FilterConditions = exports.BuildLookupFieldProjection = exports.BuildFieldProjection = exports.BuildGridFieldProjection = exports.CheckDataBeforeUpdate = exports.CheckDataBeforeAdd = exports.BuildLookupDataField = exports.SyncUserInOtherCollection = exports.SyncFieldInOtherCollection = exports.SyncFieldInSameCollectionByObjectIDWithPromise = exports.SyncFieldInSameCollectionByObjectID = exports.SyncFieldInSameCollection = exports.DeleteFieldInOtherCollection = exports.SyncParentObjectData = exports.SyncChildObjectData = exports.UpdateRecentViewFields = exports.UpdateRecentViewObject = exports.GetFieldDetail = exports.GetPageObjectSchema = exports.GetPageFieldData = exports.CheckUserProfileField = exports.IsEqualValue = exports.IsEqualArrays = exports.GetObjectByKeyValueFromList = exports.ConvertFileByteSize = exports.ReturnJsonResponse = exports.CheckForWhiteListedDomain = void 0;
 var moment_1 = __importDefault(require("moment"));
 var nodemailer_1 = __importDefault(require("nodemailer"));
 var mongodb_1 = require("mongodb");
@@ -206,7 +206,7 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                         else {
                             db.collection("ObjectSchema").findOne({ 'Name': pageData.ObjectName }, function (err, objectData) {
                                 return __awaiter(this, void 0, void 0, function () {
-                                    var removeFieldsFromFilter, j, filterData, _loop_2, i, createdByObj, modByObj, createdDateObj, modDateObj, g, group, childObjectSchema, _loop_3, i, _loop_4, i, idObject, idObject_1;
+                                    var removeFieldsFromFilter, j, filterData, _loop_2, i, createdByObj, createdDateObj, modByObj, modDateObj, g, group, childObjectSchema, _loop_3, i, _loop_4, i, idObject, idObject_1;
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
                                             case 0:
@@ -260,12 +260,26 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                                                         ]
                                                     }
                                                 };
+                                                createdDateObj = {
+                                                    Name: "CreatedDate",
+                                                    DisplayName: "Created Date",
+                                                    UniqueID: "CreatedDate",
+                                                    Sequence: 101,
+                                                    HideON: "both",
+                                                    Schema: {
+                                                        Name: "CreatedDate",
+                                                        HideON: "both",
+                                                        DisplayName: "Created Date",
+                                                        ApiName: "CreatedDate",
+                                                        UIDataType: "datetime"
+                                                    }
+                                                };
                                                 modByObj = {
                                                     Name: "ModifiedBy",
                                                     DisplayName: "Modified By",
                                                     ApiName: "ModifiedBy",
                                                     HideON: "both",
-                                                    Sequence: 101,
+                                                    Sequence: 102,
                                                     UniqueID: "ModifiedBy",
                                                     Schema: {
                                                         Name: "ModifiedBy",
@@ -284,20 +298,6 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                                                         ]
                                                     }
                                                 };
-                                                createdDateObj = {
-                                                    Name: "CreatedDate",
-                                                    DisplayName: "Created Date",
-                                                    UniqueID: "CreatedDate",
-                                                    Sequence: 102,
-                                                    HideON: "both",
-                                                    Schema: {
-                                                        Name: "CreatedDate",
-                                                        HideON: "both",
-                                                        DisplayName: "Created Date",
-                                                        ApiName: "CreatedDate",
-                                                        UIDataType: "datetime"
-                                                    }
-                                                };
                                                 modDateObj = {
                                                     Name: "ModifiedDate",
                                                     DisplayName: "Modified Date",
@@ -486,6 +486,21 @@ function UpdateRecentViewObject(objectName, objectID, userID, db) {
     });
 }
 exports.UpdateRecentViewObject = UpdateRecentViewObject;
+function UpdateRecentViewFields(objectName, fieldID, userID, db) {
+    db.collection('RecentViewObject').findOne({ 'ObjectName': objectName, 'FieldID': fieldID, 'ViewedBy': userID }, { projection: { _id: 1 } }, function (err, viewedData) {
+        if (viewedData)
+            db.collection('RecentViewObject').updateOne({ '_id': viewedData._id }, { $set: { 'ViewedDate': new Date() } });
+        else
+            db.collection("RecentViewObject").insertOne({ 'ObjectName': objectName, 'FieldID': fieldID, 'ViewedBy': userID, 'ViewedDate': new Date() });
+        db.collection("RecentViewObject").find({ 'ObjectName': objectName, 'ViewedBy': userID }, { projection: { _id: 1 } }).sort({ 'ViewedDate': -1 }).skip(10).toArray(function (err, data) {
+            if (data && data.length > 0) {
+                var idsArry = data.map(function (i) { return i._id; });
+                db.collection("RecentViewObject").deleteMany({ _id: { $in: idsArry } });
+            }
+        });
+    });
+}
+exports.UpdateRecentViewFields = UpdateRecentViewFields;
 //Sync child object
 function SyncChildObjectData(pageData, objectID, db) {
     return __awaiter(this, void 0, void 0, function () {
@@ -2173,6 +2188,58 @@ function GirdHeaderFilters(filters, fields) {
     return { '$and': sets };
 }
 exports.GirdHeaderFilters = GirdHeaderFilters;
+function FieldsGridHeaderFilters(filters, fields) {
+    var sets = [];
+    var lookupFieldsSets = [];
+    var _loop_15 = function (i) {
+        var _a;
+        var obj = filters[i];
+        var field = fields.find(function (x) { return x.UniqueID == obj.Name; });
+        if (field) {
+            var matchValue = null;
+            var fldName = field.UniqueID;
+            if (["lookup", "multilookup"].includes(field.Schema.UIDataType)) {
+                fldName += '_SearchValue';
+                lookupFieldsSets.push((_a = {}, _a[fldName] = new RegExp(obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), 'i'), _a));
+                return "continue";
+            }
+            if (["dropdown", "multiselect"].includes(field.Schema.UIDataType)) {
+                if (field.Schema.LookupObject) {
+                    matchValue = { '$in': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
+                }
+                else {
+                    matchValue = { '$in': obj.Value };
+                }
+            }
+            else if (["date", "datetime"].includes(field.Schema.UIDataType))
+                matchValue = { '$gte': moment_1.default(obj.Value.From).startOf('day').toDate(), '$lte': moment_1.default(obj.Value.To).endOf('day').toDate() };
+            // else if (field.Schema.UIDataType == 'time')
+            //     matchValue = (obj.Value == 'true');
+            else if (field.Schema.UIDataType == 'checkbox') {
+                if (obj.Value == 'true')
+                    matchValue = true;
+                else
+                    matchValue = { $ne: true };
+            }
+            else if (field.Schema.UIDataType == 'int')
+                matchValue = { '$eq': parseInt(obj.Value) };
+            else if (["decimal", "percent"].includes(field.Schema.UIDataType))
+                matchValue = { '$eq': mongodb_1.Decimal128.fromString(obj.Value) };
+            else if (field.Schema.UIDataType == 'objectid')
+                matchValue = { '$eq': obj.Value };
+            else
+                matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
+            var fieldMatch = {};
+            fieldMatch['Fields.' + fldName] = matchValue;
+            sets.push(fieldMatch);
+        }
+    };
+    for (var i = 0; i < filters.length; i++) {
+        _loop_15(i);
+    }
+    return { '$and': sets, 'lookupConditions': lookupFieldsSets };
+}
+exports.FieldsGridHeaderFilters = FieldsGridHeaderFilters;
 /** @desc:{
     objectName: It's a name of Collection.
     logAction: Add | Modify | Delete
@@ -2206,7 +2273,7 @@ function AddLog(req, objectName, logAction, objLogProp, db, next) {
 exports.AddLog = AddLog;
 function CheckFilterFieldsProjection(condition, fields, pageData, project) {
     if (condition != undefined && condition.Filters.length > 0) {
-        var _loop_15 = function (i) {
+        var _loop_16 = function (i) {
             var objFilter = condition.Filters[i];
             if (objFilter.Type == "Child") {
                 CheckFilterFieldsProjection(objFilter, fields, pageData, project);
@@ -2224,7 +2291,7 @@ function CheckFilterFieldsProjection(condition, fields, pageData, project) {
             }
         };
         for (var i = 0; i < condition.Filters.length; i++) {
-            _loop_15(i);
+            _loop_16(i);
         }
     }
 }
@@ -3813,7 +3880,7 @@ function GetDayIndex(day) {
 exports.GetDayIndex = GetDayIndex;
 function GetUserProfile(msp_d, db, mdb, next) {
     return __awaiter(this, void 0, void 0, function () {
-        var userData, userProfile_1, error_3, objectIDs_1, modules_1, licenceDetail, moduleList, _loop_16, i, error_4;
+        var userData, userProfile_1, error_3, objectIDs_1, modules_1, licenceDetail, moduleList, _loop_17, i, error_4;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -3876,14 +3943,14 @@ function GetUserProfile(msp_d, db, mdb, next) {
                         moduleList = userProfile_1[0].ModuleList;
                         userProfile_1[0].HasControlPanelAccess = [];
                         if (userProfile_1[0].Permissions) {
-                            _loop_16 = function (i) {
+                            _loop_17 = function (i) {
                                 userProfile_1[0].Permissions[i].ModuleData = moduleList.find(function (x) { return x._id == userProfile_1[0].Permissions[i].ModuleID; });
                                 if (userProfile_1[0].Permissions[i].Operations.includes("Control Panel")) {
                                     userProfile_1[0].HasControlPanelAccess.push(userProfile_1[0].Permissions[i].ModuleID);
                                 }
                             };
                             for (i = 0; i < userProfile_1[0].Permissions.length; i++) {
-                                _loop_16(i);
+                                _loop_17(i);
                             }
                         }
                         if (moduleList.length == 0) {

package/package.json

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