Merge pull request #7058 from microting/copilot/fix-9f92120b-ed56-4475-babc-55e66b47bbc6

Refactor constructors to use inject() function over constructor parameter injection

Author: renemadsen

eform-client/src/app/common/guards/admin.guard.ts

@@ -8,11 +8,11 @@ import {AuthStateService} from 'src/app/common/store';
 
 @Injectable()
 export class AdminGuard {
-  constructor(
-    private router: Router,
-    private store: Store,
-    private authStateService: AuthStateService,
-  ) {
+  private router = inject(Router);
+  private store = inject(Store);
+  private authStateService = inject(AuthStateService);
+
+  constructor() {
     console.debug('AdminGuard - constructor');
   }
 

eform-client/src/app/common/guards/auth.guard.ts

@@ -12,10 +12,10 @@ import {
 
 @Injectable()
 export class AuthGuard {
-  constructor(
-    private store: Store,
-    private router: Router,
-  ) {
+  private store = inject(Store);
+  private router = inject(Router);
+
+  constructor() {
     this.isAuth$.subscribe(x => this.isAuth = x);
     this.loginRedirectUrl$.subscribe(x => this.loginRedirectUrl = x);
   }

eform-client/src/app/common/guards/claims.guard.ts

@@ -12,13 +12,13 @@ import {UserClaimsModel} from 'src/app/common/models';
 
 @Injectable()
 export class ClaimsGuard {
+  private store = inject(Store);
+
 
   private claims: UserClaimsModel;
   private selectCurrentUserClaims$ = this.store.select(selectCurrentUserClaims);
 
-  constructor(
-    private store: Store
-  ) {
+  constructor() {
     this.selectCurrentUserClaims$.subscribe(x => this.claims = x);
   }
 

eform-client/src/app/common/guards/permission.guard.ts

@@ -12,11 +12,11 @@ import {Store} from '@ngrx/store';
 
 @Injectable()
 export class PermissionGuard {
+  private store = inject(Store);
+
   private selectCurrentUserClaims$ = this.store.select(selectCurrentUserClaims);
 
-  constructor(
-    private store: Store
-  ) {
+  constructor() {
     console.debug('PermissionGuard - constructor');
   }
 

eform-client/src/app/common/interceptors/http-error.interceptor.ts

@@ -16,21 +16,18 @@ import {
 } from 'rxjs';
 import {ToastrService} from 'ngx-toastr';
 import {AuthStateService} from 'src/app/common/store';
-import {Injectable} from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {AuthMethods, LoaderService} from 'src/app/common/services';
 import {AuthResponseModel, OperationDataResult} from 'src/app/common/models';
 import * as Sentry from '@sentry/angular';
 
 
 @Injectable()
 export class HttpErrorInterceptor implements HttpInterceptor {
+  private loaderService = inject(LoaderService);
+  private toastrService = inject(ToastrService);
+  private authStateService = inject(AuthStateService);
 
-  constructor(
-    private loaderService: LoaderService,
-    private toastrService: ToastrService,
-    private authStateService: AuthStateService,
-  ) {
-  }
 
   intercept(
     request: HttpRequest<any>,

eform-client/src/app/common/interceptors/jwt.interceptor.ts

@@ -4,7 +4,7 @@ import {
   HttpInterceptor,
   HttpRequest,
 } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {Observable, of, take} from 'rxjs';
 import { AuthStateService } from 'src/app/common/store';
 import {Store} from '@ngrx/store';
@@ -32,8 +32,8 @@ import {selectAuthIsAuth, selectBearerToken} from 'src/app/state/auth/auth.selec
 // }
 @Injectable()
 export class JwtInterceptor implements HttpInterceptor {
-  constructor(private store: Store) {
-  }
+  private store = inject(Store);
+
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     return this.store.select(selectAuthIsAuth).pipe(

eform-client/src/app/common/interceptors/loader-interceptor.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   HttpResponse,
   HttpRequest,
@@ -14,14 +14,11 @@ import {catchError, tap} from 'rxjs/operators';
 // This is a class for an HTTP interceptor that intercepts HTTP requests and responses
 // It implements the HttpInterceptor interface from the @angular/common/http package
 export class LoaderInterceptor implements HttpInterceptor {
+  private loaderService = inject(LoaderService);
+
   // This is an array of HTTP requests that are currently being processed
   private requests: HttpRequest<any>[] = [];
 
-  // This is the constructor for the class
-  // It takes a LoaderService as a parameter
-  constructor(private loaderService: LoaderService) {
-  }
-
   // This method removes a request from the requests array
   // It takes an HttpRequest as a parameter
   removeRequest(req: HttpRequest<any>) {

eform-client/src/app/common/interceptors/user-claims.interceptor.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   HttpEvent,
   HttpHandler,
@@ -12,8 +12,8 @@ import { AuthStateService } from 'src/app/common/store';
 
 @Injectable()
 export class UserClaimsInterceptor implements HttpInterceptor {
-  constructor(private authStateService: AuthStateService) {
-  }
+  private authStateService = inject(AuthStateService);
+
 
   intercept(
     request: HttpRequest<any>,

eform-client/src/app/common/modules/eform-cases/components/case-actions/case-archive-modal/case-archive-modal.component.ts

@@ -1,9 +1,4 @@
-import {
-  Component,
-  Inject,
-  OnDestroy,
-  OnInit,
-} from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
 import {AutoUnsubscribe} from 'ngx-auto-unsubscribe';
 import {CaseArchiveModel,} from 'src/app/common/models';
 import {CasesService} from 'src/app/common/services';
@@ -17,12 +12,10 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
     standalone: false
 })
 export class CaseArchiveModalComponent implements OnInit, OnDestroy {
-  constructor(
-    private casesService: CasesService,
-    public dialogRef: MatDialogRef<CaseArchiveModalComponent>,
-    @Inject(MAT_DIALOG_DATA) public caseArchiveModel: CaseArchiveModel = new CaseArchiveModel()
-  ) {
-  }
+  private casesService = inject(CasesService);
+  dialogRef = inject<MatDialogRef<CaseArchiveModalComponent>>(MatDialogRef);
+  caseArchiveModel = inject<CaseArchiveModel>(MAT_DIALOG_DATA) ?? new CaseArchiveModel();
+
 
   ngOnInit() {
   }

eform-client/src/app/common/modules/eform-cases/components/case-actions/case-remove-modal/case-remove-modal.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Inject, OnInit, Output} from '@angular/core';
+import { Component, EventEmitter, OnInit, Output, inject } from '@angular/core';
 import {CaseModel} from 'src/app/common/models/cases';
 import {CasesService} from 'src/app/common/services/cases';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
@@ -10,13 +10,19 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
     standalone: false
 })
 export class CaseRemoveModalComponent implements OnInit {
+  private casesService = inject(CasesService);
+  dialogRef = inject<MatDialogRef<CaseRemoveModalComponent>>(MatDialogRef);
+  private model = inject<{
+    caseModel: CaseModel;
+    templateId: number;
+}>(MAT_DIALOG_DATA);
+
   selectedTemplateId: number;
   selectedCaseModel: CaseModel = new CaseModel();
 
-  constructor(
-    private casesService: CasesService,
-    public dialogRef: MatDialogRef<CaseRemoveModalComponent>,
-    @Inject(MAT_DIALOG_DATA) private model: {caseModel: CaseModel, templateId: number}) {
+  constructor() {
+    const model = this.model;
+
     this.selectedCaseModel = model.caseModel;
     this.selectedTemplateId = model.templateId;
   }