Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-6558, fixed download notifications redirect.

Browse Source
This commit is contained in:
George 2023-04-20 18:24:09 +03:00
parent bf191d25ea
commit 421e26a922
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/red-ui/src/app/modules/pdf-viewer/services/webviewer-loaded.guard.ts
View File

@ -1,28 +1,36 @@
import { Injectable } from '@angular/core';
import { CanActivate } from '@angular/router';
import { CanActivate, Router } from '@angular/router';
import { REDDocumentViewer } from './document-viewer.service';
import { PdfViewer } from './pdf-viewer.service';
import { REDAnnotationManager } from './annotation-manager.service';
import { ViewerHeaderService } from './viewer-header.service';
import { LoadingService } from '@iqser/common-ui';
import { WebViewerInstance } from '@pdftron/webviewer';
@Injectable()
export class WebViewerLoadedGuard implements CanActivate {
constructor(
private readonly _documentViewer: REDDocumentViewer,
private readonly _pdf: PdfViewer,
private readonly _router: Router,
private readonly _annotationManager: REDAnnotationManager,
private readonly _viewerHeaderService: ViewerHeaderService,
private readonly _loadingService: LoadingService,
) {}
async canActivate() {
async canActivate(_, state) {
if (this._pdf.instance) {
return true;
}
this._loadingService.start();
const instance = await this._pdf.init(document.getElementById('viewer'));
let instance: WebViewerInstance | undefined;
try {
instance = await this._pdf.init(document.getElementById('viewer'));
} catch {
return this._router.navigateByUrl(state.url);
}
this._annotationManager.init(instance.Core.annotationManager);
this._documentViewer.init(instance.Core.documentViewer);

2
libs/common-ui

@ -1 +1 @@
Subproject commit 7e4e51f82c0b6748ab1b791139c73f934120694e
Subproject commit 77a84882cc7e5a44a35363cc779e2788acc6755a