@optimiser/common 1.0.404 → 1.0.406

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 (2) hide show
  1. package/dist/lib/utility.js +15 -11
  2. package/package.json +59 -59
package/dist/lib/utility.js CHANGED
@@ -821,8 +821,9 @@ function DeleteFieldInOtherCollection(objectName, objectIDs, db, params, comMast
821
821
  _c);
822
822
  }
823
823
  else {
824
- /*On deletion of Pipeline or Event, Removing Pipeline/Event Id and LookupData from Activity*/
825
- if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
824
+ /*On deletion set Lookupdata & Value to null instead of marking it as IsActive False in LookupData - QPC-9876*/
825
+ //if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
826
+ if (obj.Fields.ResetToNullOnDelete == true) {
826
827
  query.set = (_d = {},
827
828
  _d[obj.Fields.Name] = null,
828
829
  _d[alias] = null,
@@ -943,8 +944,9 @@ function DeleteFieldInOtherCollection(objectName, objectIDs, db, params, comMast
943
944
  _c);
944
945
  }
945
946
  else {
946
- /*On deletion of Pipeline or Event, Removing Pipeline/Event Id and LookupData from Activity*/
947
- if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
947
+ /*On deletion set Lookupdata & Value to null instead of marking it as IsActive False in LookupData - QPC-9876*/
948
+ //if (((objectName == "Pipeline" && obj.Fields.Name == "PipelineID") || (objectName == "Events" && obj.Fields.Name == "EventID")) && obj.Name == "Activity") {
949
+ if (obj.Fields.ResetToNullOnDelete == true) {
948
950
  query.set = (_d = {},
949
951
  _d[obj.Fields.Name] = null,
950
952
  _d[alias] = null,
@@ -5796,7 +5798,7 @@ function ValidateStateCountryField(_a) {
5796
5798
  */
5797
5799
  function CheckAccessPermissions(permissionType, objectName, msp_d, db, mdb, next) {
5798
5800
  return __awaiter(this, void 0, void 0, function () {
5799
- var response, isAllowed, data, _i, _a, item, error_9;
5801
+ var response, isAllowed, data, moduleData, _i, _a, item, error_9;
5800
5802
  return __generator(this, function (_b) {
5801
5803
  switch (_b.label) {
5802
5804
  case 0:
@@ -5804,16 +5806,18 @@ function CheckAccessPermissions(permissionType, objectName, msp_d, db, mdb, next
5804
5806
  return [4 /*yield*/, GetUserProfile(msp_d, db, mdb, next)];
5805
5807
  case 1:
5806
5808
  response = _b.sent();
5807
- isAllowed = true;
5809
+ isAllowed = false;
5808
5810
  data = response === null || response === void 0 ? void 0 : response.data;
5809
5811
  if (data && data.Permissions.length > 0) {
5812
+ moduleData = data.ModuleList.find(function (x) { return x.Objects && x.Objects.includes(objectName); });
5810
5813
  for (_i = 0, _a = data.Permissions; _i < _a.length; _i++) {
5811
5814
  item = _a[_i];
5812
- if (item.ModuleID.toLowerCase() == objectName.toLowerCase()) {
5813
- if (!item.Operations.includes(permissionType)) {
5814
- isAllowed = false;
5815
- if (item.Operations.includes('Create-Edit'))
5816
- isAllowed = true;
5815
+ if (item.ModuleID.toLowerCase() == moduleData._id()) {
5816
+ if (item.Operations.includes(permissionType)) {
5817
+ isAllowed = true;
5818
+ }
5819
+ else if (moduleData._id == "report" && item.Operations.includes('Create-Edit')) {
5820
+ isAllowed = true;
5817
5821
  }
5818
5822
  }
5819
5823
  }
package/package.json CHANGED
@@ -1,59 +1,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
- }
1
+ {
2
+ "name": "@optimiser/common",
3
+ "version": "1.0.406",
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
+ }