Fix MAT_DIALOG_DATA injection and variable references in 4 components

Co-authored-by: renemadsen <[email protected]>

Author: Copilot

eform-client/src/app/plugins/modules/backend-configuration-pn/components/area-rule-entity-list-modal/area-rule-entity-list-modal.component.ts

@@ -22,6 +22,7 @@ export class AreaRuleEntityListModalComponent implements OnInit, OnDestroy {
   public dialog = inject(MatDialog);
   private overlay = inject(Overlay);
   public dialogRef = inject(MatDialogRef<AreaRuleEntityListModalComponent>);
+  private groupId = inject<number | undefined>(MAT_DIALOG_DATA);
 
   entityListChanged: EventEmitter<Array<EntityItemModel>> = new EventEmitter<Array<EntityItemModel>>();
   entityList: Array<EntityItemModel> = [];
@@ -32,8 +33,8 @@ export class AreaRuleEntityListModalComponent implements OnInit, OnDestroy {
 
 
   ngOnInit() {
-    if (groupId) {
-      this.getEntitySelectableGroupSub$ = this.entitySelectService.getEntitySelectableGroup(groupId)
+    if (this.groupId) {
+      this.getEntitySelectableGroupSub$ = this.entitySelectService.getEntitySelectableGroup(this.groupId)
         .subscribe(data => {
           if (data && data.success && data.model) {
             this.entityList = [...data.model.entityGroupItemLst];

eform-client/src/app/plugins/modules/backend-configuration-pn/components/area-rule-plan-modal/area-rule-plan-modal.component.ts

@@ -116,7 +116,7 @@ export class AreaRulePlanModalComponent implements OnInit {
 
 
   ngOnInit() {
-    this.setData(model.areaRule, model.propertyId, model.area, model.areaRulePlan);
+    this.setData(this.model.areaRule, this.model.propertyId, this.model.area, this.model.areaRulePlan);
 
     this.repeatTypeDay = R.map(x => {
       return {name: x === 1 ? this.translate.instant('Every') : x.toString(), id: x};

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-actions/task-management-create-show-modal/task-management-create-show-modal.component.ts

@@ -39,6 +39,7 @@ export class TaskManagementCreateShowModalComponent
   private overlay = inject(Overlay);
   private taskManagementService = inject(BackendConfigurationPnTaskManagementService);
   public dialogRef = inject(MatDialogRef<TaskManagementCreateShowModalComponent>);
+  private workOrderCase = inject<WorkOrderCaseForReadModel | undefined>(MAT_DIALOG_DATA);
 
   @Output() taskCreated: EventEmitter<void> = new EventEmitter<void>();
   propertyAreas: string[] = [];
@@ -87,26 +88,26 @@ export class TaskManagementCreateShowModalComponent
       }, Validators.required),
     });
     this.getProperties();
-    if (workOrderCase) {
-      this.currentWorkOrderCase = workOrderCase;
-      this.getPropertyAreas(workOrderCase.propertyId);
-      this.getSites(workOrderCase.propertyId);
+    if (this.workOrderCase) {
+      this.currentWorkOrderCase = this.workOrderCase;
+      this.getPropertyAreas(this.workOrderCase.propertyId);
+      this.getSites(this.workOrderCase.propertyId);
       this.workOrderCaseForm.patchValue(
         {
-          propertyId: workOrderCase.propertyId,
-          areaName: workOrderCase.areaName,
+          propertyId: this.workOrderCase.propertyId,
+          areaName: this.workOrderCase.areaName,
           // assignedTo: workOrderCase.assignedSiteId,
-          descriptionTask: workOrderCase.description.replace(/<br\s*\/?>/gi, '\n'),
-          priority: workOrderCase.priority,
-          caseStatusEnum: workOrderCase.caseStatusEnum,
+          descriptionTask: this.workOrderCase.description.replace(/<br\s*\/?>/gi, '\n'),
+          priority: this.workOrderCase.priority,
+          caseStatusEnum: this.workOrderCase.caseStatusEnum,
         },
         { emitEvent: false }
       );
       // this.workOrderCaseForm.disable({ emitEvent: false });
       this.workOrderCaseForm.controls['propertyId'].disable({ emitEvent: false });
       this.workOrderCaseForm.controls['areaName'].disable({ emitEvent: false });
-      this.description = workOrderCase.description;
-      workOrderCase.pictureNames.forEach((fileName) => {
+      this.description = this.workOrderCase.description;
+      this.workOrderCase.pictureNames.forEach((fileName) => {
         this.imageSubs$.push(
           this.imageService.getImage(fileName).subscribe((blob) => {
             const imageUrl = URL.createObjectURL(blob);

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-actions/task-tracker-create-show-modal/task-tracker-create-show-modal.component.ts

@@ -39,6 +39,7 @@ export class TaskTrackerCreateShowModalComponent
   private overlay = inject(Overlay);
   private taskManagementService = inject(BackendConfigurationPnTaskManagementService);
   public dialogRef = inject(MatDialogRef<TaskTrackerCreateShowModalComponent>);
+  private workOrderCase = inject<WorkOrderCaseForReadModel | undefined>(MAT_DIALOG_DATA);
 
   @Output() taskCreated: EventEmitter<void> = new EventEmitter<void>();
   propertyAreas: string[] = [];
@@ -87,26 +88,26 @@ export class TaskTrackerCreateShowModalComponent
       }, Validators.required),
     });
     this.getProperties();
-    if (workOrderCase) {
-      this.currentWorkOrderCase = workOrderCase;
-      this.getPropertyAreas(workOrderCase.propertyId);
-      this.getSites(workOrderCase.propertyId);
+    if (this.workOrderCase) {
+      this.currentWorkOrderCase = this.workOrderCase;
+      this.getPropertyAreas(this.workOrderCase.propertyId);
+      this.getSites(this.workOrderCase.propertyId);
       this.workOrderCaseForm.patchValue(
         {
-          propertyId: workOrderCase.propertyId,
-          areaName: workOrderCase.areaName,
+          propertyId: this.workOrderCase.propertyId,
+          areaName: this.workOrderCase.areaName,
           // assignedTo: workOrderCase.assignedSiteId,
-          descriptionTask: workOrderCase.description,
-          priority: workOrderCase.priority,
-          caseStatusEnum: workOrderCase.caseStatusEnum,
+          descriptionTask: this.workOrderCase.description,
+          priority: this.workOrderCase.priority,
+          caseStatusEnum: this.workOrderCase.caseStatusEnum,
         },
         { emitEvent: false }
       );
       // this.workOrderCaseForm.disable({ emitEvent: false });
       this.workOrderCaseForm.controls['propertyId'].disable({ emitEvent: false });
       this.workOrderCaseForm.controls['areaName'].disable({ emitEvent: false });
-      this.description = workOrderCase.description;
-      workOrderCase.pictureNames.forEach((fileName) => {
+      this.description = this.workOrderCase.description;
+      this.workOrderCase.pictureNames.forEach((fileName) => {
         this.imageSubs$.push(
           this.imageService.getImage(fileName).subscribe((blob) => {
             const imageUrl = URL.createObjectURL(blob);