refactor: migrate to inject() Function

Author: autowp

src/app/about/about.component.ts

@@ -1,5 +1,5 @@
 import {DecimalPipe} from '@angular/common';
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {Router} from '@angular/router';
 import {APIUser} from '@grpc/spec.pb';
 import {StatisticsClient} from '@grpc/spec.pbsc';
@@ -86,6 +86,13 @@ Take part in [the translation of the site](https://github.com/autowp/autowp-fron
   templateUrl: './about.component.html',
 })
 export class AboutComponent implements OnInit {
+  private readonly userService = inject(UserService);
+  private readonly router = inject(Router);
+  private readonly decimalPipe = inject(DecimalPipe);
+  private readonly bytesPipe = inject(BytesPipe);
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly statGrpc = inject(StatisticsClient);
+
   protected readonly version = versionJson;
 
   protected readonly html$ = this.statGrpc
@@ -135,15 +142,6 @@ export class AboutComponent implements OnInit {
       }),
     );
 
-  constructor(
-    private readonly userService: UserService,
-    private readonly router: Router,
-    private readonly decimalPipe: DecimalPipe,
-    private readonly bytesPipe: BytesPipe,
-    private readonly pageEnv: PageEnvService,
-    private readonly statGrpc: StatisticsClient,
-  ) {}
-
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 136}), 0);
   }

src/app/account/access/access.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {environment} from '@environment/environment';
 import {PageEnvService} from '@services/page-env.service';
 
@@ -7,11 +7,11 @@ import {PageEnvService} from '@services/page-env.service';
   templateUrl: './access.component.html',
 })
 export class AccountAccessComponent implements OnInit {
+  private readonly pageEnv = inject(PageEnvService);
+
   protected readonly changePasswordUrl =
     environment.keycloak.url + '/realms/' + environment.keycloak.realm + '/account/#/security/device-activity';
 
-  constructor(private readonly pageEnv: PageEnvService) {}
-
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 133}), 0);
   }

src/app/account/account.component.ts

@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, inject} from '@angular/core';
 import {ForumsClient} from '@grpc/spec.pbsc';
 import {Empty} from '@ngx-grpc/well-known-types';
 import {AuthService} from '@services/auth.service';
@@ -26,6 +26,13 @@ interface SidebarItem {
   templateUrl: './account.component.html',
 })
 export class AccountComponent {
+  private readonly messageService = inject(MessageService);
+  private readonly auth = inject(AuthService);
+  private readonly pictureService = inject(PictureService);
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly toastService = inject(ToastsService);
+  private readonly forumsClient = inject(ForumsClient);
+
   protected readonly items$: Observable<SidebarItem[]> = combineLatest([
     this.auth.getUser$(),
     this.auth.getUser$().pipe(
@@ -148,13 +155,4 @@ export class AccountComponent {
       return items;
     }),
   );
-
-  constructor(
-    private readonly messageService: MessageService,
-    private readonly auth: AuthService,
-    private readonly pictureService: PictureService,
-    private readonly pageEnv: PageEnvService,
-    private readonly toastService: ToastsService,
-    private readonly forumsClient: ForumsClient,
-  ) {}
 }

src/app/account/accounts/accounts.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {APIService} from '@services/api.service';
 import {PageEnvService} from '@services/page-env.service';
 import {BehaviorSubject, combineLatest, EMPTY, Observable} from 'rxjs';
@@ -12,6 +12,10 @@ import {APIAccount, APIAccountItemsGetResponse} from '../account.service';
   templateUrl: './accounts.component.html',
 })
 export class AccountAccountsComponent implements OnInit {
+  private readonly api = inject(APIService);
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly toastService = inject(ToastsService);
+
   private readonly reload$ = new BehaviorSubject<void>(void 0);
   protected readonly accounts$: Observable<APIAccount[]> = combineLatest([
     this.api.request<APIAccountItemsGetResponse>('GET', 'account'),
@@ -26,12 +30,6 @@ export class AccountAccountsComponent implements OnInit {
 
   protected disconnectFailed = false;
 
-  constructor(
-    private readonly api: APIService,
-    private readonly pageEnv: PageEnvService,
-    private readonly toastService: ToastsService,
-  ) {}
-
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 123}), 0);
   }

src/app/account/contacts/contacts.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {Contact, DeleteContactRequest} from '@grpc/spec.pb';
 import {ContactsClient} from '@grpc/spec.pbsc';
 import {AuthService} from '@services/auth.service';
@@ -16,6 +16,14 @@ import {ToastsService} from '../../toasts/toasts.service';
   templateUrl: './contacts.component.html',
 })
 export class AccountContactsComponent implements OnInit {
+  private readonly contactsService = inject(ContactsService);
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly toastService = inject(ToastsService);
+  private readonly auth = inject(AuthService);
+  private readonly contacts = inject(ContactsClient);
+  private readonly languageService = inject(LanguageService);
+  private readonly keycloak = inject(KeycloakService);
+
   private readonly reload$ = new BehaviorSubject<void>(void 0);
 
   protected readonly items$: Observable<Contact[]> = this.auth.getUser$().pipe(
@@ -38,16 +46,6 @@ export class AccountContactsComponent implements OnInit {
     map((response) => response.items || []),
   );
 
-  constructor(
-    private readonly contactsService: ContactsService,
-    private readonly pageEnv: PageEnvService,
-    private readonly toastService: ToastsService,
-    private readonly auth: AuthService,
-    private readonly contacts: ContactsClient,
-    private readonly languageService: LanguageService,
-    private readonly keycloak: KeycloakService,
-  ) {}
-
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 198}), 0);
   }

