From 4c25cd04835806ccba01c4a8527c6cc1add64c6a Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 19 Jan 2021 18:20:15 +0200 Subject: [PATCH] fixed missing annotations/redactions --- apps/red-ui/src/app/common/filter/utils/filter-utils.ts | 2 +- apps/red-ui/src/app/screens/file/model/file-data.model.ts | 4 +++- .../src/app/screens/file/pdf-viewer/pdf-viewer.component.ts | 1 + apps/red-ui/src/assets/config/config.json | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts b/apps/red-ui/src/app/common/filter/utils/filter-utils.ts index 194bbb5cf..d634754ce 100644 --- a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts +++ b/apps/red-ui/src/app/common/filter/utils/filter-utils.ts @@ -24,7 +24,7 @@ export function handleFilterDelta(oldFilters: FilterModel[], newFilters: FilterM if (!oldFilter) { for (const childFilter of newFilter.filters) { - const oldFilterChild = oldFilter.filters.find((f) => f.key === childFilter.key); + const oldFilterChild = oldFilter?.filters.find((f) => f.key === childFilter.key); if (!oldFilterChild || oldFilterChild.matches !== childFilter.matches) { if (!newFiltersDelta[newFilter.key]) { newFiltersDelta[newFilter.key] = {}; diff --git a/apps/red-ui/src/app/screens/file/model/file-data.model.ts b/apps/red-ui/src/app/screens/file/model/file-data.model.ts index 83085cfc0..41c970d6d 100644 --- a/apps/red-ui/src/app/screens/file/model/file-data.model.ts +++ b/apps/red-ui/src/app/screens/file/model/file-data.model.ts @@ -59,7 +59,9 @@ export class FileDataModel { // a redaction-log entry is marked as a reason for another entry - hide it if (!!markedAsReasonRedactionLogEntry) { - markedAsReasonRedactionLogEntry.hidden = true; + if (!(this._hasAlreadyBeenProcessed(manual) && manual.status === 'APPROVED')) { + markedAsReasonRedactionLogEntry.hidden = true; + } } // an entry for this request already exists in the redactionLog diff --git a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts index e653b7378..2564ee2a9 100644 --- a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts @@ -352,6 +352,7 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnChanges { } private toPosition(page: number, selectedQuad: any): Rectangle { + console.log(selectedQuad); const pageHeight = this.instance.docViewer.getPageHeight(page); const height = selectedQuad.y2 - selectedQuad.y4; return { diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index d447e7e9e..969132fdd 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,5 +1,5 @@ { - "OAUTH_URL": "https://redkc-staging.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://redqa-auth.iqser.cloud/auth/realms/redaction", "OAUTH_CLIENT_ID": "redaction", - "API_URL": "https://redapi-staging.iqser.cloud" + "API_URL": "https://redqa-api.iqser.cloud" }