tnx-shared 5.1.154 → 5.1.158

package/bundles/tnx-shared.umd.js

@@ -345,6 +345,7 @@
         USER_READY: 'USER_READY',
         USER_LOADED: 'USER_LOADED',
         USER_INFO_CHANGED: 'USER_INFO_CHANGED',
+        NEED_CLEAR_PERMISSION_CACHE: 'CLEAR_PERMISSION_CACHE',
         ADVANCE_SEARCH_TOGGLE_BOX: 'ADVANCE_SEARCH_TOGGLE_BOX',
         ADVANCE_SEARCH_HIDE_BOX: 'ADVANCE_SEARCH_HIDE_BOX',
         ADVANCE_SEARCH_INIT: 'ADVANCE_SEARCH_INIT',
@@ -515,6 +516,11 @@
         DE_TAI: 15,
         BIEU_MAU: 16,
         TEACHERFULL: 17,
+    };
+    ComCtxConstants.PERMISSION = {
+        REFRESH_PERMISSION: 'REFRESH_PERMISSION',
+        SELECTED_OBJECT_CHANGED: 'SELECTED_OBJECT_CHANGED',
+        REFRESH_USER_PERMISSION: 'REFRESH_USER_PERMISSION',
     };
 
     //         ctr.prototype[propertyKey] = function (...args) {
@@ -9224,6 +9230,11 @@
             }
             return false;
         };
+        UserService.prototype.getFullCanBoLabel = function (item) {
+            var label = this.getUserName(item);
+            label = (item.maChucVu ? item.maChucVu + ". " : '') + ("" + label) + (item.tenDonVi ? " - " + item.tenDonVi : '');
+            return label;
+        };
         UserService.prototype.getAllWithInfo = function (filters) {
             return this.getDataCustomRoute('WithInfo', filters);
         };
@@ -9280,6 +9291,7 @@
             }
             else {
                 this._applicationContext.getRootContext().replaySubscribeOnce(ComCtxConstants.ROOT.USER_READY, function (rs) {
+                    var firstTimeLogin = rs !== null && rs !== void 0 ? rs : false;
                     var accessToken = _this._oauthService.getAccessToken();
                     var decoded = JWT.default(accessToken);
                     // Chuyển đổi sang dùng instanceId nếu đăng nhập bằng identityv4 nhưng phải sử dụng base userOrgv5
@@ -9321,7 +9333,12 @@
                             localStorage.setItem(_this.CURRENT_USER_KEY, JSON.stringify(user));
                         }
                         _this._applicationContext.getRootContext().data.currentUser = user;
-                        _this._applicationContext.getRootContext().fireReplayEvent(ComCtxConstants.ROOT.USER_LOADED, true);
+                        if (firstTimeLogin) {
+                            _this._applicationContext.getRootContext().fireEvent(ComCtxConstants.ROOT.NEED_CLEAR_PERMISSION_CACHE);
+                        }
+                        else {
+                            _this._applicationContext.getRootContext().fireReplayEvent(ComCtxConstants.ROOT.USER_LOADED, true);
+                        }
                     }, function (err) {
                     });
                 });
@@ -9910,7 +9927,20 @@
             _this.appCode = _this._moduleConfigService.getConfig().appCode;
             return _this;
         }
