From 44bda088349dadbe624a05dced06d52f69f80452 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Tue, 6 Feb 2024 13:47:29 +0200
Subject: [PATCH] RED-7296: implemented rectangle deletion by pressing esc.

---
 .../manual-annotation-dialog.component.ts     |  9 ++++++++
 .../file-preview-screen.component.ts          | 16 +++++++++++++
 .../pdf-viewer/services/pdf-viewer.service.ts | 23 ++++++++++++++-----
 .../app/modules/pdf-viewer/utils/constants.ts |  1 +
 4 files changed, 43 insertions(+), 6 deletions(-)

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..ef23b5c70 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
@@ -11,6 +11,7 @@ import { JustificationsService } from '@services/entity-services/justifications.
 import { Roles } from '@users/roles';
 import { firstValueFrom } from 'rxjs';
 import { ManualRedactionService } from '../../services/manual-redaction.service';
+import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-manager.service';
 
 export interface LegalBasisOption {
     label?: string;
@@ -40,6 +41,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
         activeDossiersService: ActiveDossiersService,
         private readonly _dictionaryService: DictionaryService,
         protected readonly _dialogRef: MatDialogRef<ManualAnnotationDialogComponent>,
+        private readonly _annotationManager: REDAnnotationManager,
         @Inject(MAT_DIALOG_DATA) readonly data: { manualRedactionEntryWrapper: ManualRedactionEntryWrapper; dossierId: string; file: File },
     ) {
         super(_dialogRef);
@@ -111,6 +113,13 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
         }
     }
 
+    close() {
+        super.close();
+        if (this.isRectangle) {
+            this._annotationManager.delete(this._annotationManager.selected[0].Id);
+        }
+    }
+
     #getRectangles() {
         const quads = this.data.manualRedactionEntryWrapper.manualRedactionEntry.positions.find(a => !!a);
         const value: string = this.form.get('multiplePages').value.replace(/[^0-9-,]/g, '');
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 30a31b8cc..cf276f786 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
@@ -181,6 +181,8 @@ export class FilePreviewScreenComponent
                 }
             }
         });
+
+        this.#handleDeleteRectangleOnEsc();
     }
 
     get changed() {
@@ -586,6 +588,20 @@ export class FilePreviewScreenComponent
         return newAnnotations;
     }
 
+    #handleDeleteRectangleOnEsc() {
+        this.pdf.instance.UI.hotkeys.on('esc', e => {
+            e.preventDefault();
+            if (!!this._annotationManager.selected[0]) {
+                const doesHaveWrapper = this._fileDataService.find(this._annotationManager.selected[0]?.Id);
+                if (!doesHaveWrapper) {
+                    this._annotationManager.delete(this._annotationManager.selected[0]?.Id);
+                } else {
+                    this._annotationManager.deselect(this._annotationManager.selected[0]?.Id);
+                }
+            }
+        });
+    }
+
     #rebuildFilters() {
         const startTime = new Date().getTime();
 
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
index c42037705..83cab4409 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
@@ -266,12 +266,18 @@ export class PdfViewer {
     }
 
     #listenForEsc() {
-        this.#instance.UI.hotkeys.on('esc', e => {
-            e.preventDefault();
-            if (this.#isElementActive('searchPanel') && !this._annotationManager.resizingAnnotationId) {
-                this.#focusViewer();
-                this.deactivateSearch();
-            }
+        this.#instance.UI.hotkeys.on('esc', {
+            keydown: e => {
+                e.preventDefault();
+            },
+            keyup: e => {
+                e.preventDefault();
+                if (this.#isElementActive('searchPanel') && !this._annotationManager.resizingAnnotationId) {
+                    this.#focusViewer();
+                    this.deactivateSearch();
+                }
+                this.#clickSelectToolButton();
+            },
         });
     }
 
@@ -382,4 +388,9 @@ export class PdfViewer {
         this.instance.UI.iframeWindow.document.getElementById('SearchPanel__input').blur();
         this.instance.UI.iframeWindow.focus();
     }
+
+    #clickSelectToolButton() {
+        const selectButton = this.instance.UI.iframeWindow.document.querySelector('[data-element="selectToolButton"]') as HTMLElement;
+        selectButton.click();
+    }
 }
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts b/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts
index 33ed36234..6479fd377 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts
@@ -65,6 +65,7 @@ export const DISABLED_HOTKEYS = [
     'SPACE',
     'UP',
     'DOWN',
+    'ESCAPE',
     'R',
     'P',
     'A',