migrate angular 21 finalize

src/app/widget-modules/components/add-song/add-song.component.ts

@@ -1,4 +1,4 @@
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
+import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
 import {ReactiveFormsModule, UntypedFormControl} from '@angular/forms';
 import {filterSong} from '../../../services/filter.helper';
 import {MatFormField, MatLabel, MatOption, MatSelect, MatSelectChange} from '@angular/material/select';
@@ -18,17 +18,15 @@ import {NgxMatSelectSearchModule} from 'ngx-mat-select-search';
   imports: [MatFormField, MatSelect, MatOption, MatLabel, NgxMatSelectSearchModule, ReactiveFormsModule],
 })
 export class AddSongComponent {
+  private showSongService = inject(ShowSongService);
+  private showService = inject(ShowService);
+
   @Input() public songs: Song[] | null = null;
   @Input() public showSongs: ShowSong[] | null = null;
   @Input() public show: Show | null = null;
   @Input() public addedLive = false;
   public filteredSongsControl = new UntypedFormControl();
 
-  public constructor(
-    private showSongService: ShowSongService,
-    private showService: ShowService
-  ) {}
-
   public filteredSongs(): Song[] {
     if (!this.songs) return [];
     const songs = this.songs

src/app/widget-modules/components/application-frame/navigation/filter/filter.component.ts

@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, inject} from '@angular/core';
 import {ActivatedRoute, Params, Router} from '@angular/router';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 
@@ -9,12 +9,13 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
   imports: [ReactiveFormsModule, FormsModule],
 })
 export class FilterComponent {
+  private router = inject(Router);
+
   public value = '';
 
-  public constructor(
-    private router: Router,
-    activatedRoute: ActivatedRoute
-  ) {
+  public constructor() {
+    const activatedRoute = inject(ActivatedRoute);
+
     activatedRoute.queryParams.subscribe((params: Params) => {
       const typedParams = params as {q: string};
       if (typedParams.q) this.value = typedParams.q;

src/app/widget-modules/components/song-text/song-text.component.ts

@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnInit, Output, QueryList, ViewChildren} from '@angular/core';
+import {ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnInit, Output, QueryList, ViewChildren, inject} from '@angular/core';
 import {TextRenderingService} from '../../../modules/songs/services/text-rendering.service';
 import {faGripLines} from '@fortawesome/free-solid-svg-icons';
 import {songSwitch} from './animation';
@@ -21,6 +21,10 @@ export type ChordMode = 'show' | 'hide' | 'onlyFirst';
   imports: [MatIconButton, FaIconComponent],
 })
 export class SongTextComponent implements OnInit {
+  private textRenderingService = inject(TextRenderingService);
+  private elRef = inject<ElementRef<HTMLElement>>(ElementRef);
+  private cRef = inject(ChangeDetectorRef);
+
   public sections: Section[] = [];
   @Input() public header: string | null = null;
   @Input() public index = -1;
@@ -35,12 +39,6 @@ export class SongTextComponent implements OnInit {
   private iText = '';
   private iTranspose: TransposeMode | null = null;
 
-  public constructor(
-    private textRenderingService: TextRenderingService,
-    private elRef: ElementRef<HTMLElement>,
-    private cRef: ChangeDetectorRef
-  ) {}
-
   @Input()
   public set chordMode(value: ChordMode) {
     this.iChordMode = value ?? 'hide';