tnx-shared 5.1.401 → 5.1.404

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
@@ -9363,6 +9363,54 @@
                 show: false
             });
         };
+        ComponentBase.prototype.addDistinct = function (lst, value) {
+            if (lst.indexOf(value) == -1) {
+                lst.push(value);
+            }
+        };
+        ComponentBase.prototype.addDistinctList = function (lst, lstValue) {
+            if (!lstValue || !lstValue.length)
+                return;
+            lstValue.forEach(function (value) {
+                if (lst.indexOf(value) == -1) {
+                    lst.push(value);
+                }
+            });
+        };
+        /**
+        * Convert 1 array => N array
+        * @param lst Mảng phần tử
+        * @param fields Mảng các field, nếu field là kiểu array thì nghĩa là mún map distinct
+        * @returns N Array
+        */
+        ComponentBase.prototype.multipleMap = function (lst) {
+            var _this = this;
+            var fields = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                fields[_i - 1] = arguments[_i];
+            }
+            var result = [];
+            var funcs = [];
+            var rawFields = [];
+            var _push = function (lst, value) { return lst.push(value); };
+            fields.forEach(function (field) {
+                result.push([]);
+                if (Array.isArray(field)) {
+                    funcs.push(_this.addDistinct);
+                    rawFields.push(field[0]);
+                }
+                else {
+                    funcs.push(_push);
+                    rawFields.push(field);
+                }
+            });
+            lst.forEach(function (item) {
+                rawFields.forEach(function (field, index) {
+                    funcs[index](result[index], item[field]);
+                });
+            });
+            return result;
+        };
         ComponentBase.prototype._printPdf = function (baseService, id, rowData) {
             return __awaiter(this, void 0, void 0, function () {
                 var itemDetail, data;
@@ -9613,10 +9661,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 +13086,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 +14312,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;
@@ -15853,6 +15907,13 @@
         ControlTreeNode.prototype.setCrudForm = function (crudForm) {
             this._crudForm = crudForm;
         };
+        Object.defineProperty(ControlTreeNode.prototype, "crudForm", {
+            get: function () {
+                return this.rootNode._crudForm;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(ControlTreeNode.prototype, "parentModel", {
             get: function () {
                 if (this.parentNode)
@@ -15882,32 +15943,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 +16043,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 +16069,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()) {
@@ -16028,12 +16099,29 @@
                 tableNode.model = [];
             }
             tableNode.model.splice(0, tableNode.model.length);
+            tableNode.setDataSourceInternal(dataSource);
+        };
+        ControlTreeNode.prototype.setDataSourceInternal = function (dataSource) {
+            if (!(this.control instanceof TableSchema))
+                return;
             if (dataSource.length == 0) {
-                tableNode.reinitChildNodes();
+                this.reinitChildNodes();
                 return;
             }
             for (var i = 0; i < dataSource.length; i++) {
-                this.rootNode._crudForm.addNewRow(tableNode.control, path, null, true, dataSource[i], i == dataSource.length - 1);
+                this.rootNode._crudForm.addNewRow(this.control, this.modelPath, null, true, dataSource[i], i == dataSource.length - 1);
+            }
+        };
+        ControlTreeNode.prototype.setValue = function (value) {
+            if (this.control instanceof TableSchema) {
+                this.setDataSourceInternal(value);
+            }
+            else if (this.control instanceof ContainerSchema) {
+                this.parentNode.data[this.control.field] = value;
+                this.crudForm.initControlDefaultValue(this.parentNode.data, this.control, this.parentNode.modelPath);
+            }
+            else {
+                this.model = value;
             }
         };
         return ControlTreeNode;
@@ -17135,7 +17223,11 @@
             schema.required = false;
         };
         DataFormBase.prototype._setModelValue = function (field, value) {
-            this.crudForm._modelData[field] = value;
+            var node = this.crudForm._rootNode.getNodeByPath(field);
+            this._setModelValueByNode(node, value);
+        };
+        DataFormBase.prototype._setModelValueByNode = function (node, value) {
+            node.setValue(value);
             this.crudForm.fireModelChanged();
         };
         DataFormBase.prototype.modifyDetailData = function (data) {
@@ -26599,9 +26691,17 @@
         function FileObjectService(http, injector, _moduleConfigService) {
             var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.fileEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/FileObject") || this;
             _this._moduleConfigService = _moduleConfigService;
+            _this.thumborEndpoint = '';
             _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.fileEndpoint;
+            _this.thumborEndpoint = _moduleConfigService.getConfig().environment.apiDomain.thumbor;
             return _this;
         }
+        FileObjectService.prototype.getFileUrlWithThumbor = function (fileId, width, height) {
+            if (width === void 0) { width = 0; }
+            if (height === void 0) { height = 0; }
+            var url = this.thumborEndpoint + "/unsafe/" + width + "x" + height + "/smart/" + this.endPoint + "/v5/FileObject/public/" + fileId + "/download";
+            return url;
+        };
         FileObjectService.prototype.copyMultipleFile = function (idsFile, idDesFolder) {
             var url = this.serviceUri + "/CopyMultipleFile?parentFolderId=" + idDesFolder;
             return this.defaultPost(url, idsFile);
@@ -34325,7 +34425,9 @@
                 }
             }
             if (element.extension.toUpperCase() == '.PNG' || element.extension.toUpperCase() == '.JPG' || element.extension.toUpperCase() == '.JPEG') {
-                result = '<div style="width:100%; margin-bottom: 15px;text-align: center;"><img style="display:block; margin:auto;" width="500" src="' + this._fileObjectService.endPoint + '/v5/FileObject/public/' + element.id + '/download" /><p><em>Tiêu đề hình ảnh</em></p></div>';
+                result = '<div style="width:100%; margin-bottom: 15px;text-align: center;"><img style="display:block; margin:auto;" width="500" src="'
+                    + this._fileObjectService.getFileUrlWithThumbor(element.id, 1080)
+                    + '" /><p><em>Tiêu đề hình ảnh</em></p></div>';
             }
             else if (element.extension.toUpperCase() == '.MP3' || element.extension.toUpperCase() == '.WMA' || element.extension.toUpperCase() == '.FLAC' || element.extension.toUpperCase() == '.AAC' || element.extension.toUpperCase() == '.OGG') {
                 result = '<div style="width:100%; margin-bottom: 15px"><audio style="display: block;margin-left: auto;margin-right: auto;" controls><source src="' + this._fileObjectService.endPoint + '/v5/FileObject/public/' + element.id + '/download" type="audio/mpeg"></audio></div>';
@@ -34352,7 +34454,7 @@
     FilePickerDialogComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'file-picker-dialog',
-                    template: "<crud-form #crudForm [(data)]=\"model.data\" [setting]=\"setting\" [context]=\"context\" [disableCaching]=\"true\"\r\n    (onFormReady)=\"_handleFormReady($event)\">\r\n    <ng-template #fileManager let-control=\"control\">\r\n        <file-manager serviceCode=\"user\" entity=\"user\" entityKey=\"entityKey\" label=\"My folder\" [dataType]=\"model.data.fileType\"\r\n            (onSelected)=\"selectedFile($event)\"></file-manager>\r\n    </ng-template>\r\n</crud-form>\r\n<ng-template #buttonTemplate>\r\n    <button type=\"button\" pButton icon=\"pi pi-save\" class=\"p-button-text\" [label]=\"'FORM.SAVE' | translate\"\r\n        (click)=\"chooseFiles($event)\"></button>\r\n\r\n    <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n        [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"_handleCancel($event)\"></button>\r\n</ng-template>\r\n",
+                    template: "<crud-form #crudForm [(data)]=\"model.data\" [setting]=\"setting\" [context]=\"context\" [disableCaching]=\"true\"\r\n    (onFormReady)=\"_handleFormReady($event)\">\r\n    <ng-template #fileManager let-control=\"control\">\r\n        <file-manager serviceCode=\"user\" entity=\"user\" [entityKey]=\"entityKey\" label=\"My folder\"\r\n            [dataType]=\"model.data.fileType\" (onSelected)=\"selectedFile($event)\"></file-manager>\r\n    </ng-template>\r\n</crud-form>\r\n<ng-template #buttonTemplate>\r\n    <button type=\"button\" pButton icon=\"pi pi-save\" class=\"p-button-text\" [label]=\"'FORM.SAVE' | translate\"\r\n        (click)=\"chooseFiles($event)\"></button>\r\n\r\n    <button type=\"button\" pButton icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\r\n        [label]=\"'FORM.CANCEL' | translate\" preventTab (click)=\"_handleCancel($event)\"></button>\r\n</ng-template>",
                     providers: [ComponentContextService],
                     styles: [""]
                 },] }
@@ -38696,25 +38798,16 @@
                 roleIds: (_f = this.action.data.roleViewIds) !== null && _f !== void 0 ? _f : [],
                 type: exports.EnumProcessWorkflowType.VIEW
             };
-            this.addDistinct(this.dataAllowEdit.userIds, this.initValueForTargetForm.lstUserId);
-            this.addDistinct(this.dataAllowEdit.departmentIds, this.initValueForTargetForm.lstDonViId);
-            this.addDistinct(this.dataAllowEdit.groupIds, this.initValueForTargetForm.lstGroupId);
-            this.addDistinct(this.dataAllowEdit.roleIds, this.initValueForTargetForm.lstRoleId);
-            this.addDistinct(this.dataOnlyView.userIds, this.initValueForTargetForm.lstUserViewId);
-            this.addDistinct(this.dataOnlyView.departmentIds, this.initValueForTargetForm.lstDonViViewId);
-            this.addDistinct(this.dataOnlyView.groupIds, this.initValueForTargetForm.lstGroupViewId);
-            this.addDistinct(this.dataOnlyView.roleIds, this.initValueForTargetForm.lstRoleViewId);
+            this.addDistinctList(this.dataAllowEdit.userIds, this.initValueForTargetForm.lstUserId);
+            this.addDistinctList(this.dataAllowEdit.departmentIds, this.initValueForTargetForm.lstDonViId);
+            this.addDistinctList(this.dataAllowEdit.groupIds, this.initValueForTargetForm.lstGroupId);
+            this.addDistinctList(this.dataAllowEdit.roleIds, this.initValueForTargetForm.lstRoleId);
+            this.addDistinctList(this.dataOnlyView.userIds, this.initValueForTargetForm.lstUserViewId);
+            this.addDistinctList(this.dataOnlyView.departmentIds, this.initValueForTargetForm.lstDonViViewId);
+            this.addDistinctList(this.dataOnlyView.groupIds, this.initValueForTargetForm.lstGroupViewId);
+            this.addDistinctList(this.dataOnlyView.roleIds, this.initValueForTargetForm.lstRoleViewId);
             this.formReady = true;
         };
-        ProcessWorkflowFormComponent.prototype.addDistinct = function (dest, source) {
-            if (!source || !source.length)
-                return;
-            source.forEach(function (item) {
-                if (dest.indexOf(item) == -1) {
-                    dest.push(item);
-                }
-            });
-        };
         ProcessWorkflowFormComponent.prototype.onFormInitialized = function (evt) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_g) {
@@ -42315,6 +42408,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);
         };
