diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts index 27efdfe3a12c687a96836d03f66d955f3b6021aa..a90f0deb26966b8ff3527b381cdb5510e9bfe544 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts @@ -1,6 +1,6 @@ import { BescheidService } from '@alfa-client/bescheid-shared'; import { mock, useFromMock } from '@alfa-client/test-utils'; -import { DialogRef } from '@angular/cdk/dialog'; +import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms'; import { MatIcon } from '@angular/material/icon'; @@ -24,11 +24,7 @@ describe('VorgangDetailBescheidenComponent', () => { new UntypedFormBuilder(), useFromMock(bescheidService), ); - - const dialogRef = { - ...mock(DialogRef), - config: { data: { vorgangWithEingangResource, bescheidDraftResource } }, - }; + const dialogRef = mock(DialogRef); beforeEach(async () => { TestBed.overrideComponent(VorgangDetailBescheidenComponent, { @@ -61,6 +57,10 @@ describe('VorgangDetailBescheidenComponent', () => { provide: DialogRef, useValue: dialogRef, }, + { + provide: DIALOG_DATA, + useValue: { vorgangWithEingangResource, bescheidDraftResource }, + }, ], imports: [ReactiveFormsModule], }).compileComponents(); diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts index f4fb2cc67cf83cca0570129a0f4e652ef89aa4ee..a985aa07223c5c926d6c0f8324edd80cd675791c 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts +++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts @@ -1,6 +1,6 @@ import { BescheidResource } from '@alfa-client/bescheid-shared'; -import { DialogRef } from '@angular/cdk/dialog'; -import { Component, OnInit } from '@angular/core'; +import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog'; +import { Component, Inject, OnInit } from '@angular/core'; import { BescheidenFormService } from './bescheiden.formservice'; import { BescheidenDialogData } from './bescheiden.model'; @@ -17,16 +17,13 @@ export class VorgangDetailBescheidenComponent implements OnInit { constructor( public dialogRef: DialogRef, public formService: BescheidenFormService, + @Inject(DIALOG_DATA) private readonly dialogData: BescheidenDialogData, ) { - this.bescheidDraftResource = ( - dialogRef.config.data as BescheidenDialogData - ).bescheidDraftResource; + this.bescheidDraftResource = dialogData.bescheidDraftResource; } ngOnInit(): void { - this.formService.setVorgangWithEingangResource( - this.dialogRef.config.data.vorgangWithEingangResource, - ); + this.formService.setVorgangWithEingangResource(this.dialogData.vorgangWithEingangResource); this.formService.patchValues(this.bescheidDraftResource); }