[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
This commit is contained in:
Sushmitha V
2021-05-14 21:02:23 +05:30
committed by GitHub
parent afd3a7c93d
commit 68db27bc91
2 changed files with 14 additions and 2 deletions

View File

@@ -94,6 +94,10 @@ describe('AspectListDialogComponent', () => {
let aspectListService: AspectListService; let aspectListService: AspectListService;
let nodeService: NodesApiService; let nodeService: NodesApiService;
let data: AspectListDialogComponentData; let data: AspectListDialogComponentData;
const event = new KeyboardEvent('keydown', {
bubbles: true,
keyCode: 27
} as KeyboardEventInit );
describe('Without passing node id', () => { describe('Without passing node id', () => {
@@ -116,7 +120,7 @@ describe('AspectListDialogComponent', () => {
{ {
provide: MatDialogRef, provide: MatDialogRef,
useValue: { useValue: {
keydownEvents: () => of(null), keydownEvents: () => of(event),
backdropClick: () => of(null), backdropClick: () => of(null),
close: jasmine.createSpy('close') close: jasmine.createSpy('close')
} }
@@ -255,7 +259,7 @@ describe('AspectListDialogComponent', () => {
provide: MatDialogRef, provide: MatDialogRef,
useValue: { useValue: {
close: jasmine.createSpy('close'), close: jasmine.createSpy('close'),
keydownEvents: () => of(null), keydownEvents: () => of(event),
backdropClick: () => of(null) backdropClick: () => of(null)
} }
} }

View File

@@ -45,6 +45,14 @@ export class AspectListDialogComponent implements OnInit {
this.dialog.backdropClick().subscribe(() => { this.dialog.backdropClick().subscribe(() => {
this.close(); this.close();
}); });
this.dialog.keydownEvents().subscribe(event => {
// Esc
if (event.keyCode === 27) {
event.preventDefault();
event.stopImmediatePropagation();
this.close();
}
});
} }
onValueChanged(aspectList: string[]) { onValueChanged(aspectList: string[]) {