@optimiser/common 1.0.402 → 1.0.404

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 +3 -2
  2. package/dist/lib/utility.js +31 -26
  3. package/package.json +59 -59
package/dist/lib/utility.d.ts CHANGED
@@ -260,10 +260,11 @@ declare function CreateBanquetingVATSettingsData(msp_d: AnyObjectInterface, db:
260
260
  declare function CheckReportFolderAccess(report: AnyObjectInterface, db: Db, msp_d: AnyObjectInterface, folderActiveStatus?: boolean): Promise<boolean>;
261
261
  /**
262
262
  * TODO: Return On behalf String in Calendar Invitation mails
263
- * @param fromUser From User Name
263
+ * @param {string} fromUser From User Name
264
+ * @param {boolean} isIgnoreTemplate boolean flag pass true to get only fromUser
264
265
  * @returns string
265
266
  */
266
- declare function GetMailFromString(fromUser: string): string;
267
+ declare function GetMailFromString(fromUser: string, isIgnoreTemplate?: boolean): string;
267
268
  /**
268
269
  * TODO: Return On behalf String in Calendar Invitation mails
269
270
  * @param fromUser From User Name
package/dist/lib/utility.js CHANGED
@@ -1856,7 +1856,7 @@ function BuildLookupDataField(fieldSchema, updateObj, db) {
1856
1856
  if (!fieldValueType) {
1857
1857
  fieldValueType = typeof (fldValue);
1858
1858
  }
1859
- errMsg = "Error Info: Error in Function BuildLookupDataField in Common Module for Company - ".concat((db.databaseName), ", ObjectName - ").concat((fieldSchema.LookupObject || ''), ", FieldName - ").concat((fieldSchema.Name || ''), " for value - ").concat(fldValue, " and data type of values is ").concat((fieldValueType || ''), " ");
1859
+ errMsg = "Error Info: Error in Function BuildLookupDataField in Common Module for Company - ".concat((db.databaseName), ", ObjectName - ").concat(((fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.LookupObject) || ''), ", FieldName - ").concat(((fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.Name) || ''), " for value - ").concat(fldValue, " and data type of values is ").concat((fieldValueType || ''), " ");
1860
1860
  console.error(errMsg, '\n', error_2);
1861
1861
  return [3 /*break*/, 24];
1862
1862
  case 24: return [2 /*return*/];
@@ -3666,12 +3666,12 @@ function SyncListSchemaFieldInOtherCollection(syncFields, db, msp_d) {
3666
3666
  }
