Merge branch 'RED-5108' into 'master'

RED-5108: added redact functionality for hint images.

See merge request redactmanager/red-ui!438

apps/red-ui/src/app/models/file/annotation-permissions.utils.ts

@@ -8,7 +8,10 @@ export const canForceHint = (annotation: AnnotationWrapper, canAddRedaction: boo
     canAddRedaction && annotation.isIgnoredHint && !annotation.pending;
 
 export const canForceRedaction = (annotation: AnnotationWrapper, canAddRedaction: boolean) =>
-    canAddRedaction && annotation.isSkipped && !annotation.isFalsePositive && !annotation.pending;
+    canAddRedaction &&
+    (annotation.isSkipped || (annotation.IMAGE_HINT && !annotation.hasBeenForcedRedaction)) &&
+    !annotation.isFalsePositive &&
+    !annotation.pending;
 
 export const canAcceptRecommendation = (annotation: AnnotationWrapper) => annotation.isRecommendation && !annotation.pending;
 

apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html

@@ -108,7 +108,7 @@
             [tooltip]="'annotation-actions.force-redaction.label' | translate"
             [type]="buttonType"
             [buttonId]="annotations.length === 1 ? 'annotation-' + annotations[0].id + '-force_redaction' : 'annotations-force_redaction'"
-            icon="iqser:thumb-up"
+            [icon]="isImageHint ? 'red:pdftron-action-add-redaction' : 'iqser:thumb-up'"
         ></iqser-circle-button>
 
         <iqser-circle-button

apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts

@@ -58,6 +58,10 @@ export class AnnotationActionsComponent implements OnChanges {
         return this.#annotations;
     }
 
+    get isImageHint(): boolean {
+        return this.annotations.every(annotation => annotation.IMAGE_HINT);
+    }
+
     @Input()
     set annotations(annotations: AnnotationWrapper[]) {
         this.#annotations = annotations.filter(a => a !== undefined);

apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html

@@ -8,6 +8,7 @@
                 [columns]="tableColumns"
                 [data]="tableData"
                 [staticColumns]="true"
+                *ngIf="!isImageHint"
             ></redaction-selected-annotations-table>
             <div *ngIf="!isHintDialog && !isDocumine" class="iqser-input-group required w-400">
                 <label [translate]="'manual-annotation.dialog.content.reason'"></label>

apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts

@@ -53,6 +53,10 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
         this.form = this.#getForm();
     }
 
+    get isImageHint() {
+        return this._data.annotations.every(annotation => annotation.IMAGE_HINT);
+    }
+
     get isHintDialog() {
         return this._data.hint;
     }

apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts

@@ -81,8 +81,11 @@ export class PdfAnnotationActionsService {
         }
 
         if (permissions.canForceRedaction && annotationChangesAllowed) {
-            const forceRedactionButton = this.#getButton('thumb-up', _('annotation-actions.force-redaction.label'), () =>
+            const isImageHint = annotations.every(annotation => annotation.IMAGE_HINT);
-                this.#annotationActionsService.forceAnnotation(annotations),
+            const forceRedactionButton = this.#getButton(
+                isImageHint ? 'general/pdftron-action-add-redaction' : 'thumb-up',
+                _('annotation-actions.force-redaction.label'),
+                () => this.#annotationActionsService.forceAnnotation(annotations),
             );
             availableActions.push(forceRedactionButton);
         }

apps/red-ui/src/app/modules/icons/icons.module.ts

@@ -86,6 +86,7 @@ export class IconsModule {
             'visibility',
             'visibility-off',
             'warning',
+            'pdftron-action-add-redaction',
         ];
 
         for (const icon of icons) {

libs/red-domain/src/lib/files/super-types.ts

@@ -88,7 +88,7 @@ export const SuperTypeMapper: Record<EntityType, Record<EntryState, (entry: IEnt
         [EntryStates.PENDING]: entry => resolveRedactionType(entry),
     },
     [EntityTypes.IMAGE_HINT]: {
-        [EntryStates.APPLIED]: wrongSuperTypeHandler,
+        [EntryStates.APPLIED]: entry => resolveRedactionType(entry),
         [EntryStates.SKIPPED]: () => SuperTypes.Hint,
         [EntryStates.IGNORED]: () => SuperTypes.IgnoredHint,
         [EntryStates.REMOVED]: wrongSuperTypeHandler,