-        PermissionService.prototype.cleanPermissionCache = function (lstModule) {
+        PermissionService.prototype.clearPermissionCacheAll = function () {
+            var _a, _b, _c;
+            var lstAppCodes = (_c = (_b = (_a = this._moduleConfigService.getConfig().environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(function (app) { return app.code; })) !== null && _c !== void 0 ? _c : [];
+            var lstApiEndpoint = [];
+            var apiDomain = this._moduleConfigService.getConfig().environment.apiDomain;
+            for (var domainName in apiDomain) {
+                if (domainName.startsWith('-') || domainName.startsWith('1') || domainName == 'gateway')
+                    continue;
+                var realDomainName = domainName.split('Endpoint') ? domainName.split('Endpoint')[0] : domainName;
+                lstApiEndpoint.push(realDomainName.toUpperCase());
+            }
+            return this.clearPermissionCache(__spread(lstAppCodes, lstApiEndpoint));
+        };
+        PermissionService.prototype.clearPermissionCache = function (lstModule) {
             var url = this.serviceUri + "/ClearPermissionCache";
             return this.defaultPost(url, lstModule);
         };
@@ -9927,12 +9957,12 @@
             var _this = this;
             return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                 var user, result, lstPermissionCode_1, lstPermissionCode_1_1, item, e_1_1;
-                var e_1, _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var e_1, _d;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0: return [4 /*yield*/, this._userService.getCurrentUser()];
                         case 1:
-                            user = (_b.sent());
+                            user = (_e.sent());
                             if (user && user.issuperuser.toLowerCase() == 'true') {
                                 resolve(lstPermissionCode);
                                 return [2 /*return*/];
@@ -9942,31 +9972,31 @@
                                 return [2 /*return*/];
                             }
                             result = [];
-                            _b.label = 2;
+                            _e.label = 2;
                         case 2:
-                            _b.trys.push([2, 7, 8, 9]);
+                            _e.trys.push([2, 7, 8, 9]);
                             lstPermissionCode_1 = __values(lstPermissionCode), lstPermissionCode_1_1 = lstPermissionCode_1.next();
-                            _b.label = 3;
+                            _e.label = 3;
                         case 3:
                             if (!!lstPermissionCode_1_1.done) return [3 /*break*/, 6];
                             item = lstPermissionCode_1_1.value;
                             return [4 /*yield*/, this.isAuthorizedPermission(item)];
                         case 4:
-                            if (_b.sent()) {
+                            if (_e.sent()) {
                                 result.push(item);
                             }
-                            _b.label = 5;
+                            _e.label = 5;
                         case 5:
                             lstPermissionCode_1_1 = lstPermissionCode_1.next();
                             return [3 /*break*/, 3];
                         case 6: return [3 /*break*/, 9];
                         case 7:
-                            e_1_1 = _b.sent();
+                            e_1_1 = _e.sent();
                             e_1 = { error: e_1_1 };
                             return [3 /*break*/, 9];
                         case 8:
                             try {
-                                if (lstPermissionCode_1_1 && !lstPermissionCode_1_1.done && (_a = lstPermissionCode_1.return)) _a.call(lstPermissionCode_1);
+                                if (lstPermissionCode_1_1 && !lstPermissionCode_1_1.done && (_d = lstPermissionCode_1.return)) _d.call(lstPermissionCode_1);
                             }
                             finally { if (e_1) throw e_1.error; }
                             return [7 /*endfinally*/];
@@ -9981,16 +10011,16 @@
             var _this = this;
             return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                 var retryCount;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             retryCount = 0;
-                            _a.label = 1;
+                            _d.label = 1;
                         case 1:
                             if (!!this._oauthService.hasValidAccessToken()) return [3 /*break*/, 3];
                             return [4 /*yield*/, this._commonService.delay(100)];
                         case 2:
-                            _a.sent();
+                            _d.sent();
                             retryCount++;
                             if (retryCount > 50) {
                                 return [3 /*break*/, 3];
@@ -9998,7 +10028,7 @@
                             return [3 /*break*/, 1];
                         case 3: return [4 /*yield*/, this.checkPermission(this.appCode, permission, resolve, reject)];
                         case 4:
-                            _a.sent();
+                            _d.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -10010,16 +10040,16 @@
             this.root = this._appContext.getRootContext();
             return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                 var retryCount;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             retryCount = 0;
-                            _a.label = 1;
+                            _d.label = 1;
                         case 1:
                             if (!!this._oauthService.hasValidAccessToken()) return [3 /*break*/, 3];
                             return [4 /*yield*/, this._commonService.delay(100)];
                         case 2:
-                            _a.sent();
+                            _d.sent();
                             retryCount++;
                             if (retryCount > 50) {
                                 return [3 /*break*/, 3];
@@ -10027,7 +10057,7 @@
                             return [3 /*break*/, 1];
                         case 3: return [4 /*yield*/, this.checkPermission(service, permission, resolve, reject)];
                         case 4:
-                            _a.sent();
+                            _d.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -10036,11 +10066,11 @@
         PermissionService.prototype.checkPermission = function (service, permission, resolve, reject) {
             return __awaiter(this, void 0, void 0, function () {
                 var user;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0: return [4 /*yield*/, this._userService.getCurrentUser()];
                         case 1:
-                            user = (_a.sent());
+                            user = (_d.sent());
                             if (user && user.issuperuser && user.issuperuser.toLowerCase() == 'true') {
                                 resolve(true);
                                 return [2 /*return*/];
@@ -10073,11 +10103,11 @@
             return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                 var user, isAuthorized;
                 var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0: return [4 /*yield*/, this._userService.getCurrentUser()];
                         case 1:
-                            user = (_a.sent());
+                            user = (_d.sent());
                             if (user && user.issuperuser.toLowerCase() == 'true') {
                                 resolve(true);
                                 return [2 /*return*/];
@@ -10109,7 +10139,7 @@
                                     });
                                 })];
                         case 2:
-                            _a.sent();
+                            _d.sent();
                             resolve(isAuthorized);
                             return [2 /*return*/];
                     }
@@ -21954,6 +21984,11 @@
             }
             return !this.buttonPermissionMap.get(this.setting.baseService.serviceCode + "/" + this.setting.baseService.entityName + "/" + buttonPermissionCode);
         };
+        CrudListComponent.prototype.setDropdownDatasource = function (field, dataSource) {
+            if (this.filterSchema.dropdown[field]) {
+                this.filterSchema.dropdown[field].dataSource = dataSource;
+            }
+        };
         return CrudListComponent;
     }(ComponentBase));
     CrudListComponent.decorators = [
@@ -22117,7 +22152,6 @@
             this.serviceUri = this.getEndpointByService(service) + "/WorkflowSetting";
         };
         WorkflowSettingsService.prototype.renderDataSourceActionWorkflow = function (workflowSchema) {
-            var _this = this;
             var dataSourceAction = [];
             var dicSameName = {};
             workflowSchema.connections.sort(multipleSort('soThuTu')).forEach(function (action) {
@@ -22148,6 +22182,51 @@
                     dataSourceAction.push(itemAdd_1);
                 }
             });
+            this.makeUniqueName(dicSameName);
+            return dataSourceAction;
+        };
+        WorkflowSettingsService.prototype.generateTenWithCode = function (item) {
+            item.ten = item.name + " - " + item.rawCode;
+        };
+        WorkflowSettingsService.prototype.generateTenWithSource = function (item) {
+            item.ten = item.name + " (" + item.sourceName + " - " + item.sourceCode + ")";
+        };
+        WorkflowSettingsService.prototype.generateTenFull = function (item) {
+            item.ten = item.name + " - " + item.rawCode + " (" + item.sourceName + " - " + item.sourceCode + ")";
+        };
+        WorkflowSettingsService.prototype.minimizeDatasourceAction = function (actions, lstWorkflowHistory) {
+            var dataSourceAction = [];
+            var dicSameName = {};
+            actions.forEach(function (action) {
+                if (action.buildIn) {
+                    dataSourceAction.push(action);
+                    return;
+                }
+                action.ten = action.shortTen;
+                if (lstWorkflowHistory) {
+                    if (!lstWorkflowHistory.some(function (q) { return q.sourceStatusCode == action.sourceCode && q.actionCode == action.rawCode; })) {
+                        return;
+                    }
+                }
+                var itemExist = dataSourceAction.find(function (q) { return q.nameLower == action.nameLower; });
+                if (itemExist) {
+                    if (!dicSameName[action.nameLower]) {
+                        dicSameName[action.nameLower] = [];
+                    }
+                    if (dicSameName[action.nameLower].indexOf(itemExist) == -1) {
+                        dicSameName[action.nameLower].push(itemExist);
+                    }
+                    if (dicSameName[action.nameLower].indexOf(action) == -1) {
+                        dicSameName[action.nameLower].push(action);
+                    }
+                }
+                dataSourceAction.push(action);
+            });
+            this.makeUniqueName(dicSameName);
+            return dataSourceAction;
+        };
+        WorkflowSettingsService.prototype.makeUniqueName = function (dicSameName) {
+            var _this = this;
             Object.values(dicSameName).forEach(function (lstItem) {
                 var arrTen = [];
                 var error = false;
@@ -22179,16 +22258,6 @@
                     _this.generateTenFull(lstItem[i]);
                 }
             });
