@optimiser/common 1.0.328 → 1.0.330

package/dist/lib/utility.d.ts

@@ -203,6 +203,26 @@ declare function CheckCaptcha(token: string, captcha: string, redisClient: Redis
 declare function IsStringValue(val: any): boolean;
 declare function ValidateSanitizeUserInput(inputFields: AnyObjectInterface, pageData: AnyObjectInterface): Promise<AnyObjectInterface[] | undefined>;
 declare function ValidateUserInput(options: AnyObjectInterface): Promise<string | undefined>;
+/**
+ * TODO: Check conditional field criteria with user inputs
+ *
+ * @param {object} field Contains shcema
+ * @param {object} record contains user inputs
+ * @param {string} action shows add or update
+ * @return message in string
+ */
+declare function CheckConditionalField(field: any, record: any, action: string): string;
+/**
+ * TODO: Check expression on date field
+ *
+ * @param {object} record Contains user inputs
+ * @param {string} fieldName name
+ * @param {string} range like 'Custom', 'today', yesterday etc.
+ * @param {string} startDate in case of custom range
+ * @param {string} endDate in case of custom range
+ * @return true or false
+ */
+declare function CheckExpressionOnDateField(record: any, fieldName: string, range: string, startDate: string, endDate: string): boolean;
 /**
  * TODO: Create lookup of fields of list schema for Vat Setting data
  *
@@ -243,4 +263,4 @@ declare function InvitationMailReplyContent(fromUser: string, fromEmail: string)
  * @return boolean
  */
 declare function HasFiscalOperator(filter: any): boolean;
-export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, UpdateRecentViewFields, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, GetObjectByString, 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, IsStringValue, ValidateSanitizeUserInput, ValidateUserInput, AddDaysToDate, CreateBanquetingVATSettingsData, CheckReportFolderAccess, GetMailFromString, InvitationMailReplyContent, HasFiscalOperator };
+export { CheckForWhiteListedDomain, ReturnJsonResponse, ConvertFileByteSize, GetObjectByKeyValueFromList, IsEqualArrays, IsEqualValue, CheckUserProfileField, GetPageFieldData, GetPageObjectSchema, GetFieldDetail, UpdateRecentViewObject, UpdateRecentViewFields, SyncChildObjectData, SyncParentObjectData, DeleteFieldInOtherCollection, SyncFieldInSameCollection, SyncFieldInSameCollectionByObjectID, SyncFieldInSameCollectionByObjectIDWithPromise, SyncFieldInOtherCollection, SyncUserInOtherCollection, GetObjectByString, 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, IsStringValue, ValidateSanitizeUserInput, ValidateUserInput, CheckConditionalField, CheckExpressionOnDateField, AddDaysToDate, CreateBanquetingVATSettingsData, CheckReportFolderAccess, GetMailFromString, InvitationMailReplyContent, HasFiscalOperator };

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.HasFiscalOperator = exports.InvitationMailReplyContent = exports.GetMailFromString = exports.CheckReportFolderAccess = exports.CreateBanquetingVATSettingsData = exports.AddDaysToDate = exports.ValidateUserInput = exports.ValidateSanitizeUserInput = exports.IsStringValue = 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.GetObjectByString = 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;
+exports.HasFiscalOperator = exports.InvitationMailReplyContent = exports.GetMailFromString = exports.CheckReportFolderAccess = exports.CreateBanquetingVATSettingsData = exports.AddDaysToDate = exports.CheckExpressionOnDateField = exports.CheckConditionalField = exports.ValidateUserInput = exports.ValidateSanitizeUserInput = exports.IsStringValue = 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.GetObjectByString = 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");
@@ -99,6 +99,7 @@ require("moment-timezone");
 var helper_1 = require("./helper");
 var sanitize = require('mongo-sanitize');
 var phoneUtil = require("google-libphonenumber").PhoneNumberUtil.getInstance();
