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 5d39bce3c..ab4b7aaf0 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -234,11 +234,6 @@ export class AnnotationWrapper { return; } - if (redactionLogEntryWrapper.status === 'DECLINED') { - annotationWrapper.superType = 'declined-suggestion'; - return; - } - if (redactionLogEntryWrapper.manualRedactionType === 'FORCE_REDACT') { annotationWrapper.force = true; @@ -261,6 +256,10 @@ export class AnnotationWrapper { annotationWrapper.superType = 'add-dictionary'; return; } + if (redactionLogEntryWrapper.status === 'DECLINED') { + annotationWrapper.superType = 'declined-suggestion'; + return; + } if (!redactionLogEntryWrapper.manual) { annotationWrapper.superType = 'skipped'; } @@ -276,6 +275,10 @@ export class AnnotationWrapper { annotationWrapper.superType = 'manual-redaction'; return; } + if (redactionLogEntryWrapper.status === 'DECLINED') { + annotationWrapper.superType = 'declined-suggestion'; + return; + } } if (redactionLogEntryWrapper.manualRedactionType === 'LEGAL_BASIS_CHANGE') { @@ -308,6 +311,10 @@ export class AnnotationWrapper { annotationWrapper.superType = 'add-dictionary'; return; } + if (redactionLogEntryWrapper.status === 'DECLINED') { + annotationWrapper.superType = 'declined-suggestion'; + return; + } } else { if (redactionLogEntryWrapper.status === 'REQUESTED') { annotationWrapper.superType = 'suggestion-add'; @@ -317,6 +324,10 @@ export class AnnotationWrapper { annotationWrapper.superType = 'manual-redaction'; return; } + if (redactionLogEntryWrapper.status === 'DECLINED') { + annotationWrapper.superType = 'declined-suggestion'; + return; + } } } diff --git a/apps/red-ui/src/app/models/file/file-data.model.ts b/apps/red-ui/src/app/models/file/file-data.model.ts index 039d7292b..d52ae25d5 100644 --- a/apps/red-ui/src/app/models/file/file-data.model.ts +++ b/apps/red-ui/src/app/models/file/file-data.model.ts @@ -71,6 +71,7 @@ export class FileDataModel { redactionLogEntryWrapper.isChangeLogEntry = true; redactionLogEntryWrapper.changeLogType = changeLogEntry.changeType; redactionLogEntryWrapper.id = 'changed-log-removed-' + redactionLogEntryWrapper.id; + result.push(redactionLogEntryWrapper); } }); @@ -90,7 +91,17 @@ export class FileDataModel { Object.assign(redactionLogEntryWrapper, redactionLogEntry); redactionLogEntryWrapper.isChangeLogEntry = !!existingChangeLogEntry; redactionLogEntryWrapper.changeLogType = 'ADDED'; - result.push(redactionLogEntryWrapper); + + if ( + redactionLogEntryWrapper.status === 'DECLINED' && + redactionLogEntryWrapper.manualRedactionType === 'ADD' && + redactionLogEntryWrapper.type === 'false_positive' + ) { + // ignore these + return; + } else { + result.push(redactionLogEntryWrapper); + } }); result = result.filter(r => reasonAnnotationIds.indexOf(r.id) < 0); diff --git a/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.html index 751745088..068652f74 100644 --- a/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/annotation-actions/annotation-actions.component.html @@ -41,7 +41,7 @@ [tooltipPosition]="tooltipPosition" [tooltip]="'annotation-actions.reject-suggestion' | translate" [type]="buttonType" - icon="red:trash" + icon="red:close" > { this._ngZone.run(() => {