-            return dataSourceAction;
-        };
-        WorkflowSettingsService.prototype.generateTenWithCode = function (item) {
-            item.ten = item.name + " - " + item.rawCode;
-        };
-        WorkflowSettingsService.prototype.generateTenWithSource = function (item) {
-            item.ten = item.name + " (" + item.sourceName + " - " + item.sourceCode + ")";
-        };
-        WorkflowSettingsService.prototype.generateTenFull = function (item) {
-            item.ten = item.name + " - " + item.rawCode + " (" + item.sourceName + " - " + item.sourceCode + ")";
         };
         return WorkflowSettingsService;
     }(BaseService));
@@ -30611,60 +30680,56 @@
                 this._componentContextService.data.personalize = {};
             }
             this._componentContextService.replaySubscribe(ComCtxConstants.ROOT.USER_LOADED, function (rs) { return __awaiter(_this, void 0, void 0, function () {
-                var lstAppCodes, oldUrl;
+                var oldUrl;
                 var _this = this;
                 return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            this._entityMetadataService.setupSyncCacheEntityMetadata();
-                            this._router.config
-                                .forEach(function (route) { return _this.addGuard(route); });
-                            if (!this.firstTimeLogin) return [3 /*break*/, 2];
-                            lstAppCodes = this.environment.appMetadata.appSwitcher.map(function (app) { return app.code; });
-                            return [4 /*yield*/, this._permissionService.cleanPermissionCache(lstAppCodes)];
-                        case 1:
-                            _a.sent();
-                            // Thêm vào để đánh dấu lần dầu login => để xử lý
-                            // UserA đag ở màn hình 1 => đăng xuất => đăng nhập vào tài khoản UserB không có quyền màn hình 1 => redirect về "/"
-                            this._storageService.removeItem('current_user_info');
-                            this._storageService.setItem('firstTimeLogin', true);
-                            oldUrl = this._storageService.getItem('currentUrl');
-                            if (oldUrl && oldUrl != top.location.href + '') {
-                                this._storageService.removeItem('currentUrl');
-                                top.location.href = "" + oldUrl;
-                            }
-                            else {
-                                this.firstTimeLogin = false;
-                                this._storageService.removeItem('currentUrl');
-                                this.pageLoaded = true;
-                                this.onlyShowMainContent = true;
-                            }
-                            return [3 /*break*/, 3];
-                        case 2:
-                            this.defaultRedirect();
-                            _a.label = 3;
-                        case 3:
-                            // var versionDeploy = this._storageService.getItem('versionDeploy');
-                            // let versionFromApplication = this.rootVersionDeploy;
-                            // if (versionFromApplication && versionDeploy && (+versionDeploy) < (+versionFromApplication)) {
-                            //     this._storageService.setItem('versionDeploy', versionFromApplication);
-                            //     this._authenService.logout();
-                            // }
-                            this.getPinnedNotes();
-                            try {
-                                this._signalRService.init().then(function () {
-                                    _this._signalRService.start('ConsistencyHub', 'BroadcastMessage', _this.clearAuthorizeCache.bind(_this));
-                                    _this._signalRService.start('NotificationHub', 'RefreshForUpdate', function (data) {
-                                        if (data.appCodes && data.appCodes.some(function (x) { return x.toUpperCase() == _this.appCode.toUpperCase(); })) {
-                                            _this._componentContextService.fireEvent(ComCtxConstants.COMMON.FORCE_RELOAD);
-                                        }
-                                    });
-                                });
-                            }
-                            catch (e) {
-                            }
-                            return [2 /*return*/];
+                    this._entityMetadataService.setupSyncCacheEntityMetadata();
+                    this._router.config
+                        .forEach(function (route) { return _this.addGuard(route); });
+                    if (this.firstTimeLogin) {
+                        // lần đầu đăng nhập thì vào trang mặc định
+                        // if (this.rootVersionDeploy) {
+                        //     this._storageService.setItem('versionDeploy', this.rootVersionDeploy);
+                        // }
+                        // Thêm vào để đánh dấu lần dầu login => để xử lý
+                        // UserA đag ở màn hình 1 => đăng xuất => đăng nhập vào tài khoản UserB không có quyền màn hình 1 => redirect về "/"
+                        this._storageService.removeItem('current_user_info');
+                        this._storageService.setItem('firstTimeLogin', true);
+                        oldUrl = this._storageService.getItem('currentUrl');
+                        if (oldUrl && oldUrl != top.location.href + '') {
+                            this._storageService.removeItem('currentUrl');
+                            top.location.href = "" + oldUrl;
+                        }
+                        else {
+                            this.firstTimeLogin = false;
+                            this._storageService.removeItem('currentUrl');
+                            this.pageLoaded = true;
+                            this.onlyShowMainContent = true;
+                        }
+                    }
+                    else {
+                        this.defaultRedirect();
+                    }
+                    // var versionDeploy = this._storageService.getItem('versionDeploy');
+                    // let versionFromApplication = this.rootVersionDeploy;
+                    // if (versionFromApplication && versionDeploy && (+versionDeploy) < (+versionFromApplication)) {
+                    //     this._storageService.setItem('versionDeploy', versionFromApplication);
+                    //     this._authenService.logout();
+                    // }
+                    this.getPinnedNotes();
+                    try {
+                        this._signalRService.init().then(function () {
+                            _this._signalRService.start('ConsistencyHub', 'BroadcastMessage', _this.clearAuthorizeCache.bind(_this));
+                            _this._signalRService.start('NotificationHub', 'RefreshForUpdate', function (data) {
+                                if (data.appCodes && data.appCodes.some(function (x) { return x.toUpperCase() == _this.appCode.toUpperCase(); })) {
+                                    _this._componentContextService.fireEvent(ComCtxConstants.COMMON.FORCE_RELOAD);
+                                }
+                            });
+                        });
+                    }
+                    catch (e) {
                     }
+                    return [2 /*return*/];
                 });
             }); });
             var defaultModulePages = this._componentContextService.data.personalize.defaultModulePages;