@@ -43705,6 +43814,7 @@
         AddNewsComponent.prototype.modifyGridInfo = function (gridInfo) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
+                    gridInfo.fields = 'id,name,newsCategoryId,type,articleType,numberView,modified,releaseDate';
                     gridInfo.filters.splice(0, 0, this.newFilter('type', exports.Operator.equal, 'NEWS'));
                     gridInfo.filters.splice(0, 0, this.newFilter('statusView', exports.Operator.equal, ItemStatus.DaXuatBan));
                     gridInfo.filters.splice(0, 0, this.newFilter('releaseDate', exports.Operator.lowerThanEqual, new Date()));
@@ -44252,14 +44362,19 @@
             this._commonService.addDistinct(arrDisplayField, arrField);
             return arrField.toString();
         };
-        AutoCompletePickerComponent.prototype.getDropdownOptions = function () {
-            return new DropdownOptions({
+        AutoCompletePickerComponent.prototype.getDropdownOptions = function (pageSize) {
+            if (pageSize === void 0) { pageSize = null; }
+            var result = new DropdownOptions({
                 displayField: this.control.displayField,
                 valueField: this.control.valueField,
                 fieldPlus: this.control.fieldPlus,
                 funcGetLabel: this.control.funcGetLabel,
                 plusUrl: this.control.plusUrl
             });
+            if (pageSize) {
+                result.pageSize = pageSize;
+            }
+            return result;
         };
         AutoCompletePickerComponent.prototype.showPickForm = function () {
             return __awaiter(this, void 0, void 0, function () {
@@ -44515,7 +44630,7 @@
                             if (!(this.value && this.value.length > 0)) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.control.baseService.getDataDropdownByFilter([
                                     this.newFilter(this.control.valueField, exports.Operator.in, this.value)
-                                ], this.getDropdownOptions())];
+                                ], this.getDropdownOptions(this.value.length))];
                         case 1:
                             dataSource = _a.sent();
                             this.fireEventAfterGetDataDropDown(dataSource);
@@ -44529,7 +44644,7 @@
                             if (!this.value) return [3 /*break*/, 5];
                             return [4 /*yield*/, this.control.baseService.getDataDropdownByFilter([
                                     this.newFilter(this.control.valueField, exports.Operator.equal, this.value)
-                                ], this.getDropdownOptions())];
+                                ], this.getDropdownOptions(1))];
                         case 4:
                             dataSource = _a.sent();
                             this.fireEventAfterGetDataDropDown(dataSource);
