From 5effc8b8c3b6d45ef1c87369029d8989ae36100b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 14 Mar 2024 07:10:05 +0100
Subject: [PATCH] OZG-5009 inject dialog data via cdk injection token
---
.../vorgang-detail-bescheiden.component.spec.ts | 12 ++++++------
.../vorgang-detail-bescheiden.component.ts | 13 +++++--------
2 files changed, 11 insertions(+), 14 deletions(-)
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 27efdfe3a1..a90f0deb26 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 f4fb2cc67c..a985aa0722 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);
}
--
GitLab