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

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

Author: renemadsen

.github/workflows/dotnet-core-master.yml

@@ -75,7 +75,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: 20
+        node-version: 22
     - name: 'Preparing Frontend checkout'
       uses: actions/checkout@v3
       with:

.github/workflows/dotnet-core-pr.yml

@@ -68,7 +68,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: 20
+        node-version: 22
     - name: 'Preparing Frontend checkout'
       uses: actions/checkout@v3
       with:

eform-client/src/app/plugins/modules/customers-pn/components/customer-pn-add/customer-pn-add.component.ts

@@ -1,4 +1,6 @@
-import {Component, EventEmitter, Inject, OnInit} from '@angular/core';
+import {Component, EventEmitter, OnInit,
+  inject
+} from '@angular/core';
 import {CustomerPnFieldsEnum, CustomersPnFieldStatusEnum} from '../../enums';
 import {FieldsPnUpdateModel, CustomerPnFullModel} from '../../models';
 import {CustomersPnService} from '../../services';
@@ -11,22 +13,21 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
   standalone: false
 })
 export class CustomerPnAddComponent implements OnInit {
+  private customersService = inject(CustomersPnService);
+  public dialogRef = inject(MatDialogRef<CustomerPnAddComponent>);
+  private data = inject<{customerId?: number, fields: FieldsPnUpdateModel}>(MAT_DIALOG_DATA);
+
   customerCreated: EventEmitter<void> = new EventEmitter<void>();
   fieldsModel = new FieldsPnUpdateModel();
   get fieldsEnum() { return CustomerPnFieldsEnum; }
   newCustomerModel: CustomerPnFullModel = new CustomerPnFullModel();
 
-  constructor(
-    private customersService: CustomersPnService,
-    public dialogRef: MatDialogRef<CustomerPnAddComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: {customerId?: number, fields: FieldsPnUpdateModel}
-  ) {
-    if (data && data.fields) {
-      this.fieldsModel = data.fields;
-    }
-  }
+  
 
   ngOnInit() {
+    if (this.data && this.data.fields) {
+      this.fieldsModel = this.data.fields;
+    }
     if (this.data && this.data.customerId) {
       this.getSingleCustomer(this.data.customerId);
     }

eform-client/src/app/plugins/modules/customers-pn/components/customer-pn-delete/customer-pn-delete.component.ts

@@ -1,4 +1,6 @@
-import {Component, EventEmitter, Inject, OnInit} from '@angular/core';
+import {Component, EventEmitter, OnInit,
+  inject
+} from '@angular/core';
 import {CustomerPnFieldsEnum} from 'src/app/plugins/modules/customers-pn/enums';
 import {CustomerPnModel} from 'src/app/plugins/modules/customers-pn/models/customer';
 import {FieldsPnUpdateModel} from 'src/app/plugins/modules/customers-pn/models/field';
@@ -12,25 +14,24 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
   standalone: false
 })
 export class CustomerPnDeleteComponent implements OnInit {
+  private customersService = inject(CustomersPnService);
+  public dialogRef = inject(MatDialogRef<CustomerPnDeleteComponent>);
+  private data = inject<{customer: CustomerPnModel, fields: FieldsPnUpdateModel}>(MAT_DIALOG_DATA);
+
   customerDeleted: EventEmitter<void> = new EventEmitter<void>();
   selectedCustomer: CustomerPnModel = new CustomerPnModel();
   fields: FieldsPnUpdateModel = new FieldsPnUpdateModel();
   get fieldsEnum() { return CustomerPnFieldsEnum; }
 
-  constructor(
-    private customersService: CustomersPnService,
-    public dialogRef: MatDialogRef<CustomerPnDeleteComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: {customer: CustomerPnModel, fields: FieldsPnUpdateModel}
-  ) {
-    if (data) {
-      this.selectedCustomer = data.customer;
-      if (data.fields) {
-        this.fields = data.fields;
-      }
-    }
-  }
+  
 
   ngOnInit() {
+    if (this.data) {
+      this.selectedCustomer = this.data.customer;
+      if (this.data.fields) {
+        this.fields = this.data.fields;
+      }
+    }
   }
 
   hide() {

eform-client/src/app/plugins/modules/customers-pn/components/customer-pn-edit/customer-pn-edit.component.ts

@@ -1,4 +1,6 @@
-import {Component, EventEmitter, Inject, OnInit} from '@angular/core';
+import {Component, EventEmitter, OnInit,
+  inject
+} from '@angular/core';
 import {CustomerPnFieldsEnum, CustomersPnFieldStatusEnum} from '../../enums';
 import {FieldsPnUpdateModel, CustomerPnFullModel} from '../../models';
 import {CustomersPnService} from '../../services';
@@ -11,24 +13,23 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
   standalone: false
 })
 export class CustomerPnEditComponent implements OnInit {
+  private customersService = inject(CustomersPnService);
+  public dialogRef = inject(MatDialogRef<CustomerPnEditComponent>);
+  private data = inject<{customerId: number, fields: FieldsPnUpdateModel}>(MAT_DIALOG_DATA);
+
   fieldsModel = new FieldsPnUpdateModel();
   customerUpdate: EventEmitter<void> = new EventEmitter<void>();
 
   get fieldsEnum() { return CustomerPnFieldsEnum; }
 
   selectedCustomerModel = new CustomerPnFullModel();
 
-  constructor(
-    private customersService: CustomersPnService,
-    public dialogRef: MatDialogRef<CustomerPnEditComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: {customerId: number, fields: FieldsPnUpdateModel}
-  ) {
-    if (data && data.fields) {
-      this.fieldsModel = data.fields;
-    }
-  }
+  
 
   ngOnInit() {
+    if (this.data && this.data.fields) {
+      this.fieldsModel = this.data.fields;
+    }
     if (this.data && this.data.customerId) {
       this.getSingleCustomer(this.data.customerId);
     }

eform-client/src/app/plugins/modules/customers-pn/components/customer-pn-import/customer-pn-import.component.ts

@@ -1,4 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit,
+  inject
+} from '@angular/core';
 import { FileUploader } from 'ng2-file-upload';
 import { Papa } from 'ngx-papaparse';
 import { CustomersPnService } from '../../services';
@@ -15,6 +17,8 @@ const URL = '';
   standalone: false
 })
 export class CustomerPnImportComponent implements OnInit {
+  private customerService = inject(CustomersPnService);
+
   public data: any = [];
   uploader: FileUploader;
   customerImportModel: CustomersPnImportModel;
@@ -52,7 +56,8 @@ export class CustomerPnImportComponent implements OnInit {
     { value: 18, label: 'FloorsWithLivingSpace' },
     { value: 19, label: 'Ignore' },
   ];
-  constructor(private customerService: CustomersPnService) {
+  
+  constructor() {
     this.customerImportModel = new CustomersPnImportModel();
     // forEach(Option in this.options) {
     //   this.customerHeaderModel = new CustomerPnHeadersModel();

eform-client/src/app/plugins/modules/customers-pn/components/customers-pn-fields/customers-pn-fields.component.ts

@@ -1,4 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit,
+  inject
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { AdvEntitySearchableGroupListRequestModel } from 'src/app/common/models';
 import { CustomersPnFieldStatusEnum } from '../../enums';
@@ -19,6 +21,10 @@ import {
   standalone: false
 })
 export class CustomersPnFieldsComponent implements OnInit {
+  private customersFieldsService = inject(CustomersPnFieldsService);
+  private customersSettingsService = inject(CustomersPnSettingsService);
+  private router = inject(Router);
+
   isChecked = false;
   fieldsUpdateModel: FieldsPnUpdateModel = new FieldsPnUpdateModel();
   customersPnSettingsModel: CustomersPnSettingsModel = new CustomersPnSettingsModel();
@@ -27,11 +33,7 @@ export class CustomersPnFieldsComponent implements OnInit {
     return CustomersPnFieldStatusEnum;
   }
 
-  constructor(
-    private customersFieldsService: CustomersPnFieldsService,
-    private customersSettingsService: CustomersPnSettingsService,
-    private router: Router
-  ) {}
+  
 
   ngOnInit() {
     this.advEntitySearchableGroupListRequestModel.pageSize = 15;

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

@@ -3,6 +3,7 @@ import {
   EventEmitter,
   OnInit,
   Output,
+  inject
 } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { TableHeaderElementModel } from 'src/app/common/models';
@@ -28,6 +29,12 @@ import { Overlay } from '@angular/cdk/overlay';
   standalone: false
 })
 export class CustomersPnPageComponent implements OnInit {
+  private customersService = inject(CustomersPnService);
+  private customersFieldsService = inject(CustomersPnFieldsService);
+  public customersStateService = inject(CustomersStateService);
+  private dialog = inject(MatDialog);
+  private overlay = inject(Overlay);
+
   @Output() onCustomerDuplicated: EventEmitter<void> = new EventEmitter<void>();
   get fieldStatusEnum() {
     return CustomersPnFieldStatusEnum;
@@ -39,14 +46,6 @@ export class CustomersPnPageComponent implements OnInit {
 
   tableHeaders: TableHeaderElementModel[];
 
-  constructor(
-    private customersService: CustomersPnService,
-    private customersFieldsService: CustomersPnFieldsService,
-    public customersStateService: CustomersStateService,
-    private dialog: MatDialog,
-    private overlay: Overlay
-  ) {}
-
   checkFieldStatus(numField: number) {
     return (
       this.fieldsModel.fields[numField].fieldStatus ===

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

@@ -1,4 +1,6 @@
-import {Injectable} from '@angular/core';
+import {Injectable,
+  inject
+} from '@angular/core';
 import {Observable, tap} from 'rxjs';
 import {
   CommonPaginationState,
@@ -25,15 +27,16 @@ import {map} from 'rxjs/operators';
 
 @Injectable({providedIn: 'root'})
 export class CustomersStateService {
+  private store = inject(Store);
+  private service = inject(CustomersPnService);
+
   private selectCustomersFilters$ = this.store.select(selectCustomersFilters);
   private selectCustomersPagination$ = this.store.select(selectCustomersPagination);
   currentPagination: CommonPaginationState;
   currentFilters: CustomersFiltrationModel;
 
-  constructor(
-    private store: Store,
-    private service: CustomersPnService,
-  ) {
+  
+  constructor() {
     this.selectCustomersPagination$.subscribe(x => this.currentPagination = x);
     this.selectCustomersFilters$.subscribe(x => this.currentFilters = x);
   }

eform-client/src/app/plugins/modules/customers-pn/layouts/customer-pn-layout.component.ts

@@ -1,4 +1,6 @@
-import { AfterContentInit, Component, OnInit } from '@angular/core';
+import { AfterContentInit, Component, OnInit,
+  inject
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Store } from '@ngrx/store';
 import { addPluginToVisited, selectPluginsVisitedPlugins } from 'src/app/state';
@@ -11,13 +13,14 @@ import { translates } from './../i18n/translates';
   standalone: false
 })
 export class CustomerPnLayoutComponent implements AfterContentInit, OnInit {
+  private translateService = inject(TranslateService);
+  private store = inject(Store);
+
   private pluginName = 'customers-pn';
 
-  constructor(
-    private translateService: TranslateService,
-    store: Store
-  ) {
-    store.select(selectPluginsVisitedPlugins)
+  
+  constructor() {
+    this.store.select(selectPluginsVisitedPlugins)
       .pipe(take(1))
       .subscribe(x => {
         // check current plugin in activated plugin
@@ -27,7 +30,7 @@ export class CustomerPnLayoutComponent implements AfterContentInit, OnInit {
             this.translateService.setTranslation(locale, translates[locale], true);
           });
           // add plugin to visited plugins
-          store.dispatch(addPluginToVisited(this.pluginName));
+          this.store.dispatch(addPluginToVisited(this.pluginName));
         }
       });
   }