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

Migrate all components and services from constructor-based DI to inject() pattern

Author: renemadsen

eform-client/src/app/plugins/modules/greate-belt-pn/components/report/report-page/report-container/report-container.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core';
+import {Component, inject, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {ActivatedRoute, Params, Router} from '@angular/router';
 import {saveAs} from 'file-saver';
 import {AutoUnsubscribe} from 'ngx-auto-unsubscribe';
@@ -34,6 +34,17 @@ import {
     standalone: false
 })
 export class ReportContainerComponent implements OnInit, OnDestroy {
+  private reportService = inject(GreateBeltPnReportService);
+  public reportStateService = inject(ReportStateService);
+  public authStateService = inject(AuthStateService);
+  private eFormService = inject(EFormService);
+  private route = inject(ActivatedRoute);
+  private store = inject(Store);
+  private router = inject(Router);
+  public dialog = inject(MatDialog);
+  private overlay = inject(Overlay);
+  private translateService = inject(TranslateService);
+
   @ViewChild('caseRemoveModal', {static: true})
   caseRemoveModal: CaseRemoveModalComponent;
   nameSearchSubject = new Subject();
@@ -110,18 +121,7 @@ export class ReportContainerComponent implements OnInit, OnDestroy {
   public selectReportFiltersNameFilter$ = this.store.select(selectReportFiltersNameFilter);
   public selectReportPagination$ = this.store.select(selectReportPagination);
 
-  constructor(
-    private reportService: GreateBeltPnReportService,
-    public reportStateService: ReportStateService,
-    public authStateService: AuthStateService,
-    private eFormService: EFormService,
-    private route: ActivatedRoute,
-    private store: Store,
-    private router: Router,
-    public dialog: MatDialog,
-    private overlay: Overlay,
-    private translateService: TranslateService,
-  ) {
+  constructor() {
     this.nameSearchSubject.pipe(debounceTime(500)).subscribe((val) => {
       this.reportStateService.updateNameFilter(val.toString());
       this.getReport();

eform-client/src/app/plugins/modules/greate-belt-pn/components/report/report-page/report-table/report-table.component.ts

@@ -2,6 +2,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   EventEmitter,
+  inject,
   Input,
   OnInit,
   Output, TemplateRef,
@@ -28,6 +29,11 @@ import {
     standalone: false
 })
 export class ReportTableComponent implements OnInit {
+  private store = inject(Store);
+  private router = inject(Router);
+  public reportStateService = inject(ReportStateService);
+  private translateService = inject(TranslateService);
+
   @Input() reportModel: Paged<ReportCaseModel> = new Paged<ReportCaseModel>();
   @Input() tableHeaders: MtxGridColumn[];
   @Input() paginationTemplate!: TemplateRef<any>;
@@ -46,14 +52,6 @@ export class ReportTableComponent implements OnInit {
   public selectReportPaginationIsSortDsc$ = this.store.select(selectReportPaginationIsSortDsc);
   public selectReportPaginationSort$ = this.store.select(selectReportPaginationSort);
 
-  constructor(
-    private store: Store,
-    private router: Router,
-    public reportStateService: ReportStateService,
-    private translateService: TranslateService,
-  ) {
-  }
-
   ngOnInit(): void {
   }
 

eform-client/src/app/plugins/modules/greate-belt-pn/components/report/store/report-state.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import {tap} from 'rxjs';
 import {
   CommonPaginationState,
@@ -18,14 +18,14 @@ import {
 
 @Injectable({ providedIn: 'root' })
 export class ReportStateService {
+  private store = inject(Store);
+  private service = inject(GreateBeltPnReportService);
   private selectReportPagination$ = this.store.select(selectReportPagination);
   private selectReportFilters$ = this.store.select(selectReportFilters);
   currentPagination: CommonPaginationState;
-  currentFilters:FiltrationStateModel;
-    constructor(
-    private store: Store,
-    private service: GreateBeltPnReportService,
-  ) {
+  currentFilters: FiltrationStateModel;
+
+  constructor() {
     this.selectReportPagination$.subscribe((x) => this.currentPagination = x);
     this.selectReportFilters$.subscribe((x) => this.currentFilters = x);
   }

eform-client/src/app/plugins/modules/greate-belt-pn/layouts/greate-belt-pn-layout.component.ts

@@ -1,4 +1,4 @@
-import {AfterContentInit, Component, OnDestroy, OnInit} from '@angular/core';
+import {AfterContentInit, Component, inject, OnDestroy, OnInit} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 import {translates} from './../i18n/translates';
 import {AuthStateService} from 'src/app/common/store';
@@ -16,15 +16,13 @@ import {filter} from 'rxjs/operators';
 })
 export class GreateBeltPnLayoutComponent
   implements AfterContentInit, OnInit, OnDestroy {
+  private store = inject(Store);
+  private localeService = inject(LocaleService);
+  private translateService = inject(TranslateService);
+  private authStateService = inject(AuthStateService);
+
   currentUserLocaleAsyncSub$: Subscription;
   private selectCurrentUserLocale$ = this.store.select(selectCurrentUserLocale);
-  constructor(
-    private store: Store,
-    private localeService: LocaleService,
-    private translateService: TranslateService,
-    private authStateService: AuthStateService
-  ) {
-  }
 
   ngOnInit(): void {
   }

eform-client/src/app/plugins/modules/greate-belt-pn/services/greate-belt-pn-report.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OperationDataResult, Paged } from 'src/app/common/models';
 import { ApiBaseService } from 'src/app/common/services';
@@ -13,7 +13,7 @@ export let GreateBeltPnPropertiesMethods = {
   providedIn: 'root',
 })
 export class GreateBeltPnReportService {
-  constructor(private apiBaseService: ApiBaseService) {}
+  private apiBaseService = inject(ApiBaseService);
 
   getReport(
     model: ReportRequestModel