@@ -44612,7 +44727,7 @@
                             return [4 /*yield*/, appendDefaultFilter(filters, this.control.defaultFilters)];
                         case 1:
                             _a.sent();
-                            this.control.baseService.getDataDropdownByFilter(filters, this.getDropdownOptions()).then(function (res) {
+                            this.control.baseService.getDataDropdownByFilter(filters, this.getDropdownOptions(obj.length)).then(function (res) {
                                 _this.fireEventAfterGetDataDropDown(res);
                                 _this.reStructureDataSource(res);
                                 _this.results = _this.dataSource;
@@ -44628,7 +44743,7 @@
                         case 3: return [3 /*break*/, 5];
                         case 4:
                             if (obj != null) {
-                                this.control.baseService.getDataDropdownByFilter([this.newFilter(this.control.valueField, exports.Operator.equal, obj)], this.getDropdownOptions()).then(function (res) {
+                                this.control.baseService.getDataDropdownByFilter([this.newFilter(this.control.valueField, exports.Operator.equal, obj)], this.getDropdownOptions(1)).then(function (res) {
                                     if (res.length > 0) {
                                         _this.fireEventAfterGetDataDropDown(res);
                                         _this.reStructureDataSource(res);
@@ -44758,11 +44873,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;
@@ -44785,11 +44895,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;
@@ -44801,13 +44911,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);
@@ -44816,14 +44922,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();
@@ -54609,15 +54720,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;
         }
@@ -54676,9 +54787,7 @@
                 return;
             }
             var gridInfo = new GridInfo({
-                filters: [
-                    this.newFilter('userId', exports.Operator.equal, this.userId)
-                ],
+                filters: [],
                 pageInfo: {
                     page: 1,
                     pageSize: this.maxNotification
@@ -54688,12 +54797,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);
@@ -54702,7 +54808,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;
@@ -54712,14 +54818,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*/];
                     }
                 });
             });