@servicelabsco/nestjs-utility-services 1.1.73 → 1.1.75
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/auth/middlewares/jwt.middleware.js +1 -1
- package/dist/auth/middlewares/jwt.middleware.js.map +1 -1
- package/dist/auth/services/auth.service.js +3 -4
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/services/device.token.service.js +1 -1
- package/dist/auth/services/device.token.service.js.map +1 -1
- package/dist/auth/services/es6.service.js +4 -1
- package/dist/auth/services/es6.service.js.map +1 -1
- package/dist/common/dtos/index.params.dto.js +1 -1
- package/dist/common/dtos/index.params.dto.js.map +1 -1
- package/dist/common/libraries/base.migration.utility.js +6 -8
- package/dist/common/libraries/base.migration.utility.js.map +1 -1
- package/dist/common/libraries/class.mapper.js +2 -2
- package/dist/common/libraries/class.mapper.js.map +1 -1
- package/dist/common/libraries/common.entity.js +1 -1
- package/dist/common/libraries/common.entity.js.map +1 -1
- package/dist/common/libraries/common.job.js +4 -5
- package/dist/common/libraries/common.job.js.map +1 -1
- package/dist/common/libraries/common.subscriber.js +1 -2
- package/dist/common/libraries/common.subscriber.js.map +1 -1
- package/dist/common/libraries/database.event.evaluator.js +1 -1
- package/dist/common/libraries/database.event.evaluator.js.map +1 -1
- package/dist/common/libraries/date.util.js +6 -6
- package/dist/common/libraries/date.util.js.map +1 -1
- package/dist/common/libraries/generic.index.parser.js +1 -4
- package/dist/common/libraries/generic.index.parser.js.map +1 -1
- package/dist/common/libraries/platform.utility.js +1 -1
- package/dist/common/libraries/platform.utility.js.map +1 -1
- package/dist/common/libraries/report.body.parser.js +1 -1
- package/dist/common/libraries/report.body.parser.js.map +1 -1
- package/dist/common/libraries/report.data.manager.js +2 -3
- package/dist/common/libraries/report.data.manager.js.map +1 -1
- package/dist/platformUtility/commands/entity.generator.command.js +1 -2
- package/dist/platformUtility/commands/entity.generator.command.js.map +1 -1
- package/dist/platformUtility/controllers/bull.job.controller.js +8 -8
- package/dist/platformUtility/controllers/bull.job.controller.js.map +1 -1
- package/dist/platformUtility/libraries/common.sqs.polling.js +3 -3
- package/dist/platformUtility/libraries/common.sqs.polling.js.map +1 -1
- package/dist/platformUtility/libraries/file.system.utility.js +1 -1
- package/dist/platformUtility/libraries/file.system.utility.js.map +1 -1
- package/dist/platformUtility/libraries/process.common.list.js +4 -7
- package/dist/platformUtility/libraries/process.common.list.js.map +1 -1
- package/dist/platformUtility/libraries/process.common.mail.js +1 -2
- package/dist/platformUtility/libraries/process.common.mail.js.map +1 -1
- package/dist/platformUtility/services/audit.service.js +1 -2
- package/dist/platformUtility/services/audit.service.js.map +1 -1
- package/dist/platformUtility/services/cache.service.js +1 -1
- package/dist/platformUtility/services/cache.service.js.map +1 -1
- package/dist/platformUtility/services/dynamo.service.js +3 -3
- package/dist/platformUtility/services/dynamo.service.js.map +1 -1
- package/dist/platformUtility/services/fcm.notification.service.js +1 -1
- package/dist/platformUtility/services/fcm.notification.service.js.map +1 -1
- package/dist/platformUtility/services/mail.service.js +1 -1
- package/dist/platformUtility/services/mail.service.js.map +1 -1
- package/dist/platformUtility/services/queue.service.js +4 -5
- package/dist/platformUtility/services/queue.service.js.map +1 -1
- package/dist/platformUtility/subscribers/base.subscriber.js +2 -4
- package/dist/platformUtility/subscribers/base.subscriber.js.map +1 -1
- package/dist/system/commands/db.scanner.command.js +5 -8
- package/dist/system/commands/db.scanner.command.js.map +1 -1
- package/dist/system/jobs/model.scanner.job.js +6 -9
- package/dist/system/jobs/model.scanner.job.js.map +1 -1
- package/dist/system/jobs/report.column.sync.job.js +1 -2
- package/dist/system/jobs/report.column.sync.job.js.map +1 -1
- package/dist/system/libraries/column.manager.js +1 -2
- package/dist/system/libraries/column.manager.js.map +1 -1
- package/dist/system/libraries/model.sync.js +1 -2
- package/dist/system/libraries/model.sync.js.map +1 -1
- package/dist/system/services/comment.service.js +1 -1
- package/dist/system/services/comment.service.js.map +1 -1
- package/dist/system/services/document.service.js +3 -3
- package/dist/system/services/document.service.js.map +1 -1
- package/dist/system/services/es6.service.js +4 -1
- package/dist/system/services/es6.service.js.map +1 -1
- package/dist/system/services/menu.service.js +1 -2
- package/dist/system/services/menu.service.js.map +1 -1
- package/dist/system/services/property.service.js +2 -2
- package/dist/system/services/property.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -65,7 +65,7 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
65
65
|
async setManyToManyRelations(model, data) {
|
|
66
66
|
for (const relation of data.mm) {
|
|
67
67
|
const relationship = await this.setHasManyRelation(model, relation);
|
|
68
|
-
if (!
|
|
68
|
+
if (!relationship?.alias_column_id)
|
|
69
69
|
continue;
|
|
70
70
|
relationship.join_definition = `"alias".source_type = '${model.model_hash}'`;
|
|
71
71
|
await relationship.save();
|
|
@@ -81,7 +81,6 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
83
|
async setHasManyRelation(model, relation) {
|
|
84
|
-
var _a, _b;
|
|
85
84
|
const referencedModel = await this.getModelFromHash(common_2.Hash.hashMD5(`${relation.foreignTable}:${relation.entityName}`));
|
|
86
85
|
if (!referencedModel)
|
|
87
86
|
return;
|
|
@@ -93,7 +92,7 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
93
92
|
source_id: model.id,
|
|
94
93
|
alias_column_id: referencedColumn.id,
|
|
95
94
|
});
|
|
96
|
-
if (
|
|
95
|
+
if (record.attributes?.sync?.system)
|
|
97
96
|
return record;
|
|
98
97
|
if (!referencedColumn)
|
|
99
98
|
return record;
|
|
@@ -102,7 +101,7 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
102
101
|
record.reference_type_id = 22;
|
|
103
102
|
record.reference_model_id = referencedModel.id;
|
|
104
103
|
record.alias_column_id = referencedColumn.id;
|
|
105
|
-
record.attributes =
|
|
104
|
+
record.attributes = { ...record.attributes, ...{ sync: { system: true } } };
|
|
106
105
|
await record.save();
|
|
107
106
|
referencedColumn.reference_model_id = model.id;
|
|
108
107
|
referencedColumn.type_id = referencedModel.model_hash === SOURCEHASH.script ? 10 : 6;
|
|
@@ -110,7 +109,6 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
110
109
|
return record;
|
|
111
110
|
}
|
|
112
111
|
async setBelongsToRelation(model, relation) {
|
|
113
|
-
var _a, _b;
|
|
114
112
|
const referencedColumn = await this.getModelColumn(model.id, relation.sourceColumn);
|
|
115
113
|
if (!referencedColumn)
|
|
116
114
|
return;
|
|
@@ -119,7 +117,7 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
119
117
|
source_id: model.id,
|
|
120
118
|
source_column_id: referencedColumn.id,
|
|
121
119
|
});
|
|
122
|
-
if (
|
|
120
|
+
if (record.attributes?.sync?.system)
|
|
123
121
|
return record;
|
|
124
122
|
const referencedModel = await this.getModelFromHash(common_2.Hash.hashMD5(`${relation.foreignTable}:${relation.entityName}`));
|
|
125
123
|
if (!referencedModel)
|
|
@@ -131,7 +129,7 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
131
129
|
record.reference_type_id = 21;
|
|
132
130
|
record.reference_model_id = referencedModel.id;
|
|
133
131
|
record.source_column_id = referencedColumn.id;
|
|
134
|
-
record.attributes =
|
|
132
|
+
record.attributes = { ...record.attributes, ...{ sync: { system: true } } };
|
|
135
133
|
await record.save();
|
|
136
134
|
referencedColumn.reference_model_id = referencedModel.id;
|
|
137
135
|
referencedColumn.type_id = referencedModel.model_hash === SOURCEHASH.script ? 10 : 6;
|
|
@@ -139,11 +137,10 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
139
137
|
return record;
|
|
140
138
|
}
|
|
141
139
|
getMetaData(hash) {
|
|
142
|
-
var _a;
|
|
143
140
|
const entity = this.localPropertyService.getEntity(hash);
|
|
144
141
|
if (typeof entity.getRepository === 'undefined')
|
|
145
142
|
return false;
|
|
146
|
-
if (typeof
|
|
143
|
+
if (typeof entity.getRepository()?.metadata === 'undefined')
|
|
147
144
|
return false;
|
|
148
145
|
const metadata = entity.getRepository().metadata;
|
|
149
146
|
const data = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.scanner.job.js","sourceRoot":"","sources":["../../../src/system/jobs/model.scanner.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yCAAoC;AACpC,kEAA8D;AAC9D,8EAA0E;AAC1E,gFAA4E;AAC5E,6DAAyD;AACzD,2DAAuD;AACvD,yEAAqE;AACrE,oGAA+F;AAC/F,uDAAwD;AAEjD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,sBAAS;IAC1C,YAA+B,YAA0B,EAAmB,oBAA0C;QAClH,KAAK,EAAE,CAAC;QADmB,iBAAY,GAAZ,YAAY,CAAc;QAAmB,yBAAoB,GAApB,oBAAoB,CAAsB;IAEtH,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC3B,MAAM,KAAK,GAAG,MAAM,0BAAW,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE,EAAE,UAAU,EAAE;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK;YAAE,OAAO,UAAU,CAAC;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QACtD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAEvD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAExD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IAQO,KAAK,CAAC,oBAAoB,CAAC,KAAkB,EAAE,IAAS;QAC5D,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IAQO,KAAK,CAAC,qBAAqB,CAAC,KAAkB,EAAE,IAAS;QAC7D,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,KAAkB,EAAE,IAAS;QAC9D,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,EAAE,EAAE;YAC5B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAEpE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"model.scanner.job.js","sourceRoot":"","sources":["../../../src/system/jobs/model.scanner.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,10 @@ let ReportColumnSyncJob = class ReportColumnSyncJob extends common_job_1.CommonJ
|
|
|
26
26
|
this.sqlService = sqlService;
|
|
27
27
|
}
|
|
28
28
|
async handle(id) {
|
|
29
|
-
var _a;
|
|
30
29
|
const report = await report_entity_1.ReportEntity.first(id, {
|
|
31
30
|
relations: ['query'],
|
|
32
31
|
});
|
|
33
|
-
if (!
|
|
32
|
+
if (!report?.query?.script)
|
|
34
33
|
return;
|
|
35
34
|
await this.setReportColumn(report);
|
|
36
35
|
const data = await this.getQueryResults(report);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,8EAA0E;AAC1E,gFAA4E;AAC5E,4EAAwE;AACxE,6DAAyD;AACzD,6DAAyD;AACzD,yEAAoE;AACpE,uDAAwD;AAEjD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,sBAAS;IAC9C,YAA+B,YAA0B,EAAmB,UAAsB;QAC9F,KAAK,EAAE,CAAC;QADmB,iBAAY,GAAZ,YAAY,CAAc;QAAmB,eAAU,GAAV,UAAU,CAAY;IAElG,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU
|
|
1
|
+
{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,8EAA0E;AAC1E,gFAA4E;AAC5E,4EAAwE;AACxE,6DAAyD;AACzD,6DAAyD;AACzD,yEAAoE;AACpE,uDAAwD;AAEjD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,sBAAS;IAC9C,YAA+B,YAA0B,EAAmB,UAAsB;QAC9F,KAAK,EAAE,CAAC;QADmB,iBAAY,GAAZ,YAAY,CAAc;QAAmB,eAAU,GAAV,UAAU,CAAY;IAElG,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,MAAM,GAAG,MAAM,4BAAY,CAAC,KAAK,CAAC,EAAE,EAAE;YACxC,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM;YAAE,OAAO;QAEnC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAEhD,IAAI,CAAC,IAAI;YAAE,OAAO,MAAM,CAAC;QAEzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IASO,KAAK,CAAC,iBAAiB,CAAC,MAAoB,EAAE,IAAS;QAC3D,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC7C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;SAC1D;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAmB,EAAE,EAAE;YACtD,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACrB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IAUO,KAAK,CAAC,UAAU,CAAC,MAAoB,EAAE,GAAQ;QACnD,MAAM,MAAM,GAAG,MAAM,4BAAY,CAAC,UAAU,CAAC;YACzC,WAAW,EAAE,UAAU,CAAC,MAAM;YAC9B,SAAS,EAAE,MAAM,CAAC,EAAE;YACpB,IAAI,EAAE,GAAG,CAAC,GAAG;SAChB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAE7B,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEzC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IASO,KAAK,CAAC,eAAe,CAAC,MAAoB;QAC9C,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,uCAAiB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACjF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,IAAI,KAAK,CAAC,aAAa,KAAK,IAAI;gBAAE,OAAO,EAAE,CAAC;YAE5C,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAC7B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;SACrE;QAED,KAAK,IAAI,UAAU,CAAC;QAEpB,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC3C;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,EAAE,CAAC;SACb;IACL,CAAC;IASO,cAAc,CAAC,GAAW;QAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,QAAQ,KAAK,KAAK;YAAE,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE/C,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAE7B,OAAO,kCAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,MAAoB,EAAE,OAAiB;QACxE,MAAM,aAAa,GAAG,MAAM,4BAAY,CAAC,IAAI,CAAC;YAC1C,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE;SAClE,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACnC,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IASO,OAAO,CAAC,GAAW;QACvB,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,OAAO,GAAG,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,CAAC,CAAC;IACb,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAoB;QAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,MAAoB,EAAE,IAAY;QACtD,MAAM,MAAM,GAAG,MAAM,uCAAiB,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAElF,IAAI,MAAM,CAAC,EAAE;YAAE,OAAO;QAEtB,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;CACJ,CAAA;AAhKY,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAEoC,4BAAY,EAA+B,wBAAU;GADzF,mBAAmB,CAgK/B;AAhKY,kDAAmB"}
|
|
@@ -32,8 +32,7 @@ class ColumnManager {
|
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
async processColumn(column) {
|
|
35
|
-
|
|
36
|
-
const rules = (_a = this.rules[column.name]) !== null && _a !== void 0 ? _a : [];
|
|
35
|
+
const rules = this.rules[column.name] ?? [];
|
|
37
36
|
const allowed = await this.evaluateSecurityRules(rules);
|
|
38
37
|
if (allowed) {
|
|
39
38
|
if (column.type_id === 18)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"column.manager.js","sourceRoot":"","sources":["../../../src/system/libraries/column.manager.ts"],"names":[],"mappings":";;;AAAA,sEAAkE;AAClE,6DAAyD;AAEzD,uEAAkE;AAClE,MAAa,aAAa;IAA1B;QACW,YAAO,GAAmB,EAAE,CAAC;QAC7B,eAAU,GAAmB,EAAE,CAAC;QAChC,2BAAsB,GAAa,EAAE,CAAC;QACtC,YAAO,GAAmB,EAAE,CAAC;QAC7B,wBAAmB,GAAa,EAAE,CAAC;QAEnC,cAAS,GAAa,EAAE,CAAC;QACzB,WAAM,GAAa,EAAE,CAAC;QAErB,SAAI,GAAQ,EAAE,CAAC;IA8D3B,CAAC;IA3DG,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,EAAU,EAAE,UAAc;QAClD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACnD,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB;QAED,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,EAAU;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAoB
|
|
1
|
+
{"version":3,"file":"column.manager.js","sourceRoot":"","sources":["../../../src/system/libraries/column.manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,9 +65,8 @@ class ModelSync {
|
|
|
65
65
|
columns: [],
|
|
66
66
|
};
|
|
67
67
|
metadata.columns.forEach((column) => {
|
|
68
|
-
var _a;
|
|
69
68
|
const type = typeof column.type === 'string' ? column.type : column.type.name;
|
|
70
|
-
const type_id =
|
|
69
|
+
const type_id = mappings[type.toLowerCase()] ?? 1;
|
|
71
70
|
this.data.columns.push({
|
|
72
71
|
name: column.databaseName,
|
|
73
72
|
type_id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.sync.js","sourceRoot":"","sources":["../../../src/system/libraries/model.sync.ts"],"names":[],"mappings":";;;AAAA,yCAA+C;AAC/C,wEAAgE;AAChE,6DAAyD;AACzD,2DAAuD;AACvD,uDAAwD;AACxD,mFAA8E;AAC9E,qCAAsC;AAOtC,MAAa,SAAS;IAkClB,YAAY,IAAY;QACpB,IAAI,CAAC,MAAM,GAAG,4BAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAOD,KAAK,CAAC,OAAO;QACT,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,WAAW;YAAE,OAAO,KAAK,CAAC;QAEnE,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEtB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,OAAO;QAE/B,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExB,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAUO,KAAK,CAAC,QAAQ;QAClB,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEnD,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,OAAO;SACV;QAED,KAAK,GAAG,IAAI,0BAAW,EAAE,CAAC;QAE1B,KAAK,CAAC,mBAAmB,GAAG,MAAM,CAAC;QAEnC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;QAC7B,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAEnC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,KAAK,CAAC,UAAU,GAAG,cAAc,IAAI,CAAC,IAAI,EAAE,CAAC;QAE7C,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAEnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IASO,KAAK,CAAC,UAAU;QACpB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAChC;IACL,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,MAAW;QAC/B,MAAM,MAAM,GAAG,MAAM,4BAAY,CAAC,UAAU,CAAC;YACzC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,UAAU,CAAC,KAAK;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE;SAC/B,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,EAAE;YAAE,OAAO;QAEtB,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;QAExB,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAEnD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC;QAEtD,IAAI,CAAC,IAAI,GAAG;YACR,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,KAAK,EAAE,QAAQ,CAAC,SAAS;YACzB,OAAO,EAAE,EAAE;SACd,CAAC;QAEF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"model.sync.js","sourceRoot":"","sources":["../../../src/system/libraries/model.sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ let CommentService = class CommentService {
|
|
|
19
19
|
let record = new comment_entity_1.CommentEntity();
|
|
20
20
|
if (body.id)
|
|
21
21
|
record = await comment_entity_1.CommentEntity.first(body.id);
|
|
22
|
-
if (!
|
|
22
|
+
if (!record?.id) {
|
|
23
23
|
record.source_type = source.source_type;
|
|
24
24
|
record.source_id = source.source_id;
|
|
25
25
|
record.is_system_generated = body.is_system_generated || false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment.service.js","sourceRoot":"","sources":["../../../src/system/services/comment.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAG5C,+DAA2D;AAQpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAQvB,KAAK,CAAC,WAAW,CAAC,KAAiD;QAC/D,OAAO,8BAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IASD,KAAK,CAAC,UAAU,CAAC,IAAmB,EAAE,MAAwB;QAC1D,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAE3B,IAAI,MAAM,GAAG,IAAI,8BAAa,EAAE,CAAC;QAEjC,IAAI,IAAI,CAAC,EAAE;YAAE,MAAM,GAAG,MAAM,8BAAa,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"comment.service.js","sourceRoot":"","sources":["../../../src/system/services/comment.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAG5C,+DAA2D;AAQpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAQvB,KAAK,CAAC,WAAW,CAAC,KAAiD;QAC/D,OAAO,8BAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IASD,KAAK,CAAC,UAAU,CAAC,IAAmB,EAAE,MAAwB;QAC1D,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAE3B,IAAI,MAAM,GAAG,IAAI,8BAAa,EAAE,CAAC;QAEjC,IAAI,IAAI,CAAC,EAAE;YAAE,MAAM,GAAG,MAAM,8BAAa,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE;YACb,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YACxC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAEpC,MAAM,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,KAAK,CAAC;SAClE;QAED,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEhC,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;CACJ,CAAA;AArCY,cAAc;IAD1B,IAAA,mBAAU,GAAE;GACA,cAAc,CAqC1B;AArCY,wCAAc"}
|
|
@@ -14,7 +14,7 @@ const document_entity_1 = require("../entities/document.entity");
|
|
|
14
14
|
let DocumentService = class DocumentService {
|
|
15
15
|
async getDocuments(query) {
|
|
16
16
|
return document_entity_1.DocumentEntity.find({
|
|
17
|
-
where:
|
|
17
|
+
where: { ...query, document_url: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) },
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
async setDocument(source, file) {
|
|
@@ -27,9 +27,9 @@ let DocumentService = class DocumentService {
|
|
|
27
27
|
document = await document_entity_1.DocumentEntity.first(file.id);
|
|
28
28
|
if (!(document.source_type === source.source_type && document.source_id === source.source_id))
|
|
29
29
|
throw new common_2.AccessException('you donot have access to this document');
|
|
30
|
-
if (!
|
|
30
|
+
if (!document?.id)
|
|
31
31
|
document.document_url = file.document_url;
|
|
32
|
-
document.attributes =
|
|
32
|
+
document.attributes = { ...document.attributes, ...file.attributes, comments: file.comments };
|
|
33
33
|
return document.save();
|
|
34
34
|
}
|
|
35
35
|
async setDocuments(source, files) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.service.js","sourceRoot":"","sources":["../../../src/system/services/document.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAsC;AACtC,yCAAgE;AAGhE,iEAA6D;AAQtD,IAAM,eAAe,GAArB,MAAM,eAAe;IAQxB,KAAK,CAAC,YAAY,CAAC,KAAmE;QAClF,OAAO,gCAAc,CAAC,IAAI,CAAC;YACvB,KAAK,
|
|
1
|
+
{"version":3,"file":"document.service.js","sourceRoot":"","sources":["../../../src/system/services/document.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAsC;AACtC,yCAAgE;AAGhE,iEAA6D;AAQtD,IAAM,eAAe,GAArB,MAAM,eAAe;IAQxB,KAAK,CAAC,YAAY,CAAC,KAAmE;QAClF,OAAO,gCAAc,CAAC,IAAI,CAAC;YACvB,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC,EAAE;SACnD,CAAC,CAAC;IACP,CAAC;IASD,KAAK,CAAC,WAAW,CAAC,MAAuB,EAAE,IAAmB;QAC1D,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO;QAC/B,IAAI,CAAC,wBAAe,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC;YAAE,OAAO;QAE3D,IAAI,QAAQ,GAAmB,gCAAc,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QAEvH,IAAI,IAAI,CAAC,EAAE;YAAE,QAAQ,GAAG,MAAM,gCAAc,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5D,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,CAAC;YACzF,MAAM,IAAI,wBAAe,CAAC,wCAAwC,CAAC,CAAC;QAExE,IAAI,CAAC,QAAQ,EAAE,EAAE;YAAE,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAE7D,QAAQ,CAAC,UAAU,GAAG,EAAE,GAAG,QAAQ,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE9F,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IASD,KAAK,CAAC,YAAY,CAAC,MAAuB,EAAE,KAAsB;QAC9D,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO;QAEpD,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA3DY,eAAe;IAD3B,IAAA,mBAAU,GAAE;GACA,eAAe,CA2D3B;AA3DY,0CAAe"}
|
|
@@ -88,7 +88,10 @@ let Es6Service = class Es6Service {
|
|
|
88
88
|
}
|
|
89
89
|
setServices() {
|
|
90
90
|
const existingServices = this.localPropertyService.get('services');
|
|
91
|
-
this.localPropertyService.set('services',
|
|
91
|
+
this.localPropertyService.set('services', {
|
|
92
|
+
...existingServices,
|
|
93
|
+
...this.services,
|
|
94
|
+
});
|
|
92
95
|
}
|
|
93
96
|
};
|
|
94
97
|
Es6Service = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.service.js","sourceRoot":"","sources":["../../../src/system/services/es6.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"es6.service.js","sourceRoot":"","sources":["../../../src/system/services/es6.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,10 +74,9 @@ let MenuService = class MenuService {
|
|
|
74
74
|
});
|
|
75
75
|
data.menus = [];
|
|
76
76
|
moduleMenus.forEach((moduleMenu) => {
|
|
77
|
-
var _a;
|
|
78
77
|
if (!moduleMenu.menu)
|
|
79
78
|
return;
|
|
80
|
-
if (!this.isMenuAllowed(
|
|
79
|
+
if (!this.isMenuAllowed(moduleMenu.menu?.menu_roles))
|
|
81
80
|
return;
|
|
82
81
|
data.menus.push((0, class_transformer_1.plainToClass)(menu_list_modifier_1.MenuListModifier, moduleMenu.menu, {
|
|
83
82
|
excludeExtraneousValues: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/system/services/menu.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAiD;AACjD,qCAAiC;AACjC,uEAAmE;AACnE,qFAAiF;AACjF,sEAAkE;AAClE,yDAAqD;AAErD,6DAAyD;AACzD,uEAAkE;AAClE,+EAA0E;AAC1E,wEAAmE;AACnE,4EAAuE;AACvE,6DAAyD;AACzD,2DAAsD;AACtD,uDAAwD;AAQjD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAQpB,YACqB,aAA4B,EAC5B,iBAAoC,EACpC,eAAgC;QAFhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAOJ,KAAK,CAAC,QAAQ;QACV,OAAO;YACH,OAAO,EAAE,MAAM,IAAI,CAAC,WAAW,EAAE;YACjC,KAAK,EAAE,MAAM,IAAI,CAAC,kBAAkB,EAAE;SACzC,CAAC;IACN,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,EAAU;QAC3B,MAAM,IAAI,GAAG,MAAM,wBAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,wCAAkB,CAAC,oBAAoB,CAAC,CAAC;QAG9D,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QAG5E,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAE/E,OAAO,IAAI,CAAC;IAChB,CAAC;IAQO,KAAK,CAAC,kBAAkB;QAC5B,MAAM,KAAK,GAAG,MAAM,6CAAoB,CAAC,IAAI,EAAE,CAAC;QAEhD,OAAO,0BAAW,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAQO,KAAK,CAAC,WAAW;QACrB,MAAM,OAAO,GAAG,MAAM,4BAAY,CAAC,IAAI,CAAC;YACpC,KAAK,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE;SAClC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,EAAE,CAAC;QAGpB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC;IASO,KAAK,CAAC,cAAc,CAAC,MAAoB;QAC7C,MAAM,WAAW,GAAG,MAAM,qCAAgB,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE;YACrD,KAAK,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE;YAC/B,SAAS,EAAE,CAAC,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,uBAAuB,CAAC;SACtF,CAAC,CAAC;QAEH,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAExC,MAAM,IAAI,GAAG,IAAA,gCAAY,EAAC,yCAAkB,EAAE,MAAM,EAAE;YAClD,uBAAuB,EAAE,IAAI;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAEhB,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/system/services/menu.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ let PropertyService = class PropertyService {
|
|
|
21
21
|
this.cacheService = cacheService;
|
|
22
22
|
}
|
|
23
23
|
async get(key, defaultValue) {
|
|
24
|
-
defaultValue = defaultValue
|
|
24
|
+
defaultValue = defaultValue ?? null;
|
|
25
25
|
const index = `property.${key}`;
|
|
26
26
|
const value = await this.cacheService.get(index, null);
|
|
27
27
|
if (value)
|
|
@@ -38,7 +38,7 @@ let PropertyService = class PropertyService {
|
|
|
38
38
|
return pValue;
|
|
39
39
|
}
|
|
40
40
|
async getFromDb(key, defaultValue) {
|
|
41
|
-
defaultValue = defaultValue
|
|
41
|
+
defaultValue = defaultValue ?? null;
|
|
42
42
|
const property = await property_entity_1.PropertyEntity.findOne({ where: { name: key } });
|
|
43
43
|
if (!property)
|
|
44
44
|
return defaultValue;
|
|
@@ -1 +1 @@
|
|
|
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;AAC7D,sEAAkE;AAClE,yDAA0D;AAQnD,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,
|
|
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;AAC7D,sEAAkE;AAClE,yDAA0D;AAQnD,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,IAAI,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;QAEnC,IAAI,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC5B,IAAI,QAAQ,CAAC,YAAY;YAAE,MAAM,GAAG,0BAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAGhE,IAAI,QAAQ,CAAC,kBAAkB,EAAE;YAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;SAC9E;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IASD,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,YAAkB;QAC3C,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC;QAEpC,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;QAEnC,IAAI,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC5B,IAAI,QAAQ,CAAC,YAAY;YAAE,MAAM,GAAG,0BAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAGhE,OAAO,MAAM,CAAC;IAClB,CAAC;IAQD,KAAK,CAAC,GAAG,CAAC,QAAiC;QACvC,MAAM,MAAM,GAAG,MAAM,gCAAc,CAAC,UAAU,CAAC;YAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,IAAA,yCAAqB,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEhF,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;CACJ,CAAA;AAxEY,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAOkC,4BAAY;GAN9C,eAAe,CAwE3B;AAxEY,0CAAe"}
|
package/package.json
CHANGED