@servicelabsco/nestjs-utility-services 1.1.15 → 1.1.17
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.js +31 -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.d.ts +1 -0
- package/dist/common/libraries/common.subscriber.js +10 -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/dtos/common.attributes.dto.d.ts +1 -0
- package/dist/platformUtility/dtos/common.attributes.dto.js +6 -0
- package/dist/platformUtility/dtos/common.attributes.dto.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.FormService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -27,15 +18,13 @@ let FormService = class FormService {
|
|
27
18
|
constructor(securityRuleService) {
|
28
19
|
this.securityRuleService = securityRuleService;
|
29
20
|
}
|
30
|
-
getDictionary(form) {
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
rules,
|
36
|
-
});
|
37
|
-
return columnManager.allowed;
|
21
|
+
async getDictionary(form) {
|
22
|
+
const rules = await this.securityRuleService.getFormSecurityRules(form);
|
23
|
+
const columnManager = new column_manager_1.ColumnManager();
|
24
|
+
await columnManager.process(SOURCEHASH.form, form.id, {
|
25
|
+
rules,
|
38
26
|
});
|
27
|
+
return columnManager.allowed;
|
39
28
|
}
|
40
29
|
};
|
41
30
|
FormService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"form.service.js","sourceRoot":"","sources":["../../../src/system/services/form.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"form.service.js","sourceRoot":"","sources":["../../../src/system/services/form.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uDAAwD;AAExD,gEAA4D;AAC5D,mEAA8D;AAGvD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACpB,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;IAEzE,KAAK,CAAC,aAAa,CAAC,IAAgB;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,aAAa,GAAG,IAAI,8BAAa,EAAE,CAAC;QAE1C,MAAM,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YAClD,KAAK;SACR,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC,OAAO,CAAC;IACjC,CAAC;CACJ,CAAA;AAbY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEyC,2CAAmB;GAD5D,WAAW,CAavB;AAbY,kCAAW"}
|
@@ -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.ListService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -41,35 +32,29 @@ let ListService = class ListService {
|
|
41
32
|
this.uiActionService = uiActionService;
|
42
33
|
this.businessRuleService = businessRuleService;
|
43
34
|
}
|
44
|
-
index(params) {
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
return listManager.process(params);
|
49
|
-
});
|
35
|
+
async index(params) {
|
36
|
+
const listManager = new list_manager_1.ListManager(this.modelService, this.sqlService, this.cacheService, this.preferenceService, this.businessRuleService);
|
37
|
+
params.layout = await this.getLayoutDefinition(params.layout_id);
|
38
|
+
return listManager.process(params);
|
50
39
|
}
|
51
|
-
show(id, params) {
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
return recordManager.process(id, params);
|
56
|
-
});
|
40
|
+
async show(id, params) {
|
41
|
+
const recordManager = new record_manager_1.RecordManager(this.modelService, this.sqlService, this.cacheService, this.preferenceService, this.uiActionService, this.businessRuleService);
|
42
|
+
params.layout = await this.getLayoutDefinition(params.layout_id);
|
43
|
+
return recordManager.process(id, params);
|
57
44
|
}
|
58
|
-
getLayoutDefinition(layoutId) {
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
columns.push((0, class_transformer_1.plainToClass)(layout_column_db_dto_1.LayoutColumnDbDto, columnDefinition));
|
70
|
-
});
|
71
|
-
return columns;
|
45
|
+
async getLayoutDefinition(layoutId) {
|
46
|
+
if (!layoutId)
|
47
|
+
return [];
|
48
|
+
const columns = [];
|
49
|
+
const definition = await list_preference_entity_1.ListPreferenceEntity.first(layoutId);
|
50
|
+
if (!definition)
|
51
|
+
throw new operation_exception_1.OperationException(`Invalid layoutid ${layoutId}`);
|
52
|
+
if (!Array.isArray(definition.column_definition))
|
53
|
+
return [];
|
54
|
+
definition.column_definition.forEach((columnDefinition) => {
|
55
|
+
columns.push((0, class_transformer_1.plainToClass)(layout_column_db_dto_1.LayoutColumnDbDto, columnDefinition));
|
72
56
|
});
|
57
|
+
return columns;
|
73
58
|
}
|
74
59
|
getBaseFromModel(model) {
|
75
60
|
return model.name.toLowerCase();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"list.service.js","sourceRoot":"","sources":["../../../src/system/services/list.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"list.service.js","sourceRoot":"","sources":["../../../src/system/services/list.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAiD;AACjD,gFAA4E;AAC5E,yFAAoF;AAEpF,uEAAmE;AACnE,iFAA6E;AAC7E,+EAA0E;AAC1E,uFAAkF;AAClF,4EAAwE;AAExE,sEAAkE;AAClE,0EAAsE;AACtE,iFAA2E;AAC3E,qFAAiF;AAG1E,IAAM,WAAW,GAAjB,MAAM,WAAW;IACpB,YACqB,YAA0B,EAC1B,UAAsB,EACtB,YAA0B,EAC1B,iBAAoC,EACpC,eAAgC,EAChC,mBAAwC;QALxC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;QAChC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAC1D,CAAC;IAEJ,KAAK,CAAC,KAAK,CAAC,MAA4B;QACpC,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAE7I,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEjE,OAAO,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,MAA4B;QAC/C,MAAM,aAAa,GAAG,IAAI,8BAAa,CACnC,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,mBAAmB,CAC3B,CAAC;QACF,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEjE,OAAO,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,QAAgB;QACtC,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAC;QAEzB,MAAM,OAAO,GAAwB,EAAE,CAAC;QAExC,MAAM,UAAU,GAAG,MAAM,6CAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE9D,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,wCAAkB,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;QAG9E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC;YAAE,OAAO,EAAE,CAAC;QAE5D,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAqB,EAAE,EAAE;YAC3D,OAAO,CAAC,IAAI,CAAC,IAAA,gCAAY,EAAC,wCAAiB,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,gBAAgB,CAAC,KAAkB;QAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;CACJ,CAAA;AAtDY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAG0B,4BAAY;QACd,wBAAU;QACR,4BAAY;QACP,sCAAiB;QACnB,mCAAe;QACX,2CAAmB;GAPpD,WAAW,CAsDvB;AAtDY,kCAAW"}
|
@@ -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.MenuService = void 0;
|
22
13
|
const common_1 = require("@nestjs/common");
|
@@ -40,77 +31,67 @@ let MenuService = class MenuService {
|
|
40
31
|
this.preferenceService = preferenceService;
|
41
32
|
this.uiActionService = uiActionService;
|
42
33
|
}
|
43
|
-
getMenus() {
|
44
|
-
return
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
};
|
49
|
-
});
|
34
|
+
async getMenus() {
|
35
|
+
return {
|
36
|
+
modules: await this.loadModules(),
|
37
|
+
pages: await this.getPageDefinitions(),
|
38
|
+
};
|
50
39
|
}
|
51
|
-
getMenuDetails(id) {
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
return menu;
|
59
|
-
});
|
40
|
+
async getMenuDetails(id) {
|
41
|
+
const menu = await menu_entity_1.MenuEntity.first(id);
|
42
|
+
if (!menu)
|
43
|
+
throw new operation_exception_1.OperationException('Menu doesnot exist');
|
44
|
+
menu.list_layouts = await this.preferenceService.getMenuListPreferences(id);
|
45
|
+
menu.ui_actions = await this.uiActionService.getUiActions(SOURCEHASH.menu, id);
|
46
|
+
return menu;
|
60
47
|
}
|
61
|
-
getPageDefinitions() {
|
62
|
-
|
63
|
-
|
64
|
-
return class_mapper_1.ClassMapper.removeArrayWhoColumns(pages);
|
65
|
-
});
|
48
|
+
async getPageDefinitions() {
|
49
|
+
const pages = await page_definition_entity_1.PageDefinitionEntity.find();
|
50
|
+
return class_mapper_1.ClassMapper.removeArrayWhoColumns(pages);
|
66
51
|
}
|
67
|
-
loadModules() {
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
return
|
78
|
-
return res;
|
79
|
-
});
|
52
|
+
async loadModules() {
|
53
|
+
const modules = await module_entity_1.ModuleEntity.find({
|
54
|
+
order: { display_order: 'ASC' },
|
55
|
+
where: { application_id: (0, typeorm_1.IsNull)() },
|
56
|
+
});
|
57
|
+
const promises = [];
|
58
|
+
modules.forEach((module) => {
|
59
|
+
promises.push(this.getModuleMenus(module));
|
60
|
+
});
|
61
|
+
return Promise.all(promises).then((res) => {
|
62
|
+
return res;
|
80
63
|
});
|
81
64
|
}
|
82
|
-
getModuleMenus(module) {
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
65
|
+
async getModuleMenus(module) {
|
66
|
+
const moduleMenus = await module_menu_entity_1.ModuleMenuEntity.find({
|
67
|
+
where: { module_id: module.id, deleted_at: (0, typeorm_1.IsNull)() },
|
68
|
+
order: { display_order: 'ASC' },
|
69
|
+
relations: ['menu', 'menu.menu_roles', 'menu.child_menus', 'menu.child_menus.menu'],
|
70
|
+
});
|
71
|
+
if (moduleMenus.length === 0)
|
72
|
+
return [];
|
73
|
+
const data = (0, class_transformer_1.plainToClass)(module_list_modifier_1.ModuleListModifier, module, {
|
74
|
+
excludeExtraneousValues: true,
|
75
|
+
});
|
76
|
+
data.menus = [];
|
77
|
+
moduleMenus.forEach((moduleMenu) => {
|
78
|
+
var _a;
|
79
|
+
if (!moduleMenu.menu)
|
80
|
+
return;
|
81
|
+
if (!this.isMenuAllowed((_a = moduleMenu.menu) === null || _a === void 0 ? void 0 : _a.menu_roles))
|
82
|
+
return;
|
83
|
+
data.menus.push((0, class_transformer_1.plainToClass)(menu_list_modifier_1.MenuListModifier, moduleMenu.menu, {
|
92
84
|
excludeExtraneousValues: true,
|
93
|
-
});
|
94
|
-
|
95
|
-
|
96
|
-
var _a;
|
97
|
-
if (!moduleMenu.menu)
|
98
|
-
return;
|
99
|
-
if (!this.isMenuAllowed((_a = moduleMenu.menu) === null || _a === void 0 ? void 0 : _a.menu_roles))
|
85
|
+
}));
|
86
|
+
moduleMenu.menu.child_menus.forEach((childMenu) => {
|
87
|
+
if (childMenu.deleted_at)
|
100
88
|
return;
|
101
|
-
data.menus.push((0, class_transformer_1.plainToClass)(menu_list_modifier_1.MenuListModifier,
|
89
|
+
data.menus.push((0, class_transformer_1.plainToClass)(menu_list_modifier_1.MenuListModifier, childMenu.menu, {
|
102
90
|
excludeExtraneousValues: true,
|
103
91
|
}));
|
104
|
-
moduleMenu.menu.child_menus.forEach((childMenu) => {
|
105
|
-
if (childMenu.deleted_at)
|
106
|
-
return;
|
107
|
-
data.menus.push((0, class_transformer_1.plainToClass)(menu_list_modifier_1.MenuListModifier, childMenu.menu, {
|
108
|
-
excludeExtraneousValues: true,
|
109
|
-
}));
|
110
|
-
});
|
111
92
|
});
|
112
|
-
return data;
|
113
93
|
});
|
94
|
+
return data;
|
114
95
|
}
|
115
96
|
isMenuAllowed(roles) {
|
116
97
|
if (this.accessManager.hasRoleId(1))
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/system/services/menu.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/system/services/menu.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.ModelService = void 0;
|
22
13
|
const property_service_1 = require("./property.service");
|
@@ -40,87 +31,75 @@ let ModelService = class ModelService {
|
|
40
31
|
this.securityRuleService = securityRuleService;
|
41
32
|
this.propertyService = propertyService;
|
42
33
|
}
|
43
|
-
getUiActions(model) {
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
return class_mapper_1.ClassMapper.removeArrayWhoColumns(actions.concat(customActions));
|
61
|
-
});
|
34
|
+
async getUiActions(model) {
|
35
|
+
const actions = [];
|
36
|
+
if (await this.validateModelAccess(model, 'a')) {
|
37
|
+
actions.push(await ui_action_entity_1.UiActionEntity.first(1));
|
38
|
+
actions.push(await ui_action_entity_1.UiActionEntity.first(5));
|
39
|
+
}
|
40
|
+
if (await this.validateModelAccess(model, 'e')) {
|
41
|
+
actions.push(await ui_action_entity_1.UiActionEntity.first(2));
|
42
|
+
}
|
43
|
+
if (await this.validateModelAccess(model, 'd')) {
|
44
|
+
actions.push(await ui_action_entity_1.UiActionEntity.first(3));
|
45
|
+
}
|
46
|
+
const enableAuditLog = await this.propertyService.get('system.audit.enable', true);
|
47
|
+
if (enableAuditLog && actions.length)
|
48
|
+
actions.push(await ui_action_entity_1.UiActionEntity.first(4));
|
49
|
+
const customActions = await this.uiActionService.getUiActions(SOURCEHASH.model, model.id);
|
50
|
+
return class_mapper_1.ClassMapper.removeArrayWhoColumns(actions.concat(customActions));
|
62
51
|
}
|
63
|
-
validateHashAccess(hash, operation) {
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
return model;
|
76
|
-
});
|
52
|
+
async validateHashAccess(hash, operation) {
|
53
|
+
let model = null;
|
54
|
+
if (hash.length === 32)
|
55
|
+
model = await this.getModelFromHash(hash);
|
56
|
+
else
|
57
|
+
model = await this.getModelFromIdentifier(hash.toLowerCase());
|
58
|
+
if (!model)
|
59
|
+
throw new operation_exception_1.OperationException(`No model with hash ${hash} exists`);
|
60
|
+
const hasAccess = await this.validateModelAccess(model, operation);
|
61
|
+
if (!hasAccess)
|
62
|
+
throw new access_exception_1.AccessException(`You dont have access to model ${model.name}`);
|
63
|
+
return model;
|
77
64
|
}
|
78
|
-
getModelFromHash(hash) {
|
79
|
-
|
80
|
-
|
81
|
-
where: { model_hash: hash },
|
82
|
-
});
|
83
|
-
if (model)
|
84
|
-
return model;
|
85
|
-
return this.getModelFromIdentifier(hash.toLowerCase());
|
65
|
+
async getModelFromHash(hash) {
|
66
|
+
const model = await model_entity_1.ModelEntity.findOne({
|
67
|
+
where: { model_hash: hash },
|
86
68
|
});
|
69
|
+
if (model)
|
70
|
+
return model;
|
71
|
+
return this.getModelFromIdentifier(hash.toLowerCase());
|
87
72
|
}
|
88
|
-
getModelFromIdentifier(identifier) {
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
where: { route_identifier: identifier },
|
94
|
-
});
|
73
|
+
async getModelFromIdentifier(identifier) {
|
74
|
+
if (identifier.length < 1)
|
75
|
+
return null;
|
76
|
+
return model_entity_1.ModelEntity.findOne({
|
77
|
+
where: { route_identifier: identifier },
|
95
78
|
});
|
96
79
|
}
|
97
|
-
getDictionary(model, operation, data) {
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
return columnManager;
|
103
|
-
});
|
80
|
+
async getDictionary(model, operation, data) {
|
81
|
+
const rules = await this.securityRuleService.getModelSecurityRules(model, operation);
|
82
|
+
const columnManager = new column_manager_1.ColumnManager();
|
83
|
+
await columnManager.process(SOURCEHASH.model, model.id, { rules, data });
|
84
|
+
return columnManager;
|
104
85
|
}
|
105
|
-
validateModelAccess(model, operation) {
|
106
|
-
|
107
|
-
if (model.deleted_at)
|
108
|
-
return false;
|
109
|
-
const roles = yield model_role_entity_1.ModelRoleEntity.find({
|
110
|
-
where: { model_id: model.id },
|
111
|
-
});
|
112
|
-
if (roles.length === 0) {
|
113
|
-
return this.validateUnRegulatedModelAccess(model, operation);
|
114
|
-
}
|
115
|
-
for (const role of roles) {
|
116
|
-
if (this.accessManager.hasRoleId(role.role_id)) {
|
117
|
-
if (role.scope.includes(operation)) {
|
118
|
-
return true;
|
119
|
-
}
|
120
|
-
}
|
121
|
-
}
|
86
|
+
async validateModelAccess(model, operation) {
|
87
|
+
if (model.deleted_at)
|
122
88
|
return false;
|
89
|
+
const roles = await model_role_entity_1.ModelRoleEntity.find({
|
90
|
+
where: { model_id: model.id },
|
123
91
|
});
|
92
|
+
if (roles.length === 0) {
|
93
|
+
return this.validateUnRegulatedModelAccess(model, operation);
|
94
|
+
}
|
95
|
+
for (const role of roles) {
|
96
|
+
if (this.accessManager.hasRoleId(role.role_id)) {
|
97
|
+
if (role.scope.includes(operation)) {
|
98
|
+
return true;
|
99
|
+
}
|
100
|
+
}
|
101
|
+
}
|
102
|
+
return false;
|
124
103
|
}
|
125
104
|
validateUnRegulatedModelAccess(model, operation) {
|
126
105
|
if (!this.accessManager.hasRoleId(ROLEMAPPING.internal))
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../src/system/services/model.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../src/system/services/model.service.ts"],"names":[],"mappings":"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"}
|
@@ -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.PreferenceService = void 0;
|
19
10
|
const common_1 = require("@nestjs/common");
|
@@ -24,58 +15,46 @@ const list_preference_entity_1 = require("../entities/list.preference.entity");
|
|
24
15
|
const form_preference_entity_1 = require("../entities/form.preference.entity");
|
25
16
|
const SOURCEHASH = require("../../config/source.hash");
|
26
17
|
let PreferenceService = class PreferenceService {
|
27
|
-
getMenuListPreferences(id) {
|
28
|
-
return
|
29
|
-
return this.getListPreferences(SOURCEHASH.menu, id);
|
30
|
-
});
|
18
|
+
async getMenuListPreferences(id) {
|
19
|
+
return this.getListPreferences(SOURCEHASH.menu, id);
|
31
20
|
}
|
32
|
-
getTabListPreferences(id) {
|
33
|
-
return
|
34
|
-
return this.getListPreferences(SOURCEHASH.relationship, id);
|
35
|
-
});
|
21
|
+
async getTabListPreferences(id) {
|
22
|
+
return this.getListPreferences(SOURCEHASH.relationship, id);
|
36
23
|
}
|
37
|
-
getTabFormPreferences(id) {
|
38
|
-
return
|
39
|
-
return this.getFormPreferences(SOURCEHASH.relationship, id);
|
40
|
-
});
|
24
|
+
async getTabFormPreferences(id) {
|
25
|
+
return this.getFormPreferences(SOURCEHASH.relationship, id);
|
41
26
|
}
|
42
|
-
getListPreferences(source_type, source_id) {
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
],
|
58
|
-
});
|
59
|
-
return class_mapper_1.ClassMapper.removeArrayWhoColumns(preferences);
|
27
|
+
async getListPreferences(source_type, source_id) {
|
28
|
+
const user = auth_1.Auth.user();
|
29
|
+
const preferences = await list_preference_entity_1.ListPreferenceEntity.find({
|
30
|
+
where: [
|
31
|
+
{
|
32
|
+
source_type,
|
33
|
+
source_id,
|
34
|
+
user_id: user.id,
|
35
|
+
},
|
36
|
+
{
|
37
|
+
source_type,
|
38
|
+
source_id,
|
39
|
+
user_id: (0, typeorm_1.IsNull)(),
|
40
|
+
},
|
41
|
+
],
|
60
42
|
});
|
43
|
+
return class_mapper_1.ClassMapper.removeArrayWhoColumns(preferences);
|
61
44
|
}
|
62
|
-
getFormPreferences(source_type, source_id) {
|
63
|
-
return
|
64
|
-
|
65
|
-
where: { source_type, source_id },
|
66
|
-
});
|
45
|
+
async getFormPreferences(source_type, source_id) {
|
46
|
+
return form_preference_entity_1.FormPreferenceEntity.find({
|
47
|
+
where: { source_type, source_id },
|
67
48
|
});
|
68
49
|
}
|
69
|
-
getModelFormPreferences(id) {
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
},
|
76
|
-
});
|
77
|
-
return class_mapper_1.ClassMapper.removeArrayWhoColumns(preferences);
|
50
|
+
async getModelFormPreferences(id) {
|
51
|
+
const preferences = await form_preference_entity_1.FormPreferenceEntity.find({
|
52
|
+
where: {
|
53
|
+
source_type: SOURCEHASH.model,
|
54
|
+
source_id: id,
|
55
|
+
},
|
78
56
|
});
|
57
|
+
return class_mapper_1.ClassMapper.removeArrayWhoColumns(preferences);
|
79
58
|
}
|
80
59
|
};
|
81
60
|
PreferenceService = __decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preference.service.js","sourceRoot":"","sources":["../../../src/system/services/preference.service.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"preference.service.js","sourceRoot":"","sources":["../../../src/system/services/preference.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiC;AACjC,sDAAmD;AACnD,sEAAkE;AAClE,+EAA0E;AAC1E,+EAA0E;AAC1E,uDAAwD;AAGjD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,KAAK,CAAC,sBAAsB,CAAC,EAAU;QACnC,OAAO,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,EAAU;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,EAAU;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,WAAmB,EAAE,SAAiB;QAClE,MAAM,IAAI,GAAG,WAAI,CAAC,IAAI,EAAE,CAAC;QAEzB,MAAM,WAAW,GAAG,MAAM,6CAAoB,CAAC,IAAI,CAAC;YAChD,KAAK,EAAE;gBACH;oBACI,WAAW;oBACX,SAAS;oBACT,OAAO,EAAE,IAAI,CAAC,EAAE;iBACnB;gBACD;oBACI,WAAW;oBACX,SAAS;oBACT,OAAO,EAAE,IAAA,gBAAM,GAAE;iBACpB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,0BAAW,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,WAAmB,EAAE,SAAiB;QAClE,OAAO,6CAAoB,CAAC,IAAI,CAAC;YAC7B,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE;SACpC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,EAAU;QACpC,MAAM,WAAW,GAAG,MAAM,6CAAoB,CAAC,IAAI,CAAC;YAChD,KAAK,EAAE;gBACH,WAAW,EAAE,UAAU,CAAC,KAAK;gBAC7B,SAAS,EAAE,EAAE;aAChB;SACJ,CAAC,CAAC;QAEH,OAAO,0BAAW,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAC1D,CAAC;CACJ,CAAA;AAlDY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CAkD7B;AAlDY,8CAAiB"}
|