@optimiser/common 1.0.231 → 1.0.235

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.
Files changed (3) hide show
  1. package/dist/lib/utility.d.ts +2 -1
  2. package/dist/lib/utility.js +115 -6
  3. package/package.json +1 -1
package/dist/lib/utility.d.ts CHANGED
@@ -176,6 +176,7 @@ declare function GetUserProfile(msp_d: AnyObjectInterface, db: Db, mdb: Db, next
176
176
  data: any;
177
177
  } | undefined>;
178
178
  declare function CheckPageAuthentication(pageData: AnyObjectInterface, msp_d: AnyObjectInterface, db: Db, mdb: Db, next: NextFunction): Promise<boolean>;
179
+ declare function RemoveFieldsFromFilters(condition: AnyObjectInterface, fields: AnyObjectInterface[], identifier: string): void;
179
180
  /**
180
181
  * @param Error Error object
181
182
  * @param ServiceOrigin - Error Occur in Service (Service Name)
@@ -187,4 +188,4 @@ declare function CheckPageAuthentication(pageData: AnyObjectInterface, msp_d: An
187
188
  declare function ErrorHandlerForServices(Error: OPT_ERROR, ServiceOrigin: string, EmailConfig: any, Module?: string, db?: Db): Promise<any>;
188
189
  declare function CheckCaptcha(token: string, captcha: string, redisClient: Redis): Promise<unknown>;
189
190
  declare function ValidateSanitizeUserInput(inputFields: AnyObjectInterface, pageData: AnyObjectInterface): Promise<AnyObjectInterface[] | undefined>;
190
- 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, GetUserProfile, CheckPageAuthentication, ErrorHandlerForServices, CheckCaptcha, ValidateSanitizeUserInput };
191
+ 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 };
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.ValidateSanitizeUserInput = exports.CheckCaptcha = exports.ErrorHandlerForServices = exports.CheckPageAuthentication = exports.GetUserProfile = 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;
83
+ 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;
84
84
  var moment_1 = __importDefault(require("moment"));
85
85
  var nodemailer_1 = __importDefault(require("nodemailer"));
86
86
  var mongodb_1 = require("mongodb");
@@ -206,7 +206,7 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
206
206
  else {
207
207
  db.collection("ObjectSchema").findOne({ 'Name': pageData.ObjectName }, function (err, objectData) {
208
208
  return __awaiter(this, void 0, void 0, function () {
209
- var _loop_2, i, g, group, childObjectSchema, _loop_3, i, _loop_4, i, idObject, idObject_1;
209
+ var removeFieldsFromFilter, j, filterData, _loop_2, i, g, group, childObjectSchema, _loop_3, i, _loop_4, i, createdByObj, modByObj, createdDateObj, modDateObj, idObject, idObject_1;
210
210
  return __generator(this, function (_a) {
211
211
  switch (_a.label) {
212
212
  case 0:
@@ -214,6 +214,14 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
214
214
  next(err);
215
215
  }
216
216
  pageData["ObjectSchema"] = objectData;
217
+ removeFieldsFromFilter = objectData.Fields.filter(function (f) { return f.IsFilter == false; }).map(function (fld) { return fld.Name; });
218
+ if (removeFieldsFromFilter && pageData.ListViewFilters && removeFieldsFromFilter.length > 0 && pageData.ListViewFilters.length > 0) {
219
+ for (j = 0; j < pageData.ListViewFilters.length; j++) {
220
+ filterData = pageData.ListViewFilters[j];
221
+ RemoveFieldsFromFilters(filterData.Conditions, removeFieldsFromFilter, 'Name');
222
+ }
223
+ }
224
+ //** Ends */
217
225
  if (pageData.Fields != undefined) {
218
226
  _loop_2 = function (i) {
219
227
  var fld = pageData.Fields[i];
@@ -269,6 +277,82 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
269
277
  g++;
270
278
  return [3 /*break*/, 1];
271
279
  case 5:
280
+ createdByObj = {
281
+ Name: "CreatedBy",
282
+ DisplayName: "Created By",
283
+ ApiName: "CreatedBy",
284
+ HideON: "both",
285
+ Sequence: 100,
286
+ UniqueID: "CreatedBy",
287
+ Schema: {
288
+ Name: "CreatedBy",
289
+ DisplayName: "Created By",
290
+ HideON: "both",
291
+ ApiName: "CreatedBy",
292
+ UIDataType: "lookup",
293
+ LookupObject: "User",
294
+ LookupFields: [
295
+ "FirstName",
296
+ "LastName"
297
+ ],
298
+ ExtraLookupFields: [
299
+ "UserStatus",
300
+ "IsAppUser"
301
+ ]
302
+ }
303
+ };
304
+ modByObj = {
305
+ Name: "ModifiedBy",
306
+ DisplayName: "Modified By",
307
+ ApiName: "ModifiedBy",
308
+ HideON: "both",
309
+ Sequence: 101,
310
+ UniqueID: "ModifiedBy",
311
+ Schema: {
312
+ Name: "ModifiedBy",
313
+ DisplayName: "Modified By",
314
+ HideON: "both",
315
+ ApiName: "ModifiedBy",
316
+ UIDataType: "lookup",
317
+ LookupObject: "User",
318
+ LookupFields: [
319
+ "FirstName",
320
+ "LastName"
321
+ ],
322
+ ExtraLookupFields: [
323
+ "UserStatus",
324
+ "IsAppUser"
325
+ ]
326
+ }
327
+ };
328
+ createdDateObj = {
329
+ Name: "CreatedDate",
330
+ DisplayName: "Created Date",
331
+ UniqueID: "CreatedDate",
332
+ Sequence: 102,
333
+ HideON: "both",
334
+ Schema: {
335
+ Name: "CreatedDate",
336
+ HideON: "both",
337
+ DisplayName: "Created Date",
338
+ ApiName: "CreatedDate",
339
+ UIDataType: "datetime"
340
+ }
341
+ };
342
+ modDateObj = {
343
+ Name: "ModifiedDate",
344
+ DisplayName: "Modified Date",
345
+ UniqueID: "ModifiedDate",
346
+ HideON: "both",
347
+ Sequence: 103,
348
+ Schema: {
349
+ Name: "ModifiedDate",
350
+ HideON: "both",
351
+ DisplayName: "Modified Date",
352
+ ApiName: "ModifiedDate",
353
+ UIDataType: "datetime"
354
+ }
355
+ };
272
356
  if (pageData.Fields && pageData.Type == "ObjectGrid") {
273
357
  idObject = {
274
358
  Name: "_id",
@@ -279,6 +363,15 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
279
363
  Width: 100
280
364
  };
281
365
  pageData.Fields.splice(0, 0, idObject);
366
+ //By Kashish : To handle System Info Fields in Grid
367
+ if (!pageData.Fields.find(function (x) { return x.Name == 'CreatedBy'; }))
368
+ pageData.Fields.push(createdByObj);
369
+ if (!pageData.Fields.find(function (x) { return x.Name == 'CreatedDate'; }))
370
+ pageData.Fields.push(createdDateObj);
371
+ if (!pageData.Fields.find(function (x) { return x.Name == 'ModifiedBy'; }))
372
+ pageData.Fields.push(modByObj);
373
+ if (!pageData.Fields.find(function (x) { return x.Name == 'ModifiedDate'; }))
374
+ pageData.Fields.push(modDateObj);
282
375
  }
283
376
  if (pageData.Fields && pageData.Type == "ObjectDetail") {
284
377
  idObject_1 = {
@@ -286,14 +379,16 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
286
379
  Sequence: 0,
287
380
  UIDataType: "objectid",
288
381
  UniqueID: "_id",
289
- DisplayName: "ID"
382
+ DisplayName: "ID",
383
+ HideON: "both"
290
384
  };
291
385
  pageData.Fields == pageData.Fields.map(function (s) {
292
386
  if (s.Schema && s.Schema.UIDataType == "collection") {
293
387
  s.Schema.Fields.splice(0, 0, idObject_1);
294
- }
295
- else {
296
- s;
388
+ //By Kashish : To handle System Info Fields
389
+ if (createdByObj && createdDateObj && modByObj && modDateObj) {
390
+ s.Schema.Fields.splice(-1, 0, createdByObj.Schema, createdDateObj.Schema, modByObj.Schema, modDateObj.Schema);
391
+ }
297
392
  }
298
393
  });
299
394
  }
@@ -3806,6 +3901,20 @@ function CheckPageAuthentication(pageData, msp_d, db, mdb, next) {
3806
3901
  });
3807
3902
  }
3808
3903
  exports.CheckPageAuthentication = CheckPageAuthentication;
3904
+ function RemoveFieldsFromFilters(condition, fields, identifier) {
3905
+ if (condition != undefined && condition.Filters.length > 0) {
3906
+ fields.forEach(function (fld) {
3907
+ condition.Filters = condition.Filters.filter(function (fltr) { return fltr[identifier] !== fld; });
3908
+ });
3909
+ for (var i = 0; i < condition.Filters.length; i++) {
3910
+ var objFilter = condition.Filters[i];
3911
+ if (objFilter.Type == "Child") {
3912
+ RemoveFieldsFromFilters(objFilter, fields, identifier);
3913
+ }
3914
+ }
3915
+ }
3916
+ }
3917
+ exports.RemoveFieldsFromFilters = RemoveFieldsFromFilters;
3809
3918
  /**
3810
3919
  * @param Error Error object
3811
3920
  * @param ServiceOrigin - Error Occur in Service (Service Name)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optimiser/common",
3
- "version": "1.0.231",
3
+ "version": "1.0.235",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {