@optimiser/common 1.0.273 → 1.0.276
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/utility.d.ts +8 -2
- package/dist/lib/utility.js +25 -6
- package/package.json +1 -1
package/dist/lib/utility.d.ts
CHANGED
|
@@ -76,7 +76,7 @@ declare function MakeUserPasswordInvalid(options: AnyObjectInterface): void;
|
|
|
76
76
|
declare function ConvertJsonToXLXS(data: AnyObjectInterface, params: AnyObjectInterface | undefined, filePath: string): Promise<void>;
|
|
77
77
|
declare function SendResetPasswordMail(db: Db, userDetails: AnyObjectInterface, type?: string): Promise<unknown>;
|
|
78
78
|
declare function SendMailToSupport(mailData: AnyObjectInterface, callback: callBackInterface): void;
|
|
79
|
-
declare function MailTemplateStructure(content: string): string;
|
|
79
|
+
declare function MailTemplateStructure(content: string, HasDontReplyContent?: boolean): string;
|
|
80
80
|
declare function SendMailToCustomer(mailData: AnyObjectInterface, callback: callBackInterface): void;
|
|
81
81
|
declare function parseMSPCookie(cookie: AnyObjectInterface): any;
|
|
82
82
|
declare function isEmptyObj(object: AnyObjectInterface): boolean;
|
|
@@ -215,4 +215,10 @@ declare function CreateBanquetingVATSettingsData(msp_d: AnyObjectInterface, db:
|
|
|
215
215
|
* @return N/A
|
|
216
216
|
*/
|
|
217
217
|
declare function CheckReportFolderAccess(report: AnyObjectInterface, db: Db, msp_d: AnyObjectInterface, folderActiveStatus?: boolean): Promise<boolean>;
|
|
218
|
-
|
|
218
|
+
/**
|
|
219
|
+
* TODO: Return On behalf String in Calendar Invitation mails
|
|
220
|
+
* @param fromUser From User Name
|
|
221
|
+
* @returns string
|
|
222
|
+
*/
|
|
223
|
+
declare function GetMailFromString(fromUser: string): string;
|
|
224
|
+
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, CheckReportFolderAccess, GetMailFromString };
|
package/dist/lib/utility.js
CHANGED
|
@@ -80,7 +80,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
80
80
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
81
81
|
};
|
|
82
82
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
83
|
-
exports.CheckReportFolderAccess = 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;
|
|
83
|
+
exports.GetMailFromString = exports.CheckReportFolderAccess = 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;
|
|
84
84
|
var moment_1 = __importDefault(require("moment"));
|
|
85
85
|
var nodemailer_1 = __importDefault(require("nodemailer"));
|
|
86
86
|
var mongodb_1 = require("mongodb");
|
|
@@ -2039,7 +2039,7 @@ function FilterConditions(condition, match, fields) {
|
|
|
2039
2039
|
if (["lookup", "multilookup"].includes(field.Schema.UIDataType)) {
|
|
2040
2040
|
fldName += '_SearchValue';
|
|
2041
2041
|
}
|
|
2042
|
-
//added by nirbhay on 25.04.22 to add dropdown in any type of fields for filter
|
|
2042
|
+
//added by nirbhay on 25.04.22 to add dropdown and multiselect in any type of fields for filter
|
|
2043
2043
|
if (field.Schema.SearchType) {
|
|
2044
2044
|
fldName = field.UniqueID;
|
|
2045
2045
|
if (field.Schema.SearchType == 'dropdown') {
|
|
@@ -2047,6 +2047,13 @@ function FilterConditions(condition, match, fields) {
|
|
|
2047
2047
|
obj.Value = new mongodb_1.ObjectId(obj.Value);
|
|
2048
2048
|
}
|
|
2049
2049
|
}
|
|
2050
|
+
else if (field.Schema.SearchType == 'multiselect') {
|
|
2051
|
+
if (field.Schema.LookupObject && obj.Value && obj.Value.length && (field.Schema.SelectKeyType == undefined || field.Schema.SelectKeyType == 'objectid')) {
|
|
2052
|
+
for (var j = 0; j < obj.Value.length; j++) {
|
|
2053
|
+
obj.Value[j] = new mongodb_1.ObjectId(obj.Value[j]);
|
|
2054
|
+
}
|
|
2055
|
+
}
|
|
2056
|
+
}
|
|
2050
2057
|
}
|
|
2051
2058
|
switch (field.Schema.UIDataType) {
|
|
2052
2059
|
case "int":
|
|
@@ -2085,7 +2092,7 @@ function FilterConditions(condition, match, fields) {
|
|
|
2085
2092
|
case "CONTAINS":
|
|
2086
2093
|
if (obj.Value === '')
|
|
2087
2094
|
matchValue = { '$in': [null, ''] };
|
|
2088
|
-
else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType)) {
|
|
2095
|
+
else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType) || field.Schema.SearchType == 'multiselect') {
|
|
2089
2096
|
matchValue = { '$in': obj.Value };
|
|
2090
2097
|
}
|
|
2091
2098
|
else
|
|
@@ -2094,7 +2101,7 @@ function FilterConditions(condition, match, fields) {
|
|
|
2094
2101
|
case "NOT_CONTAINS":
|
|
2095
2102
|
if (obj.Value === '')
|
|
2096
2103
|
matchValue = { '$nin': [null, ''] };
|
|
2097
|
-
else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType)) {
|
|
2104
|
+
else if (["dropdown", "multiselect"].includes(field.Schema.UIDataType) || field.Schema.SearchType == 'multiselect') {
|
|
2098
2105
|
matchValue = { '$nin': obj.Value };
|
|
2099
2106
|
}
|
|
2100
2107
|
else
|
|
@@ -2203,6 +2210,9 @@ function GirdHeaderFilters(filters, fields) {
|
|
|
2203
2210
|
if (field.Schema.SearchType == 'dropdown') {
|
|
2204
2211
|
matchValue = { '$eq': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
|
|
2205
2212
|
}
|
|
2213
|
+
else if (field.Schema.SearchType == 'multiselect') {
|
|
2214
|
+
matchValue = { '$in': bson_1.EJSON.parse(JSON.stringify(obj.Value)) };
|
|
2215
|
+
}
|
|
2206
2216
|
else if (["lookup", "multilookup"].includes(field.Schema.UIDataType)) {
|
|
2207
2217
|
fldName += '_SearchValue';
|
|
2208
2218
|
matchValue = { '$regex': obj.Value.trim().replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, "\\$&"), '$options': 'i' };
|
|
@@ -3147,8 +3157,8 @@ function SendMailToSupport(mailData, callback) {
|
|
|
3147
3157
|
});
|
|
3148
3158
|
}
|
|
3149
3159
|
exports.SendMailToSupport = SendMailToSupport;
|
|
3150
|
-
function MailTemplateStructure(content) {
|
|
3151
|
-
return "<html xmlns:v=\"urn:schemas-microsoft-com:vml\">\n <head>\n <style> v:* { behavior: url(#default#VML); }</style >\n </head>\n <body style='background-color: #fff;'>\n <table width=\"100%\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\">\n <!-- <table width=\"100%\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#fff;\"> -->\n <tr>\n <td align=\"center\" valign=\"top\">\n <table width=\"650\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#fff;\">\n <tr>\n <td align=\"left\" valign=\"top\" bgcolor=\"#ffffff\" style=\"padding-top:16px; padding-bottom:12px; padding-left: 20px; padding-right: 20px; background-color: #fff; border-bottom: 1px solid #fff;\">\n <img src=\"https://platform.optimiser.com/images/MainLogo.png\" alt=\"Optimiser\"/>\n </td>\n </tr>\n <tr>\n <td align=\"center\" valign=\"top\" bgcolor=\"#fff\" style=\"background-color: #fff; text-align: left; padding-right: 0px; padding-left: 0px; font-size:16px; font-family:Arial, Helvetica, sans-serif; color:#000000;\">\n " + content + "\n <p style=\"margin-bottom: 1em;\">\n Thanks,<br>\n " + constants_1.default.ProjectName + " team\n </p>\n </td>\n </tr>\n <tr>\n <td align=\"center\" valign=\"top\" bgcolor=\"##075DA8\" style=\" border-top: 1px solid #dee2e6; background-color: #075DA8
|
|
3160
|
+
function MailTemplateStructure(content, HasDontReplyContent) {
|
|
3161
|
+
return "<html xmlns:v=\"urn:schemas-microsoft-com:vml\">\n <head>\n <style> v:* { behavior: url(#default#VML); }</style >\n </head>\n <body style='background-color: #fff;'>\n <table width=\"100%\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\">\n <!-- <table width=\"100%\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#fff;\"> -->\n <tr>\n <td align=\"center\" valign=\"top\">\n <table width=\"650\" border=\"0\" align=\"center\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#fff;\">\n <tr>\n <td align=\"left\" valign=\"top\" bgcolor=\"#ffffff\" style=\"padding-top:16px; padding-bottom:12px; padding-left: 20px; padding-right: 20px; background-color: #fff; border-bottom: 1px solid #fff;\">\n <img src=\"https://platform.optimiser.com/images/MainLogo.png\" alt=\"Optimiser\"/>\n </td>\n </tr>\n <tr>\n <td align=\"center\" valign=\"top\" bgcolor=\"#fff\" style=\"background-color: #fff; text-align: left; padding-right: 0px; padding-left: 0px; font-size:16px; font-family:Arial, Helvetica, sans-serif; color:#000000;\">\n " + content + "\n <p style=\"margin-bottom: 1em;\">\n Thanks,<br>\n " + constants_1.default.ProjectName + " team\n </p>\n </td>\n </tr>\n <tr>\n <td align=\"center\" valign=\"top\" bgcolor=\"##075DA8\" style=\" border-top: 1px solid #dee2e6; background-color: #075DA8;\">\n <p style=\"font-size:13px; font-family:Arial, Helvetica, sans-serif; color:#fff; margin:1.8em; font-weight:normal;\">\n <a href=\"https://www.optimiser.com/\" style=\"color:#fff; text-decoration:underline; \">www.optimiser.com</a> | <a href=\"mailto:support@optimiser.com\" style=\"color:#fff; text-decoration:underline; \">support@optimiser.com</a> | \n +44 (0)203 972 1666\n </p>\n </td>\n </tr>\n " + (HasDontReplyContent ? "<tr>\n <td align=\"center\" valign=\"top\" bgcolor=\"#fff\" style=\"margin-top: 1em;background-color: #fff; text-align: left; padding-right: 0px; padding-left: 0px; font-size:13px; font-family:Arial, Helvetica, sans-serif; color:#000000;\">\n <p style=\"margin-top: 1em;\">\n ##DonotReplyContent##\n </p>\n </td>\n </tr>" : '') + "\n \n </table>\n </td>\n </tr>\n </table>\n </body>";
|
|
3152
3162
|
/* `<body style='background-color: #eee;'>
|
|
3153
3163
|
<table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" style="background:#eee;">
|
|
3154
3164
|
<tr>
|
|
@@ -4384,3 +4394,12 @@ function CheckReportFolderAccess(report, db, msp_d, folderActiveStatus) {
|
|
|
4384
4394
|
});
|
|
4385
4395
|
}
|
|
4386
4396
|
exports.CheckReportFolderAccess = CheckReportFolderAccess;
|
|
4397
|
+
/**
|
|
4398
|
+
* TODO: Return On behalf String in Calendar Invitation mails
|
|
4399
|
+
* @param fromUser From User Name
|
|
4400
|
+
* @returns string
|
|
4401
|
+
*/
|
|
4402
|
+
function GetMailFromString(fromUser) {
|
|
4403
|
+
return "Optimiser (on behalf of " + fromUser + ")";
|
|
4404
|
+
}
|
|
4405
|
+
exports.GetMailFromString = GetMailFromString;
|