From 230d7814c084dc1ccb72febb2e31378a3021773e Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 12 Jan 2022 10:26:08 +0200 Subject: [PATCH 1/7] fixed ocr doc reload issue --- .../file-preview-screen.component.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index 61a18608d..bf35e0ffd 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -389,6 +389,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni async viewerReady($event: WebViewerInstance) { this._instance = $event; this.ready = true; + await this._stampPDF(); await this._reloadAnnotations(); this._setExcludedPageStyles(); @@ -410,6 +411,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } else { this._loadingService.stop(); } + this._changeDetectorRef.markForCheck(); } async annotationsChangedByReviewAction(annotation: AnnotationWrapper) { @@ -469,19 +471,25 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni if (!this._instance) { return; } + + const document = this._instance.Core.documentViewer.getDocument(); + if (!document) { + return; + } + const pdfNet = this._instance.Core.PDFNet; - const document = await this._instance.Core.documentViewer.getDocument().getPDFDoc(); + const pdfDoc = await this._instance.Core.documentViewer.getDocument().getPDFDoc(); const file = this._filesMapService.get(this.dossierId, this.fileId); const allPages = [...Array(file.numberOfPages).keys()].map(page => page + 1); - await clearStamps(document, pdfNet, allPages); + await clearStamps(pdfDoc, pdfNet, allPages); if (this.viewModeService.viewMode === 'REDACTED') { const dossier = this._dossiersService.find(this.dossierId); if (dossier.watermarkPreviewEnabled) { - await this._stampPreview(document, dossier.dossierTemplateId); + await this._stampPreview(pdfDoc, dossier.dossierTemplateId); } } else { - await this._stampExcludedPages(document, file.excludedPages); + await this._stampExcludedPages(pdfDoc, file.excludedPages); } this._instance.Core.documentViewer.refreshAll(); this._instance.Core.documentViewer.updateView([this.activeViewerPage], this.activeViewerPage); From 55946c55b7ffb48174f76d1ce42ed575fef14fbf Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 12 Jan 2022 10:44:54 +0200 Subject: [PATCH 2/7] download notification --- .../components/base-screen/base-screen.component.html | 2 -- .../components/base-screen/base-screen.component.ts | 5 ----- .../upload-download/services/file-download.service.ts | 10 ---------- 3 files changed, 17 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 534a5c4fb..1f7abb691 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -27,7 +27,6 @@ @@ -36,7 +35,6 @@ diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index 1771c2bdd..759273a83 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -36,26 +36,22 @@ export class BaseScreenComponent { routerLink: '/main/account', show: true, action: this.appStateService.reset, - showDot: () => false, }, { name: _('top-bar.navigation-items.my-account.children.admin'), routerLink: '/main/admin', show: this.currentUser.isManager || this.currentUser.isUserAdmin, action: this.appStateService.reset, - showDot: () => false, }, { name: _('top-bar.navigation-items.my-account.children.downloads'), routerLink: '/main/downloads', show: this.currentUser.isUser, - showDot: () => this.fileDownloadService.hasPendingDownloads, }, { name: _('top-bar.navigation-items.my-account.children.trash'), routerLink: '/main/admin/trash', show: this.currentUser.isManager, - showDot: () => false, }, ]; readonly searchActions: readonly SpotlightSearchAction[] = [ @@ -85,7 +81,6 @@ export class BaseScreenComponent { readonly userService: UserService, readonly userPreferenceService: UserPreferenceService, readonly titleService: Title, - readonly fileDownloadService: FileDownloadService, private readonly _router: Router, private readonly _translateService: TranslateService, readonly breadcrumbsService: BreadcrumbsService, diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts index ede23950a..bbc3e3acd 100644 --- a/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts +++ b/apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts @@ -16,8 +16,6 @@ import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/ @Injectable() export class FileDownloadService extends EntitiesService { - hasPendingDownloads = false; - constructor( private readonly _userService: UserService, private readonly _keycloakService: KeycloakService, @@ -25,13 +23,6 @@ export class FileDownloadService extends EntitiesService user.isUser), - switchMap(() => this.loadAll()), - ) - .subscribe(); } downloadFiles(fileIds: List, dossierId: string): Observable { @@ -45,7 +36,6 @@ export class FileDownloadService extends EntitiesService new DownloadStatus(entity)), tap(entities => this.setEntities(entities)), - tap(() => (this.hasPendingDownloads = !!this.all.find(f => !f.lastDownload && f.isReady))), ); } From 0369bf55779f1b04df927de7f705d38f3736c214 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 12 Jan 2022 09:48:36 +0100 Subject: [PATCH 3/7] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3202 -> 3202 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 311d988d8..d8ac1638b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.140.0", + "version": "3.141.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ac9d35ffd862c0d9268708cd5e2aac1d5dcdb6c1..ba13b99237a61e23b55a2b9dc0647ebde5530af5 100644 GIT binary patch delta 3101 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 Date: Wed, 12 Jan 2022 10:55:56 +0200 Subject: [PATCH 4/7] dl screen --- .../downloads-list-screen/downloads-list-screen.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts index 73cee8af0..2e8cd19ce 100644 --- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts +++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts @@ -11,6 +11,8 @@ import { } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { RouterHistoryService } from '@services/router-history.service'; +import { interval } from 'rxjs'; +import { switchMap } from 'rxjs/operators'; @Component({ selector: 'redaction-downloads-list-screen', @@ -43,6 +45,9 @@ export class DownloadsListScreenComponent extends ListingComponent this._loadData())) + .subscribe(); } downloadItem(download: DownloadStatus) { From 95e898c03c8bb8585bfb066e47679bf49b7b60f6 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 12 Jan 2022 09:59:40 +0100 Subject: [PATCH 5/7] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3202 -> 3200 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8ac1638b..b0ec78d81 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.141.0", + "version": "3.142.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ba13b99237a61e23b55a2b9dc0647ebde5530af5..40e1c49bfcb916035f1f888d6e777e27aaed8509 100644 GIT binary patch delta 3112 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 Date: Wed, 12 Jan 2022 13:09:06 +0200 Subject: [PATCH 6/7] Fixed arrow navigation --- .../file-preview-screen.component.html | 2 +- .../file-preview-screen.component.ts | 41 ++++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html index 9e859f0f8..33575b2ea 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html @@ -67,7 +67,7 @@ this.permissionsService.canPerformAnnotationActions(file) && viewMode === 'STANDARD'), @@ -331,6 +318,14 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } } + handleArrowEvent($event: KeyboardEvent): void { + if (['ArrowUp', 'ArrowDown'].includes($event.key)) { + if (this.selectedAnnotations.length === 1) { + this._workloadComponent.navigateAnnotations($event); + } + } + } + @HostListener('window:keyup', ['$event']) handleKeyEvent($event: KeyboardEvent) { if (this._router.url.indexOf('/file/') < 0) { @@ -341,13 +336,6 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni return; } - if (['ArrowUp', 'ArrowDown'].includes($event.key)) { - if (this.selectedAnnotations.length === 1) { - this._workloadComponent.navigateAnnotations($event); - } - return; - } - if (['Escape'].includes($event.key)) { this.fullScreen = false; this.closeFullScreen(); @@ -447,6 +435,19 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni return false; } + private _setActiveViewerPage() { + const currentPage = this._instance?.Core.documentViewer?.getCurrentPage(); + if (!currentPage) { + this.activeViewerPage = 1; + } else { + this.activeViewerPage = this.viewModeService.isCompare + ? currentPage % 2 === 0 + ? currentPage / 2 + : (currentPage + 1) / 2 + : currentPage; + } + } + private _setExcludedPageStyles() { const file = this._filesMapService.get(this.dossierId, this.fileId); setTimeout(() => { From 33f93592f68ac9784e14ff61c44bea4d74030bbc Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 12 Jan 2022 12:13:38 +0100 Subject: [PATCH 7/7] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3200 -> 3202 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b0ec78d81..3fb6881a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.142.0", + "version": "3.143.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 40e1c49bfcb916035f1f888d6e777e27aaed8509..e07249f0a9eca0d02c26cb4e514880860e951e50 100644 GIT binary patch delta 3150 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 delta 3112 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