From 5be720bc7e558dbfebf49f7ce8bf92a05e8b992a Mon Sep 17 00:00:00 2001
From: Dan Percic <dan.percic.ext@knecon.com>
Date: Fri, 15 Sep 2023 14:43:07 +0300
Subject: [PATCH] DM-473 revert to original behaviour

---
 .../add-annotation-dialog.component.html               |  2 +-
 .../manual-annotation-dialog.component.ts              |  2 ++
 .../redact-text-dialog.component.html                  |  6 +-----
 .../file-preview/file-preview-screen.component.ts      |  3 ++-
 .../modules/file-preview/services/pdf-proxy.service.ts | 10 +---------
 apps/red-ui/src/app/utils/functions.ts                 | 10 +++++++++-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
index 97a163b1a..b00923b5d 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component.html
@@ -5,7 +5,7 @@
         <div class="dialog-content redaction">
             <div class="iqser-input-group w-450">
                 <label [translate]="'add-annotation.dialog.content.selected-text'" class="selected-text"></label>
-                <span [innerHTML]="form.controls.selectedText.value" class="use-backslash-n-as-line-break"></span>
+                <span [innerHTML]="form.controls.selectedText.value"></span>
             </div>
 
             <div class="iqser-input-group required w-450">
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index 829047265..53595cb9b 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -9,6 +9,7 @@ import { ActiveDossiersService } from '@services/dossiers/active-dossiers.servic
 import { DictionaryService } from '@services/entity-services/dictionary.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Roles } from '@users/roles';
+import { removeHyphensAndSpecialChars } from '@utils/functions';
 import { firstValueFrom } from 'rxjs';
 import { ManualRedactionService } from '../../services/manual-redaction.service';
 
@@ -185,6 +186,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
         addRedactionRequest.value = addRedactionRequest.rectangle
             ? this.form.get('classification').value
             : this.form.get('selectedText').value;
+        addRedactionRequest.value = removeHyphensAndSpecialChars(addRedactionRequest.value);
     }
 
     #selectReason() {
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
index 150c83ee9..048b49c85 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.html
@@ -14,11 +14,7 @@
                 ></label>
 
                 <div [ngClass]="isEditingSelectedText ? 'flex relative' : 'flex-align-items-center'" class="fixed-height">
-                    <span
-                        *ngIf="!isEditingSelectedText"
-                        [innerHTML]="form.controls.selectedText.value"
-                        class="use-backslash-n-as-line-break"
-                    ></span>
+                    <span *ngIf="!isEditingSelectedText" [innerHTML]="form.controls.selectedText.value"></span>
 
                     <textarea
                         *ngIf="isEditingSelectedText"
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
index cf56904e0..27edbab0c 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@@ -52,7 +52,7 @@ import JSZip from 'jszip';
 import { NGXLogger } from 'ngx-logger';
 import { combineLatest, first, firstValueFrom, of, pairwise } from 'rxjs';
 import { catchError, filter, map, startWith, switchMap, tap } from 'rxjs/operators';
-import { byId, byPage, download, handleFilterDelta, hasChanges } from '../../utils';
+import { byId, byPage, download, handleFilterDelta, hasChanges, removeHyphensAndSpecialChars } from '../../utils';
 import { AnnotationDrawService } from '../pdf-viewer/services/annotation-draw.service';
 import { REDAnnotationManager } from '../pdf-viewer/services/annotation-manager.service';
 import { REDDocumentViewer } from '../pdf-viewer/services/document-viewer.service';
@@ -533,6 +533,7 @@ export class FilePreviewScreenComponent
         }
 
         const hint = manualRedactionEntryWrapper.type === ManualRedactionEntryTypes.HINT;
+        result.redaction.value = removeHyphensAndSpecialChars(result.redaction.value);
         const add$ = this._manualRedactionService.addAnnotation([result.redaction], this.dossierId, this.fileId, {
             hint,
             dictionaryLabel: result.dictionary?.label,
diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
index a63e2d645..4c190375d 100644
--- a/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
+++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-proxy.service.ts
@@ -266,19 +266,11 @@ export class PdfProxyService {
             }
         }
 
-        entry.value = this.#formatSelectedText(text);
+        entry.value = text;
         entry.rectangle = !text;
         return entry;
     }
 
-    #formatSelectedText(text: string): string {
-        return text?.replace(
-            // eslint-disable-next-line no-control-regex,max-len
-            /([^\s\d-]{2,})[-\u00AD]\u000D|[\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
-            '$1',
-        );
-    }
-
     #deactivateMultiSelect() {
         this._logger.info('[PDF] Deactivating multi-select');
         this._multiSelectService.deactivate();
diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts
index 83190316a..df12eb1d3 100644
--- a/apps/red-ui/src/app/utils/functions.ts
+++ b/apps/red-ui/src/app/utils/functions.ts
@@ -1,5 +1,5 @@
-import type { List } from '@iqser/common-ui/lib/utils';
 import { ITrackable } from '@iqser/common-ui';
+import type { List } from '@iqser/common-ui/lib/utils';
 import type { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Dayjs } from 'dayjs';
 
@@ -133,3 +133,11 @@ export function calcTextWidthInPixels(text: string): number {
 
     return width;
 }
+
+export function removeHyphensAndSpecialChars(text: string): string {
+    return text?.replace(
+        // eslint-disable-next-line no-control-regex,max-len
+        /([^\s\d-]{2,})[-\u00AD]\u000A\u000D|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]/gi,
+        '$1',
+    );
+}