From 1df643b4f553856417a28e409e691e4df60a9632 Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 12 May 2021 18:27:40 +0300 Subject: [PATCH] fixed issue with viewed pages --- .../app/modules/projects/services/pdf-viewer-data.service.ts | 4 +++- apps/red-ui/src/app/services/permissions.service.ts | 2 +- apps/red-ui/src/assets/config/config.json | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts index b064f9225..fee0e93e7 100644 --- a/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts +++ b/apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts @@ -47,7 +47,9 @@ export class PdfViewerDataService { getViewedPagesForActiveFile() { if (this._permissionsService.canMarkPagesAsViewed()) { - return this._viewedPagesControllerService.getViewedPages(this._appStateService.activeProjectId, this._appStateService.activeFileId); + return this._viewedPagesControllerService + .getViewedPages(this._appStateService.activeProjectId, this._appStateService.activeFileId) + .pipe(catchError(() => of({ pages: [] }))); } return of({ pages: [] }); } diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index ff22c66e8..282fee636 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -250,7 +250,7 @@ export class PermissionsService { if (!fileStatus) { return false; } - return (fileStatus.status === 'UNDER_REVIEW' && this.isFileReviewer(fileStatus)) || (fileStatus.status === 'UNDER_APPROVAL' && this.isApprover()); + return (fileStatus.status === 'UNDER_REVIEW' || fileStatus.status === 'UNDER_APPROVAL') && this.isFileReviewer(fileStatus); } canDownloadRedactedFile(fileStatus: FileStatusWrapper) { diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 61103f817..f7bee7030 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,6 +1,6 @@ { - "OAUTH_URL": "https://adi-dev.iqser.cloud/auth/realms/redaction", - "API_URL": "https://adi-dev.iqser.cloud/redaction-gateway-v1", + "OAUTH_URL": "https://red-staging.iqser.cloud/auth/realms/redaction", + "API_URL": "https://red-staging.iqser.cloud/redaction-gateway-v1", "OAUTH_CLIENT_ID": "redaction", "BACKEND_APP_VERSION": "4.4.40", "FRONTEND_APP_VERSION": "1.1",