tnx-shared 5.3.429 → 5.3.430

package/bundles/tnx-shared.umd.js

@@ -11639,7 +11639,13 @@
     var ComponentBaseWithButton = /** @class */ (function (_super) {
         __extends(ComponentBaseWithButton, _super);
         function ComponentBaseWithButton(_injector) {
-            return _super.call(this, _injector) || this;
+            var _this = _super.call(this, _injector) || this;
+            // Danh sách nút hành động quy trình. Được render TỰ ĐỘNG ở footer của tn-dialog,
+            // nên form không cần tự khai báo *ngFor trong #buttonTemplate.
+            _this.buttons = [];
+            // Tiền tố nhãn cho các nút quy trình tự động (vd 'Lưu và'); để rỗng nếu không cần.
+            _this.workflowButtonLabelPrefix = 'Lưu và ';
+            return _this;
         }
         return ComponentBaseWithButton;
     }(ComponentBase));
@@ -19029,6 +19035,192 @@
         { type: StorageUpdatedService }
     ]; };
 
+    var WorkflowPermissionDetailService = /** @class */ (function (_super) {
+        __extends(WorkflowPermissionDetailService, _super);
+        function WorkflowPermissionDetailService(http, injector, _moduleConfigService) {
+            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/WorkflowPermissionDetail") || this;
+            _this.serviceManagers = {};
+            _this.entityName = 'WorkflowPermissionDetail';
+            _this.tableName = '';
+            _this.guidEmpty = '00000000-0000-0000-0000-000000000000';
+            _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
+            _this._moduleConfig = _moduleConfigService.getConfig();
+            return _this;
+        }
+        WorkflowPermissionDetailService.prototype.registerService = function (settingKey, service) {
+            this.serviceManagers[settingKey] = service;
+        };
+        WorkflowPermissionDetailService.prototype.getEndpointByService = function (service) {
+            return service.endPoint + "/" + this._moduleConfig.environment.apiVersion;
+        };
+        WorkflowPermissionDetailService.prototype.changeEndpoint = function (baseService) {
+            this.serviceUri = this.getEndpointByService(baseService) + "/WorkflowPermissionDetail";
+            this.tableName = baseService.entityName;
+            return this;
+        };
+        WorkflowPermissionDetailService.prototype.appendInfoForWorkflowSingle = function (userIdCurrent, data, fieldKey, ignoreWorkflow, callBackWhenNotHaveStatus) {
+            if (fieldKey === void 0) { fieldKey = 'id'; }
+            if (ignoreWorkflow === void 0) { ignoreWorkflow = false; }
+            if (callBackWhenNotHaveStatus === void 0) { callBackWhenNotHaveStatus = null; }
+            return __awaiter(this, void 0, void 0, function () {
+                var itemId, filters, sorts, dataStatus, notifierService;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (callBackWhenNotHaveStatus == null) {
+                                callBackWhenNotHaveStatus = function (itemStatus, rowItem) {
+                                    if (rowItem[fieldKey]
+                                        && rowItem.workflowCode
+                                        && rowItem.currentStateCode) {
+                                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
+                                        itemStatus.trangThai = rowItem.currentStateCode;
+                                        itemStatus.workflowCode = rowItem.workflowCode;
+                                        itemStatus.permission = exports.PermissionBase.READ;
+                                    }
+                                };
+                            }
+                            itemId = data[fieldKey];
+                            filters = [
+                                this.newFilter('itemId', exports.Operator.equal, itemId),
+                                this.newFilter('notInWorkflow', exports.Operator.equal, false),
+                            ];
+                            sorts = [];
+                            if (!ignoreWorkflow) {
+                                filters.push(this.newFilter('userId', exports.Operator.equal, userIdCurrent));
+                            }
+                            else {
+                                sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
+                            }
+                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')];
+                        case 1:
+                            dataStatus = (_a.sent()).data;
+                            if (dataStatus == null) {
+                                notifierService = this._injector.get(NotifierService);
+                                return [2 /*return*/, notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi')];
+                            }
+                            this.appendWorkflowInfoToItem(data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
+                            return [2 /*return*/, true];
+                    }
+                });
+            });
+        };
+        WorkflowPermissionDetailService.prototype.appendWorkflowInfoToItem = function (data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus) {
+            var _this = this;
+            if (callBackWhenNotHaveStatus === void 0) { callBackWhenNotHaveStatus = null; }
+            var itemStatus = {
+                textTrangThai: 'Chưa chạy quy trình'
+            };
+            if (itemId) {
+                // const lstItemStatus = dataStatus.filter(q => q.itemId == itemId && q.userId == userIdCurrent);
+                // if (ignoreWorkflow === true && lstItemStatus.length === 0) {
+                //     lstItemStatus.push(...dataStatus.filter(q => q.itemId === itemId));
+                // }
+                var lstItemStatus = dataStatus.filter(function (q) { return q.itemId === itemId; });
+                // let itemStatus = null;
+                if (lstItemStatus.length) {
+                    itemStatus = lstItemStatus.find(function (q) { return (q.permission & exports.PermissionBase.EDIT) == exports.PermissionBase.EDIT; });
+                    if (itemStatus == null) {
+                        itemStatus = lstItemStatus[0];
+                    }
+                }
+            }
+            // Nếu không có bản ghi trạng thái
+            // Nhưng đã tạo task rồi thì hiển thị trạng thái "đã tạo công việc" để tránh trường hợp hiển thị nút bắt đầu thừa trên giao diện
+            if (!itemStatus.trangThai) {
+                callBackWhenNotHaveStatus(itemStatus, data);
+            }
+            data.__isCoEdit = dataStatus.some(function (x) { return x.itemId === itemId && x.userId != _this.guidEmpty && x.isCOEdit; });
+            data.__trangThai = itemStatus.trangThai;
+            data.__textTrangThai = itemStatus.textTrangThai;
+            if (itemStatus.workflowCode == DummyWorkflowCode) {
+                data.hiddenWorkflowAction = true;
+            }
+            data.__workflowCode = itemStatus.workflowCode;
+            data.__permission = itemStatus.permission;
+            data.__disableEdit = true;
+            data.__disableDelete = true;
+            if (data.basePermission & exports.PermissionBase.EDIT
+                || data.__permission & exports.PermissionBase.EDIT) {
+                data.__disableEdit = false;
+            }
+            else {
+                data.__disablePermissionEdit = true;
+            }
+            if (data.basePermission & exports.PermissionBase.DELETE
+                || data.__permission & exports.PermissionBase.DELETE) {
+                data.__disableDelete = false;
+            }
+            else {
+                data.__disablePermissionDelete = true;
+            }
+        };
+        /**
+         * Lấy thêm các thông tin cần cho quy trình nghiệp vụ cho các bản ghi trong data
+         */
+        WorkflowPermissionDetailService.prototype.appendInfoForWorkflow = function (userIdCurrent, data, fieldKey, ignoreWorkflow, callBackWhenNotHaveStatus) {
+            if (fieldKey === void 0) { fieldKey = 'id'; }
+            if (ignoreWorkflow === void 0) { ignoreWorkflow = false; }
+            if (callBackWhenNotHaveStatus === void 0) { callBackWhenNotHaveStatus = null; }
+            return __awaiter(this, void 0, void 0, function () {
+                var lstItemId, filters, sorts, dataStatus, notifierService;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (callBackWhenNotHaveStatus == null) {
+                                callBackWhenNotHaveStatus = function (itemStatus, rowItem) {
+                                    if (rowItem[fieldKey]
+                                        && rowItem.workflowCode
+                                        && rowItem.currentStateCode) {
+                                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
+                                        itemStatus.trangThai = rowItem.currentStateCode;
+                                        itemStatus.workflowCode = rowItem.workflowCode;
+                                        itemStatus.permission = exports.PermissionBase.READ;
+                                    }
+                                };
+                            }
+                            lstItemId = data.filter(function (q) { return q[fieldKey]; }).map(function (q) { return q[fieldKey]; });
+                            filters = [
+                                this.newFilter('itemId', exports.Operator.in, lstItemId),
+                                this.newFilter('notInWorkflow', exports.Operator.equal, false),
+                            ];
+                            if (this.tableName) {
+                                filters.push(this.newFilter('tableName', exports.Operator.equal, this.tableName));
+                            }
+                            sorts = [];
+                            // if (!ignoreWorkflow) {
+                            //     filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
+                            // }
+                            sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
+                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')];
+                        case 1:
+                            dataStatus = (_a.sent()).data;
+                            if (dataStatus == null) {
+                                notifierService = this._injector.get(NotifierService);
+                                return [2 /*return*/, notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi')];
+                            }
+                            data.forEach(function (rowItem) {
+                                _this.appendWorkflowInfoToItem(rowItem, rowItem[fieldKey], userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
+                            });
+                            return [2 /*return*/, true];
+                    }
+                });
+            });
+        };
+        return WorkflowPermissionDetailService;
+    }(BaseService));
+    WorkflowPermissionDetailService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function WorkflowPermissionDetailService_Factory() { return new WorkflowPermissionDetailService(i0__namespace.ɵɵinject(i1__namespace$1.HttpClient), i0__namespace.ɵɵinject(i0__namespace.INJECTOR), i0__namespace.ɵɵinject(ModuleConfigService)); }, token: WorkflowPermissionDetailService, providedIn: "root" });
+    WorkflowPermissionDetailService.decorators = [
+        { type: i0.Injectable, args: [{
+                    providedIn: 'root'
+                },] }
+    ];
+    WorkflowPermissionDetailService.ctorParameters = function () { return [
+        { type: i1$1.HttpClient },
+        { type: i0.Injector },
+        { type: ModuleConfigService }
+    ]; };
+
     var DataFormBase = /** @class */ (function (_super) {
         __extends(DataFormBase, _super);
         function DataFormBase(_injector) {
@@ -19053,6 +19245,8 @@
             _this.autoGetDetail = true;
             _this.autoSave = true;
             _this.isCloseForm = true;
+            // Khi lưu bằng workflow action: tạm chặn đóng form lúc lưu, chỉ đóng sau khi action chạy xong
+            _this._suppressOnSaved = false;
             _this.saving = false;
             _this.getDetailPlusUrl = null;
             _this.insertPlusUrl = null;
@@ -19077,6 +19271,7 @@
             _this._entityMetadataService = _this._injector.get(EntityMetadataService);
             _this._userService = _this._injector.get(UserService);
             _this._commonService = _this._injector.get(CommonService);
+            _this._workflowPermissionDetailService = _this._injector.get(WorkflowPermissionDetailService);
             return _this;
         }
         DataFormBase.prototype.ngOnInit = function () {
@@ -19206,6 +19401,134 @@
                 evt.rootModel[FieldWorkflowCodeInCrudForm] = workflowSetting.workflowCode;
             }
         };
+        /**
+         * Lấy trạng thái quy trình hiện tại của bản ghi, gắn các field __trangThai/__textTrangThai/__workflowCode/__permission
+         * vào data và sinh danh sách nút hành động quy trình (this.buttons) khi bản ghi đã chạy quy trình.
+         * Yêu cầu: this.setting.baseService đã được cấu hình và this.crudList được truyền từ crud-list cha.
+         */
+        DataFormBase.prototype.generateWorkflowButton = function (data) {
+            return __awaiter(this, void 0, void 0, function () {
+                var lstItemStatus, itemStatus, actions;
+                var _this = this;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0: return [4 /*yield*/, this._workflowPermissionDetailService.changeEndpoint(this.setting.baseService).getAll([
+                                this.newFilter('itemId', exports.Operator.equal, data.id),
+                            ], 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', [], 'ForCrudList')];
+                        case 1:
+                            lstItemStatus = (_e.sent()).data;
+                            if (lstItemStatus == null) {
+                                return [2 /*return*/, this._notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi')];
+                            }
+                            itemStatus = null;
+                            if (!lstItemStatus.length) {
+                                itemStatus = {
+                                    textTrangThai: 'Chưa chạy quy trình'
+                                };
+                            }
+                            else {
+                                data.startedWorkflow = true;
+                                itemStatus = lstItemStatus.find(function (q) { return (q.permission & exports.PermissionBase.EDIT) == exports.PermissionBase.EDIT; });
+                                if (itemStatus == null) {
+                                    itemStatus = lstItemStatus[0];
+                                }
+                            }
+                            data.__trangThai = itemStatus.trangThai;
+                            data.__textTrangThai = itemStatus.textTrangThai;
+                            data.__workflowCode = itemStatus.workflowCode;
+                            data.__permission = itemStatus.permission;
+                            if (!(data.startedWorkflow && this.crudList)) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.crudList.getActionWorkflow(data)];
+                        case 2:
+                            actions = _e.sent();
+                            if (!Array.isArray(actions))
+                                return [2 /*return*/];
+                            // Chỉ bọc các action lấy từ getActionAllow; các nút phụ (Thu hồi, Cho ý kiến,
+                            // Xem lịch sử, Chuyển xử lý) giữ nguyên hành vi gốc
+                            actions.filter(function (b) { return b.isActionAllow; }).forEach(function (b) { return _this._decorateWorkflowActionButton(b); });
+                            this.buttons = actions;
+                            _e.label = 3;
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        /**
+         * Gắn hành vi cho 1 nút action quy trình (lấy từ getActionAllow):
+         * - Khi form đang sửa: thêm tiền tố nhãn; nếu dữ liệu thay đổi thì lưu trước (không đóng form), lưu lỗi thì dừng.
+         * - Chạy action gốc, và đóng form sau khi action thực sự hoàn tất.
+         */
+        DataFormBase.prototype._decorateWorkflowActionButton = function (button) {
+            var _this = this;
+            var isEdit = this._isFormEdit();
+            var runAction = button.command;
+            if (isEdit) {
+                button.label = this.workflowButtonLabelPrefix + button.label;
+            }
+            button.command = function () { return __awaiter(_this, void 0, void 0, function () {
+                var saved;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            if (this.model.submitting)
+                                return [2 /*return*/];
+                            if (!(isEdit && this._isWorkflowDataChanged())) return [3 /*break*/, 2];
+                            this.model.submitting = true;
+                            this._suppressOnSaved = true; // không đóng form khi lưu
+                            return [4 /*yield*/, this.save()];
+                        case 1:
+                            saved = _e.sent();
+                            this._suppressOnSaved = false;
+                            if (!saved)
+                                return [2 /*return*/];
+                            _e.label = 2;
+                        case 2:
+                            if (!runAction)
+                                return [2 /*return*/];
+                            this._closeFormWhenWorkflowProcessed();
+                            return [4 /*yield*/, runAction()];
+                        case 3:
+                            _e.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            }); };
+        };
+        /**
+         * Đóng form (phát onSaved) đúng một lần khi crudList báo action quy trình đã xử lý xong.
+         */
+        DataFormBase.prototype._closeFormWhenWorkflowProcessed = function () {
+            var _this = this;
+            var _a;
+            var processed = (_a = this.crudList) === null || _a === void 0 ? void 0 : _a.onProcessedWorkflow;
+            if (!processed)
+                return;
+            var sub = processed.subscribe(function () {
+                sub.unsubscribe();
+                _this.onSaved.emit({ id: _this.model.data.id, insert: false, isCloseForm: true });
+            });
+        };
+        /**
+         * So sánh dữ liệu hiện tại với snapshot lúc tải (logSetting.valueBeforeUpdate) để biết form có thay đổi không.
+         * Chuẩn hoá cả 2 qua crudForm.getMinimizeData (bỏ _status/_errors/_source, resolve dropdown object về giá trị thô)
+         * để so sánh ổn định. Nếu không có snapshot thì coi như có thay đổi (luôn lưu) cho an toàn.
+         */
+        /**
+         * Form có tham gia quy trình hay không (dựa trên cấu hình parentSetting) - cùng điều kiện với biến hasWorkflow trong addSchemaBase.
+         */
+        DataFormBase.prototype._hasWorkflow = function () {
+            var _a;
+            return !!(this.parentSetting
+                && ((this.parentSetting.workflowSettingNew && ((_a = this.parentSetting.workflowSettingNew.workflows) === null || _a === void 0 ? void 0 : _a.length) > 0)
+                    || this.parentSetting.isWorkflowTree));
+        };
+        DataFormBase.prototype._isWorkflowDataChanged = function () {
+            if (!this.logSetting.valueBeforeUpdate || !this.crudForm)
+                return true;
+            var current = JSON.stringify(this.crudForm.getMinimizeData(this.model.data));
+            var before = JSON.stringify(this.crudForm.getMinimizeData(this.logSetting.valueBeforeUpdate));
+            return current !== before;
+        };
         DataFormBase.prototype._handleFormReady = function (formEvent) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_e) {
@@ -19306,7 +19629,9 @@
                             return [4 /*yield*/, this.onAfterGetDetail(response.data)];
                         case 7:
                             _e.sent();
-                            if (this.logSetting.isEnableLog) {
+                            // Lưu snapshot dữ liệu trước khi sửa khi: bật log HOẶC form có quy trình
+                            // (để so sánh thay đổi, quyết định có cần lưu trước khi chạy action quy trình hay không)
+                            if (this.logSetting.isEnableLog || this._hasWorkflow()) {
                                 this.logSetting.valueBeforeUpdate = this._commonService.cloneObject(response.data);
                             }
                             return [3 /*break*/, 10];
@@ -19436,7 +19761,12 @@
                             if (this.logSetting.isEnableLog) {
                                 this.getLogValueAfterLoadDetail();
                             }
-                            return [2 /*return*/];
+                            if (!(this._hasWorkflow() && this.crudList)) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.generateWorkflowButton(data)];
+                        case 3:
+                            _e.sent();
+                            _e.label = 4;
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
@@ -19821,7 +20151,7 @@
                         case 0: return [4 /*yield*/, this.validateFormBase()];
                         case 1:
                             validated = _e.sent();
-                            if (!validated) return [3 /*break*/, 13];
+                            if (!validated) return [3 /*break*/, 14];
                             if (!this.logSetting.isEnableLog) return [3 /*break*/, 5];
                             if (!!this.logSetting.isCustomAll) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.getLogValue()];
@@ -19842,27 +20172,26 @@
                         case 6:
                             _e.sent();
                             this.triggerSaveFileUpload();
-                            if (!this.autoSave) return [3 /*break*/, 11];
+                            if (!this.autoSave) return [3 /*break*/, 12];
                             if (!(this._isFormEdit() || this._isFormView())) return [3 /*break*/, 8];
                             return [4 /*yield*/, this.onUpdate()];
-                        case 7:
-                            _e.sent();
-                            return [3 /*break*/, 10];
+                        case 7: return [2 /*return*/, _e.sent()];
                         case 8:
                             if (!this._isFormAddNew()) return [3 /*break*/, 10];
                             return [4 /*yield*/, this.onInsert()];
-                        case 9:
-                            _e.sent();
-                            return [3 /*break*/, 10];
-                        case 10: return [3 /*break*/, 12];
-                        case 11:
+                        case 9: return [2 /*return*/, _e.sent()];
+                        case 10: 
+                        // form view, do nothing
+                        return [2 /*return*/, false];
+                        case 11: return [3 /*break*/, 13];
+                        case 12:
                             this.handleManualSave();
-                            _e.label = 12;
-                        case 12: return [3 /*break*/, 14];
-                        case 13:
+                            return [2 /*return*/, true];
+                        case 13: return [3 /*break*/, 15];
+                        case 14:
                             this.model.submitting = false;
-                            _e.label = 14;
-                        case 14: return [2 /*return*/];
+                            return [2 /*return*/, false];
+                        case 15: return [2 /*return*/];
                     }
                 });
             });