src/app/account/delete/delete.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {Router} from '@angular/router';
 import {APIDeleteUserRequest} from '@grpc/spec.pb';
 import {UsersClient} from '@grpc/spec.pbsc';
@@ -17,19 +17,17 @@ import {ToastsService} from '../../toasts/toasts.service';
   templateUrl: './delete.component.html',
 })
 export class AccountDeleteComponent implements OnInit {
+  private readonly router = inject(Router);
+  private readonly auth = inject(AuthService);
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly toastService = inject(ToastsService);
+  private readonly usersGrpc = inject(UsersClient);
+
   protected readonly form = {
     password_old: '',
   };
   protected invalidParams?: InvalidParams;
 
-  constructor(
-    private readonly router: Router,
-    private readonly auth: AuthService,
-    private readonly pageEnv: PageEnvService,
-    private readonly toastService: ToastsService,
-    private readonly usersGrpc: UsersClient,
-  ) {}
-
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 137}), 0);
   }

src/app/account/delete/deleted/deleted.component.ts

@@ -1,12 +1,12 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {PageEnvService} from '@services/page-env.service';
 
 @Component({
   selector: 'app-account-delete-deleted',
   templateUrl: './deleted.component.html',
 })
 export class AccountDeletedComponent implements OnInit {
-  constructor(private readonly pageEnv: PageEnvService) {}
+  private readonly pageEnv = inject(PageEnvService);
 
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 93}), 0);

src/app/account/email/email.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {environment} from '@environment/environment';
 import {APIMeRequest, UserFields} from '@grpc/spec.pb';
 import {UsersClient} from '@grpc/spec.pbsc';
@@ -13,6 +13,10 @@ import {ToastsService} from '../../toasts/toasts.service';
   templateUrl: './email.component.html',
 })
 export class AccountEmailComponent implements OnInit {
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly toastService = inject(ToastsService);
+  private readonly usersClient = inject(UsersClient);
+
   protected readonly email$: Observable<null | string> = this.usersClient
     .me(new APIMeRequest({fields: new UserFields({email: true})}))
     .pipe(
@@ -26,12 +30,6 @@ export class AccountEmailComponent implements OnInit {
   protected readonly changeEmailUrl =
     environment.keycloak.url + '/realms/' + environment.keycloak.realm + '/account/#/personal-info';
 
-  constructor(
-    private readonly pageEnv: PageEnvService,
-    private readonly toastService: ToastsService,
-    private readonly usersClient: UsersClient,
-  ) {}
-
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 55}), 0);
   }

src/app/account/inbox-pictures/inbox-pictures.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {AuthService} from '@services/auth.service';
 import {PageEnvService} from '@services/page-env.service';
@@ -13,6 +13,12 @@ import {ToastsService} from '../../toasts/toasts.service';
   templateUrl: './inbox-pictures.component.html',
 })
 export class AccountInboxPicturesComponent implements OnInit {
+  private readonly auth = inject(AuthService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly pictureService = inject(PictureService);
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly toastService = inject(ToastsService);
+
   protected readonly data$ = combineLatest([
     this.route.queryParamMap.pipe(
       map((params) => parseInt(params.get('page') || '', 10)),
@@ -39,14 +45,6 @@ export class AccountInboxPicturesComponent implements OnInit {
     }),
   );
 
-  constructor(
-    private readonly auth: AuthService,
-    private readonly route: ActivatedRoute,
-    private readonly pictureService: PictureService,
-    private readonly pageEnv: PageEnvService,
-    private readonly toastService: ToastsService,
-  ) {}
-
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 94}), 0);
   }

src/app/account/messages/messages.component.ts

@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, inject} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {APIMessage, APIUser, MessagingGetMessagesRequest, Pages} from '@grpc/spec.pb';
 import {MessagingClient} from '@grpc/spec.pbsc';
@@ -16,6 +16,14 @@ import {ToastsService} from '../../toasts/toasts.service';
   templateUrl: './messages.component.html',
 })
 export class AccountMessagesComponent {
+  private readonly messageService = inject(MessageService);
+  private readonly messageDialogService = inject(MessageDialogService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly pageEnv = inject(PageEnvService);
+  private readonly toastService = inject(ToastsService);
+  private readonly messagingClient = inject(MessagingClient);
+  private readonly userService = inject(UserService);
+
   protected folder: string = '';
   private readonly change$ = new BehaviorSubject<void>(void 0);
 
@@ -97,16 +105,6 @@ export class AccountMessagesComponent {
     }),
   );
 
-  constructor(
-    private readonly messageService: MessageService,
-    private readonly messageDialogService: MessageDialogService,
-    private readonly route: ActivatedRoute,
-    private readonly pageEnv: PageEnvService,
-    private readonly toastService: ToastsService,
-    private readonly messagingClient: MessagingClient,
-    private readonly userService: UserService,
-  ) {}
-
   protected deleteMessage(id: string) {
     this.messageService.deleteMessage$(id).subscribe({
       error: (response: unknown) => this.toastService.handleError(response),