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

fixed issue with viewed pages

Browse Source
This commit is contained in:
Timo 2021-05-12 18:27:40 +03:00
parent 8f95197266
commit 1df643b4f5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/projects/services/pdf-viewer-data.service.ts
View File

@ -47,7 +47,9 @@ export class PdfViewerDataService {
getViewedPagesForActiveFile() { getViewedPagesForActiveFile() {
if (this._permissionsService.canMarkPagesAsViewed()) { 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: [] }); return of({ pages: [] });
} }

2
apps/red-ui/src/app/services/permissions.service.ts
View File

@ -250,7 +250,7 @@ export class PermissionsService {
if (!fileStatus) { if (!fileStatus) {
return false; 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) { canDownloadRedactedFile(fileStatus: FileStatusWrapper) {

4
apps/red-ui/src/assets/config/config.json
View File

@ -1,6 +1,6 @@
{ {
"OAUTH_URL": "https://adi-dev.iqser.cloud/auth/realms/redaction", "OAUTH_URL": "https://red-staging.iqser.cloud/auth/realms/redaction",
"API_URL": "https://adi-dev.iqser.cloud/redaction-gateway-v1", "API_URL": "https://red-staging.iqser.cloud/redaction-gateway-v1",
"OAUTH_CLIENT_ID": "redaction", "OAUTH_CLIENT_ID": "redaction",
"BACKEND_APP_VERSION": "4.4.40", "BACKEND_APP_VERSION": "4.4.40",
"FRONTEND_APP_VERSION": "1.1", "FRONTEND_APP_VERSION": "1.1",