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

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

Author: renemadsen

eform-client/src/app/plugins/modules/items-planning-pn/layouts/items-planning-pn-layout.component.ts

@@ -1,4 +1,4 @@
-import {AfterContentInit, Component, OnInit} from '@angular/core';
+import {AfterContentInit, Component, OnInit, inject} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 import {translates} from './../i18n/translates';
 import {Store} from '@ngrx/store';
@@ -12,13 +12,12 @@ import {take} from 'rxjs';
     standalone: false
 })
 export class ItemsPlanningPnLayoutComponent implements AfterContentInit, OnInit {
+  private translateService = inject(TranslateService);
+  private store = inject(Store);
   private pluginName = 'items-planning';
 
-  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
@@ -28,7 +27,7 @@ export class ItemsPlanningPnLayoutComponent 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));
         }
       });
   }

eform-client/src/app/plugins/modules/items-planning-pn/modules/pairing/components/pairing-grid-page/pairing-grid-page.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnDestroy, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit, inject} from '@angular/core';
 import {
   ItemsPlanningPnPairingService,
 } from '../../../../services';
@@ -21,6 +21,11 @@ import {dialogConfigHelper} from 'src/app/common/helpers';
     standalone: false
 })
 export class PairingGridPageComponent implements OnInit, OnDestroy {
+  private pairingService = inject(ItemsPlanningPnPairingService);
+  public pairingStateService = inject(PairingStateService);
+  public dialog = inject(MatDialog);
+  private overlay = inject(Overlay);
+
   sitesDto: SiteNameDto[] = [];
   pairings: PairingsModel = new PairingsModel();
   availableTags: CommonDictionaryModel[] = [];
@@ -32,14 +37,6 @@ export class PairingGridPageComponent implements OnInit, OnDestroy {
   updatePairings$: Subscription;
   updatePairingsSub$: Subscription;
 
-  constructor(
-    private pairingService: ItemsPlanningPnPairingService,
-    public pairingStateService: PairingStateService,
-    public dialog: MatDialog,
-    private overlay: Overlay,
-  ) {
-  }
-
   ngOnInit(): void {
     this.getAllInitialData();
   }

eform-client/src/app/plugins/modules/items-planning-pn/modules/pairing/components/pairing-grid-table/pairing-grid-table.component.ts

@@ -8,7 +8,8 @@ import {
   Output,
   SimpleChanges,
   TemplateRef,
-  ViewChild
+  ViewChild,
+  inject
 } from '@angular/core';
 import {PairingModel, PairingsModel, PairingUpdateModel} from '../../../../models';
 import {AuthStateService} from 'src/app/common/store';
@@ -34,6 +35,13 @@ import {
     standalone: false
 })
 export class PairingGridTableComponent implements OnInit, OnDestroy, OnChanges {
+  private store = inject(Store);
+  private itemsPlanningStore = inject(Store);
+  public authStateService = inject(AuthStateService);
+  public pairingStateService = inject(PairingStateService);
+  private sitesService = inject(SitesService);
+  private tagsService = inject(ItemsPlanningPnTagsService);
+
   @ViewChild('firstCellTpl', {static: true}) firstCell!: TemplateRef<any>;
   @ViewChild('otherCellsTpl', {static: true}) otherCellsTpl!: TemplateRef<any>;
   @Input() pairingsModel: PairingsModel;
@@ -51,16 +59,6 @@ export class PairingGridTableComponent implements OnInit, OnDestroy, OnChanges {
   public selectPairingsTagsIds$ = this.itemsPlanningStore.select(selectPairingsTagsIds);
   public selectPairingsSiteIds$ = this.itemsPlanningStore.select(selectPairingsSiteIds);
 
-  constructor(
-    private store: Store,
-    private itemsPlanningStore: Store,
-    public authStateService: AuthStateService,
-    public pairingStateService: PairingStateService,
-    private sitesService: SitesService,
-    private tagsService: ItemsPlanningPnTagsService,
-  ) {
-  }
-
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.pairingsModel && !changes.pairingsModel.isFirstChange()) {
       this.pairingsModel.pairings = this.pairingsModel.pairings.map((x) => ({

eform-client/src/app/plugins/modules/items-planning-pn/modules/pairing/components/pairing-grid-update/pairing-grid-update.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Inject, OnInit,} from '@angular/core';
+import {Component, EventEmitter, Inject, OnInit, inject} from '@angular/core';
 import {PairingUpdateModel} from '../../../../models';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 
@@ -9,16 +9,16 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
     standalone: false
 })
 export class PairingGridUpdateComponent implements OnInit {
+  public dialogRef = inject(MatDialogRef<PairingGridUpdateComponent>);
+  private model = inject<PairingUpdateModel[]>(MAT_DIALOG_DATA);
+
   updatePairings: EventEmitter<void> = new EventEmitter<void>();
   pairingsForDeploy: PairingUpdateModel[] = [];
   pairingsForRetract: PairingUpdateModel[] = [];
 
-  constructor(
-    public dialogRef: MatDialogRef<PairingGridUpdateComponent>,
-    @Inject(MAT_DIALOG_DATA) model: PairingUpdateModel[],
-  ) {
-    this.pairingsForDeploy = model.filter(x => x.paired === true);
-    this.pairingsForRetract = model.filter(x => x.paired === false);
+  constructor() {
+    this.pairingsForDeploy = this.model.filter(x => x.paired === true);
+    this.pairingsForRetract = this.model.filter(x => x.paired === false);
   }
 
   ngOnInit() {

eform-client/src/app/plugins/modules/items-planning-pn/modules/pairing/components/store/pairing-state.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {ItemsPlanningPnPairingService} from '../../../../services';
 import {Store} from '@ngrx/store';
 import {
@@ -12,14 +12,14 @@ import {arrayToggle} from 'src/app/common/helpers';
 
 @Injectable({providedIn: 'root'})
 export class PairingStateService {
+  private store = inject(Store<ItemsPlanningState>);
+  private service = inject(ItemsPlanningPnPairingService);
+
   // @ts-ignore
   private selectPairingsFilters$ = this.store.select(selectPairingsFilters);
   currentFilters: PairingFiltrationState;
 
-  constructor(
-    private store: Store<ItemsPlanningState>,
-    private service: ItemsPlanningPnPairingService,
-  ) {
+  constructor() {
     this.selectPairingsFilters$.subscribe((x) => this.currentFilters = x);
   }
 

eform-client/src/app/plugins/modules/items-planning-pn/modules/plannings/components/planning-actions/planning-assign-sites-modal/planning-assign-sites-modal.component.ts

@@ -4,6 +4,7 @@ import {
   Inject,
   OnDestroy,
   OnInit,
+  inject
 } from '@angular/core';
 import { SiteNameDto } from 'src/app/common/models';
 import { AutoUnsubscribe } from 'ngx-auto-unsubscribe';
@@ -31,6 +32,13 @@ import { MatCheckboxChange } from '@angular/material/checkbox';
     standalone: false
 })
 export class PlanningAssignSitesModalComponent implements OnInit, OnDestroy {
+  private itemsPlanningPnPlanningsService = inject(ItemsPlanningPnPlanningsService);
+  private itemsPlanningPnPairingService = inject(ItemsPlanningPnPairingService);
+  private authStateService = inject(AuthStateService);
+  public translateService = inject(TranslateService);
+  public dialogRef = inject(MatDialogRef<PlanningAssignSitesModalComponent>);
+  private model = inject<{sitesDto: SiteNameDto[], selectedPlanning: PlanningModel}>(MAT_DIALOG_DATA);
+
   sitesAssigned: EventEmitter<void> = new EventEmitter<void>();
   assignModel: PlanningAssignSitesModel = new PlanningAssignSitesModel();
   selectedPlanning: PlanningModel = new PlanningModel();
@@ -46,19 +54,10 @@ export class PlanningAssignSitesModalComponent implements OnInit, OnDestroy {
   pairSingle$: Subscription;
   // getAllSites$: Subscription;
 
-  constructor(
-    // private eFormService: EFormService,
-    // private sitesService: SitesService,
-    private itemsPlanningPnPlanningsService: ItemsPlanningPnPlanningsService,
-    private itemsPlanningPnPairingService: ItemsPlanningPnPairingService,
-    private authStateService: AuthStateService,
-    public translateService: TranslateService,
-    public dialogRef: MatDialogRef<PlanningAssignSitesModalComponent>,
-    @Inject(MAT_DIALOG_DATA) model: {sitesDto: SiteNameDto[], selectedPlanning: PlanningModel}
-  ) {
+  constructor() {
     // debugger;
-    this.sitesDto = model.sitesDto;
-    this.selectedPlanning = model.selectedPlanning;
+    this.sitesDto = this.model.sitesDto;
+    this.selectedPlanning = this.model.selectedPlanning;
   }
 
   ngOnInit() {

eform-client/src/app/plugins/modules/items-planning-pn/modules/plannings/components/planning-actions/planning-create/planning-create.component.ts

@@ -4,6 +4,7 @@ import {
   EventEmitter,
   OnDestroy,
   OnInit,
+  inject
 } from '@angular/core';
 import {debounceTime, switchMap} from 'rxjs/operators';
 import {
@@ -43,6 +44,17 @@ import {MatDatepickerInputEvent} from '@angular/material/datepicker';
     standalone: false
 })
 export class PlanningCreateComponent implements OnInit, OnDestroy {
+  private foldersService = inject(FoldersService);
+  private itemsPlanningPnPlanningsService = inject(ItemsPlanningPnPlanningsService);
+  private sitesService = inject(SitesService);
+  private eFormService = inject(EFormService);
+  private tagsService = inject(ItemsPlanningPnTagsService);
+  private cd = inject(ChangeDetectorRef);
+  private location = inject(Location);
+  private authStateService = inject(AuthStateService);
+  public dialog = inject(MatDialog);
+  private overlay = inject(Overlay);
+
   typeahead = new EventEmitter<string>();
   newPlanningModel: PlanningCreateModel = new PlanningCreateModel();
   templateRequestModel: TemplateRequestModel = new TemplateRequestModel();
@@ -66,18 +78,7 @@ export class PlanningCreateComponent implements OnInit, OnDestroy {
   //   return this.authStateService.currentUserClaims;
   // }
 
-  constructor(
-    private foldersService: FoldersService,
-    private itemsPlanningPnPlanningsService: ItemsPlanningPnPlanningsService,
-    private sitesService: SitesService,
-    private eFormService: EFormService,
-    private tagsService: ItemsPlanningPnTagsService,
-    private cd: ChangeDetectorRef,
-    private location: Location,
-    private authStateService: AuthStateService,
-    public dialog: MatDialog,
-    private overlay: Overlay,
-  ) {
+  constructor() {
     this.typeahead
       .pipe(
         debounceTime(200),

eform-client/src/app/plugins/modules/items-planning-pn/modules/plannings/components/planning-actions/planning-delete/planning-delete.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Inject, OnInit} from '@angular/core';
+import {Component, EventEmitter, Inject, OnInit, inject} from '@angular/core';
 import {ItemsPlanningPnPlanningsService} from '../../../../../services';
 import {PlanningModel} from '../../../../../models';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
@@ -10,12 +10,11 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
     standalone: false
 })
 export class PlanningDeleteComponent implements OnInit {
+  private itemsPlanningPnPlanningsService = inject(ItemsPlanningPnPlanningsService);
+  public dialogRef = inject(MatDialogRef<PlanningDeleteComponent>);
+  public planningModel = inject<PlanningModel>(MAT_DIALOG_DATA);
+
   planningDeleted: EventEmitter<void> = new EventEmitter<void>();
-  constructor(
-    private itemsPlanningPnPlanningsService: ItemsPlanningPnPlanningsService,
-    public dialogRef: MatDialogRef<PlanningDeleteComponent>,
-    @Inject(MAT_DIALOG_DATA) public planningModel: PlanningModel = new PlanningModel()
-  ) { }
 
   ngOnInit() {
   }

eform-client/src/app/plugins/modules/items-planning-pn/modules/plannings/components/planning-actions/planning-edit/planning-edit.component.ts

@@ -17,6 +17,7 @@ import {
   EventEmitter,
   OnDestroy,
   OnInit,
+  inject
 } from '@angular/core';
 import { Location } from '@angular/common';
 import { debounceTime, switchMap, take } from 'rxjs/operators';
@@ -40,6 +41,16 @@ import {MatDatepickerInputEvent} from '@angular/material/datepicker';
     standalone: false
 })
 export class PlanningEditComponent implements OnInit, OnDestroy {
+  private foldersService = inject(FoldersService);
+  private activateRoute = inject(ActivatedRoute);
+  private itemsPlanningPnPlanningsService = inject(ItemsPlanningPnPlanningsService);
+  private cd = inject(ChangeDetectorRef);
+  private tagsService = inject(ItemsPlanningPnTagsService);
+  private eFormService = inject(EFormService);
+  private location = inject(Location);
+  public dialog = inject(MatDialog);
+  private overlay = inject(Overlay);
+
   selectedPlanningModel: PlanningModel = new PlanningModel();
   templateRequestModel: TemplateRequestModel = new TemplateRequestModel();
   templatesModel: TemplateListModel = new TemplateListModel();
@@ -62,17 +73,7 @@ export class PlanningEditComponent implements OnInit, OnDestroy {
   activatedRouteSub$: Subscription;
   folderSelectedSub$: Subscription;
 
-  constructor(
-    private foldersService: FoldersService,
-    private activateRoute: ActivatedRoute,
-    private itemsPlanningPnPlanningsService: ItemsPlanningPnPlanningsService,
-    private cd: ChangeDetectorRef,
-    private tagsService: ItemsPlanningPnTagsService,
-    private eFormService: EFormService,
-    private location: Location,
-    public dialog: MatDialog,
-    private overlay: Overlay,
-  ) {
+  constructor() {
     this.typeahead
       .pipe(
         debounceTime(200),

eform-client/src/app/plugins/modules/items-planning-pn/modules/plannings/components/planning-actions/planning-multiple-delete/planning-multiple-delete.component.ts

@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Inject, OnInit,} from '@angular/core';
+import {Component, EventEmitter, Inject, OnInit, inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 
 @Component({
@@ -8,11 +8,10 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
     standalone: false
 })
 export class PlanningMultipleDeleteComponent implements OnInit {
+  public dialogRef = inject(MatDialogRef<PlanningMultipleDeleteComponent>);
+  public selectedPlanningsCount = inject<number>(MAT_DIALOG_DATA);
+
   deleteMultiplePlannings: EventEmitter<void> = new EventEmitter<void>();
-  constructor(
-    public dialogRef: MatDialogRef<PlanningMultipleDeleteComponent>,
-    @Inject(MAT_DIALOG_DATA) public selectedPlanningsCount: number,
-  ) {}
 
   ngOnInit() {}