@servicelabsco/nestjs-utility-services 1.1.14 → 1.1.16
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/app.controller.js +7 -24
- package/dist/app.controller.js.map +1 -1
- package/dist/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/app.service.js +8 -23
- package/dist/app.service.js.map +1 -1
- package/dist/auth/controllers/auth.controller.js +54 -75
- package/dist/auth/controllers/auth.controller.js.map +1 -1
- package/dist/auth/controllers/social.controller.js +7 -20
- package/dist/auth/controllers/social.controller.js.map +1 -1
- package/dist/auth/controllers/user.controller.js +6 -17
- package/dist/auth/controllers/user.controller.js.map +1 -1
- package/dist/auth/es6.classes.d.ts +2 -1
- package/dist/auth/es6.classes.js +2 -1
- package/dist/auth/es6.classes.js.map +1 -1
- package/dist/auth/middlewares/basic.auth.middleware.js +14 -25
- package/dist/auth/middlewares/basic.auth.middleware.js.map +1 -1
- package/dist/auth/middlewares/index.d.ts +1 -0
- package/dist/auth/middlewares/index.js +1 -0
- package/dist/auth/middlewares/index.js.map +1 -1
- package/dist/auth/middlewares/internal.middleware.d.ts +10 -0
- package/dist/auth/middlewares/internal.middleware.js +48 -0
- package/dist/auth/middlewares/internal.middleware.js.map +1 -0
- package/dist/auth/middlewares/jwt.middleware.js +19 -32
- package/dist/auth/middlewares/jwt.middleware.js.map +1 -1
- package/dist/auth/services/auth.service.js +42 -63
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/services/device.token.service.js +34 -47
- package/dist/auth/services/device.token.service.js.map +1 -1
- package/dist/auth/services/refresh.token.service.js +17 -30
- package/dist/auth/services/refresh.token.service.js.map +1 -1
- package/dist/auth/services/social.service.js +20 -33
- package/dist/auth/services/social.service.js.map +1 -1
- package/dist/auth/services/user.service.js +29 -46
- package/dist/auth/services/user.service.js.map +1 -1
- package/dist/auth/strategies/fb.strategy.js +8 -19
- package/dist/auth/strategies/fb.strategy.js.map +1 -1
- package/dist/auth/strategies/google.strategy.js +8 -19
- package/dist/auth/strategies/google.strategy.js.map +1 -1
- package/dist/cli.js +12 -23
- package/dist/cli.js.map +1 -1
- package/dist/common/guards/login.guard.js +5 -20
- package/dist/common/guards/login.guard.js.map +1 -1
- package/dist/common/libraries/base.migration.utility.js +106 -145
- package/dist/common/libraries/base.migration.utility.js.map +1 -1
- package/dist/common/libraries/common.entity.js +42 -63
- package/dist/common/libraries/common.entity.js.map +1 -1
- package/dist/common/libraries/common.job.d.ts +2 -0
- package/dist/common/libraries/common.job.js +46 -46
- package/dist/common/libraries/common.job.js.map +1 -1
- package/dist/common/libraries/common.mapper.job.js +20 -35
- package/dist/common/libraries/common.mapper.job.js.map +1 -1
- package/dist/common/libraries/common.subscriber.js +4 -17
- package/dist/common/libraries/common.subscriber.js.map +1 -1
- package/dist/common/libraries/data.manager.js +85 -112
- package/dist/common/libraries/data.manager.js.map +1 -1
- package/dist/common/libraries/list.manager.js +62 -85
- package/dist/common/libraries/list.manager.js.map +1 -1
- package/dist/common/libraries/migration.utility.js +10 -31
- package/dist/common/libraries/migration.utility.js.map +1 -1
- package/dist/common/libraries/platform.utility.js +2 -13
- package/dist/common/libraries/platform.utility.js.map +1 -1
- package/dist/common/libraries/record.manager.js +106 -127
- package/dist/common/libraries/record.manager.js.map +1 -1
- package/dist/common/libraries/report.data.manager.js +66 -93
- package/dist/common/libraries/report.data.manager.js.map +1 -1
- package/dist/common/libraries/report.list.manager.js +69 -92
- package/dist/common/libraries/report.list.manager.js.map +1 -1
- package/dist/common/libraries/reverse.migration.utility.js +4 -23
- package/dist/common/libraries/reverse.migration.utility.js.map +1 -1
- package/dist/common/libraries/seeder.utility.js +51 -70
- package/dist/common/libraries/seeder.utility.js.map +1 -1
- package/dist/console.js +4 -13
- package/dist/console.js.map +1 -1
- package/dist/main.js +15 -26
- package/dist/main.js.map +1 -1
- package/dist/migrations/1599567001962-AddUserSequence.js +3 -16
- package/dist/migrations/1599567001962-AddUserSequence.js.map +1 -1
- package/dist/migrations/1607944291609-AddUniqueIndexDeviceToken.js +7 -20
- package/dist/migrations/1607944291609-AddUniqueIndexDeviceToken.js.map +1 -1
- package/dist/platformUtility/commands/entity.generator.command.js +81 -108
- package/dist/platformUtility/commands/entity.generator.command.js.map +1 -1
- package/dist/platformUtility/commands/maintenance.command.js +16 -35
- package/dist/platformUtility/commands/maintenance.command.js.map +1 -1
- package/dist/platformUtility/commands/sqs.worker.command.js +49 -72
- package/dist/platformUtility/commands/sqs.worker.command.js.map +1 -1
- package/dist/platformUtility/commands/sync.class.command.js +14 -25
- package/dist/platformUtility/commands/sync.class.command.js.map +1 -1
- package/dist/platformUtility/consumers/event.consumer.js +21 -42
- package/dist/platformUtility/consumers/event.consumer.js.map +1 -1
- package/dist/platformUtility/consumers/job.consumer.js +8 -19
- package/dist/platformUtility/consumers/job.consumer.js.map +1 -1
- package/dist/platformUtility/controllers/queue.controller.js +47 -76
- package/dist/platformUtility/controllers/queue.controller.js.map +1 -1
- package/dist/platformUtility/jobs/record.watcher.job.js +5 -18
- package/dist/platformUtility/jobs/record.watcher.job.js.map +1 -1
- package/dist/platformUtility/jobs/test.job.js +1 -12
- package/dist/platformUtility/jobs/test.job.js.map +1 -1
- package/dist/platformUtility/libraries/process.common.mail.js +27 -44
- package/dist/platformUtility/libraries/process.common.mail.js.map +1 -1
- package/dist/platformUtility/libraries/process.postmark.mail.js +22 -37
- package/dist/platformUtility/libraries/process.postmark.mail.js.map +1 -1
- package/dist/platformUtility/services/audit.service.js +50 -67
- package/dist/platformUtility/services/audit.service.js.map +1 -1
- package/dist/platformUtility/services/cache.service.js +21 -36
- package/dist/platformUtility/services/cache.service.js.map +1 -1
- package/dist/platformUtility/services/dynamo.service.js +16 -29
- package/dist/platformUtility/services/dynamo.service.js.map +1 -1
- package/dist/platformUtility/services/fcm.notification.service.js +42 -63
- package/dist/platformUtility/services/fcm.notification.service.js.map +1 -1
- package/dist/platformUtility/services/mail.service.js +8 -19
- package/dist/platformUtility/services/mail.service.js.map +1 -1
- package/dist/platformUtility/services/queue.service.js +105 -158
- package/dist/platformUtility/services/queue.service.js.map +1 -1
- package/dist/platformUtility/services/remote.request.service.js +8 -19
- package/dist/platformUtility/services/remote.request.service.js.map +1 -1
- package/dist/platformUtility/services/sql.service.js +17 -38
- package/dist/platformUtility/services/sql.service.js.map +1 -1
- package/dist/platformUtility/services/sqs.service.js +39 -56
- package/dist/platformUtility/services/sqs.service.js.map +1 -1
- package/dist/platformUtility/services/startup.service.js +8 -21
- package/dist/platformUtility/services/startup.service.js.map +1 -1
- package/dist/platformUtility/subscribers/base.subscriber.js +6 -19
- package/dist/platformUtility/subscribers/base.subscriber.js.map +1 -1
- package/dist/system/commands/db.scanner.command.js +182 -221
- package/dist/system/commands/db.scanner.command.js.map +1 -1
- package/dist/system/commands/event.queue.command.js +30 -47
- package/dist/system/commands/event.queue.command.js.map +1 -1
- package/dist/system/commands/jobs.scanner.command.js +7 -18
- package/dist/system/commands/jobs.scanner.command.js.map +1 -1
- package/dist/system/commands/model.scanner.command.js +15 -30
- package/dist/system/commands/model.scanner.command.js.map +1 -1
- package/dist/system/commands/report.scanner.command.js +9 -20
- package/dist/system/commands/report.scanner.command.js.map +1 -1
- package/dist/system/commands/service.scanner.command.js +7 -18
- package/dist/system/commands/service.scanner.command.js.map +1 -1
- package/dist/system/commands/sync.all.command.js +13 -24
- package/dist/system/commands/sync.all.command.js.map +1 -1
- package/dist/system/controllers/base.controller.js +62 -87
- package/dist/system/controllers/base.controller.js.map +1 -1
- package/dist/system/controllers/data.controller.js +10 -23
- package/dist/system/controllers/data.controller.js.map +1 -1
- package/dist/system/controllers/form.controller.js +9 -20
- package/dist/system/controllers/form.controller.js.map +1 -1
- package/dist/system/controllers/menu.controller.js +4 -17
- package/dist/system/controllers/menu.controller.js.map +1 -1
- package/dist/system/controllers/preference.controller.js +51 -74
- package/dist/system/controllers/preference.controller.js.map +1 -1
- package/dist/system/controllers/report.controller.js +29 -46
- package/dist/system/controllers/report.controller.js.map +1 -1
- package/dist/system/controllers/upload.controller.js +11 -26
- package/dist/system/controllers/upload.controller.js.map +1 -1
- package/dist/system/controllers/user.preference.controller.js +9 -22
- package/dist/system/controllers/user.preference.controller.js.map +1 -1
- package/dist/system/es6.classes.d.ts +1 -1
- package/dist/system/jobs/clean.scheduled.event.job.js +3 -14
- package/dist/system/jobs/clean.scheduled.event.job.js.map +1 -1
- package/dist/system/jobs/column.mapper.job.js +18 -33
- package/dist/system/jobs/column.mapper.job.js.map +1 -1
- package/dist/system/jobs/model.scanner.job.js +106 -133
- package/dist/system/jobs/model.scanner.job.js.map +1 -1
- package/dist/system/jobs/property.job.js +5 -16
- package/dist/system/jobs/property.job.js.map +1 -1
- package/dist/system/jobs/relationship.mapper.job.js +18 -33
- package/dist/system/jobs/relationship.mapper.job.js.map +1 -1
- package/dist/system/jobs/report.column.sync.job.js +71 -94
- package/dist/system/jobs/report.column.sync.job.js.map +1 -1
- package/dist/system/jobs/scheduled.event.job.js +15 -28
- package/dist/system/jobs/scheduled.event.job.js.map +1 -1
- package/dist/system/jobs/scheduled.events.job.js +11 -22
- package/dist/system/jobs/scheduled.events.job.js.map +1 -1
- package/dist/system/jobs/user.group.member.job.js +56 -79
- package/dist/system/jobs/user.group.member.job.js.map +1 -1
- package/dist/system/jobs/user.group.permission.job.js +24 -39
- package/dist/system/jobs/user.group.permission.job.js.map +1 -1
- package/dist/system/jobs/user.group.role.job.js +24 -39
- package/dist/system/jobs/user.group.role.job.js.map +1 -1
- package/dist/system/libraries/business.rule.filter.validator.js +20 -37
- package/dist/system/libraries/business.rule.filter.validator.js.map +1 -1
- package/dist/system/libraries/business.rule.query.evaluator.js +24 -39
- package/dist/system/libraries/business.rule.query.evaluator.js.map +1 -1
- package/dist/system/libraries/column.manager.js +42 -61
- package/dist/system/libraries/column.manager.js.map +1 -1
- package/dist/system/libraries/model.sync.js +64 -87
- package/dist/system/libraries/model.sync.js.map +1 -1
- package/dist/system/libraries/security.rule.evaluator.js +13 -26
- package/dist/system/libraries/security.rule.evaluator.js.map +1 -1
- package/dist/system/services/business.rule.service.js +23 -36
- package/dist/system/services/business.rule.service.js.map +1 -1
- package/dist/system/services/client.script.service.js +17 -28
- package/dist/system/services/client.script.service.js.map +1 -1
- package/dist/system/services/column.service.js +12 -23
- package/dist/system/services/column.service.js.map +1 -1
- package/dist/system/services/comment.service.js +2 -13
- package/dist/system/services/comment.service.js.map +1 -1
- package/dist/system/services/common.service.js +27 -44
- package/dist/system/services/common.service.js.map +1 -1
- package/dist/system/services/document.service.js +3 -14
- package/dist/system/services/document.service.js.map +1 -1
- package/dist/system/services/event.detail.service.js +10 -21
- package/dist/system/services/event.detail.service.js.map +1 -1
- package/dist/system/services/event.queue.service.js +21 -34
- package/dist/system/services/event.queue.service.js.map +1 -1
- package/dist/system/services/form.service.js +6 -17
- package/dist/system/services/form.service.js.map +1 -1
- package/dist/system/services/list.service.js +20 -35
- package/dist/system/services/list.service.js.map +1 -1
- package/dist/system/services/menu.service.js +50 -69
- package/dist/system/services/menu.service.js.map +1 -1
- package/dist/system/services/model.service.js +60 -81
- package/dist/system/services/model.service.js.map +1 -1
- package/dist/system/services/preference.service.js +32 -53
- package/dist/system/services/preference.service.js.map +1 -1
- package/dist/system/services/property.service.js +23 -36
- package/dist/system/services/property.service.js.map +1 -1
- package/dist/system/services/report.service.js +19 -32
- package/dist/system/services/report.service.js.map +1 -1
- package/dist/system/services/scheduled.event.service.js +69 -90
- package/dist/system/services/scheduled.event.service.js.map +1 -1
- package/dist/system/services/security.rule.service.js +23 -40
- package/dist/system/services/security.rule.service.js.map +1 -1
- package/dist/system/services/ui.action.service.js +13 -24
- package/dist/system/services/ui.action.service.js.map +1 -1
- package/dist/system/services/upload.service.js +33 -48
- package/dist/system/services/upload.service.js.map +1 -1
- package/dist/system/services/user.preference.service.js +38 -57
- package/dist/system/services/user.preference.service.js.map +1 -1
- package/dist/system/subscribers/column.subscriber.js +4 -17
- package/dist/system/subscribers/column.subscriber.js.map +1 -1
- package/dist/system/subscribers/property.subscriber.js +4 -17
- package/dist/system/subscribers/property.subscriber.js.map +1 -1
- package/dist/system/subscribers/relationship.subscriber.js +4 -17
- package/dist/system/subscribers/relationship.subscriber.js.map +1 -1
- package/dist/system/subscribers/scheduled.event.subscriber.js +6 -19
- package/dist/system/subscribers/scheduled.event.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.member.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.member.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.permission.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.permission.subscriber.js.map +1 -1
- package/dist/system/subscribers/user.group.role.subscriber.js +4 -17
- package/dist/system/subscribers/user.group.role.subscriber.js.map +1 -1
- package/dist/worker.js +6 -17
- package/dist/worker.js.map +1 -1
- package/package.json +2 -1
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.PropertyService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -27,36 +18,32 @@ let PropertyService = class PropertyService {
|
|
27
18
|
constructor(cacheService) {
|
28
19
|
this.cacheService = cacheService;
|
29
20
|
}
|
30
|
-
get(key, defaultValue) {
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
return property.value;
|
44
|
-
});
|
21
|
+
async get(key, defaultValue) {
|
22
|
+
defaultValue = defaultValue !== null && defaultValue !== void 0 ? defaultValue : null;
|
23
|
+
const index = `property.${key}`;
|
24
|
+
const value = await this.cacheService.get(index, null);
|
25
|
+
if (value)
|
26
|
+
return value;
|
27
|
+
const property = await property_entity_1.PropertyEntity.findOne({ where: { name: key } });
|
28
|
+
if (!property)
|
29
|
+
return defaultValue;
|
30
|
+
if (property.is_caching_enabled) {
|
31
|
+
await this.cacheService.set(index, property.value, date_util_1.DateUtil.getFutureDateTime(15));
|
32
|
+
}
|
33
|
+
return property.value;
|
45
34
|
}
|
46
|
-
set(property) {
|
35
|
+
async set(property) {
|
47
36
|
var _a;
|
48
|
-
|
49
|
-
|
50
|
-
name: property.name,
|
51
|
-
});
|
52
|
-
record.value = property.value;
|
53
|
-
record.is_caching_enabled = (_a = property.is_caching_enabled) !== null && _a !== void 0 ? _a : true;
|
54
|
-
yield record.save();
|
55
|
-
if (record && record.is_caching_enabled) {
|
56
|
-
yield this.cacheService.set(`property.${property.name}`, property.value, date_util_1.DateUtil.getFutureDateTime(15));
|
57
|
-
}
|
58
|
-
return record;
|
37
|
+
const record = await property_entity_1.PropertyEntity.firstOrNew({
|
38
|
+
name: property.name,
|
59
39
|
});
|
40
|
+
record.value = property.value;
|
41
|
+
record.is_caching_enabled = (_a = property.is_caching_enabled) !== null && _a !== void 0 ? _a : true;
|
42
|
+
await record.save();
|
43
|
+
if (record && record.is_caching_enabled) {
|
44
|
+
await this.cacheService.set(`property.${property.name}`, property.value, date_util_1.DateUtil.getFutureDateTime(15));
|
45
|
+
}
|
46
|
+
return record;
|
60
47
|
}
|
61
48
|
};
|
62
49
|
PropertyService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"property.service.js","sourceRoot":"","sources":["../../../src/system/services/property.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"property.service.js","sourceRoot":"","sources":["../../../src/system/services/property.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,gFAA4E;AAC5E,gEAA4D;AAC5D,iEAA6D;AAQtD,IAAM,eAAe,GAArB,MAAM,eAAe;IAMxB,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAS3D,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,YAAkB;QACrC,YAAY,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,IAAI,CAAC;QAEpC,MAAM,KAAK,GAAG,YAAY,GAAG,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEvD,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QAExB,MAAM,QAAQ,GAAG,MAAM,gCAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ;YAAE,OAAO,YAAY,CAAC;QAGnC,IAAI,QAAQ,CAAC,kBAAkB,EAAE;YAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;SACtF;QAED,OAAO,QAAQ,CAAC,KAAK,CAAC;IAC1B,CAAC;IAQD,KAAK,CAAC,GAAG,CAAC,QAAuC;;QAC7C,MAAM,MAAM,GAAG,MAAM,gCAAc,CAAC,UAAU,CAAC;YAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC9B,MAAM,CAAC,kBAAkB,GAAG,MAAA,QAAQ,CAAC,kBAAkB,mCAAI,IAAI,CAAC;QAEhE,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpB,IAAI,MAAM,IAAI,MAAM,CAAC,kBAAkB,EAAE;YACrC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;SAC5G;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AAxDY,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAOkC,4BAAY;GAN9C,eAAe,CAwD3B;AAxDY,0CAAe"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.ReportService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -33,32 +24,28 @@ let ReportService = class ReportService {
|
|
33
24
|
this.preferenceService = preferenceService;
|
34
25
|
this.uiActionService = uiActionService;
|
35
26
|
}
|
36
|
-
hasAccess(id) {
|
37
|
-
|
38
|
-
|
39
|
-
where: { report_id: id },
|
40
|
-
});
|
41
|
-
if (assignments.length === 0) {
|
42
|
-
return this.accessManager.hasRoleId(ROLEMAPPING.internal) || this.accessManager.hasRoleId(ROLEMAPPING.super_admin);
|
43
|
-
}
|
44
|
-
return this.accessManager.hasRoleAssignments(assignments);
|
27
|
+
async hasAccess(id) {
|
28
|
+
const assignments = await entities_1.ReportRoleEntity.find({
|
29
|
+
where: { report_id: id },
|
45
30
|
});
|
31
|
+
if (assignments.length === 0) {
|
32
|
+
return this.accessManager.hasRoleId(ROLEMAPPING.internal) || this.accessManager.hasRoleId(ROLEMAPPING.super_admin);
|
33
|
+
}
|
34
|
+
return this.accessManager.hasRoleAssignments(assignments);
|
46
35
|
}
|
47
|
-
getReportDetails(id) {
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
report
|
55
|
-
|
56
|
-
relations: ['primary_axis', 'secondary_axis'],
|
57
|
-
});
|
58
|
-
report.list_layouts = yield this.preferenceService.getListPreferences(SOURCEHASH.report, id);
|
59
|
-
report.ui_actions = yield this.uiActionService.getUiActions(SOURCEHASH.report, id);
|
60
|
-
return report;
|
36
|
+
async getReportDetails(id) {
|
37
|
+
const report = await entities_1.ReportEntity.first(id, {
|
38
|
+
relations: ['params'],
|
39
|
+
});
|
40
|
+
if (!report)
|
41
|
+
throw new operation_exception_1.OperationException('Report doesnot exist');
|
42
|
+
report.charts = await entities_1.ChartEntity.find({
|
43
|
+
where: { source_type: SOURCEHASH.report, source_id: id },
|
44
|
+
relations: ['primary_axis', 'secondary_axis'],
|
61
45
|
});
|
46
|
+
report.list_layouts = await this.preferenceService.getListPreferences(SOURCEHASH.report, id);
|
47
|
+
report.ui_actions = await this.uiActionService.getUiActions(SOURCEHASH.report, id);
|
48
|
+
return report;
|
62
49
|
}
|
63
50
|
};
|
64
51
|
ReportService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/system/services/report.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/system/services/report.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uEAAmE;AACnE,qFAAiF;AACjF,0CAA0E;AAC1E,6DAAyD;AACzD,2DAAsD;AACtD,yDAA0D;AAC1D,uDAAwD;AAGjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACtB,YACqB,aAA4B,EAC5B,iBAAoC,EACpC,eAAgC;QAFhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,EAAU;QACtB,MAAM,WAAW,GAAG,MAAM,2BAAgB,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;SAC3B,CAAC,CAAC;QAEH,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SACtH;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAU;QAC7B,MAAM,MAAM,GAAG,MAAM,uBAAY,CAAC,KAAK,CAAC,EAAE,EAAE;YACxC,SAAS,EAAE,CAAC,QAAQ,CAAC;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,wCAAkB,CAAC,sBAAsB,CAAC,CAAC;QAElE,MAAM,CAAC,MAAM,GAAG,MAAM,sBAAW,CAAC,IAAI,CAAC;YACnC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE;YACxD,SAAS,EAAE,CAAC,cAAc,EAAE,gBAAgB,CAAC;SAChD,CAAC,CAAC;QAEH,MAAM,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAE7F,MAAM,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEnF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AApCY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAG2B,8BAAa;QACT,sCAAiB;QACnB,mCAAe;GAJ5C,aAAa,CAoCzB;AApCY,sCAAa"}
|
@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
7
|
};
|
8
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
15
|
-
});
|
16
|
-
};
|
17
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
18
9
|
exports.ScheduledEventService = void 0;
|
19
10
|
const common_1 = require("@nestjs/common");
|
@@ -24,97 +15,85 @@ const event_queue_entity_1 = require("../entities/event.queue.entity");
|
|
24
15
|
const scheduled_event_entity_1 = require("../entities/scheduled.event.entity");
|
25
16
|
const SOURCEHASH = require("../../config/source.hash");
|
26
17
|
let ScheduledEventService = class ScheduledEventService {
|
27
|
-
getActiveEvents(id) {
|
28
|
-
return
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
},
|
38
|
-
});
|
18
|
+
async getActiveEvents(id) {
|
19
|
+
return event_queue_entity_1.EventQueueEntity.find({
|
20
|
+
where: {
|
21
|
+
source_type: SOURCEHASH.scheduledEvent,
|
22
|
+
source_id: id,
|
23
|
+
start_time: (0, typeorm_1.IsNull)(),
|
24
|
+
},
|
25
|
+
order: {
|
26
|
+
scheduled_start_time: 'ASC',
|
27
|
+
},
|
39
28
|
});
|
40
29
|
}
|
41
|
-
getCompletedEvents(id) {
|
42
|
-
return
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
},
|
53
|
-
});
|
30
|
+
async getCompletedEvents(id) {
|
31
|
+
return event_queue_entity_1.EventQueueEntity.find({
|
32
|
+
where: {
|
33
|
+
source_type: SOURCEHASH.scheduledEvent,
|
34
|
+
source_id: id,
|
35
|
+
start_time: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
|
36
|
+
},
|
37
|
+
take: 10,
|
38
|
+
order: {
|
39
|
+
scheduled_start_time: 'DESC',
|
40
|
+
},
|
54
41
|
});
|
55
42
|
}
|
56
|
-
deleteActiveEvents(id) {
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
promises.push(record.softRemove());
|
62
|
-
});
|
63
|
-
Promise.all(promises).then(() => {
|
64
|
-
return;
|
65
|
-
});
|
43
|
+
async deleteActiveEvents(id) {
|
44
|
+
const records = await this.getActiveEvents(id);
|
45
|
+
const promises = [];
|
46
|
+
records.forEach((record) => {
|
47
|
+
promises.push(record.softRemove());
|
66
48
|
});
|
67
|
-
|
68
|
-
|
69
|
-
return __awaiter(this, void 0, void 0, function* () {
|
70
|
-
const record = new event_queue_entity_1.EventQueueEntity();
|
71
|
-
record.name = job.event.name;
|
72
|
-
record.event_id = job.event_id;
|
73
|
-
record.parameter = job.parameter;
|
74
|
-
record.scheduled_start_time = scheduledTime;
|
75
|
-
record.source_type = SOURCEHASH.scheduledEvent;
|
76
|
-
record.source_id = job.id;
|
77
|
-
yield record.save();
|
78
|
-
return record;
|
49
|
+
Promise.all(promises).then(() => {
|
50
|
+
return;
|
79
51
|
});
|
80
52
|
}
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
if (!nextTime.hasNext())
|
99
|
-
return;
|
100
|
-
const event = yield this.setNewEvent(job, nextTime.next().toDate());
|
101
|
-
job.last_scheduled_time = event.scheduled_start_time;
|
102
|
-
++inQueue;
|
103
|
-
}
|
104
|
-
yield job.save();
|
53
|
+
async setNewEvent(job, scheduledTime = new Date()) {
|
54
|
+
const record = new event_queue_entity_1.EventQueueEntity();
|
55
|
+
record.name = job.event.name;
|
56
|
+
record.event_id = job.event_id;
|
57
|
+
record.parameter = job.parameter;
|
58
|
+
record.scheduled_start_time = scheduledTime;
|
59
|
+
record.source_type = SOURCEHASH.scheduledEvent;
|
60
|
+
record.source_id = job.id;
|
61
|
+
await record.save();
|
62
|
+
return record;
|
63
|
+
}
|
64
|
+
async createEventsForJob(job) {
|
65
|
+
if (!(job && job.event))
|
66
|
+
return job;
|
67
|
+
const events = await this.getActiveEvents(job.id);
|
68
|
+
let inQueue = events.length;
|
69
|
+
if (inQueue > 6)
|
105
70
|
return job;
|
71
|
+
let lastRunTime = inQueue ? events.slice(-1)[0].scheduled_start_time : date_util_1.DateUtil.getDateTime();
|
72
|
+
lastRunTime = lastRunTime < job.start_time ? job.start_time : lastRunTime;
|
73
|
+
if (lastRunTime > job.end_time)
|
74
|
+
return;
|
75
|
+
const nextTime = parser.parseExpression(job.timing, {
|
76
|
+
currentDate: lastRunTime,
|
77
|
+
endDate: job.end_time,
|
106
78
|
});
|
79
|
+
while (inQueue <= 10) {
|
80
|
+
if (!nextTime.hasNext())
|
81
|
+
return;
|
82
|
+
const event = await this.setNewEvent(job, nextTime.next().toDate());
|
83
|
+
job.last_scheduled_time = event.scheduled_start_time;
|
84
|
+
++inQueue;
|
85
|
+
}
|
86
|
+
await job.save();
|
87
|
+
return job;
|
107
88
|
}
|
108
|
-
getActiveSchedules() {
|
109
|
-
return
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
},
|
117
|
-
});
|
89
|
+
async getActiveSchedules() {
|
90
|
+
return scheduled_event_entity_1.ScheduledEventEntity.find({
|
91
|
+
relations: ['event'],
|
92
|
+
where: {
|
93
|
+
active: true,
|
94
|
+
end_time: (0, typeorm_1.Not)((0, typeorm_1.LessThan)(date_util_1.DateUtil.getDateTime())),
|
95
|
+
last_scheduled_time: (0, typeorm_1.LessThan)(date_util_1.DateUtil.getFutureDateTime(10)),
|
96
|
+
},
|
118
97
|
});
|
119
98
|
}
|
120
99
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":"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"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.SecurityRuleService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -27,32 +18,25 @@ let SecurityRuleService = class SecurityRuleService {
|
|
27
18
|
constructor(sqlService) {
|
28
19
|
this.sqlService = sqlService;
|
29
20
|
}
|
30
|
-
getModelSecurityRules(model, operation) {
|
31
|
-
return
|
32
|
-
return this.getSecurityRules(model.id, model.table_name, operation, SOURCEHASH.model);
|
33
|
-
});
|
21
|
+
async getModelSecurityRules(model, operation) {
|
22
|
+
return this.getSecurityRules(model.id, model.table_name, operation, SOURCEHASH.model);
|
34
23
|
}
|
35
|
-
getFormSecurityRules(form) {
|
36
|
-
return
|
37
|
-
return this.getSecurityRules(form.id, form.identifier, '-', SOURCEHASH.form);
|
38
|
-
});
|
24
|
+
async getFormSecurityRules(form) {
|
25
|
+
return this.getSecurityRules(form.id, form.identifier, '-', SOURCEHASH.form);
|
39
26
|
}
|
40
27
|
getSecurityObjectNotation(identifier, name) {
|
41
28
|
if (name === identifier || name === `${identifier}.*`)
|
42
29
|
return identifier;
|
43
30
|
return name.split('.').slice(-1)[0];
|
44
31
|
}
|
45
|
-
getScript(id) {
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
return script.script;
|
50
|
-
});
|
32
|
+
async getScript(id) {
|
33
|
+
const script = await system_script_entity_1.SystemScriptEntity.findOne({ where: { id } });
|
34
|
+
if (script)
|
35
|
+
return script.script;
|
51
36
|
}
|
52
|
-
getSecurityRules(id, identifier, operation, sourceType) {
|
53
|
-
|
54
|
-
|
55
|
-
const sql = `SELECT
|
37
|
+
async getSecurityRules(id, identifier, operation, sourceType) {
|
38
|
+
const rules = {};
|
39
|
+
const sql = `SELECT
|
56
40
|
id,
|
57
41
|
name,
|
58
42
|
filter_condition_id,
|
@@ -84,19 +68,18 @@ let SecurityRuleService = class SecurityRuleService {
|
|
84
68
|
OR a.name = CONCAT('${identifier}', '.', b.name))
|
85
69
|
AND a.deleted_at IS NULL
|
86
70
|
AND b.deleted_at IS NULL`;
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
});
|
71
|
+
const records = await this.sqlService.sql(sql);
|
72
|
+
for (const record of records) {
|
73
|
+
const base = this.getSecurityObjectNotation(identifier, record.name);
|
74
|
+
if (!rules[base])
|
75
|
+
rules[base] = [];
|
76
|
+
if (record.script_id)
|
77
|
+
record.script = await this.getScript(record.script_id);
|
78
|
+
if (record.filter_condition_id)
|
79
|
+
record.filter_condition_id = await this.getScript(record.filter_condition_id);
|
80
|
+
rules[base].push(record);
|
81
|
+
}
|
82
|
+
return rules;
|
100
83
|
}
|
101
84
|
};
|
102
85
|
SecurityRuleService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"security.rule.service.js","sourceRoot":"","sources":["../../../src/system/services/security.rule.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"security.rule.service.js","sourceRoot":"","sources":["../../../src/system/services/security.rule.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uDAAwD;AACxD,4EAAwE;AAGxE,2EAAsE;AAG/D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IACvD,KAAK,CAAC,qBAAqB,CAAC,KAAkB,EAAE,SAAiB;QAC7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAgB;QACvC,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,yBAAyB,CAAC,UAAkB,EAAE,IAAY;QACtD,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,GAAG,UAAU,IAAI;YAAE,OAAO,UAAU,CAAC;QAEzE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACtB,MAAM,MAAM,GAAG,MAAM,yCAAkB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAU,EAAE,UAAkB,EAAE,SAAiB,EAAE,UAAkB;QACxF,MAAM,KAAK,GAAG,EAAE,CAAC;QAEjB,MAAM,GAAG,GAAG;;;;;;;;;;6BAUS,SAAS;oBAClB,UAAU;2BACH,UAAU;;;;;;;;;;;;sBAYf,EAAE;6BACK,UAAU;;+BAER,SAAS;;6BAEX,UAAU;;+BAER,CAAC;QAExB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE/C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAErE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAEnC,IAAI,MAAM,CAAC,SAAS;gBAAE,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE7E,IAAI,MAAM,CAAC,mBAAmB;gBAAE,MAAM,CAAC,mBAAmB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAE9G,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC5B;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAzEY,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAEgC,wBAAU;GAD1C,mBAAmB,CAyE/B;AAzEY,kDAAmB"}
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
10
|
};
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
18
|
-
});
|
19
|
-
};
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
21
12
|
exports.UiActionService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -27,22 +18,20 @@ let UiActionService = class UiActionService {
|
|
27
18
|
constructor(accessManager) {
|
28
19
|
this.accessManager = accessManager;
|
29
20
|
}
|
30
|
-
getUiActions(source_type, source_id) {
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
return actions.push(this.stripOffUnwanted(record));
|
43
|
-
});
|
44
|
-
return actions;
|
21
|
+
async getUiActions(source_type, source_id) {
|
22
|
+
const actions = [];
|
23
|
+
const records = await ui_action_entity_1.UiActionEntity.find({
|
24
|
+
where: { source_type, source_id, active: true },
|
25
|
+
relations: ['roles', 'permissions', 'filter_condition', 'script'],
|
26
|
+
order: {
|
27
|
+
display_order: 'ASC',
|
28
|
+
},
|
29
|
+
});
|
30
|
+
records.forEach((record) => {
|
31
|
+
if (this.validateUiActionAccess(record))
|
32
|
+
return actions.push(this.stripOffUnwanted(record));
|
45
33
|
});
|
34
|
+
return actions;
|
46
35
|
}
|
47
36
|
validateUiActionAccess(uiAction) {
|
48
37
|
if (uiAction.roles.length === 0 && uiAction.permissions.length === 0)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ui.action.service.js","sourceRoot":"","sources":["../../../src/system/services/ui.action.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"ui.action.service.js","sourceRoot":"","sources":["../../../src/system/services/ui.action.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA8D;AAC9D,sEAAkE;AAClE,uEAAmE;AAG5D,IAAM,eAAe,GAArB,MAAM,eAAe;IACxB,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAC7D,KAAK,CAAC,YAAY,CAAC,WAAmB,EAAE,SAAiB;QACrD,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,MAAM,OAAO,GAAG,MAAM,iCAAc,CAAC,IAAI,CAAC;YACtC,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;YAC/C,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,QAAQ,CAAC;YACjE,KAAK,EAAE;gBACH,aAAa,EAAE,KAAK;aACvB;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvB,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;gBAAE,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAChG,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,sBAAsB,CAAC,QAAwB;QAEnD,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAGlF,IAAI,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEvE,IAAI,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC;QAEnF,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,gBAAgB,CAAC,QAAwB;QAC7C,OAAO,QAAQ,CAAC,KAAK,CAAC;QACtB,OAAO,QAAQ,CAAC,WAAW,CAAC;QAE5B,OAAO,0BAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;CACJ,CAAA;AAtCY,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAEmC,8BAAa;GADhD,eAAe,CAsC3B;AAtCY,0CAAe"}
|