tnx-shared 5.3.304 → 5.3.305
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/bundles/tnx-shared.umd.js +53 -71
- package/bundles/tnx-shared.umd.js.map +1 -1
- package/bundles/tnx-shared.umd.min.js +1 -1
- package/bundles/tnx-shared.umd.min.js.map +1 -1
- package/esm2015/services/master-data.service.js +3 -16
- package/fesm2015/tnx-shared.js +2 -15
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/services/master-data.service.d.ts +0 -1
- package/services/master-data.service.d.ts.map +1 -1
- package/tnx-shared.metadata.json +1 -1
|
@@ -6284,14 +6284,12 @@
|
|
|
6284
6284
|
var MasterDataService = /** @class */ (function () {
|
|
6285
6285
|
function MasterDataService(_httpClient, _commonService, _injector, _storageUpdatedService, _moduleConfigService) {
|
|
6286
6286
|
var _this = this;
|
|
6287
|
-
var _a, _b;
|
|
6288
6287
|
this._httpClient = _httpClient;
|
|
6289
6288
|
this._commonService = _commonService;
|
|
6290
6289
|
this._injector = _injector;
|
|
6291
6290
|
this._storageUpdatedService = _storageUpdatedService;
|
|
6292
6291
|
this._moduleConfigService = _moduleConfigService;
|
|
6293
6292
|
this.setupSignalr = false;
|
|
6294
|
-
this.isDisabledGetCache = false;
|
|
6295
6293
|
this.storage = localStorage;
|
|
6296
6294
|
this.categoryPrefix = 'cat_';
|
|
6297
6295
|
this.categoryGroupPrefix = 'cat_group_';
|
|
@@ -6300,14 +6298,13 @@
|
|
|
6300
6298
|
this.env = this._moduleConfigService.getConfig().environment;
|
|
6301
6299
|
this.apiEndpoint = this.env.apiDomain.commonMasterDataEndpoint;
|
|
6302
6300
|
this.apiVersion = this.env.apiVersion;
|
|
6303
|
-
this.isDisabledGetCache = (_b = (_a = this.env.cauHinhNghiepVu) === null || _a === void 0 ? void 0 : _a.isDisabledGetCacheCommonMasterdata) !== null && _b !== void 0 ? _b : false;
|
|
6304
6301
|
this.groupCategoryEndpoint = this.apiEndpoint + "/" + this.apiVersion + "/Groupcategory";
|
|
6305
6302
|
this.singleCategoryEndpoint = this.apiEndpoint + "/" + this.apiVersion + "/SingleCategory";
|
|
6306
6303
|
if (!this.setupSignalr) {
|
|
6307
6304
|
this._storageUpdatedService.subscribeChangedLocalStorage('cat_*', function (data) { return __awaiter(_this, void 0, void 0, function () {
|
|
6308
6305
|
var dataObj, dataSource_1, content, groupCode, result, groupCode, result;
|
|
6309
|
-
return __generator(this, function (
|
|
6310
|
-
switch (
|
|
6306
|
+
return __generator(this, function (_a) {
|
|
6307
|
+
switch (_a.label) {
|
|
6311
6308
|
case 0:
|
|
6312
6309
|
if (typeof data == 'string') {
|
|
6313
6310
|
dataObj = JSON.parse(data);
|
|
@@ -6322,19 +6319,19 @@
|
|
|
6322
6319
|
groupCode = dataObj.message.content.replace(this.categoryGroupPrefix, '');
|
|
6323
6320
|
return [4 /*yield*/, this.getGroupItemByCode(groupCode)];
|
|
6324
6321
|
case 1:
|
|
6325
|
-
result =
|
|
6322
|
+
result = _a.sent();
|
|
6326
6323
|
this.storage.setItem("" + this.categoryGroupPrefix + groupCode, JSON.stringify(result.data));
|
|
6327
6324
|
return [3 /*break*/, 4];
|
|
6328
6325
|
case 2:
|
|
6329
6326
|
groupCode = dataObj.message.content.replace(this.categoryPrefix, '');
|
|
6330
6327
|
return [4 /*yield*/, this.doGetAll(groupCode)];
|
|
6331
6328
|
case 3:
|
|
6332
|
-
result =
|
|
6329
|
+
result = _a.sent();
|
|
6333
6330
|
result.data.forEach(function (element) {
|
|
6334
6331
|
dataSource_1.push({ id: element.id, code: element.code, name: element.name });
|
|
6335
6332
|
});
|
|
6336
6333
|
this.storage.setItem("" + this.categoryPrefix + groupCode, JSON.stringify(dataSource_1));
|
|
6337
|
-
|
|
6334
|
+
_a.label = 4;
|
|
6338
6335
|
case 4: return [2 /*return*/];
|
|
6339
6336
|
}
|
|
6340
6337
|
});
|
|
@@ -6345,13 +6342,13 @@
|
|
|
6345
6342
|
MasterDataService.prototype.getAllByGroupCode = function (groupCode) {
|
|
6346
6343
|
return __awaiter(this, void 0, void 0, function () {
|
|
6347
6344
|
var dataSource, result;
|
|
6348
|
-
return __generator(this, function (
|
|
6349
|
-
switch (
|
|
6345
|
+
return __generator(this, function (_a) {
|
|
6346
|
+
switch (_a.label) {
|
|
6350
6347
|
case 0:
|
|
6351
6348
|
dataSource = [];
|
|
6352
6349
|
return [4 /*yield*/, this.doGetAllCustom(groupCode)];
|
|
6353
6350
|
case 1:
|
|
6354
|
-
result =
|
|
6351
|
+
result = _a.sent();
|
|
6355
6352
|
result.data.forEach(function (element) {
|
|
6356
6353
|
dataSource.push({ id: element.id, code: element.code, name: element.name });
|
|
6357
6354
|
});
|
|
@@ -6364,26 +6361,11 @@
|
|
|
6364
6361
|
var _this = this;
|
|
6365
6362
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6366
6363
|
var dataSource;
|
|
6367
|
-
return __generator(this, function (
|
|
6368
|
-
switch (
|
|
6369
|
-
case 0:
|
|
6370
|
-
dataSource = [];
|
|
6371
|
-
if (!(this.isDisabledGetCache === true)) return [3 /*break*/, 2];
|
|
6372
|
-
return [4 /*yield*/, this.getAllByGroupCode(groupCode)];
|
|
6364
|
+
return __generator(this, function (_a) {
|
|
6365
|
+
switch (_a.label) {
|
|
6366
|
+
case 0: return [4 /*yield*/, this.getAllByGroupCode(groupCode)];
|
|
6373
6367
|
case 1:
|
|
6374
|
-
dataSource =
|
|
6375
|
-
return [3 /*break*/, 5];
|
|
6376
|
-
case 2:
|
|
6377
|
-
if (!!this.storage.getItem("" + this.categoryPrefix + groupCode)) return [3 /*break*/, 4];
|
|
6378
|
-
return [4 /*yield*/, this.getAllByGroupCode(groupCode)];
|
|
6379
|
-
case 3:
|
|
6380
|
-
dataSource = _c.sent();
|
|
6381
|
-
this.storage.setItem("" + this.categoryPrefix + groupCode, JSON.stringify(dataSource));
|
|
6382
|
-
return [3 /*break*/, 5];
|
|
6383
|
-
case 4:
|
|
6384
|
-
dataSource = JSON.parse(this.storage.getItem("" + this.categoryPrefix + groupCode));
|
|
6385
|
-
_c.label = 5;
|
|
6386
|
-
case 5:
|
|
6368
|
+
dataSource = _a.sent();
|
|
6387
6369
|
resolve(dataSource);
|
|
6388
6370
|
return [2 /*return*/];
|
|
6389
6371
|
}
|
|
@@ -6394,20 +6376,20 @@
|
|
|
6394
6376
|
var _this = this;
|
|
6395
6377
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6396
6378
|
var config, result;
|
|
6397
|
-
return __generator(this, function (
|
|
6398
|
-
switch (
|
|
6379
|
+
return __generator(this, function (_a) {
|
|
6380
|
+
switch (_a.label) {
|
|
6399
6381
|
case 0:
|
|
6400
6382
|
config = '';
|
|
6401
6383
|
if (!!this.storage.getItem(code)) return [3 /*break*/, 2];
|
|
6402
6384
|
return [4 /*yield*/, this.doGetConfigByCode(code)];
|
|
6403
6385
|
case 1:
|
|
6404
|
-
result =
|
|
6386
|
+
result = _a.sent();
|
|
6405
6387
|
this.storage.setItem(code, JSON.stringify(result.data));
|
|
6406
6388
|
config = result.data;
|
|
6407
6389
|
return [3 /*break*/, 3];
|
|
6408
6390
|
case 2:
|
|
6409
6391
|
config = JSON.parse(this.storage.getItem(code));
|
|
6410
|
-
|
|
6392
|
+
_a.label = 3;
|
|
6411
6393
|
case 3:
|
|
6412
6394
|
resolve(config);
|
|
6413
6395
|
return [2 /*return*/];
|
|
@@ -6418,7 +6400,7 @@
|
|
|
6418
6400
|
MasterDataService.prototype.getDropdown = function (groupCode) {
|
|
6419
6401
|
var _this = this;
|
|
6420
6402
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6421
|
-
return __generator(this, function (
|
|
6403
|
+
return __generator(this, function (_a) {
|
|
6422
6404
|
this.get(groupCode).then(function (source) {
|
|
6423
6405
|
var op = source.map(function (x) { return ({ title: x.name, label: x.name, value: x.code }); });
|
|
6424
6406
|
resolve(op);
|
|
@@ -6436,7 +6418,7 @@
|
|
|
6436
6418
|
MasterDataService.prototype.getItems = function (groupCode) {
|
|
6437
6419
|
var _this = this;
|
|
6438
6420
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6439
|
-
return __generator(this, function (
|
|
6421
|
+
return __generator(this, function (_a) {
|
|
6440
6422
|
this.get(groupCode).then(function (source) {
|
|
6441
6423
|
var op = source.map(function (x) { return ({ label: x.name, value: x.code }); });
|
|
6442
6424
|
resolve(op);
|
|
@@ -6456,7 +6438,7 @@
|
|
|
6456
6438
|
var _this = this;
|
|
6457
6439
|
if (level === void 0) { level = 1; }
|
|
6458
6440
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6459
|
-
return __generator(this, function (
|
|
6441
|
+
return __generator(this, function (_a) {
|
|
6460
6442
|
this.getAddress(id, level).then(function (source) {
|
|
6461
6443
|
var op = source.map(function (x) { return ({ title: x.name, label: x.name, value: x.code }); });
|
|
6462
6444
|
resolve(op);
|
|
@@ -6470,20 +6452,20 @@
|
|
|
6470
6452
|
if (level === void 0) { level = 1; }
|
|
6471
6453
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6472
6454
|
var dataSource, result;
|
|
6473
|
-
return __generator(this, function (
|
|
6474
|
-
switch (
|
|
6455
|
+
return __generator(this, function (_a) {
|
|
6456
|
+
switch (_a.label) {
|
|
6475
6457
|
case 0:
|
|
6476
6458
|
dataSource = [];
|
|
6477
6459
|
if (!!this.storage.getItem(this.administrativeUnit + ".Level" + level + "." + id)) return [3 /*break*/, 2];
|
|
6478
6460
|
return [4 /*yield*/, this.dogetAddress(id, level)];
|
|
6479
6461
|
case 1:
|
|
6480
|
-
result =
|
|
6462
|
+
result = _a.sent();
|
|
6481
6463
|
this.storage.setItem(this.administrativeUnit + ".Level" + level + "." + id, JSON.stringify(result.data));
|
|
6482
6464
|
dataSource = result.data;
|
|
6483
6465
|
return [3 /*break*/, 3];
|
|
6484
6466
|
case 2:
|
|
6485
6467
|
dataSource = JSON.parse(this.storage.getItem(this.administrativeUnit + ".Level" + level + "." + id));
|
|
6486
|
-
|
|
6468
|
+
_a.label = 3;
|
|
6487
6469
|
case 3:
|
|
6488
6470
|
resolve(dataSource);
|
|
6489
6471
|
return [2 /*return*/];
|
|
@@ -6495,11 +6477,11 @@
|
|
|
6495
6477
|
var _this = this;
|
|
6496
6478
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6497
6479
|
var streets, parentIds;
|
|
6498
|
-
return __generator(this, function (
|
|
6499
|
-
switch (
|
|
6480
|
+
return __generator(this, function (_a) {
|
|
6481
|
+
switch (_a.label) {
|
|
6500
6482
|
case 0: return [4 /*yield*/, this.getAddress(districtCode, 2)];
|
|
6501
6483
|
case 1:
|
|
6502
|
-
streets =
|
|
6484
|
+
streets = _a.sent();
|
|
6503
6485
|
parentIds = streets.filter(function (x) { return x.name == streetName; }).map(function (x) { return x.parentId; });
|
|
6504
6486
|
resolve(parentIds);
|
|
6505
6487
|
return [2 /*return*/];
|
|
@@ -6520,8 +6502,8 @@
|
|
|
6520
6502
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6521
6503
|
var itemData, serviceUri, result;
|
|
6522
6504
|
var _this = this;
|
|
6523
|
-
return __generator(this, function (
|
|
6524
|
-
switch (
|
|
6505
|
+
return __generator(this, function (_a) {
|
|
6506
|
+
switch (_a.label) {
|
|
6525
6507
|
case 0:
|
|
6526
6508
|
itemData = new MasterDataItem();
|
|
6527
6509
|
if (!!this.storage.getItem("" + this.administrativeUnitItem + id)) return [3 /*break*/, 2];
|
|
@@ -6530,13 +6512,13 @@
|
|
|
6530
6512
|
.pipe(operators.catchError(function (err) { return _this._commonService.handleError(err, _this._injector); }))
|
|
6531
6513
|
.toPromise()];
|
|
6532
6514
|
case 1:
|
|
6533
|
-
result =
|
|
6515
|
+
result = _a.sent();
|
|
6534
6516
|
this.storage.setItem("" + this.administrativeUnitItem + id, JSON.stringify(result.data));
|
|
6535
6517
|
itemData = result.data;
|
|
6536
6518
|
return [3 /*break*/, 3];
|
|
6537
6519
|
case 2:
|
|
6538
6520
|
itemData = JSON.parse(this.storage.getItem("" + this.administrativeUnitItem + id));
|
|
6539
|
-
|
|
6521
|
+
_a.label = 3;
|
|
6540
6522
|
case 3:
|
|
6541
6523
|
resolve(itemData);
|
|
6542
6524
|
return [2 /*return*/];
|
|
@@ -6558,14 +6540,14 @@
|
|
|
6558
6540
|
return __awaiter(this, void 0, void 0, function () {
|
|
6559
6541
|
var group, gridInfo;
|
|
6560
6542
|
var _this = this;
|
|
6561
|
-
return __generator(this, function (
|
|
6562
|
-
switch (
|
|
6543
|
+
return __generator(this, function (_a) {
|
|
6544
|
+
switch (_a.label) {
|
|
6563
6545
|
case 0: return [4 /*yield*/, this.getGroupByCode(groupCode)];
|
|
6564
6546
|
case 1:
|
|
6565
|
-
group =
|
|
6547
|
+
group = _a.sent();
|
|
6566
6548
|
if (!group.data) {
|
|
6567
6549
|
return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6568
|
-
return __generator(this, function (
|
|
6550
|
+
return __generator(this, function (_a) {
|
|
6569
6551
|
resolve({ success: true, data: [] });
|
|
6570
6552
|
return [2 /*return*/];
|
|
6571
6553
|
});
|
|
@@ -6585,11 +6567,11 @@
|
|
|
6585
6567
|
});
|
|
6586
6568
|
});
|
|
6587
6569
|
};
|
|
6588
|
-
// thực hiện get list singleCategory theo groupCategoryCode trên redis
|
|
6570
|
+
// thực hiện get list singleCategory theo groupCategoryCode trên redis cache
|
|
6589
6571
|
MasterDataService.prototype.doGetAllCustom = function (groupCode) {
|
|
6590
6572
|
return __awaiter(this, void 0, void 0, function () {
|
|
6591
6573
|
var uri;
|
|
6592
|
-
return __generator(this, function (
|
|
6574
|
+
return __generator(this, function (_a) {
|
|
6593
6575
|
uri = this.singleCategoryEndpoint + "/GetDataByGroupCode/" + groupCode;
|
|
6594
6576
|
return [2 /*return*/, this._httpClient.get(uri).toPromise()];
|
|
6595
6577
|
});
|
|
@@ -6601,7 +6583,7 @@
|
|
|
6601
6583
|
MasterDataService.prototype.getGroupByCode = function (groupCode) {
|
|
6602
6584
|
return __awaiter(this, void 0, void 0, function () {
|
|
6603
6585
|
var uri;
|
|
6604
|
-
return __generator(this, function (
|
|
6586
|
+
return __generator(this, function (_a) {
|
|
6605
6587
|
uri = this.groupCategoryEndpoint + "/getByCode/" + groupCode;
|
|
6606
6588
|
return [2 /*return*/, this._httpClient.get(uri).toPromise()];
|
|
6607
6589
|
});
|
|
@@ -6635,20 +6617,20 @@
|
|
|
6635
6617
|
var _this = this;
|
|
6636
6618
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6637
6619
|
var dataSource, result;
|
|
6638
|
-
return __generator(this, function (
|
|
6639
|
-
switch (
|
|
6620
|
+
return __generator(this, function (_a) {
|
|
6621
|
+
switch (_a.label) {
|
|
6640
6622
|
case 0:
|
|
6641
6623
|
dataSource = [];
|
|
6642
6624
|
if (!!this.storage.getItem("" + this.categoryPrefix + groupCode)) return [3 /*break*/, 2];
|
|
6643
6625
|
return [4 /*yield*/, this.doGetAll(groupCode)];
|
|
6644
6626
|
case 1:
|
|
6645
|
-
result =
|
|
6627
|
+
result = _a.sent();
|
|
6646
6628
|
this.storage.setItem("" + this.categoryPrefix + groupCode, JSON.stringify(result.data));
|
|
6647
6629
|
dataSource = result.data;
|
|
6648
6630
|
return [3 /*break*/, 3];
|
|
6649
6631
|
case 2:
|
|
6650
6632
|
dataSource = JSON.parse(this.storage.getItem("" + this.categoryPrefix + groupCode));
|
|
6651
|
-
|
|
6633
|
+
_a.label = 3;
|
|
6652
6634
|
case 3:
|
|
6653
6635
|
resolve(dataSource.find(function (x) { return x.code === code; }));
|
|
6654
6636
|
return [2 /*return*/];
|
|
@@ -6669,8 +6651,8 @@
|
|
|
6669
6651
|
var _this = this;
|
|
6670
6652
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6671
6653
|
var strResult, x, x, x;
|
|
6672
|
-
return __generator(this, function (
|
|
6673
|
-
switch (
|
|
6654
|
+
return __generator(this, function (_a) {
|
|
6655
|
+
switch (_a.label) {
|
|
6674
6656
|
case 0:
|
|
6675
6657
|
strResult = '';
|
|
6676
6658
|
if (strText && strText != '') {
|
|
@@ -6682,29 +6664,29 @@
|
|
|
6682
6664
|
if (!(ward && ward != '')) return [3 /*break*/, 2];
|
|
6683
6665
|
return [4 /*yield*/, this.getItemDetailUnit(ward)];
|
|
6684
6666
|
case 1:
|
|
6685
|
-
x =
|
|
6667
|
+
x = _a.sent();
|
|
6686
6668
|
if (x !== null) {
|
|
6687
6669
|
strResult += x.name + ', ';
|
|
6688
6670
|
}
|
|
6689
|
-
|
|
6671
|
+
_a.label = 2;
|
|
6690
6672
|
case 2:
|
|
6691
6673
|
if (!(district && district != '')) return [3 /*break*/, 4];
|
|
6692
6674
|
return [4 /*yield*/, this.getItemDetailUnit(district)];
|
|
6693
6675
|
case 3:
|
|
6694
|
-
x =
|
|
6676
|
+
x = _a.sent();
|
|
6695
6677
|
if (x !== null) {
|
|
6696
6678
|
strResult += x.name + ', ';
|
|
6697
6679
|
}
|
|
6698
|
-
|
|
6680
|
+
_a.label = 4;
|
|
6699
6681
|
case 4:
|
|
6700
6682
|
if (!(city && city != '')) return [3 /*break*/, 6];
|
|
6701
6683
|
return [4 /*yield*/, this.getItemDetailUnit(city)];
|
|
6702
6684
|
case 5:
|
|
6703
|
-
x =
|
|
6685
|
+
x = _a.sent();
|
|
6704
6686
|
if (x !== null) {
|
|
6705
6687
|
strResult += x.name;
|
|
6706
6688
|
}
|
|
6707
|
-
|
|
6689
|
+
_a.label = 6;
|
|
6708
6690
|
case 6:
|
|
6709
6691
|
resolve(strResult);
|
|
6710
6692
|
return [2 /*return*/];
|
|
@@ -6740,8 +6722,8 @@
|
|
|
6740
6722
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
6741
6723
|
var data, dataStorage, apiUrl;
|
|
6742
6724
|
var _this = this;
|
|
6743
|
-
return __generator(this, function (
|
|
6744
|
-
switch (
|
|
6725
|
+
return __generator(this, function (_a) {
|
|
6726
|
+
switch (_a.label) {
|
|
6745
6727
|
case 0:
|
|
6746
6728
|
dataStorage = this.storage.getItem("" + this.categoryPrefix + groupCode);
|
|
6747
6729
|
if (!!dataStorage) return [3 /*break*/, 2];
|
|
@@ -6752,7 +6734,7 @@
|
|
|
6752
6734
|
.post(apiUrl, gridInfo)
|
|
6753
6735
|
.pipe(operators.catchError(function (err) { return _this.handleError(err, _this._injector); })).toPromise()];
|
|
6754
6736
|
case 1:
|
|
6755
|
-
data =
|
|
6737
|
+
data = _a.sent();
|
|
6756
6738
|
this.storage.setItem("" + this.categoryPrefix + groupCode, JSON.stringify(data.data));
|
|
6757
6739
|
return [3 /*break*/, 3];
|
|
6758
6740
|
case 2:
|
|
@@ -6760,7 +6742,7 @@
|
|
|
6760
6742
|
success: true,
|
|
6761
6743
|
data: JSON.parse(dataStorage)
|
|
6762
6744
|
};
|
|
6763
|
-
|
|
6745
|
+
_a.label = 3;
|
|
6764
6746
|
case 3:
|
|
6765
6747
|
resolve(data);
|
|
6766
6748
|
return [2 /*return*/];
|