tnx-shared 5.1.400 → 5.1.403

package/bundles/tnx-shared.umd.js

@@ -9189,8 +9189,8 @@
         });
         ;
         /**
-        * On destroy
-        */
+         * On destroy
+         */
         ComponentBase.prototype.ngOnDestroy = function () {
             var e_1, _a;
             // Unsubscribe from all subscriptions
@@ -9613,10 +9613,12 @@
                                                 value_2 = this_1._getValueFromDatasource(itemSelected, schema.multiple, tmpSchema.funcGetLabel);
                                             }
                                             else if (schema instanceof CheckboxControlSchema || schema instanceof SwitchControlSchema) {
-                                                if (!value_2)
+                                                if (!value_2) {
                                                     value_2 = 'Không';
-                                                else
+                                                }
+                                                else {
                                                     value_2 = 'Có';
+                                                }
                                             }
                                             _b.label = 19;
                                         case 19:
@@ -13036,7 +13038,7 @@
             _this.eventType = exports.EventType;
             // Doc tu cau hinh tham so he thong
             _this.limitSize = 0;
-            _this.formControls = [];
+            _this.formControls = {};
             _this.funcCheckUniqueField = {};
             _this.beforeData = {};
             _this.cachedValues = {};
@@ -14262,18 +14264,22 @@
             for (var field in model) {
                 if (field != '_errors' && field != '_status' && field != '_source') {
                     var subUniqueKeyControl = void 0;
-                    if (uniqueKeyControl != null && uniqueKeyControl !== '')
+                    if (uniqueKeyControl != null && uniqueKeyControl !== '') {
                         subUniqueKeyControl = uniqueKeyControl + '.' + field;
-                    else
+                    }
+                    else {
                         subUniqueKeyControl = field;
+                    }
                     var control = this.formControls[subUniqueKeyControl];
                     if (!control)
                         continue;
                     var subPath = void 0;
-                    if (path != null && path !== '')
+                    if (path != null && path !== '') {
                         subPath = path + '.' + field;
-                    else
+                    }
+                    else {
                         subPath = field;
+                    }
                     var subModel = model[field];
                     if (subModel instanceof Array) {
                         var index = 0;
@@ -15882,32 +15888,40 @@
         });
         Object.defineProperty(ControlTreeNode.prototype, "model", {
             get: function () {
-                if (this.parentNode)
+                if (this.parentNode) {
                     return this.parentNode.data[this.field];
-                else
+                }
+                else {
                     return this.data;
+                }
             },
             set: function (val) {
-                if (this.parentNode)
+                if (this.parentNode) {
                     this.parentNode.data[this.field] = val;
-                else
+                }
+                else {
                     this.data = val;
+                }
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(ControlTreeNode.prototype, "value", {
             get: function () {
-                if (this.parentNode)
+                if (this.parentNode) {
                     return this.parentNode.data[this.field];
-                else
+                }
+                else {
                     return this.data;
+                }
             },
             set: function (val) {
-                if (this.parentNode)
+                if (this.parentNode) {
                     this.parentNode.data[this.field] = val;
-                else
+                }
+                else {
                     this.data = val;
+                }
             },
             enumerable: false,
             configurable: true
@@ -15974,8 +15988,9 @@
         };
         ControlTreeNode.prototype.findInTree = function (node, modelPath) {
             var e_33, _d;
-            if (node.modelPath != null && node.modelPath.toLowerCase() == modelPath.toLowerCase())
+            if (node.modelPath != null && node.modelPath.toLowerCase() == modelPath.toLowerCase()) {
                 return node;
+            }
             else {
                 try {
                     for (var _e = __values(node.childNodes), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -15999,8 +16014,9 @@
         };
         ControlTreeNode.prototype.findSchemaInTree = function (node, schemaPath) {
             var e_34, _d;
-            if (node.schemaPath != null && node.schemaPath.toLowerCase() == schemaPath.toLowerCase())
+            if (node.schemaPath != null && node.schemaPath.toLowerCase() == schemaPath.toLowerCase()) {
                 return node;
+            }
             else {
                 try {
                     for (var _e = __values(node.childNodes), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -42315,6 +42331,22 @@
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.notificationCRUDEndpoint;
             return _this;
         }
+        NotificationService.prototype.getAllUserReadNotification = function () {
+            var url = this.serviceUri + "/AllUserReadNotification";
+            return this.defaultGet(url);
+        };
+        NotificationService.prototype.getAllUserNotification = function () {
+            var url = this.serviceUri + "/AllUserNotification";
+            return this.defaultGet(url);
+        };
+        NotificationService.prototype.getReadUserNotification = function (gridInfo) {
+            var url = this.serviceUri + "/UserReadNotification";
+            return this.defaultPost(url, gridInfo);
+        };
+        NotificationService.prototype.getUserNotification = function (gridInfo) {
+            var url = this.serviceUri + "/UserNotification";
+            return this.defaultPost(url, gridInfo);
+        };
         NotificationService.prototype.sendNotification = function (data) {
             return this.defaultPost(this.serviceUri + "/InsertToManyUser/", data);
         };
@@ -43838,6 +43870,9 @@
         });
         AddressComponent.prototype.ngOnInit = function () {
             var _this = this;
+            if (!this.control.baseService) {
+                this.control.baseService = this._addressService;
+            }
             this.control._component = this;
             _super.prototype.ngOnInit.call(this);
             // Nếu đã ẩn quận huyện thì phải ẩn luôn cả phường xã
@@ -43851,7 +43886,7 @@
                     label: 'Tỉnh/Thành phố',
                     placeholder: 'Chọn tỉnh/thành phố',
                     required: this.control.required && this.control.requiredProvince,
-                    baseService: this._addressService,
+                    baseService: this.control.baseService,
                     defaultFilters: [{ field: 'level', operator: exports.Operator.equal, value: exports.ENUM_DON_VI_HANH_CHINH.THANH_PHO.toString() }],
                     valueField: 'id',
                     displayField: 'name',
@@ -43868,7 +43903,7 @@
                     label: 'Quận/Huyện',
                     placeholder: 'Chọn quận/huyện',
                     required: this.control.required && this.control.requiredDistrict,
-                    baseService: this._addressService,
+                    baseService: this.control.baseService,
                     defaultFilters: [{ field: 'level', operator: exports.Operator.equal, value: exports.ENUM_DON_VI_HANH_CHINH.QUAN_HUYEN.toString() }],
                     bindingFilters: [{ field: 'parentId', operator: exports.Operator.equal, sourceField: 'idProvince', subField: 'idRoot' }],
                     valueField: 'id',
@@ -43884,7 +43919,7 @@
                     label: 'Phường/Xã',
                     placeholder: 'Chọn phường/xã',
                     required: this.control.required && this.control.requiredWard,
-                    baseService: this._addressService,
+                    baseService: this.control.baseService,
                     defaultFilters: [{ field: 'level', operator: exports.Operator.equal, value: exports.ENUM_DON_VI_HANH_CHINH.PHUONG_XA.toString() }],
                     bindingFilters: [{ field: 'parentId', operator: exports.Operator.equal, sourceField: 'idDistrict', subField: 'idRoot' }],
                     valueField: 'id',
@@ -43957,7 +43992,7 @@
                     street: this._modelData.street,
                     no: this._modelData.no
                 };
-                this._addressService.getAll([
+                this.control.baseService.getAll([
                     this.newFilter('id', exports.Operator.in, values)
                 ], 'id,name').then(function (res) { return _this.handleResponse(res, '', function (data) {
                     if (_this._modelData.idProvince) {
@@ -44755,11 +44790,6 @@
             this.fieldValue = this.control.valueField;
             if (this.control.dataSource == null || this.control.dataSource.length == 0) {
                 this.bindDataSource(this.control.serviceUri, this.control.baseService);
-                // if (this.control.serviceUri) {
-                // }
-                // else if(this.control.baseService) {
-                //
-                // }
             }
             else {
                 this.dataSourceInternal = this.control.dataSource;
@@ -44782,11 +44812,11 @@
             var _this = this;
             var _a, _b;
             if (baseService) {
+                var dropdownOptions = new DropdownOptions({
+                    displayField: (_a = this.control.displayField) !== null && _a !== void 0 ? _a : 'ten',
+                    valueField: (_b = this.control.valueField) !== null && _b !== void 0 ? _b : 'id',
+                });
                 if (baseService instanceof BaseService) {
-                    var dropdownOptions = new DropdownOptions({
-                        displayField: (_a = this.control.displayField) !== null && _a !== void 0 ? _a : 'ten',
-                        valueField: (_b = this.control.valueField) !== null && _b !== void 0 ? _b : 'id',
-                    });
                     baseService.getDataDropdown(dropdownOptions).then(function (res) {
                         _this.dataSourceInternal = res;
                         _this.gotData = true;
@@ -44798,13 +44828,9 @@
                         console.log(err);
                     });
                 }
-                else if (baseService instanceof MasterDataService) {
-                    baseService.getDropdown(this.control.groupCode).then(function (res) {
-                        // const displayField = this.control.displayField ?? 'id';
-                        // const valueField = this.control.valueField ?? 'code';
-                        _this.dataSourceInternal = res.map(function (item) {
-                            return { id: item.value, ten: item.label };
-                        });
+                if (baseService instanceof MasterDataService) {
+                    baseService.getDataDropdown(this.control.groupCode, null, dropdownOptions).then(function (res) {
+                        _this.dataSourceInternal = res;
                         if (_this.wroteValue)
                             _this.fixValue();
                         _this.onReady.emit(_this.control.field);
@@ -44813,14 +44839,19 @@
                         _this.onReady.emit(_this.control.field);
                     });
                 }
+                return;
             }
-            else if (serviceUri) {
+            if (serviceUri) {
                 this._dropDownService.getDataSource(serviceUri).then(function (rs) {
                     var arr = [];
-                    // for (let i = 0; i < rs.data.length; i++) {
-                    //     arr.push({ label: rs.data[i][this.control.displayField], title: rs.data[i][this.control.displayField], value: rs.data[i][this.control.valueField] });
-                    // }
-                    _this.dataSourceInternal = rs.data;
+                    for (var i = 0; i < rs.data.length; i++) {
+                        arr.push({
+                            label: rs.data[i][_this.control.displayField],
+                            title: rs.data[i][_this.control.displayField],
+                            value: rs.data[i][_this.control.valueField]
+                        });
+                    }
+                    _this.dataSourceInternal = arr;
                     _this.gotData = true;
                     if (_this.wroteValue) {
                         _this.fixValue();
@@ -54606,15 +54637,15 @@
             _this.url = '';
             _this.urldetail = '';
             _this.notifications = [];
-            _this.rootContext.subscribe('NOTIFICATION_CHANGE', function (rs) {
+            _this.rootContext.subscribe(ComCtxConstants.NOTIFICATION.NOTIFICATION_CHANGE, function (rs) {
                 _this.refreshNotification();
             });
             _this._signalRService.start('NotificationHub', TopicReloadNotification, function (data) {
                 _this.refreshNotification();
             });
-            // this.rootContext.subscribe(ComCtxConstants.NOTIFICATION.NOTIFICATION_RELOAD, res => {
-            //     this.refreshNotification();
-            // });
+            _this.rootContext.subscribe(ComCtxConstants.NOTIFICATION.NOTIFICATION_RELOAD, function (res) {
+                _this.refreshNotification();
+            });
             _this.environment = _this._moduleConfigService.getConfig().environment;
             return _this;
         }
@@ -54673,9 +54704,7 @@
                 return;
             }
             var gridInfo = new GridInfo({
-                filters: [
-                    this.newFilter('userId', exports.Operator.equal, this.userId)
-                ],
+                filters: [],
                 pageInfo: {
                     page: 1,
                     pageSize: this.maxNotification
@@ -54685,12 +54714,9 @@
                 ],
                 fields: ''
             });
-            var readedFilters = [
-                this.newFilter('userId', exports.Operator.equal, this.userId),
-                this.newFilter('readedTime', exports.Operator.isNull, '1')
-            ];
             Promise.all([
-                this._notificationService.getByGridRequest(gridInfo).then(function (res) { return _this.handleResponse(res, '', function (f) {
+                this._notificationService.getUserNotification(gridInfo)
+                    .then(function (res) { return _this.handleResponse(res, '', function (f) {
                     _this.notifications = res.data;
                     if (!res.success || res.data == null) {
                         _this._notifierService.showWarningByResponse(res);
@@ -54699,7 +54725,7 @@
                     _this.bounceNoti = true;
                     _this.afterGetNotication();
                 }); }),
-                this._notificationService.getAll(readedFilters, 'id').then(function (res) {
+                this._notificationService.getAllUserReadNotification().then(function (res) {
                     if (res.data == null || !res.success) {
                         _this._notifierService.showWarningByResponse(res);
                         return;
@@ -54709,14 +54735,39 @@
             ]);
         };
         TnAppNotificationComponent.prototype.afterGetNotication = function () {
-            var _this = this;
-            this.notifications.forEach(function (element) {
-                if (element.createdUserId == null) {
-                    return;
-                }
-                _this._userV5Service.getBasicUserInfo(element.createdUserId).then(function (result) {
-                    if (result.avatar) {
-                        element.avatarId = result.avatar;
+            return __awaiter(this, void 0, void 0, function () {
+                var idsUserCreated, userRes, lstUserInfo;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            idsUserCreated = [];
+                            this.notifications.forEach(function (element) {
+                                if (element.createdUserId == null) {
+                                    return;
+                                }
+                                idsUserCreated.push(element.createdUserId);
+                            });
+                            if (idsUserCreated.length === 0) {
+                                return [2 /*return*/];
+                            }
+                            return [4 /*yield*/, this._userV5Service.getAll([this.newFilter('id', exports.Operator.in, idsUserCreated)], 'avatar,id')];
+                        case 1:
+                            userRes = _a.sent();
+                            if (!userRes.success || !userRes.data || userRes.data.length === 0) {
+                                return [2 /*return*/];
+                            }
+                            lstUserInfo = userRes.data;
+                            this.notifications.forEach(function (notification) {
+                                if (!notification.createdUserId) {
+                                    return;
+                                }
+                                var userInfo = lstUserInfo.find(function (x) { return x.id === notification.createdUserId; });
+                                if (!userInfo) {
+                                    return;
+                                }
+                                notification.avatar = userInfo.avatar;
+                            });
+                            return [2 /*return*/];
                     }
                 });
             });