Merge pull request #1176 from microting/copilot/migrate-components-to-inject-pattern

Migrate from constructor-based DI to inject() pattern

Author: renemadsen

eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-add-site-modal/settings-add-site-modal.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Inject, OnDestroy, OnInit} from '@angular/core';
+import {Component, EventEmitter, OnDestroy, OnInit, inject} from '@angular/core';
 import {SiteNameDto} from 'src/app/common/models';
 import {AutoUnsubscribe} from 'ngx-auto-unsubscribe';
 import {Subscription} from 'rxjs';
@@ -7,26 +7,26 @@ import {eqBy, prop, symmetricDifferenceWith} from 'ramda';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 
 @AutoUnsubscribe()
-@Component({
-    selector: 'app-settings-add-site-modal',
-    templateUrl: './settings-add-site-modal.component.html',
-    styleUrls: ['./settings-add-site-modal.component.scss'],
-    standalone: false
+@Component({
+    selector: 'app-settings-add-site-modal',
+    templateUrl: './settings-add-site-modal.component.html',
+    styleUrls: ['./settings-add-site-modal.component.scss'],
+    standalone: false
 })
 export class SettingsAddSiteModalComponent implements OnInit, OnDestroy {
+  private settingsService = inject(WorkflowPnSettingsService);
+  public dialogRef = inject(MatDialogRef<SettingsAddSiteModalComponent>);
+  private model = inject<{ sites: SiteNameDto[], assignedSites: SiteNameDto[] }>(MAT_DIALOG_DATA);
+
   siteAdded: EventEmitter<void> = new EventEmitter<void>();
   availableSites: any[] = [];
   selectedSiteId: number;
   addSiteSub$: Subscription;
 
-  constructor(
-    private settingsService: WorkflowPnSettingsService,
-    public dialogRef: MatDialogRef<SettingsAddSiteModalComponent>,
-    @Inject(MAT_DIALOG_DATA) model: { sites: SiteNameDto[], assignedSites: SiteNameDto[] }
-  ) {
+  constructor() {
     // Removing assigned sites from all sites by id
     const propEqual = eqBy(prop('siteUId'));
-    this.availableSites = symmetricDifferenceWith(propEqual, model.sites, model.assignedSites);
+    this.availableSites = symmetricDifferenceWith(propEqual, this.model.sites, this.model.assignedSites);
   }
 
   ngOnInit(): void {

eform-client/src/app/plugins/modules/workflow-pn/components/settings/settings-remove-site-modal/settings-remove-site-modal.component.ts

@@ -5,27 +5,28 @@ import {
   OnInit,
   Output,
   ViewChild,
+  inject
 } from '@angular/core';
 import { SiteNameDto } from 'src/app/common/models';
 import {WorkflowPnSettingsService} from '../../../services';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe';
 import { Subscription } from 'rxjs';
 
 @AutoUnsubscribe()
-@Component({
-    selector: 'app-settings-remove-site-modal',
-    templateUrl: './settings-remove-site-modal.component.html',
-    styleUrls: ['./settings-remove-site-modal.component.scss'],
-    standalone: false
+@Component({
+    selector: 'app-settings-remove-site-modal',
+    templateUrl: './settings-remove-site-modal.component.html',
+    styleUrls: ['./settings-remove-site-modal.component.scss'],
+    standalone: false
 })
 export class SettingsRemoveSiteModalComponent implements OnInit, OnDestroy {
+  private settingsService = inject(WorkflowPnSettingsService);
+
   @ViewChild('frame', { static: false }) frame;
   @Output() siteRemoved: EventEmitter<void> = new EventEmitter<void>();
   selectedSite: SiteNameDto = new SiteNameDto();
   removeSub$: Subscription;
 
-  constructor(private settingsService: WorkflowPnSettingsService) {}
-
   ngOnInit(): void {}
 
   show(site: SiteNameDto) {

eform-client/src/app/plugins/modules/workflow-pn/components/settings/workflow-folders-modal/workflow-folders-modal.component.ts

@@ -1,35 +1,35 @@
 import {
   Component,
   EventEmitter,
-  Inject,
   OnDestroy,
   OnInit,
+  inject
 } from '@angular/core';
 import { AuthService, FoldersService} from 'src/app/common/services';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe';
 import { FolderDto } from 'src/app/common/models';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 
 @AutoUnsubscribe()
-@Component({
-    selector: 'app-workflow-folders-modal',
-    templateUrl: './workflow-folders-modal.component.html',
-    styleUrls: ['./workflow-folders-modal.component.scss'],
-    standalone: false
+@Component({
+    selector: 'app-workflow-folders-modal',
+    templateUrl: './workflow-folders-modal.component.html',
+    styleUrls: ['./workflow-folders-modal.component.scss'],
+    standalone: false
 })
 export class WorkflowFoldersModalComponent implements OnInit, OnDestroy {
+  private folderService = inject(FoldersService);
+  private authService = inject(AuthService);
+  private model = inject<{folders: FolderDto[], selectedFolderId?: number}>(MAT_DIALOG_DATA);
+  public dialogRef = inject(MatDialogRef<WorkflowFoldersModalComponent>);
+
   folderSelected: EventEmitter<FolderDto> = new EventEmitter<FolderDto>();
   folders: FolderDto[] = [];
   selectedFolderId: number;
 
-  constructor(
-    private folderService: FoldersService,
-    private authService: AuthService,
-    @Inject(MAT_DIALOG_DATA) model: {folders: FolderDto[], selectedFolderId?: number},
-    public dialogRef: MatDialogRef<WorkflowFoldersModalComponent>,
-    ) {
-    this.folders = model.folders;
-    this.selectedFolderId = model.selectedFolderId;
+  constructor() {
+    this.folders = this.model.folders;
+    this.selectedFolderId = this.model.selectedFolderId;
   }
 
   ngOnInit() {

eform-client/src/app/plugins/modules/workflow-pn/components/settings/workflow-settings/workflow-settings.component.ts

@@ -3,6 +3,7 @@ import {
   EventEmitter,
   OnDestroy,
   OnInit, ViewChild,
+  inject
 } from '@angular/core';
 import {Router} from '@angular/router';
 import {AutoUnsubscribe} from 'ngx-auto-unsubscribe';
@@ -30,6 +31,14 @@ import {DeleteModalComponent} from 'src/app/common/modules/eform-shared/componen
     standalone: false
 })
 export class WorkflowSettingsComponent implements OnInit, OnDestroy {
+  private workflowPnSettingsService = inject(WorkflowPnSettingsService);
+  private router = inject(Router);
+  private foldersService = inject(FoldersService);
+  private sitesService = inject(SitesService);
+  public dialog = inject(MatDialog);
+  private overlay = inject(Overlay);
+  private translateService = inject(TranslateService);
+
   @ViewChild('addSiteModal') addSiteModal: SettingsAddSiteModalComponent;
   typeahead = new EventEmitter<string>();
   settingsModel: WorkflowSettingsModel = new WorkflowSettingsModel();
@@ -68,16 +77,8 @@ export class WorkflowSettingsComponent implements OnInit, OnDestroy {
     },
   ];
   siteSelectedSub$: Subscription;
-  constructor(
-    private workflowPnSettingsService: WorkflowPnSettingsService,
-    private router: Router,
-    private foldersService: FoldersService,
-    private sitesService: SitesService,
-    public dialog: MatDialog,
-    private overlay: Overlay,
-    private translateService: TranslateService,
-  ) {
-  }
+
+  
 
   ngOnInit() {
     this.getSettings();

eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/store/workflow-cases-state.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {tap} from 'rxjs';
 import {updateTableSort} from 'src/app/common/helpers';
 import {
@@ -18,15 +18,15 @@ import {
 
 @Injectable({providedIn: 'root'})
 export class WorkflowCasesStateService {
+  private store = inject(Store);
+  private service = inject(WorkflowPnCasesService);
+
   private selectWorkflowCasesPagination$ = this.store.select(selectWorkflowCasesPagination);
   private selectWorkflowCasesFilters$ = this.store.select(selectWorkflowCasesFilters);
   currentPagination: CommonPaginationState;
   currentFilters: WorkflowCasesFiltration;
 
-  constructor(
-    private store: Store,
-    private service: WorkflowPnCasesService,
-  ) {
+  constructor() {
     this.selectWorkflowCasesPagination$.subscribe((x) => this.currentPagination = x);
     this.selectWorkflowCasesFilters$.subscribe((x) => this.currentFilters = x);
   }

eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-delete/workflow-case-delete.component.ts

@@ -1,9 +1,9 @@
 import {
   Component,
   EventEmitter,
-  Inject,
   OnDestroy,
   OnInit,
+  inject
 } from '@angular/core';
 import {AutoUnsubscribe} from 'ngx-auto-unsubscribe';
 import {Subscription} from 'rxjs';
@@ -19,16 +19,13 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
     standalone: false
 })
 export class WorkflowCaseDeleteComponent implements OnInit, OnDestroy {
+  private workflowCaseService = inject(WorkflowPnCasesService);
+  public dialogRef = inject(MatDialogRef<WorkflowCaseDeleteComponent>);
+  public workflowCaseModel = inject<WorkflowCaseModel>(MAT_DIALOG_DATA);
+
   workflowCaseDeleted: EventEmitter<void> = new EventEmitter<void>();
   deleteWorkflowCase$: Subscription;
 
-  constructor(
-    private workflowCaseService: WorkflowPnCasesService,
-    public dialogRef: MatDialogRef<WorkflowCaseDeleteComponent>,
-    @Inject(MAT_DIALOG_DATA) public workflowCaseModel: WorkflowCaseModel = new WorkflowCaseModel(),
-  ) {
-  }
-
   ngOnInit() {
   }
 

eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-case-edit/workflow-case-edit.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnDestroy, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit, inject} from '@angular/core';
 import {
   CommonDictionaryTextModel,
   SiteNameDto,
@@ -26,6 +26,14 @@ import {MatDatepickerInputEvent} from '@angular/material/datepicker';
     standalone: false
 })
 export class WorkflowCaseEditComponent implements OnInit, OnDestroy {
+  private activateRoute = inject(ActivatedRoute);
+  private router = inject(Router);
+  private authStore = inject(Store);
+  private workflowPnCasesService = inject(WorkflowPnCasesService);
+  private formBuilder = inject(FormBuilder);
+  private sitesService = inject(SitesService);
+  private entitySelectService = inject(EntitySelectService);
+
   deviceUsersList: SiteNameDto[] = [];
   places: Array<CommonDictionaryTextModel> = [];
   incidentTypes: Array<CommonDictionaryTextModel> = [];
@@ -49,21 +57,25 @@ export class WorkflowCaseEditComponent implements OnInit, OnDestroy {
     {id: 4, text: 'Annulleret'}, // Canceled
   ];
 
-  constructor(
-    private activateRoute: ActivatedRoute,
-    private router: Router,
-    private authStore: Store,
-    private workflowPnCasesService: WorkflowPnCasesService,
-    private formBuilder: FormBuilder,
-    private sitesService: SitesService,
-    private entitySelectService: EntitySelectService
-  ) {
+  
+
+  ngOnInit() {
     this.activatedRouteSub$ = this.activateRoute.params.subscribe((params) => {
       this.id = +params['id'];
     });
     this.activateRoute.queryParams.subscribe((params) => {
       this.reverseRoute = params['reverseRoute'];
     });
+
+    this.dataForm = this.formBuilder.group({
+      deadline: ['', Validators.required],
+      dateOfIncident: ['', Validators.required],
+    });
+    this.getSites();
+    this.loadCase();
+  }
+
+  ngOnDestroy() {
   }
 
   goBack() {
@@ -122,18 +134,6 @@ export class WorkflowCaseEditComponent implements OnInit, OnDestroy {
       });
   }
 
-  ngOnInit() {
-    this.dataForm = this.formBuilder.group({
-      deadline: ['', Validators.required],
-      dateOfIncident: ['', Validators.required],
-    });
-    this.getSites();
-    this.loadCase();
-  }
-
-  ngOnDestroy() {
-  }
-
   loadCase() {
     if (!this.id || this.id === 0) {
       return;

eform-client/src/app/plugins/modules/workflow-pn/components/workflow-cases/workflow-cases-page/workflow-cases-page.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnDestroy, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit, inject} from '@angular/core';
 import {AutoUnsubscribe} from 'ngx-auto-unsubscribe';
 import {Subject, Subscription, zip} from 'rxjs';
 import {debounceTime} from 'rxjs/operators';
@@ -33,6 +33,15 @@ import {
     standalone: false
 })
 export class WorkflowCasesPageComponent implements OnInit, OnDestroy {
+  private store = inject(Store);
+  public workflowCasesStateService = inject(WorkflowCasesStateService);
+  private service = inject(WorkflowPnCasesService);
+  private translateService = inject(TranslateService);
+  private dialog = inject(MatDialog);
+  private overlay = inject(Overlay);
+  private iconRegistry = inject(MatIconRegistry);
+  private sanitizer = inject(DomSanitizer);
+
   workflowCasesModel: Paged<WorkflowCaseModel> = new Paged<WorkflowCaseModel>();
   searchSubject = new Subject();
   statuses = [
@@ -96,25 +105,16 @@ export class WorkflowCasesPageComponent implements OnInit, OnDestroy {
   public selectWorkflowCasesFiltersName$ = this.store.select(selectWorkflowCasesFiltersName);
   public selectWorkflowCasesPagination$ = this.store.select(selectWorkflowCasesPagination);
 
-  constructor(
-    private store: Store,
-    public workflowCasesStateService: WorkflowCasesStateService,
-    private service: WorkflowPnCasesService,
-    private translateService: TranslateService,
-    private dialog: MatDialog,
-    private overlay: Overlay,
-    iconRegistry: MatIconRegistry,
-    sanitizer: DomSanitizer,
-  ) {
+  
+
+  ngOnInit() {
     this.searchSubject.pipe(debounceTime(500)).subscribe((val) => {
       this.workflowCasesStateService.updateNameFilter(val.toString());
       this.getWorkflowCases();
     });
-    iconRegistry.addSvgIconLiteral('file-word', sanitizer.bypassSecurityTrustHtml(WordIcon));
-    iconRegistry.addSvgIconLiteral('file-pdf', sanitizer.bypassSecurityTrustHtml(PdfIcon));
-  }
+    this.iconRegistry.addSvgIconLiteral('file-word', this.sanitizer.bypassSecurityTrustHtml(WordIcon));
+    this.iconRegistry.addSvgIconLiteral('file-pdf', this.sanitizer.bypassSecurityTrustHtml(PdfIcon));
 
-  ngOnInit() {
     this.getWorkflowCases();
   }