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 7c2876e8f..51a75e509 100644
--- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts
+++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts
@@ -58,6 +58,12 @@ export class AnnotationWrapper {
changeLogType?: 'ADDED' | 'REMOVED' | 'CHANGED';
engines?: string[];
+ hasBeenResized: boolean;
+ hasBeenRecategorized: boolean;
+ hasLegalBasisChanged: boolean;
+ hasBeenForced: boolean;
+ hasBeenRemovedByManualOverride: boolean;
+
private _origin: RedactionLogEntryWrapper;
get isChangeLogRemoved() {
@@ -169,6 +175,16 @@ export class AnnotationWrapper {
return this.dictionaryOperation;
}
+ get hasRedactionChanges(): boolean {
+ return (
+ this.hasBeenResized ||
+ this.hasBeenRecategorized ||
+ this.hasLegalBasisChanged ||
+ this.hasBeenForced ||
+ this.hasBeenRemovedByManualOverride
+ );
+ }
+
get isConvertedRecommendation() {
return this.isRecommendation && this.superType === 'suggestion-add-dictionary';
}
@@ -221,6 +237,11 @@ export class AnnotationWrapper {
annotationWrapper.engines = redactionLogEntry.engines;
annotationWrapper.section = redactionLogEntry.section;
annotationWrapper.rectangle = redactionLogEntry.rectangle;
+ annotationWrapper.hasBeenResized = redactionLogEntry.hasBeenResized;
+ annotationWrapper.hasBeenRecategorized = redactionLogEntry.hasBeenRecategorized;
+ annotationWrapper.hasLegalBasisChanged = redactionLogEntry.hasLegalBasisChanged;
+ annotationWrapper.hasBeenForced = redactionLogEntry.hasBeenForced;
+ annotationWrapper.hasBeenRemovedByManualOverride = redactionLogEntry.hasBeenRemovedByManualOverride;
this._createContent(annotationWrapper, redactionLogEntry);
this._setSuperType(annotationWrapper, redactionLogEntry);
diff --git a/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts b/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts
index 9dc800a87..f3bcacbd8 100644
--- a/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts
+++ b/apps/red-ui/src/app/models/file/redaction-log-entry.wrapper.ts
@@ -46,4 +46,10 @@ export interface RedactionLogEntryWrapper {
recategorizationType?: string;
legalBasisChangeValue?: string;
engines?: string[];
+
+ hasBeenResized?: boolean;
+ hasBeenRecategorized?: boolean;
+ hasLegalBasisChanged?: boolean;
+ hasBeenForced?: boolean;
+ hasBeenRemovedByManualOverride?: boolean;
}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.html
similarity index 69%
rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.html
rename to apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.html
index 766e23aa6..01bdc134e 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.html
@@ -1,15 +1,19 @@
+
+
+
+
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.scss
similarity index 85%
rename from apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.scss
rename to apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.scss
index c731a1878..d8356a43f 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.scss
@@ -1,5 +1,12 @@
@use '../../../../../../../assets/styles/variables';
+:host {
+ display: flex;
+ position: absolute;
+ top: 6px;
+ right: 8px;
+}
+
.popover {
width: 260px;
padding: 10px;
@@ -44,6 +51,10 @@
margin-right: 8px;
}
}
+
+ &:not(:last-child) {
+ margin-right: 2px;
+ }
}
mat-icon {
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.ts
new file mode 100644
index 000000000..745b6212a
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-details/annotation-details.component.ts
@@ -0,0 +1,89 @@
+import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { AnnotationWrapper } from '@models/file/annotation.wrapper';
+import { TranslateService } from '@ngx-translate/core';
+import { annotationChangesTranslations } from '../../../../../../translations/annotation-changes-translations';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+
+interface Engine {
+ readonly icon: string;
+ readonly description: string;
+ readonly show: boolean;
+}
+
+const Engines = {
+ DICTIONARY: 'DICTIONARY',
+ NER: 'NER',
+ RULE: 'RULE',
+} as const;
+
+type EngineName = keyof typeof Engines;
+
+@Component({
+ selector: 'redaction-annotation-details',
+ templateUrl: './annotation-details.component.html',
+ styleUrls: ['./annotation-details.component.scss'],
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AnnotationDetailsComponent implements OnChanges {
+ @Input() annotation: AnnotationWrapper;
+
+ isPopoverOpen = false;
+ hasEnginesToShow: boolean;
+ engines: readonly Engine[];
+
+ hasChangesToShow: boolean;
+ changesTooltip: string;
+
+ constructor(private readonly _translateService: TranslateService) {}
+
+ ngOnChanges(changes: SimpleChanges) {
+ if (changes.annotation) {
+ this._updateChanges();
+ this._updateEngines();
+ }
+ }
+
+ private _updateChanges(): void {
+ const changesProperties = [
+ 'hasBeenResized',
+ 'hasBeenRecategorized',
+ 'hasLegalBasisChanged',
+ 'hasBeenForced',
+ 'hasBeenRemovedByManualOverride',
+ ];
+ const changes = changesProperties.filter(key => this.annotation[key]);
+ const header = this._translateService.instant(_('annotation-changes.header'));
+ const details = changes
+ .map(change => this._translateService.instant(annotationChangesTranslations[change]))
+ .map(change => `• ${change}`);
+ this.changesTooltip = [header, ...details].join('\n');
+
+ this.hasChangesToShow = changes.length > 0;
+ }
+
+ private _updateEngines(): void {
+ this.engines = [
+ {
+ icon: 'red:dictionary',
+ description: this._translateService.instant('annotation-engines.dictionary', { isHint: this.annotation.hint }),
+ show: this._isBasedOn(Engines.DICTIONARY),
+ },
+ {
+ icon: 'red:ai',
+ description: this._translateService.instant('annotation-engines.ner'),
+ show: this._isBasedOn(Engines.NER),
+ },
+ {
+ icon: 'red:rule',
+ description: this._translateService.instant('annotation-engines.rule', { rule: this.annotation.legalBasisValue }),
+ show: this._isBasedOn(Engines.RULE),
+ },
+ ];
+
+ this.hasEnginesToShow = this.engines.length && this.engines.some(source => source.show);
+ }
+
+ private _isBasedOn(engineName: EngineName) {
+ return !!this.annotation.engines?.includes(engineName);
+ }
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.ts
deleted file mode 100644
index 434b1dd03..000000000
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-source/annotation-source.component.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { OnChange } from '@iqser/common-ui';
-import { TranslateService } from '@ngx-translate/core';
-
-interface Engine {
- readonly icon: string;
- readonly description: string;
- readonly show: boolean;
-}
-
-const Engines = {
- DICTIONARY: 'DICTIONARY',
- NER: 'NER',
- RULE: 'RULE',
-} as const;
-
-type EngineName = keyof typeof Engines;
-
-@Component({
- selector: 'redaction-annotation-source',
- templateUrl: './annotation-source.component.html',
- styleUrls: ['./annotation-source.component.scss'],
- changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class AnnotationSourceComponent {
- @Input()
- @OnChange('updateEngines')
- annotation: AnnotationWrapper;
-
- isPopoverOpen = false;
- engines: readonly Engine[];
-
- constructor(private readonly _translateService: TranslateService) {}
-
- get hasEnginesToShow(): boolean {
- return this.engines.length && this.engines.some(source => source.show);
- }
-
- updateEngines(): void {
- this.engines = [
- {
- icon: 'red:dictionary',
- description: this._translateService.instant('annotation-engines.dictionary', { isHint: this.annotation.hint }),
- show: this._isBasedOn(Engines.DICTIONARY),
- },
- {
- icon: 'red:ai',
- description: this._translateService.instant('annotation-engines.ner'),
- show: this._isBasedOn(Engines.NER),
- },
- {
- icon: 'red:rule',
- description: this._translateService.instant('annotation-engines.rule', { rule: this.annotation.legalBasisValue }),
- show: this._isBasedOn(Engines.RULE),
- },
- ];
- }
-
- private _isBasedOn(engineName: EngineName) {
- return !!this.annotation.engines?.includes(engineName);
- }
-}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html
index b4a0acb70..368df6874 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.html
@@ -4,8 +4,8 @@
[attr.annotation-id]="annotation.id"
[attr.annotation-page]="activeViewerPage"
[class.active]="isSelected(annotation.annotationId)"
- [class.multi-select-active]="multiSelectService.active$ | async"
[class.help-mode]="helpModeService.isHelpModeActive$ | async"
+ [class.multi-select-active]="multiSelectService.active$ | async"
class="annotation-wrapper"
>
@@ -59,5 +59,5 @@
-
+