tnx-shared 5.3.410 → 5.3.411

package/bundles/tnx-shared.umd.js

@@ -1357,6 +1357,7 @@
             this.hiddenKySoSimCaNhan = false;
             this.hiddenKySoUsbCaNhan = false;
             this.hiddenKySoDonVi = false;
+            this.hiddenKySoSmartCA = false;
             this.hiddenButPhe = false;
             this.arrFieldMustValidate = [];
             this.getCustomDataTrinhKy = function (rowData) { return ({}); };
@@ -35768,7 +35769,8 @@
                         command: function () {
                             _this.signFileSmartCA(item);
                         },
-                        visible: item.extension == '.PDF'
+                        visible: (this._fileObjectService.isTypeFileKySo(item.name)
+                            && this.layout !== exports.EnumFileLayout.SIMPLE_FOR_LIST && !this.parentSetting.hiddenKySoSmartCA),
                     },
                     {
                         label: 'Ký số cá nhân (USB)', icon: 'fas fa-signature',
@@ -36819,20 +36821,49 @@
         };
         FileManagerComponent.prototype.signFileSmartCA = function (rowData) {
             return __awaiter(this, void 0, void 0, function () {
-                var dataKySo;
+                var sourceFileId, sourceFile, rsConvert, e_5, dataKySo;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, this._userChuKySoService.getDetailByFilter([
+                        case 0:
+                            sourceFileId = rowData.id;
+                            sourceFile = rowData;
+                            if (!this._fileExplorerService.needConvertBeforeSign(rowData.name)) return [3 /*break*/, 4];
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, this._fileExplorerService.convertDocumentToPdfAndSave({
+                                    instanceId: sourceFileId,
+                                    name: this._fileExplorerService.changeFileExtension(rowData.name, 'pdf'),
+                                    folderInstanceId: rowData.parentFolderId,
+                                    ownerType: this._userService.getCurrentUser().userId.toString(),
+                                })];
+                        case 2:
+                            rsConvert = _b.sent();
+                            if (!rsConvert || !rsConvert.success) {
+                                this._notifierService.showWarning("C\u00F3 l\u1ED7i x\u1EA3y ra khi chuy\u1EC3n \u0111\u1ED5i t\u00E0i li\u1EC7u " + rowData.name + " th\u00E0nh pdf \u0111\u1EC3 k\u00FD. Vui l\u00F2ng th\u1EED l\u1EA1i sau");
+                                return [2 /*return*/];
+                            }
+                            else {
+                                this._notifierService.showSuccess("Chuy\u1EC3n \u0111\u1ED5i t\u00E0i li\u1EC7u " + rowData.name + " th\u00E0nh pdf th\u00E0nh c\u00F4ng");
+                                sourceFileId = rsConvert.data;
+                                sourceFile = { id: sourceFileId };
+                            }
+                            return [3 /*break*/, 4];
+                        case 3:
+                            e_5 = _b.sent();
+                            this._notifierService.showWarning("C\u00F3 l\u1ED7i x\u1EA3y ra khi chuy\u1EC3n \u0111\u1ED5i t\u00E0i li\u1EC7u " + rowData.name + " th\u00E0nh pdf \u0111\u1EC3 k\u00FD. Vui l\u00F2ng th\u1EED l\u1EA1i sau");
+                            return [2 /*return*/];
+                        case 4: return [4 /*yield*/, this._userChuKySoService.getDetailByFilter([
                                 this.newFilter('provider', exports.Operator.equal, 'SmartCA'),
                                 this.newFilter('userId', exports.Operator.equal, this._userService.getCurrentUser().userId),
                             ])];
-                        case 1:
+                        case 5:
                             dataKySo = (_b.sent()).data;
                             if (!dataKySo) {
                                 this._notifierService.showWarning('Người dùng chưa cấu hình thông tin ký số');
                             }
                             this.forms.fileViewer.formData.data = {
-                                fileId: rowData.id,
+                                fileId: sourceFileId,
                                 isFileVersion: false,
                                 fileName: rowData.name,
                                 service: rowData.serviceCode,
@@ -37022,7 +37053,7 @@
             });
         };
         FileManagerComponent.prototype.buildTreeData = function (data, rootFolderId) {
-            var e_5, _b;
+            var e_6, _b;
             var result = [];
             var rootData = data.filter(function (x) { return x.parentFolderId == rootFolderId; });
             if (rootData.length > 0) {
@@ -37038,12 +37069,12 @@
                         });
                     }
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
                         if (rootData_1_1 && !rootData_1_1.done && (_b = rootData_1.return)) _b.call(rootData_1);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_6) throw e_6.error; }
                 }
             }
             return result;
@@ -50555,6 +50586,9 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            if (!this.model.data.signatureLocation) {
+                                return [2 /*return*/, this._notifierService.showWarning('Vui lòng chọn vị trí chữ ký trước khi thực hiện ký số')];
+                            }
                             this.showWaitBox('Đang thực hiện ký số, vui lòng kiểm tra ứng dụng SmartCA');
                             return [4 /*yield*/, this._fileObjectService.kySoSmartCA(this.model.data)];
                         case 1: