From 0f00cafae3813b6d753bf0b4ed444a6336218319 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 14 Dec 2021 23:07:12 +0200 Subject: [PATCH] Fixed OCR INC6158219 / RED-2813 --- angular.json | 3 +++ .../file-preview-screen/file-preview-screen.component.ts | 7 +++++-- .../modules/dossier/services/annotation-actions.service.ts | 2 +- .../modules/dossier/services/annotation-draw.service.ts | 2 +- apps/red-ui/src/app/services/config.service.ts | 1 - .../src/app/services/entity-services/files-map.service.ts | 7 +++++-- apps/red-ui/src/app/services/user-preference.service.ts | 1 - 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/angular.json b/angular.json index 700f0f37e..bef6f9183 100644 --- a/angular.json +++ b/angular.json @@ -1,4 +1,7 @@ { + "cli": { + "analytics": "4b8eed12-a1e6-4b7a-9ea2-925b27941271" + }, "version": 1, "projects": { "common-ui": { 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 4f1bbc0ae..ec3849327 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 @@ -167,13 +167,16 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni } async updateViewMode(): Promise { - const annotations = this._getAnnotations(a => a.getCustomData('redacto-manager')); + const ocrAnnotationIds = this.annotationData.allAnnotations.filter(a => a.isOCR).map(a => a.id); + const annotations = this._getAnnotations(a => a.getCustomData('redact-manager')); const redactions = annotations.filter(a => a.getCustomData('redaction')); switch (this.viewModeService.viewMode) { case 'STANDARD': { this._setAnnotationsColor(redactions, 'annotationColor'); - const standardEntries = annotations.filter(a => a.getCustomData('changeLogRemoved') === 'false'); + const standardEntries = annotations + .filter(a => a.getCustomData('changeLogRemoved') === 'false') + .filter(a => !ocrAnnotationIds.includes(a.Id)); const nonStandardEntries = annotations.filter(a => a.getCustomData('changeLogRemoved') === 'true'); this._show(standardEntries); this._hide(nonStandardEntries); diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts index d9b5c3945..87f773043 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts @@ -390,7 +390,7 @@ export class AnnotationActionsService { } updateHiddenAnnotation(annotations: AnnotationWrapper[], viewerAnnotations: Annotation[], hidden: boolean) { - const annotationId = (viewerAnnotations[0] as any).Dx; + const annotationId = viewerAnnotations[0].Id; const annotationToBeUpdated = annotations.find((a: AnnotationWrapper) => a.annotationId === annotationId); annotationToBeUpdated.hidden = hidden; } diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-draw.service.ts index f777317a6..ecdccdbc9 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-draw.service.ts @@ -180,7 +180,7 @@ export class AnnotationDrawService { (hideSkipped && annotationWrapper.isSkipped) || annotationWrapper.isOCR || annotationWrapper.hidden; - annotation.setCustomData('redacto-manager', 'true'); + annotation.setCustomData('redact-manager', 'true'); annotation.setCustomData('redaction', String(annotationWrapper.isRedacted)); annotation.setCustomData('skipped', String(annotationWrapper.isSkipped)); annotation.setCustomData('changeLog', String(annotationWrapper.isChangeLogEntry)); diff --git a/apps/red-ui/src/app/services/config.service.ts b/apps/red-ui/src/app/services/config.service.ts index d22af1396..c50b4c3b9 100644 --- a/apps/red-ui/src/app/services/config.service.ts +++ b/apps/red-ui/src/app/services/config.service.ts @@ -48,7 +48,6 @@ export class ConfigService { } updateDisplayName(name: string): void { - console.log('got name', name); this._values = { ...this._values, APP_NAME: name } as const; this._titleService.setTitle(this._values.APP_NAME || 'RedactManager'); } diff --git a/apps/red-ui/src/app/services/entity-services/files-map.service.ts b/apps/red-ui/src/app/services/entity-services/files-map.service.ts index a8f69b6a4..b861090da 100644 --- a/apps/red-ui/src/app/services/entity-services/files-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/files-map.service.ts @@ -70,8 +70,11 @@ export class FilesMapService { } replace(entity: File) { - const all = this.get(entity.dossierId).filter(file => file.fileId !== entity.fileId); - this.set(entity.dossierId, [...all, entity]); + const existingFile = this.get(entity.dossierId).find(file => file.fileId === entity.fileId); + if (existingFile.lastUpdated !== entity.lastUpdated) { + const all = this.get(entity.dossierId).filter(file => file.fileId !== entity.fileId); + this.set(entity.dossierId, [...all, entity]); + } } watch$(key: string, entityId: string): Observable { diff --git a/apps/red-ui/src/app/services/user-preference.service.ts b/apps/red-ui/src/app/services/user-preference.service.ts index 3cad19c8b..e2ac56f9e 100644 --- a/apps/red-ui/src/app/services/user-preference.service.ts +++ b/apps/red-ui/src/app/services/user-preference.service.ts @@ -69,7 +69,6 @@ export class UserPreferenceService extends GenericService { } reload(): void { - console.log('here'); this.getAll() .toPromise() .then(attributes => {