@@ -19963,11 +20292,9 @@
                         case 3:
                             confirmed = _e.sent();
                             if (!confirmed)
-                                return [2 /*return*/];
+                                return [2 /*return*/, false];
                             return [4 /*yield*/, this._insert()];
-                        case 4:
-                            _e.sent();
-                            return [2 /*return*/];
+                        case 4: return [2 /*return*/, _e.sent()];
                     }
                 });
             });
@@ -19994,39 +20321,40 @@
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_e) {
-                    this.getPromiseActionInsert()
-                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
-                                case 0:
-                                    this.model.submitting = false;
-                                    this.showMessageAfterInsert(response.success, response);
-                                    if (!response.success) return [3 /*break*/, 2];
-                                    this.model.data.id = response.data;
-                                    return [4 /*yield*/, this.onAfterSave(response)];
-                                case 1:
-                                    _e.sent();
-                                    this.onSaved.emit({
-                                        id: this.model.data.id,
-                                        insert: true,
-                                        isCloseForm: this.isCloseForm
-                                    });
-                                    return [3 /*break*/, 3];
-                                case 2:
-                                    this.handleInsertError(response);
-                                    _e.label = 3;
-                                case 3: return [2 /*return*/];
+                    return [2 /*return*/, this.getPromiseActionInsert()
+                            .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_e) {
+                                switch (_e.label) {
+                                    case 0:
+                                        this.model.submitting = false;
+                                        this.showMessageAfterInsert(response.success, response);
+                                        if (!response.success) return [3 /*break*/, 2];
+                                        this.model.data.id = response.data;
+                                        return [4 /*yield*/, this.onAfterSave(response)];
+                                    case 1:
+                                        _e.sent();
+                                        if (!this._suppressOnSaved) {
+                                            this.onSaved.emit({
+                                                id: this.model.data.id,
+                                                insert: true,
+                                                isCloseForm: this.isCloseForm
+                                            });
+                                        }
+                                        return [2 /*return*/, true];
+                                    case 2:
+                                        this.handleInsertError(response);
+                                        return [2 /*return*/, false];
+                                }
+                            });
+                        }); }, function (error) {
+                            if (!error.error.success && error.error.errorCheckExist) {
+                                _this.model.submitting = false;
+                                return false;
                             }
-                        });
-                    }); }, function (error) {
-                        if (!error.error.success && error.error.errorCheckExist) {
                             _this.model.submitting = false;
-                            return;
-                        }
-                        _this.model.submitting = false;
-                        _this.showMessageAfterInsert(false, error);
-                    });
-                    return [2 /*return*/];
+                            _this.showMessageAfterInsert(false, error);
+                            return false;
+                        })];
                 });
             });
         };
@@ -20037,10 +20365,11 @@
         };
         DataFormBase.prototype.onUpdate = function () {
             return __awaiter(this, void 0, void 0, function () {
+                var updatePromise;
                 var _this = this;
                 return __generator(this, function (_e) {
                     this.setDefaultValue(this.model.data);
-                    this.getPromiseActionUpdate()
+                    updatePromise = this.getPromiseActionUpdate()
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
                         return __generator(this, function (_e) {
                             switch (_e.label) {
@@ -20051,30 +20380,32 @@
                                     return [4 /*yield*/, this.onAfterSave(response)];
                                 case 1:
                                     _e.sent();
-                                    this.onSaved.emit({
-                                        id: this.model.data.id,
-                                        insert: false,
-                                        isCloseForm: this.isCloseForm
-                                    });
-                                    return [3 /*break*/, 3];
+                                    if (!this._suppressOnSaved) {
+                                        this.onSaved.emit({
+                                            id: this.model.data.id,
+                                            insert: false,
+                                            isCloseForm: this.isCloseForm
+                                        });
+                                    }
+                                    return [2 /*return*/, true];
                                 case 2:
                                     this.handleUpdateError(response);
-                                    _e.label = 3;
-                                case 3: return [2 /*return*/];
+                                    return [2 /*return*/, false];
                             }
                         });
                     }); }, function (error) {
                         if (!error.error.success && error.error.errorCheckExist) {
                             _this.model.submitting = false;
-                            return;
+                            return false;
                         }
                         _this.model.submitting = false;
                         _this.showMessageAfterUpdate(false, error);
+                        return false;
                     });
                     if (this.logSetting.isEnableLog) {
                         this.logSetting.arrValueAfterUpdate = [];
                     }
-                    return [2 /*return*/];
+                    return [2 /*return*/, updatePromise];
                 });
             });
         };
