tnx-shared 5.1.418 → 5.1.420

package/bundles/tnx-shared.umd.js

@@ -9053,12 +9053,12 @@
             var svUrl = this.serviceUri + "/GenerateDownloadLinkMultiple";
             return this.defaultPost(svUrl, model);
         };
-        DownloadLinkService.prototype.getAnonymousDownloadUrl = function (hash) {
-            return this.serviceUri + "/Download/" + hash;
-        };
         DownloadLinkService.prototype.getDownloadForSignUrl = function (hash) {
             return this.serviceUri + "/DownloadForSign/" + hash;
         };
+        DownloadLinkService.prototype.getAnonymousDownloadUrl = function (hash) {
+            return this.serviceUri + "/Download/" + hash;
+        };
         DownloadLinkService.prototype.getAnonymousDownloadUrlForViewer = function (hash, forceUsingInternal) {
             if (forceUsingInternal === void 0) { forceUsingInternal = false; }
             if (this._moduleConfigService.getConfig().environment.usingInternalFileEndpointForView || forceUsingInternal) {
@@ -20279,7 +20279,7 @@
                                         : this._checkPermission(userPermissions, permissionToCheck)];
                             }
                             else {
-                                console.log("Kh\u00F4ng c\u00F3 quy\u1EC1n v\u1EDBi ph\u00E2n h\u1EC7 [" + service + "]");
+                                // console.log(`Không có quyền với phân hệ [${service}]`);
                                 return [2 /*return*/, false];
                             }
                             return [3 /*break*/, 3];
@@ -20305,6 +20305,8 @@
                     var userPermissionPointer = 0;
                     // pointer permission đang check
                     var permissionToCheckPointer = 0;