@@ -30710,6 +30775,21 @@
             root.data.allowAnonymous = this.allowAnonymous;
             // get current User
             this._userService.populateCurrentUser();
+            this._componentContextService.subscribe(ComCtxConstants.ROOT.NEED_CLEAR_PERMISSION_CACHE, function () { return __awaiter(_this, void 0, void 0, function () {
+                var res;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this._permissionService.clearPermissionCacheAll()];
+                        case 1:
+                            res = _a.sent();
+                            if (!res.success) {
+                                this._notifierService.showWarning('Có lỗi trong lúc clear cache phân quyền');
+                            }
+                            this._applicationContext.getRootContext().fireReplayEvent(ComCtxConstants.ROOT.USER_LOADED);
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
             this._componentContextService.subscribe(ComCtxConstants.ROOT.KEY_DOWN_ARROWLEFT, function (e) {
                 if (document.activeElement === _this.cancelButton.nativeElement) {
                     _this.okButton.nativeElement.focus();
@@ -30943,7 +31023,7 @@
                     _this._authenService.cleanupLocalStorage();
                     _this._authenService.cleanupSessionStorage();
                     _this._storageUpdatedService.cleanupStorageService();
-                    _this._componentContextService.fireReplayEvent(ComCtxConstants.ROOT.USER_READY, true);
+                    _this._componentContextService.fireReplayEvent(ComCtxConstants.ROOT.USER_READY, _this.firstTimeLogin);
                 }
                 else if (evt.type === 'token_expires') {
                     _this._oauthService.tryLogin();
@@ -30969,12 +31049,8 @@
                 }
             });
             this._oauthService.loadDiscoveryDocument();
-            if (this.firstTimeLogin) {
-                var lstPhanHeCode = this.environment.appMetadata.appSwitcher.map(function (phanHe) { return phanHe.code; });
-                this._permissionService.cleanPermissionCache(lstPhanHeCode);
-            }
             if (this._oauthService.hasValidAccessToken()) {
-                this._componentContextService.fireReplayEvent(ComCtxConstants.ROOT.USER_READY, true);
+                this._componentContextService.fireReplayEvent(ComCtxConstants.ROOT.USER_READY, this.firstTimeLogin);
                 this._oauthService.setupAutomaticSilentRefresh();
             }
             else {
@@ -48059,6 +48135,8 @@
                 StraightConnection: true,
                 CenterConnectionLabel: true
             });
+            _this.generated = false;
+            _this.dataSourceAction = [];
             _this.stateDistance = 350;
             _this.topDistance = 80;
             _this.fileDataService = _fileDataService;
@@ -48112,7 +48190,6 @@
         };
         WorkflowHistoryNewComponent.prototype.init = function () {
             this.machineCodeKetThucs = this.currentWorkflow.data.machines.filter(function (q) { return q.type == exports.EnumStateType.STOP; }).map(function (q) { return q.code; });
-            var datasourceAction = this.createDatasourceAction();
             this.setting.modelSchemas = [
                 new ModelSchema({ field: 'userIdCreated', name: 'Người gửi', fullName: 'Người gửi', description: '' }),
                 new ModelSchema({ field: 'actionCode', name: 'Thao tác', fullName: 'Thao tác', description: '' }),
@@ -48127,6 +48204,7 @@
                 new ModelSchema({ field: 'roleViewIds', name: 'Chức vụ theo dõi', fullName: 'Chức vụ theo dõi', description: '' }),
                 new ModelSchema({ field: 'note', name: 'Ý kiến', fullName: 'Ý kiến', description: '' })
             ];
+            this.dataSourceAction = this.createDatasourceAction();
             this.setting.cols = [
                 new ColumnSchemaBase({
                     field: 'userIdCreated',
@@ -48136,9 +48214,10 @@
                 }),
                 new ColumnSchemaBase({
                     field: 'fullActionCode',
+                    fieldFilter: 'actionCode',
                     label: 'Hành động',
                     width: '9%',
-                    dataSource: datasourceAction,
+                    dataSource: this.dataSourceAction,
                     displayFieldInGrid: 'shortTen',
                     valueField: 'code'
                 }),
@@ -48246,6 +48325,7 @@
                 })
             ];
             this.model.ready = true;
+            this.minimizeDatasourceAction();
             _super.prototype.ngOnInit.call(this);
         };
         WorkflowHistoryNewComponent.prototype.findLastHistoryAndGetData = function () {
@@ -48403,18 +48483,52 @@
         WorkflowHistoryNewComponent.prototype.cloneConnection = function (connection, sourceState, targetState) {
             return Object.assign(Object.assign({}, connection), { source: sourceState.id, target: targetState.id });
         };
+        WorkflowHistoryNewComponent.prototype.minimizeDatasourceAction = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var lstWorkflowHistory, dataSource;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this._workflowHistoryService.getAll(this.getDefaultFilter(), 'sourceStatusCode,actionCode')];
+                        case 1:
+                            lstWorkflowHistory = (_a.sent()).data;
+                            dataSource = this._workflowSettingService.minimizeDatasourceAction(this.dataSourceAction, lstWorkflowHistory);
+                            this.crudList.setDropdownDatasource('fullActionCode', dataSource);
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         WorkflowHistoryNewComponent.prototype.createDatasourceAction = function () {
             var result = [
-                { code: MaActionBatDauQuyTrinh, ten: 'Bắt đầu quy trình' }
+                { code: MaActionBatDauQuyTrinh, ten: 'Bắt đầu quy trình', buildIn: true }
             ];
             result.push.apply(result, __spread(this._workflowSettingService.renderDataSourceActionWorkflow(this.currentWorkflow.data)));
-            result.push({ code: ActionUpdateModel, ten: 'Chỉnh sửa' }, { code: ActionChoYKienBase, ten: 'Cho ý kiến' }, { code: ActionThuHoiBase, ten: 'Thu hồi thao tác' });
+            result.push({ code: ActionUpdateModel, ten: 'Chỉnh sửa', buildIn: true }, { code: ActionChoYKienBase, ten: 'Cho ý kiến', buildIn: true }, { code: ActionThuHoiBase, ten: 'Thu hồi thao tác', buildIn: true });
+            result.filter(function (q) { return q.buildIn; }).forEach(function (item) {
+                item.rawCode = item.code;
+                item.shortTen = item.ten;
+            });
             return result;
         };
