From 42b840681f45c4c268c487fdb3c1a765b48979b0 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 29 Mar 2022 20:21:25 +0300 Subject: [PATCH] Fixed various ui issues --- apps/red-ui/src/app/models/file/annotation.wrapper.ts | 8 +++++++- .../annotation-card/annotation-card.component.html | 4 +++- .../upload-download/services/file-download.service.ts | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 742bb6e96..54ae0e1ed 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -79,7 +79,13 @@ export class AnnotationWrapper implements Record { } get canBeMarkedAsFalsePositive() { - return (this.isRecommendation || this.superType === SuperTypes.Redaction) && !this.isImage && !this.imported && !this.pending; + return ( + (this.isRecommendation || this.superType === SuperTypes.Redaction) && + !this.isImage && + !this.imported && + !this.pending && + !this.hasBeenResized + ); } get isSuperTypeBasedColor() { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html index a4da78866..66b1d335b 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html @@ -4,7 +4,9 @@
{{ annotation.typeLabel | translate }} {{ 'annotation.pending' | translate }} + > {{ + 'annotation.pending' | translate + }}
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 f06acb081..c83700033 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 @@ -13,6 +13,7 @@ import { map, switchMap, tap } from 'rxjs/operators'; import { KeycloakService } from 'keycloak-angular'; import { UserService } from '@services/user.service'; import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui'; +import { NGXLogger } from 'ngx-logger'; @Injectable() export class FileDownloadService extends EntitiesService { @@ -21,6 +22,7 @@ export class FileDownloadService extends EntitiesService