+                    // mark co the check query param
+                    var aboutToCheckQueryParam = false;
                     // check từng char của 2 mảng
                     for (; permissionToCheckPointer < permissionToCheck.length;) {
                         // nếu char là ký tự bắt đầu template => tịnh tiến pointer của 2 mảng
@@ -20318,10 +20320,13 @@
                                 if (userPermission[userPermissionPointer] != '}') {
                                     continue;
                                 }
+                                if (userPermission[userPermissionPointer] === '?') {
+                                    aboutToCheckQueryParam = true;
+                                }
                                 ++userPermissionPointer; // tiến tiến đến ký tự sau kết thúc template
                                 // check trường hợp trường hợp chuỗi template có dạng "{template}acsekjf"
                                 // => cần check các ký tự sau template và trước ký tự '/'
-                                if (userPermission[userPermissionPointer] != '/') {
+                                if (userPermission[userPermissionPointer] != '/' && (aboutToCheckQueryParam && userPermission[userPermissionPointer] != '&')) {
                                     needRecheck = true;
                                     for (; userPermissionPointer < userPermission.length; userPermissionPointer++) {
                                         if (userPermissionPointer == userPermission.length - 1) {
@@ -20339,7 +20344,7 @@
                                 if (permissionToCheckPointer == permissionToCheck.length - 1) {
                                     break;
                                 }
-                                if (permissionToCheck[permissionToCheckPointer] == '/') {
+                                if (permissionToCheck[permissionToCheckPointer] == '/' || (aboutToCheckQueryParam && permissionToCheck[permissionToCheckPointer] == '&')) {
                                     break;
                                 }
                             }
@@ -35520,11 +35525,12 @@
 
     var FileUploadComponent = /** @class */ (function (_super) {
         __extends(FileUploadComponent, _super);
-        function FileUploadComponent(_fileObjectService, _notifierService, _downloadLinkService, _injector) {
+        function FileUploadComponent(_fileObjectService, _notifierService, _downloadLinkService, _fileExplorerService, _injector) {
             var _this = _super.call(this, _injector) || this;
             _this._fileObjectService = _fileObjectService;
             _this._notifierService = _notifierService;
             _this._downloadLinkService = _downloadLinkService;
+            _this._fileExplorerService = _fileExplorerService;
             _this.chooseLabel = 'Chọn';
             _this.readonly = true;
             _this.accept = 'image/*,.xlsx,.xls,.pdf,.doc,.docx,.zip,.rar';
@@ -35547,6 +35553,14 @@
             _this.hasFile = false;
             _this.showNoti = false;
             _this.notification = null;
+            _this.forms = {
+                fileViewer: {
+                    formData: {
+                        data: {},
+                    },
+                    show: false,
+                }
+            };
             return _this;
         }
         FileUploadComponent.prototype.writeValue = function (obj) {
@@ -35681,12 +35695,44 @@
                 this._downloadLinkService.downloadLink(model);
             }
         };
+        FileUploadComponent.prototype.openFileViewer = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var fileBinary, fileObject, fileName;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this._fileExplorerService.checkPhysicalFile(this.fileId)];
+                        case 1:
+                            fileBinary = _a.sent();
+                            if (!fileBinary.success) {
+                                this._notifierService.showWarning('File không tồn tại, vui lòng liên hệ quản trị viên');
+                                return [2 /*return*/];
+                            }
+                            return [4 /*yield*/, this._fileObjectService.getDetail(this.fileId)];
+                        case 2:
+                            fileObject = _a.sent();
+                            fileName = '';
+                            if (!fileObject.success) {
+                                this._notifierService.showWarning('Có lỗi trong lúc lấy dữ liệu file, vui lòng liên hệ quản trị viên');
+                                return [2 /*return*/];
+                            }
+                            fileName = fileObject === null || fileObject === void 0 ? void 0 : fileObject.name;
+                            this.forms.fileViewer.formData.data = {
+                                fileId: this.fileId,
+                                isFileVersion: false,
+                                fileName: fileName,
+                            };
+                            this.forms.fileViewer.show = true;
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         return FileUploadComponent;
     }(ComponentBase));
     FileUploadComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'file-upload',
-                    template: "<div class=\"file-upload\">\r\n    <div class=\"fl-icon\">\r\n        <i *ngIf=\"loading\" class=\"pi pi-spin pi-spinner\" style=\"font-size: 2rem\"></i>\r\n        <i *ngIf=\"!loading\" class=\"pi pi-file-o\" style=\"font-size: 2rem\"></i>\r\n    </div>\r\n\r\n    <div class=\"fl-file-name\" (click)=\"onDownloadFile()\">\r\n        <span *ngIf=\"!showNoti\">{{selectedFileName}}</span>\r\n        <span *ngIf=\"showNoti\"> {{notification}} </span>\r\n    </div>\r\n\r\n    <div class=\"fl-buttons\">\r\n        <button *ngIf=\"!hasFile && !readonly\" pTooltip=\"Ch\u1ECDn file\" class=\"fl-choose\"\r\n            class=\"link-or-action p-button-text p-button-rounded fl-choose\" tooltipPosition=\"top\" pButton type=\"button\"\r\n            icon=\"pi pi-plus\" (click)=\"onOpenSelect()\"></button>\r\n\r\n        <button *ngIf=\"hasFile && !readonly\" (click)=\"onRemoveFile()\"\r\n            class=\"link-or-action p-button-text p-button-rounded p-button-danger fl-remove\" pTooltip=\"X\u00F3a file\"\r\n            tooltipPosition=\"top\" pButton type=\"button\" icon=\"pi pi-trash\"></button>\r\n\r\n        <button [disabled]=\"!menu || !menu.length\" type=\"button\" pButton icon=\"pi pi-ellipsis-v\"\r\n            class=\"link-or-action p-button-text p-button-rounded\" pTooltip=\"Th\u00EAm\" tooltipPosition=\"top\"\r\n            (click)=\"showContextMenu($event)\"></button>\r\n    </div>\r\n\r\n    <div style=\"display: none;\">\r\n        <p-fileUpload #file [accept]=\"accept\" [auto]=\"false\" class=\"file-upload\" mode=\"basic\"\r\n            [chooseLabel]=\"chooseLabel\" name=\"file[]\" [accept]=\"accept\" pTooltip=\"Ch\u1ECDn t\u1EEB m\u00E1y t\u00EDnh\"\r\n            toolStipPosition=\"top\" multiple=\"single\" [invalidFileSizeMessageSummary]=\"invalidFileSizeMessageSummary\"\r\n            [invalidFileSizeMessageDetail]=\"invalidFileSizeMessageDetail\"\r\n            [invalidFileTypeMessageSummary]=\"invalidFileTypeMessageSummary\"\r\n            [invalidFileTypeMessageDetail]=\"invalidFileTypeMessageDetail\"\r\n            [invalidFileLimitMessageSummary]=\"invalidFileLimitMessageSummary\"\r\n            [invalidFileLimitMessageDetail]=\"invalidFileLimitMessageDetail\" (onSelect)=\"onSelectFile($event)\"\r\n            (onError)=\"handleError($event)\">\r\n        </p-fileUpload>\r\n    </div>\r\n\r\n</div>\r\n\r\n<p-contextMenu #contextMenu [appendTo]=\"'body'\" [model]=\"menu\" styleClass=\"fm-contextMenu-panel\">\r\n</p-contextMenu>",
+                    template: "<div class=\"file-upload\">\r\n    <div class=\"fl-icon\">\r\n        <i *ngIf=\"loading\" class=\"pi pi-spin pi-spinner\" style=\"font-size: 2rem\"></i>\r\n        <i *ngIf=\"!loading\" class=\"pi pi-file-o\" style=\"font-size: 2rem\"></i>\r\n    </div>\r\n\r\n    <div class=\"fl-file-name\" (click)=\"openFileViewer()\">\r\n        <span *ngIf=\"!showNoti\">{{selectedFileName}}</span>\r\n        <span *ngIf=\"showNoti\"> {{notification}} </span>\r\n    </div>\r\n\r\n    <div class=\"fl-buttons\">\r\n        <button *ngIf=\"!hasFile && !readonly\" pTooltip=\"Ch\u1ECDn file\" class=\"fl-choose\"\r\n            class=\"link-or-action p-button-text p-button-rounded fl-choose\" tooltipPosition=\"top\" pButton type=\"button\"\r\n            icon=\"pi pi-plus\" (click)=\"onOpenSelect()\"></button>\r\n\r\n        <button *ngIf=\"hasFile && !readonly\" (click)=\"onRemoveFile()\"\r\n            class=\"link-or-action p-button-text p-button-rounded p-button-danger fl-remove\" pTooltip=\"X\u00F3a file\"\r\n            tooltipPosition=\"top\" pButton type=\"button\" icon=\"pi pi-trash\"></button>\r\n\r\n        <button [disabled]=\"!menu || !menu.length\" type=\"button\" pButton icon=\"pi pi-ellipsis-v\"\r\n            class=\"link-or-action p-button-text p-button-rounded\" pTooltip=\"Th\u00EAm\" tooltipPosition=\"top\"\r\n            (click)=\"showContextMenu($event)\"></button>\r\n    </div>\r\n\r\n    <div style=\"display: none;\">\r\n        <p-fileUpload #file [accept]=\"accept\" [auto]=\"false\" class=\"file-upload\" mode=\"basic\"\r\n            [chooseLabel]=\"chooseLabel\" name=\"file[]\" [accept]=\"accept\" pTooltip=\"Ch\u1ECDn t\u1EEB m\u00E1y t\u00EDnh\"\r\n            toolStipPosition=\"top\" multiple=\"single\" [invalidFileSizeMessageSummary]=\"invalidFileSizeMessageSummary\"\r\n            [invalidFileSizeMessageDetail]=\"invalidFileSizeMessageDetail\"\r\n            [invalidFileTypeMessageSummary]=\"invalidFileTypeMessageSummary\"\r\n            [invalidFileTypeMessageDetail]=\"invalidFileTypeMessageDetail\"\r\n            [invalidFileLimitMessageSummary]=\"invalidFileLimitMessageSummary\"\r\n            [invalidFileLimitMessageDetail]=\"invalidFileLimitMessageDetail\" (onSelect)=\"onSelectFile($event)\"\r\n            (onError)=\"handleError($event)\">\r\n        </p-fileUpload>\r\n    </div>\r\n\r\n</div>\r\n\r\n<p-contextMenu #contextMenu [appendTo]=\"'body'\" [model]=\"menu\" styleClass=\"fm-contextMenu-panel\">\r\n</p-contextMenu>\r\n\r\n<file-viewer #fileViewerNew *ngIf=\"forms.fileViewer.show\" [parentModel]=\"model\" [parentContext]=\"context\"\r\n    [readonly]=\"readonly\" [model]=\"forms.fileViewer.formData\" (onClose)=\"forms.fileViewer.show = false;\">\r\n</file-viewer>",
                     providers: [
                         {
                             provide: forms.NG_VALUE_ACCESSOR,
@@ -35702,6 +35748,7 @@
         { type: FileObjectService },
         { type: NotifierService },
         { type: DownloadLinkService },
+        { type: FileExplorerService },
         { type: i0.Injector }
     ]; };
     FileUploadComponent.propDecorators = {
@@ -43141,7 +43188,7 @@
     var PositionService = /** @class */ (function (_super) {
         __extends(PositionService, _super);
         function PositionService(http, injector, _moduleConfigService) {
-            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/ChucVu") || this;
+            var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/DmChucVu") || this;
             _this._moduleConfigService = _moduleConfigService;
             _this.entityName = 'DmChucVu';
             _this.serviceCode = 'UserOrg';
@@ -51143,6 +51190,10 @@
                         case 0:
                             this.data = this.model.data;
                             if (!this.data.fileId && !this.data.fileVersionId) {
+                                if (this.data.fileUrl != null && this.data.fileUrl !== '') {
+                                    this.data.extension = this._fileObjectService.getFileExtension(this.data.name);
+                                    this.data.fileType = this._fileObjectService.getFileType(this.data.extension);
+                                }
                                 return [2 /*return*/];
                             }
                             data = null;
@@ -51175,24 +51226,40 @@
             this.model.images = [];
             this.model.isImage = true;
             this.show = true;
+            this.context.root.subscribe(ComCtxConstants.ROOT.KEY_DOWN_ESC, function () {
+                _this.closeSidebar(null);
+            });
+            var forceUsingInternal = false;
+            var processFunc;
             switch (this.data.fileType) {
                 case FILE_TYPES.IMAGE:
-                    this.processShowImage();
+                    processFunc = this.processShowImage.bind(this);
                     break;
                 case FILE_TYPES.VIDEO:
                 case FILE_TYPES.AUDIO:
-                    this.processVideoOrAudio();
+                    processFunc = this.processVideoOrAudio.bind(this);
                     break;
                 case FILE_TYPES.PDF:
-                    this.processFilePdf();
+                    processFunc = this.processFilePdf.bind(this);
                     break;
                 default:
-                    this.processOtherFileExtension();
+                    this.model.isImage = false;
+                    forceUsingInternal = true;
+                    processFunc = this.processOtherFileExtension.bind(this);
                     break;
             }
-            this.context.root.subscribe(ComCtxConstants.ROOT.KEY_DOWN_ESC, function () {
-                _this.closeSidebar(null);
-            });
+            if (!this.data.fileUrl || this.data.fileUrl === '') {
+                var model = this.getGenerateDownloadLinkModel();
+                this._downloadLinkService
+                    .generateDownloadLink(model)
+                    .then(function (rs) {
+                    var url = _this._downloadLinkService.getAnonymousDownloadUrlForViewer(rs.data, forceUsingInternal);
+                    processFunc(url);
+                });
+            }
+            else {
+                processFunc(this.data.fileUrl);
+            }
         };
         FileViewerComponent.prototype.getGenerateDownloadLinkModel = function () {
             return {
@@ -51200,15 +51267,6 @@
                 fileVersionId: this.data.fileVersionId
             };
         };
-        FileViewerComponent.prototype.processShowImage = function () {
-            var _this = this;
-            var model = this.getGenerateDownloadLinkModel();
-            this._downloadLinkService.generateDownloadLink(model)
-                .then(function (rs) {
-                _this.model.images = [_this._downloadLinkService.getAnonymousDownloadUrlForViewer(rs.data)];
-                // this.showImageWhenLoaded();
-            });
-        };
         FileViewerComponent.prototype.showImageWhenLoaded = function () {
             var _this = this;
             var done = false;
@@ -51227,31 +51285,17 @@
                 setTimeout(function () { return _this.showImageWhenLoaded(); }, 50);
             }
         };
-        FileViewerComponent.prototype.processVideoOrAudio = function () {
-            var _this = this;
-            var model = this.getGenerateDownloadLinkModel();
-            this._downloadLinkService.generateDownloadLink(model)
-                .then(function (rs) {
-                _this.model.fileUrl = _this._downloadLinkService.getAnonymousDownloadUrlForViewer(rs.data);
-            });
+        FileViewerComponent.prototype.processShowImage = function (url) {
+            this.model.images = [url];
         };
-        FileViewerComponent.prototype.processFilePdf = function () {
-            var _this = this;
-            var model = this.getGenerateDownloadLinkModel();
-            this._downloadLinkService.generateDownloadLink(model)
-                .then(function (rs) {
-                _this.model.fileUrl = _this._downloadLinkService.getAnonymousDownloadUrl(rs.data);
-            });
+        FileViewerComponent.prototype.processVideoOrAudio = function (url) {
+            this.model.fileUrl = url;
         };
-        FileViewerComponent.prototype.processOtherFileExtension = function () {
-            var _this = this;
-            this.model.isImage = false;
-            var model = this.getGenerateDownloadLinkModel();
-            this._downloadLinkService.generateDownloadLink(model)
-                .then(function (rs) {
-                var fileUrl = _this._downloadLinkService.getAnonymousDownloadUrlForViewer(rs.data, true);
-                _this.initDocumentViewer(_this.data.extension, _this.data.fileType, fileUrl);
-            });
+        FileViewerComponent.prototype.processFilePdf = function (url) {
+            this.model.fileUrl = url;
+        };
+        FileViewerComponent.prototype.processOtherFileExtension = function (url) {
+            this.initDocumentViewer(this.data.extension, this.data.fileType, url);
         };
         FileViewerComponent.prototype.initDocumentViewer = function (fileExtension, fileType, fileUrl) {
             var config = {
@@ -53713,7 +53757,6 @@
                             return [4 /*yield*/, this._permissionService.isAuthorized(element.code, (element.code + ".MODULE." + element.code).toUpperCase(), true)];
                         case 3:
                             isAuthorized = _c.sent();
-                            // const isAuthorized = await this._permissionService.isAuthorized(element.code, `test/lksjeflksejflseifjseifjslkejfkiki/test/kkjlskejflsekfjseklfj`.toUpperCase());
                             if (isAuthorized) {
                                 arr.push(element);
                             }
@@ -53748,7 +53791,7 @@
                         }
                     });
                     if (_this.appSwitcherItems.length === 1) {
-                        _this.switchApp(_this.appSwitcherItems[0]);
+                        setTimeout(function (x) { return _this.switchApp(_this.appSwitcherItems[0]); }, 100);
                     }
                 }
             });
@@ -53958,7 +54001,7 @@
                         }
                     });
                     if (_this.appSwitcherItems.length === 1) {
-                        _this.switchApp(_this.appSwitcherItems[0]);
+                        setTimeout(function (x) { return _this.switchApp(_this.appSwitcherItems[0]); }, 100);
                     }
                 }
             });