+var _settingData = {};
 function GetObjectByKeyValueFromList(list, key, val) {
     if (list && list.length > 0) {
         for (var i = 0; i < list.length; i++) {
@@ -4568,17 +4569,24 @@ function IsAnotherObjectField(pageData, fieldName) {
 * example: if there is no issue found it return "" else return error message - "FirstName is required!"
 */
 function ValidateUserInput(options) {
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var inputFields, fieldsJsonData, pageData, documentID, db, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _loop_19, isValid, isValid, validateResp, _a, pageFields_1, pageField, state_2, countryData, err_3;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var inputFields, fieldsJsonData, pageData, documentID, db, fiscalSettingData, action, objectSchema, objectName, pageFields, schemaFields, inputField, msg, _loop_18, _i, inputField_1, name_1, state_1, _loop_19, isValid, isValid, validateResp, _d, pageFields_1, pageField, state_2, countryData, err_3;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
-                    _b.trys.push([0, 7, , 8]);
+                    _e.trys.push([0, 8, , 9]);
                     inputFields = options.userInput;
                     fieldsJsonData = bson_1.EJSON.parse(JSON.stringify(inputFields));
                     pageData = options.pageData;
                     documentID = options.objectID;
                     db = options.db;
+                    return [4 /*yield*/, db.collection('Company').findOne({ IsActive: true }, { projection: { "Setting.FiscalFrom": 1, "Setting.FiscalMonth": 1, "Setting.DateFormat": 1 } })];
+                case 1:
+                    fiscalSettingData = _e.sent();
+                    _settingData['FiscalMonth'] = ((_a = fiscalSettingData === null || fiscalSettingData === void 0 ? void 0 : fiscalSettingData.Setting) === null || _a === void 0 ? void 0 : _a.FiscalMonth) || 'Jan';
+                    _settingData['FiscalFrom'] = ((_b = fiscalSettingData === null || fiscalSettingData === void 0 ? void 0 : fiscalSettingData.Setting) === null || _b === void 0 ? void 0 : _b.FiscalFrom) || 'Start';
+                    _settingData['DateFormat'] = ((_c = fiscalSettingData === null || fiscalSettingData === void 0 ? void 0 : fiscalSettingData.Setting) === null || _c === void 0 ? void 0 : _c.DateFormat) || 'DD-MMM-YYYY';
                     action = (documentID) ? "update" : "add";
                     objectSchema = pageData.ObjectSchema;
                     objectName = objectSchema.Name;
@@ -5006,41 +5014,41 @@ function ValidateUserInput(options) {
                             }
                         });
                     };
-                    _a = 0, pageFields_1 = pageFields;
-                    _b.label = 1;
-                case 1:
-                    if (!(_a < pageFields_1.length)) return [3 /*break*/, 4];
-                    pageField = pageFields_1[_a];
-                    return [5 /*yield**/, _loop_19(pageField)];
+                    _d = 0, pageFields_1 = pageFields;
+                    _e.label = 2;
                 case 2:
-                    state_2 = _b.sent();
-                    if (state_2 === "break")
-                        return [3 /*break*/, 4];
-                    _b.label = 3;
+                    if (!(_d < pageFields_1.length)) return [3 /*break*/, 5];
+                    pageField = pageFields_1[_d];
+                    return [5 /*yield**/, _loop_19(pageField)];
                 case 3:
-                    _a++;
-                    return [3 /*break*/, 1];
+                    state_2 = _e.sent();
+                    if (state_2 === "break")
+                        return [3 /*break*/, 5];
+                    _e.label = 4;
                 case 4:
+                    _d++;
+                    return [3 /*break*/, 2];
+                case 5:
                     if (msg != "") {
                         return [2 /*return*/, msg];
                     }
-                    if (!(objectName == 'City')) return [3 /*break*/, 6];
+                    if (!(objectName == 'City')) return [3 /*break*/, 7];
                     return [4 /*yield*/, db.collection("Country").findOne({ '_id': inputFields.CountryID, 'IsActive': true })];
-                case 5:
-                    countryData = _b.sent();
+                case 6:
+                    countryData = _e.sent();
                     if (countryData) {
                         inputFields.CountryName = countryData.Name;
                     }
                     else {
                         msg = "Invalid country code!";
                     }
-                    _b.label = 6;
-                case 6: return [2 /*return*/, msg];
-                case 7:
-                    err_3 = _b.sent();
+                    _e.label = 7;
+                case 7: return [2 /*return*/, msg];
+                case 8:
+                    err_3 = _e.sent();
                     console.log("Error in ValidateUserInput", err_3);
-                    return [3 /*break*/, 8];
-                case 8: return [2 /*return*/];
+                    return [3 /*break*/, 9];
+                case 9: return [2 /*return*/];
             }
         });
     });