3667
3667
  ]).toArray(function (err, data) {
3668
3668
  return __awaiter(this, void 0, void 0, function () {
3669
- var modifiedObj, _i, data_1, obj, query, schemaData, fieldSchema, alias, i, query, bulkOps;
3669
+ var modifiedObj, _i, data_1, obj, query, schemaData, modifiedByfieldSchema, alias, i, query, bulkOps;
3670
3670
  var _a, _b, _c, _d, _e, _f;
3671
3671
  return __generator(this, function (_g) {
3672
3672
  switch (_g.label) {
3673
3673
  case 0:
3674
- if (!(data.length > 0)) return [3 /*break*/, 11];
3674
+ if (!(data.length > 0)) return [3 /*break*/, 12];
3675
3675
  modifiedObj = {
3676
3676
  ModifiedBy: new mongodb_1.ObjectId(msp_d.ui),
3677
3677
  ModifiedDate: new Date()
@@ -3679,7 +3679,7 @@ function SyncListSchemaFieldInOtherCollection(syncFields, db, msp_d) {
3679
3679
  _i = 0, data_1 = data;
3680
3680
  _g.label = 1;
3681
3681
  case 1:
3682
- if (!(_i < data_1.length)) return [3 /*break*/, 7];
3682
+ if (!(_i < data_1.length)) return [3 /*break*/, 8];
3683
3683
  obj = data_1[_i];
3684
3684
  query = {
3685
3685
  ObjectName: obj.Name
@@ -3687,11 +3687,14 @@ function SyncListSchemaFieldInOtherCollection(syncFields, db, msp_d) {
3687
3687
  return [4 /*yield*/, db.collection('ObjectSchema').findOne({ Name: query.ObjectName })];
3688
3688
  case 2:
3689
3689
  schemaData = _g.sent();
3690
- fieldSchema = schemaData.Fields.find(function (x) { return x.Name == 'ModifiedBy'; });
3691
- return [4 /*yield*/, BuildLookupDataField(fieldSchema, modifiedObj, db)];
3690
+ modifiedByfieldSchema = schemaData.Fields.find(function (x) { return x.Name == 'ModifiedBy'; });
3691
+ if (!modifiedByfieldSchema) return [3 /*break*/, 4];
3692
+ return [4 /*yield*/, BuildLookupDataField(modifiedByfieldSchema, modifiedObj, db)];
3692
3693
  case 3:
3693
3694
  _g.sent();
3694
- if (!(obj.Fields.ListSchemaName == syncFields.ListSchemaName || (obj.Fields.IsMultipleListSchemaName && obj.Fields.ListSchemaName.includes(syncFields.ListSchemaName)))) return [3 /*break*/, 5];
3695
+ _g.label = 4;
3696
+ case 4:
3697
+ if (!(obj.Fields.ListSchemaName == syncFields.ListSchemaName || (obj.Fields.IsMultipleListSchemaName && obj.Fields.ListSchemaName.includes(syncFields.ListSchemaName)))) return [3 /*break*/, 6];
3695
3698
  alias = obj.Fields.Name + constants_1.default.LookupAlias;
3696
3699
  query.match = (_a = {},
3697
3700
  _a[obj.Fields.Name] = syncFields.ListKey,
@@ -3712,25 +3715,25 @@ function SyncListSchemaFieldInOtherCollection(syncFields, db, msp_d) {
3712
3715
  query.set = (_f = {}, _f[alias + '.Value'] = syncFields.Value, _f);
3713
3716
  }
3714
3717
  query.set = __assign(__assign({}, query.set), modifiedObj);
3715
- if (!!syncFields.IsDeleteValue) return [3 /*break*/, 5];
3718
+ if (!!syncFields.IsDeleteValue) return [3 /*break*/, 6];
3716
3719
  return [4 /*yield*/, BuildSearchValueQuery(syncFields, obj, query, db)];
3717
- case 4:
3718
- _g.sent();
3719
- _g.label = 5;
3720
3720
  case 5:
3721
+ _g.sent();
3722
+ _g.label = 6;
3723
+ case 6:
3721
3724
  if (query.set && query.match) {
3722
3725
  querys.push(query);
3723
3726
  }
3724
- _g.label = 6;
3725
- case 6:
3727
+ _g.label = 7;
3728
+ case 7:
3726
3729
  _i++;
3727
3730
  return [3 /*break*/, 1];
3728
- case 7:
3729
- if (!(querys.length > 0)) return [3 /*break*/, 11];
3730
- i = 0;
3731
- _g.label = 8;
3732
3731
  case 8:
3733
- if (!(i < querys.length)) return [3 /*break*/, 11];
3732
+ if (!(querys.length > 0)) return [3 /*break*/, 12];
3733
+ i = 0;
3734
+ _g.label = 9;
3735
+ case 9:
3736
+ if (!(i < querys.length)) return [3 /*break*/, 12];
3734
3737
  query = querys[i];
3735
3738
  bulkOps = [];
3736
3739
  if (query.arrayFilters !== undefined) {
@@ -3745,13 +3748,13 @@ function SyncListSchemaFieldInOtherCollection(syncFields, db, msp_d) {
3745
3748
  bulkOps.push.apply(bulkOps, query.setSearchValue);
3746
3749
  }
3747
3750
  return [4 /*yield*/, db.collection(query.ObjectName).bulkWrite(bulkOps)];
3748
- case 9:
3749
- _g.sent();
3750
- _g.label = 10;
3751
3751
  case 10:
3752
- i++;
3753
- return [3 /*break*/, 8];
3752
+ _g.sent();
3753
+ _g.label = 11;
3754
3754
  case 11:
3755
+ i++;
3756
+ return [3 /*break*/, 9];
3757
+ case 12:
3755
3758
  resolve();
3756
3759
  return [2 /*return*/];
3757
3760
  }
@@ -5488,11 +5491,13 @@ function CheckReportFolderAccess(report, db, msp_d, folderActiveStatus) {
5488
5491
  exports.CheckReportFolderAccess = CheckReportFolderAccess;
5489
5492
  /**
5490
5493
  * TODO: Return On behalf String in Calendar Invitation mails
5491
- * @param fromUser From User Name
5494
+ * @param {string} fromUser From User Name
5495
+ * @param {boolean} isIgnoreTemplate boolean flag pass true to get only fromUser
5492
5496
  * @returns string
5493
5497
  */
5494
- function GetMailFromString(fromUser) {
5495
- return "Optimiser (on behalf of ".concat(fromUser, ")");
5498
+ function GetMailFromString(fromUser, isIgnoreTemplate) {
5499
+ if (isIgnoreTemplate === void 0) { isIgnoreTemplate = false; }
5500
+ return isIgnoreTemplate ? fromUser : "Optimiser (on behalf of ".concat(fromUser, ")");
5496
5501
  }
5497
5502
  exports.GetMailFromString = GetMailFromString;
5498
5503
  /**
package/package.json CHANGED
@@ -1,59 +1,59 @@
1
- {
2
- "name": "@optimiser/common",
3
- "version": "1.0.402",
4
- "description": "",
5
- "main": "dist/index.js",
6
- "scripts": {
7
- "compile": "tsc",
8
- "push": "tsc && npm version patch -git-tag-version false && npm publish"
9
- },
10
- "files": [
11
- "dist/*"
12
- ],
13
- "author": "",
14
- "license": "ISC",
15
- "dependencies": {
16
- "@types/geoip-lite": "^1.4.0",
17
- "@types/promise.allsettled": "^1.0.3",
18
- "@types/request": "^2.48.5",
19
- "@types/sanitize-html": "^2.11.0",
20
- "@types/sequelize": "^4.28.9",
21
- "@types/unzipper": "^0.10.3",
22
- "@types/uuid": "^8.3.0",
23
- "aws-sdk": "^2.786.0",
24
- "axios": "^0.21.4",
25
- "bson": "^4.2.0",
26
- "exceljs": "^4.3.0",
27
- "express": "^4.17.1",
28
- "express-validator": "^6.9.2",
29
- "firebase-admin": "^12.0.0",
30
- "geoip-lite": "^1.4.2",
31
- "google-libphonenumber": "^3.2.30",
32
- "ioredis": "^4.17.3",
33
- "libphonenumber-js": "^1.9.51",
34
- "moment": "^2.25.3",
35
- "moment-timezone": "^0.5.27",
36
- "mongo-sanitize": "^1.1.0",
37
- "mongodb": "^3.6.2",
38
- "nodemailer": "^6.4.11",
39
- "promise.allsettled": "^1.0.2",
40
- "qrcode": "^1.5.3",
41
- "request": "^2.88.2",
42
- "sanitize-html": "^2.13.0",
43
- "sequelize": "^6.3.5",
44
- "typescript": "^5.3.3",
45
- "unzipper": "^0.10.11",
46
- "uuid": "^8.3.1"
47
- },
48
- "devDependencies": {
49
- "@types/aws-sdk": "^2.7.0",
50
- "@types/bson": "^4.0.2",
51
- "@types/exceljs": "^1.3.0",
52
- "@types/express": "^4.17.8",
53
- "@types/ioredis": "^4.17.4",
54
- "@types/moment": "^2.13.0",
55
- "@types/moment-timezone": "^0.5.30",
56
- "@types/mongodb": "^3.5.27",
57
- "@types/nodemailer": "^6.4.0"
58
- }
59
- }
1
+ {
2
+ "name": "@optimiser/common",
3
+ "version": "1.0.404",
4
+ "description": "",
5
+ "main": "dist/index.js",
6
+ "scripts": {
7
+ "compile": "tsc",
8
+ "push": "tsc && npm version patch -git-tag-version false && npm publish"
9
+ },
10
+ "files": [
11
+ "dist/*"
12
+ ],
13
+ "author": "",
14
+ "license": "ISC",
15
+ "dependencies": {
16
+ "@types/geoip-lite": "^1.4.0",
17
+ "@types/promise.allsettled": "^1.0.3",
18
+ "@types/request": "^2.48.5",
19
+ "@types/sanitize-html": "^2.11.0",
20
+ "@types/sequelize": "^4.28.9",
21
+ "@types/unzipper": "^0.10.3",
22
+ "@types/uuid": "^8.3.0",
23
+ "aws-sdk": "^2.786.0",
24
+ "axios": "^0.21.4",
25
+ "bson": "^4.2.0",
26
+ "exceljs": "^4.3.0",
27
+ "express": "^4.17.1",
28
+ "express-validator": "^6.9.2",
29
+ "firebase-admin": "^12.0.0",
30
+ "geoip-lite": "^1.4.2",
31
+ "google-libphonenumber": "^3.2.30",
32
+ "ioredis": "^4.17.3",
33
+ "libphonenumber-js": "^1.9.51",
34
+ "moment": "^2.25.3",
35
+ "moment-timezone": "^0.5.27",
36
+ "mongo-sanitize": "^1.1.0",
37
+ "mongodb": "^3.6.2",
38
+ "nodemailer": "^6.4.11",
39
+ "promise.allsettled": "^1.0.2",
40
+ "qrcode": "^1.5.3",
41
+ "request": "^2.88.2",
42
+ "sanitize-html": "^2.13.0",
43
+ "sequelize": "^6.3.5",
44
+ "typescript": "^5.3.3",
45
+ "unzipper": "^0.10.11",
46
+ "uuid": "^8.3.1"
47
+ },
48
+ "devDependencies": {
49
+ "@types/aws-sdk": "^2.7.0",
50
+ "@types/bson": "^4.0.2",
51
+ "@types/exceljs": "^1.3.0",
52
+ "@types/express": "^4.17.8",
53
+ "@types/ioredis": "^4.17.4",
54
+ "@types/moment": "^2.13.0",
55
+ "@types/moment-timezone": "^0.5.30",
56
+ "@types/mongodb": "^3.5.27",
57
+ "@types/nodemailer": "^6.4.0"
58
+ }
59
+ }