OZG-5976 refactor

alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.service.ts

@@ -10,6 +10,7 @@ export class OzgcloudDialogService {
   readonly WIZARD_DIALOG_CONFIG: DialogConfig = {
     width: '1000px',
     restoreFocus: false,
+    disableClose: true,
   };
 
   constructor(private dialog: Dialog) {}

alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts

@@ -128,12 +128,6 @@ describe('VorgangDetailBescheidenComponent', () => {
   });
 
   describe('handleEscapeKey', () => {
-    it('should set dialogRef.disableClose to true', () => {
-      component.handleEscapeKey();
-
-      expect(component.dialogRef.disableClose).toBeTruthy();
-    });
-
     it('should subscribe to dialogRef.keydownEvents', () => {
       component.handleEscapeKey();
 

alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts

@@ -4,7 +4,7 @@ import { OzgcloudDialogService } from '@alfa-client/ui';
 import { VorgangService } from '@alfa-client/vorgang-shared';
 import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
 import { Component, Inject, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';
-import { Subscription } from 'rxjs';
+import { Subscription, filter } from 'rxjs';
 import { BescheidenFormService } from './bescheiden.formservice';
 import { BescheidenDialogData } from './bescheiden.model';
 import { VorgangDetailBescheidenAbbrechenDialogComponent } from './vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-abbrechen-dialog/vorgang-detail-bescheiden-abbrechen-dialog.component';
@@ -40,12 +40,9 @@ export class VorgangDetailBescheidenComponent implements OnDestroy, OnInit {
   }
 
   handleEscapeKey(): void {
-    this.dialogRef.disableClose = true;
-    this.keydownEventsSubscription = this.dialogRef.keydownEvents.subscribe((event) => {
-      if (event.key === 'Escape') {
-        this.cancelWizard();
-      }
-    });
+    this.keydownEventsSubscription = this.dialogRef.keydownEvents
+      .pipe(filter((event) => event.key === 'Escape'))
+      .subscribe(() => this.cancelWizard());
   }
 
   ngOnDestroy(): void {