@@ -5055,40 +5063,73 @@ exports.ValidateUserInput = ValidateUserInput;
  * @return message in string
  */
 function CheckConditionalField(field, record, action) {
-    var msg = '';
-    var fieldData = record[field.Name];
-    if (field.Schema.ConditionalAction == 'enabled' && field.IsRequired == true) {
-        if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
-            msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is required!';
+    try {
+        var msg = '';
+        var fieldData = record[field.Name];
+        if (field.Schema.ConditionalAction == 'enabled' && field.IsRequired == true) {
+            if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
+                msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is required!';
+            }
         }
-    }
-    else if (record != undefined && eval(field.Schema.ConditionalExpression) == true) {
-        switch (field.Schema.ConditionalAction) {
-            case "mandatory":
-            case "enabled-mandatory":
-            case "show-enabled-mandatory":
-            case "show-disabled-mandatory":
-                if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
-                    msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is conditionally required!';
-                }
-                break;
+        else if (record != undefined && eval(field.Schema.ConditionalExpression) == true) {
+            switch (field.Schema.ConditionalAction) {
+                case "mandatory":
+                case "enabled-mandatory":
+                case "show-enabled-mandatory":
+                case "show-disabled-mandatory":
+                    if (field.Schema.UIDataType != 'autoincrement' && (fieldData === '' || fieldData === null || (fieldData === undefined && action == "add"))) {
+                        msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is conditionally required!';
+                    }
+                    break;
+            }
+        }
+        else {
+            switch (field.Schema.ConditionalAction) {
+                case "show-disabled-mandatory":
+                case "show-disabled-nonmandatory":
+                    break;
+                case "show-enabled-mandatory":
+                case "show-enabled-nonmandatory":
+                    if (fieldData) {
+                        msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is a hidden field and should not contain value.';
+                    }
+                    break;
+            }
         }
+        return msg;
     }
-    else {
-        switch (field.Schema.ConditionalAction) {
-            case "show-disabled-mandatory":
-            case "show-disabled-nonmandatory":
-                break;
-            case "show-enabled-mandatory":
-            case "show-enabled-nonmandatory":
-                if (fieldData) {
-                    msg = ((field.DisplayName || field.Schema.DisplayName) || field.Name) + ' is a hidden field and should not contain value.';
-                }
-                break;
+    catch (error) {
+        console.error("Internal Error in CheckConditionalField Function : ", error);
+        return '';
+    }
+}
+exports.CheckConditionalField = CheckConditionalField;
+/**
+ * TODO: Check expression on date field
+ *
+ * @param {object} record Contains user inputs
+ * @param {string} fieldName name
+ * @param {string} range like 'Custom', 'today', yesterday etc.
+ * @param {string} startDate in case of custom range
+ * @param {string} endDate in case of custom range
+ * @return true or false
+ */
+function CheckExpressionOnDateField(record, fieldName, range, startDate, endDate) {
+    try {
+        if (range == 'Custom') {
+            return (record[fieldName] && (moment_1.default(record[fieldName]).isBetween(moment_1.default(startDate, _settingData.DateFormat).startOf('day'), moment_1.default(endDate, _settingData.DateFormat).endOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(startDate, _settingData.DateFormat).startOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(endDate, _settingData.DateFormat).endOf('day')))) ? true : false;
         }
+        else {
+            var _a = helper_1.GetDateRangeFromOperatorValue(range, _settingData.FiscalMonth, _settingData.FiscalFrom), startDate_1 = _a.startDate, endDate_1 = _a.endDate;
+            return (record[fieldName] && (moment_1.default(record[fieldName]).isBetween(moment_1.default(startDate_1, _settingData.DateFormat).startOf('day'), moment_1.default(endDate_1, _settingData.DateFormat).endOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(startDate_1, _settingData.DateFormat).startOf('day')) || moment_1.default(record[fieldName]).isSame(moment_1.default(endDate_1, _settingData.DateFormat).endOf('day')))) ? true : false;
+        }
+    }
+    catch (error) {
+        console.error("Internal Error in CheckExpressionOnDateField Function : ", error);
+        return false;
     }
-    return msg;
 }
+exports.CheckExpressionOnDateField = CheckExpressionOnDateField;
 /**
  * TODO: Create lookup of fields of list schema for Vat Setting data
  *

package/package.json

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