From 68db27bc918396ff76c3218ff6f6d4ca4cd3d8a1 Mon Sep 17 00:00:00 2001
From: Sushmitha V <58967843+Sushmitha100796@users.noreply.github.com>
Date: Fri, 14 May 2021 21:02:23 +0530
Subject: [PATCH] [ACA-4422] Resolved - Edit Aspects Dialog should close when
 pressing ESC (#7022)

* [ACA-4422] Resolved - Edit Aspects Dialog should close when pressing ESC

* [ACA-4422] Fixed unit test failure

* [ACA-4422] Resolved unit test errors
---
 .../lib/aspect-list/aspect-list-dialog.component.spec.ts  | 8 ++++++--
 .../src/lib/aspect-list/aspect-list-dialog.component.ts   | 8 ++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts
index 02a5d40c95..2728ef4616 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts
+++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts
@@ -94,6 +94,10 @@ describe('AspectListDialogComponent', () => {
     let aspectListService: AspectListService;
     let nodeService: NodesApiService;
     let data: AspectListDialogComponentData;
+    const event = new KeyboardEvent('keydown', {
+        bubbles: true,
+        keyCode: 27
+    } as KeyboardEventInit );
 
     describe('Without passing node id', () => {
 
@@ -116,7 +120,7 @@ describe('AspectListDialogComponent', () => {
                     {
                         provide: MatDialogRef,
                         useValue: {
-                            keydownEvents: () => of(null),
+                            keydownEvents: () => of(event),
                             backdropClick: () => of(null),
                             close: jasmine.createSpy('close')
                         }
@@ -255,7 +259,7 @@ describe('AspectListDialogComponent', () => {
                         provide: MatDialogRef,
                         useValue: {
                             close: jasmine.createSpy('close'),
-                            keydownEvents: () => of(null),
+                            keydownEvents: () => of(event),
                             backdropClick: () => of(null)
                         }
                     }
diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts
index fb2bac4c35..b2062d3656 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts
+++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts
@@ -45,6 +45,14 @@ export class AspectListDialogComponent implements OnInit {
         this.dialog.backdropClick().subscribe(() => {
             this.close();
         });
+        this.dialog.keydownEvents().subscribe(event => {
+            // Esc
+            if (event.keyCode === 27) {
+                event.preventDefault();
+                event.stopImmediatePropagation();
+                this.close();
+            }
+        });
     }
 
     onValueChanged(aspectList: string[]) {