+        WorkflowHistoryNewComponent.prototype.getDefaultFilter = function () {
+            return [
+                this.newFilter('tableName', exports.Operator.equal, this.tableName),
+                this.newFilter('itemId', exports.Operator.equal, this.item.id),
+                this.newFilter('workflowCode', exports.Operator.equal, this.item.__workflowCode)
+            ];
+        };
         WorkflowHistoryNewComponent.prototype.modifyGridInfo = function (gridInfo) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    gridInfo.filters.unshift(this.newFilter('tableName', exports.Operator.equal, this.tableName), this.newFilter('itemId', exports.Operator.equal, this.item.id), this.newFilter('workflowCode', exports.Operator.equal, this.item.__workflowCode));
+                var filterByActionCode, arrValue_1, arrActionCode;
+                var _a;
+                return __generator(this, function (_b) {
+                    filterByActionCode = gridInfo.filters.find(function (q) { return q.field == 'actionCode'; });
+                    if (filterByActionCode) {
+                        arrValue_1 = JSON.parse(filterByActionCode.value);
+                        arrActionCode = this.dataSourceAction.filter(function (q) { return arrValue_1.some(function (x) { return x == q.code; }); }).map(function (x) { return x.rawCode; });
+                        filterByActionCode.value = JSON.stringify(arrActionCode);
+                    }
+                    (_a = gridInfo.filters).unshift.apply(_a, __spread(this.getDefaultFilter()));
                     gridInfo.sorts.unshift(this.newSort('created', -1));
                     return [2 /*return*/];
                 });
@@ -48426,7 +48540,13 @@
                 return __generator(this, function (_a) {
                     // Duyệt từng history để chỉ hiển thị luồng hiện tại của quy trình. k hiển thị các bước thừa
                     dataSource.forEach(function (item) {
-                        item.fullActionCode = item.sourceStatusCode + "___" + item.actionCode;
+                        item.fullActionCode = item.actionCode;
+                        if (item.actionCode != MaActionBatDauQuyTrinh
+                            && item.actionCode != ActionUpdateModel
+                            && item.actionCode != ActionChoYKienBase
+                            && item.actionCode != ActionThuHoiBase) {
+                            item.fullActionCode = item.sourceStatusCode + "___" + item.actionCode;
+                        }
                         _this.splitList(item, 'userIds');
                         _this.splitList(item, 'userViewIds');
                         _this.splitList(item, 'donViIds');
@@ -48465,7 +48585,10 @@
         WorkflowHistoryNewComponent.prototype.afterGetData = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    this.regenerateMachineData();
+                    if (!this.generated) {
+                        this.generated = true;
+                        this.regenerateMachineData();
+                    }
                     return [2 /*return*/];
                 });
             });