@@ -20192,6 +20523,7 @@
         parentSetting: [{ type: i0.Input }],
         model: [{ type: i0.Input }],
         forceOnlyView: [{ type: i0.Input }],
+        crudList: [{ type: i0.Input }],
         onSave: [{ type: i0.Output }],
         onSaved: [{ type: i0.Output }],
         onCancel: [{ type: i0.Output }],
@@ -22459,192 +22791,6 @@
         { type: ModuleConfigService }
     ]; };
 
-    var WorkflowPermissionDetailService = /** @class */ (function (_super) {
-        __extends(WorkflowPermissionDetailService, _super);
-        function WorkflowPermissionDetailService(http, injector, _moduleConfigService) {
-            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/WorkflowPermissionDetail") || this;
-            _this.serviceManagers = {};
-            _this.entityName = 'WorkflowPermissionDetail';
-            _this.tableName = '';
-            _this.guidEmpty = '00000000-0000-0000-0000-000000000000';
-            _this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
-            _this._moduleConfig = _moduleConfigService.getConfig();
-            return _this;
-        }
-        WorkflowPermissionDetailService.prototype.registerService = function (settingKey, service) {
-            this.serviceManagers[settingKey] = service;
-        };
-        WorkflowPermissionDetailService.prototype.getEndpointByService = function (service) {
-            return service.endPoint + "/" + this._moduleConfig.environment.apiVersion;
-        };
-        WorkflowPermissionDetailService.prototype.changeEndpoint = function (baseService) {
-            this.serviceUri = this.getEndpointByService(baseService) + "/WorkflowPermissionDetail";
-            this.tableName = baseService.entityName;
-            return this;
-        };
-        WorkflowPermissionDetailService.prototype.appendInfoForWorkflowSingle = function (userIdCurrent, data, fieldKey, ignoreWorkflow, callBackWhenNotHaveStatus) {
-            if (fieldKey === void 0) { fieldKey = 'id'; }
-            if (ignoreWorkflow === void 0) { ignoreWorkflow = false; }
-            if (callBackWhenNotHaveStatus === void 0) { callBackWhenNotHaveStatus = null; }
-            return __awaiter(this, void 0, void 0, function () {
-                var itemId, filters, sorts, dataStatus, notifierService;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (callBackWhenNotHaveStatus == null) {
-                                callBackWhenNotHaveStatus = function (itemStatus, rowItem) {
-                                    if (rowItem[fieldKey]
-                                        && rowItem.workflowCode
-                                        && rowItem.currentStateCode) {
-                                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
-                                        itemStatus.trangThai = rowItem.currentStateCode;
-                                        itemStatus.workflowCode = rowItem.workflowCode;
-                                        itemStatus.permission = exports.PermissionBase.READ;
-                                    }
-                                };
-                            }
-                            itemId = data[fieldKey];
-                            filters = [
-                                this.newFilter('itemId', exports.Operator.equal, itemId),
-                                this.newFilter('notInWorkflow', exports.Operator.equal, false),
-                            ];
-                            sorts = [];
-                            if (!ignoreWorkflow) {
-                                filters.push(this.newFilter('userId', exports.Operator.equal, userIdCurrent));
-                            }
-                            else {
-                                sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
-                            }
-                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')];
-                        case 1:
-                            dataStatus = (_a.sent()).data;
-                            if (dataStatus == null) {
-                                notifierService = this._injector.get(NotifierService);
-                                return [2 /*return*/, notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi')];
-                            }
-                            this.appendWorkflowInfoToItem(data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
-                            return [2 /*return*/, true];
-                    }
-                });
-            });
-        };
-        WorkflowPermissionDetailService.prototype.appendWorkflowInfoToItem = function (data, itemId, userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus) {
-            var _this = this;
-            if (callBackWhenNotHaveStatus === void 0) { callBackWhenNotHaveStatus = null; }
-            var itemStatus = {
-                textTrangThai: 'Chưa chạy quy trình'
-            };
-            if (itemId) {
-                // const lstItemStatus = dataStatus.filter(q => q.itemId == itemId && q.userId == userIdCurrent);
-                // if (ignoreWorkflow === true && lstItemStatus.length === 0) {
-                //     lstItemStatus.push(...dataStatus.filter(q => q.itemId === itemId));
-                // }
-                var lstItemStatus = dataStatus.filter(function (q) { return q.itemId === itemId; });
-                // let itemStatus = null;
-                if (lstItemStatus.length) {
-                    itemStatus = lstItemStatus.find(function (q) { return (q.permission & exports.PermissionBase.EDIT) == exports.PermissionBase.EDIT; });
-                    if (itemStatus == null) {
-                        itemStatus = lstItemStatus[0];
-                    }
-                }
-            }
-            // Nếu không có bản ghi trạng thái
-            // Nhưng đã tạo task rồi thì hiển thị trạng thái "đã tạo công việc" để tránh trường hợp hiển thị nút bắt đầu thừa trên giao diện
-            if (!itemStatus.trangThai) {
-                callBackWhenNotHaveStatus(itemStatus, data);
-            }
-            data.__isCoEdit = dataStatus.some(function (x) { return x.itemId === itemId && x.userId != _this.guidEmpty && x.isCOEdit; });
-            data.__trangThai = itemStatus.trangThai;
-            data.__textTrangThai = itemStatus.textTrangThai;
-            if (itemStatus.workflowCode == DummyWorkflowCode) {
-                data.hiddenWorkflowAction = true;
-            }
-            data.__workflowCode = itemStatus.workflowCode;
-            data.__permission = itemStatus.permission;
-            data.__disableEdit = true;
-            data.__disableDelete = true;
-            if (data.basePermission & exports.PermissionBase.EDIT
-                || data.__permission & exports.PermissionBase.EDIT) {
-                data.__disableEdit = false;
-            }
-            else {
-                data.__disablePermissionEdit = true;
-            }
-            if (data.basePermission & exports.PermissionBase.DELETE
-                || data.__permission & exports.PermissionBase.DELETE) {
-                data.__disableDelete = false;
-            }
-            else {
-                data.__disablePermissionDelete = true;
-            }
-        };
-        /**
-         * Lấy thêm các thông tin cần cho quy trình nghiệp vụ cho các bản ghi trong data
-         */
-        WorkflowPermissionDetailService.prototype.appendInfoForWorkflow = function (userIdCurrent, data, fieldKey, ignoreWorkflow, callBackWhenNotHaveStatus) {
-            if (fieldKey === void 0) { fieldKey = 'id'; }
-            if (ignoreWorkflow === void 0) { ignoreWorkflow = false; }
-            if (callBackWhenNotHaveStatus === void 0) { callBackWhenNotHaveStatus = null; }
-            return __awaiter(this, void 0, void 0, function () {
-                var lstItemId, filters, sorts, dataStatus, notifierService;
-                var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (callBackWhenNotHaveStatus == null) {
-                                callBackWhenNotHaveStatus = function (itemStatus, rowItem) {
-                                    if (rowItem[fieldKey]
-                                        && rowItem.workflowCode
-                                        && rowItem.currentStateCode) {
-                                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
-                                        itemStatus.trangThai = rowItem.currentStateCode;
-                                        itemStatus.workflowCode = rowItem.workflowCode;
-                                        itemStatus.permission = exports.PermissionBase.READ;
-                                    }
-                                };
-                            }
-                            lstItemId = data.filter(function (q) { return q[fieldKey]; }).map(function (q) { return q[fieldKey]; });
-                            filters = [
-                                this.newFilter('itemId', exports.Operator.in, lstItemId),
-                                this.newFilter('notInWorkflow', exports.Operator.equal, false),
-                            ];
-                            if (this.tableName) {
-                                filters.push(this.newFilter('tableName', exports.Operator.equal, this.tableName));
-                            }
-                            sorts = [];
-                            // if (!ignoreWorkflow) {
-                            //     filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
-                            // }
-                            sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }), new Sort({ field: 'isCOEdit', dir: -1 }));
-                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission,isCOEdit', sorts, 'ForCrudList')];
-                        case 1:
-                            dataStatus = (_a.sent()).data;
-                            if (dataStatus == null) {
-                                notifierService = this._injector.get(NotifierService);
-                                return [2 /*return*/, notifierService.showWarning('Không lấy được thông tin trạng thái hiện tại của bản ghi')];
-                            }
-                            data.forEach(function (rowItem) {
-                                _this.appendWorkflowInfoToItem(rowItem, rowItem[fieldKey], userIdCurrent, ignoreWorkflow, dataStatus, callBackWhenNotHaveStatus);
-                            });
-                            return [2 /*return*/, true];
-                    }
-                });
-            });
-        };
-        return WorkflowPermissionDetailService;
-    }(BaseService));
-    WorkflowPermissionDetailService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function WorkflowPermissionDetailService_Factory() { return new WorkflowPermissionDetailService(i0__namespace.ɵɵinject(i1__namespace$1.HttpClient), i0__namespace.ɵɵinject(i0__namespace.INJECTOR), i0__namespace.ɵɵinject(ModuleConfigService)); }, token: WorkflowPermissionDetailService, providedIn: "root" });
-    WorkflowPermissionDetailService.decorators = [
-        { type: i0.Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    WorkflowPermissionDetailService.ctorParameters = function () { return [
-        { type: i1$1.HttpClient },
-        { type: i0.Injector },
-        { type: ModuleConfigService }
-    ]; };
-
     var sort_by;
     (function () {
         var defaultCompareFunc = function (a, b) {
@@ -26143,6 +26289,7 @@
                                         buttonContexts.push({
                                             soThuTu: action.soThuTu,
                                             actionCode: action.code,
+                                            isActionAllow: true,
                                             icon: _this.sourceIcon[action.icon],
                                             label: action.name,
                                             command: function () { return _this.processWorkflow(crudListSetting, itemWorkflowSetting_1, action); }
@@ -56795,7 +56942,7 @@
     TnDialogComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'tn-dialog',
-                    template: "<p-dialog #dialog [closeOnEscape]=\"closeOnEscape\" [appendTo]=\"'body'\" [focusOnShow]=\"false\" [focusTrap]=\"false\"\n    [(visible)]=\"visible\" [modal]=\"modal\" [responsive]=\"true\" [maximizable]=\"maximizable\" [autoZIndex]=\"true\"\n    [styleClass]=\"styleClass\" [maskStyleClass]=\"maskClass\" [showHeader]=\"showHeader\"\n    [style]=\"{'width': popupSize.width + 'px', 'min-width': popupSize.width + 'px', 'height': popupSize.height + 'px', 'min-height': popupSize.height + 'px'}\"\n    (onShow)=\"handleShowDialog($event)\" (onHide)=\"handleHideDialog($event)\">\n    <tn-custom-scrollbar #scrollbar [useDefaultScrollBar]=\"useDefaultScrollBar\" [class]=\"scrollBarStyleClass\"\n        [config]=\"scrollConfig\" [style]=\"scrollStyle\" class=\"tn-dialog-scrollbar\">\n        <ng-content></ng-content>\n    </tn-custom-scrollbar>\n    <p-header *ngIf=\"showHeader\">\n        <ng-container *ngIf=\"header && !headerTemplate\">\n            <div>{{header | translate}}</div>\n        </ng-container>\n        <ng-container *ngIf=\"headerTemplate\">\n            <ng-container *ngTemplateOutlet=\"headerTemplate\"></ng-container>\n        </ng-container>\n    </p-header>\n    <p-footer *ngIf=\"showFooter\">\n        <p-footer *ngIf=\"formBase && formBase.buttonTemplate\" style=\"display: flex;float: right\">\n            <ng-container *ngTemplateOutlet=\"formBase.buttonTemplate\">\n            </ng-container>\n        </p-footer>\n        <ng-container *ngIf=\"!formBase || !formBase.buttonTemplate\">\n            <p-footer *ngIf=\"footer\">\n                <ng-container *ngTemplateOutlet=\"footer\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"buttonTemplateInput\">\n                <ng-container *ngTemplateOutlet=\"buttonTemplateInput\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"!footer && !buttonTemplateInput\">\n                <button pButton preventTab type=\"button\" icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\n                    [label]=\"'FORM.CANCEL' | translate\" (click)=\"handleHideDialog($event)\"></button>\n            </p-footer>\n        </ng-container>\n    </p-footer>\n</p-dialog>",
+                    template: "<p-dialog #dialog [closeOnEscape]=\"closeOnEscape\" [appendTo]=\"'body'\" [focusOnShow]=\"false\" [focusTrap]=\"false\"\n    [(visible)]=\"visible\" [modal]=\"modal\" [responsive]=\"true\" [maximizable]=\"maximizable\" [autoZIndex]=\"true\"\n    [styleClass]=\"styleClass\" [maskStyleClass]=\"maskClass\" [showHeader]=\"showHeader\"\n    [style]=\"{'width': popupSize.width + 'px', 'min-width': popupSize.width + 'px', 'height': popupSize.height + 'px', 'min-height': popupSize.height + 'px'}\"\n    (onShow)=\"handleShowDialog($event)\" (onHide)=\"handleHideDialog($event)\">\n    <tn-custom-scrollbar #scrollbar [useDefaultScrollBar]=\"useDefaultScrollBar\" [class]=\"scrollBarStyleClass\"\n        [config]=\"scrollConfig\" [style]=\"scrollStyle\" class=\"tn-dialog-scrollbar\">\n        <ng-content></ng-content>\n    </tn-custom-scrollbar>\n    <p-header *ngIf=\"showHeader\">\n        <ng-container *ngIf=\"header && !headerTemplate\">\n            <div>{{header | translate}}</div>\n        </ng-container>\n        <ng-container *ngIf=\"headerTemplate\">\n            <ng-container *ngTemplateOutlet=\"headerTemplate\"></ng-container>\n        </ng-container>\n    </p-header>\n    <p-footer *ngIf=\"showFooter\">\n        <p-footer *ngIf=\"formBase && formBase.buttonTemplate\" style=\"display: flex;float: right\">\n            <button *ngFor=\"let butt of formBase.buttons\" pButton [icon]=\"butt.icon\" class=\"p-button-text\"\n                [label]=\"butt.label\" (click)=\"butt.command()\"></button>\n            <ng-container *ngTemplateOutlet=\"formBase.buttonTemplate\">\n            </ng-container>\n        </p-footer>\n        <ng-container *ngIf=\"!formBase || !formBase.buttonTemplate\">\n            <p-footer *ngIf=\"footer\">\n                <ng-container *ngTemplateOutlet=\"footer\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"buttonTemplateInput\">\n                <ng-container *ngTemplateOutlet=\"buttonTemplateInput\"></ng-container>\n            </p-footer>\n            <p-footer *ngIf=\"!footer && !buttonTemplateInput\">\n                <button pButton preventTab type=\"button\" icon=\"pi pi-replay\" class=\"p-button-text p-button-secondary\"\n                    [label]=\"'FORM.CANCEL' | translate\" (click)=\"handleHideDialog($event)\"></button>\n            </p-footer>\n        </ng-container>\n    </p-footer>\n</p-dialog>",
                     styles: [""]
                 },] }
     ];