update tslint -> eslint

src/app/modules/shows/show/song/song.component.html

@@ -1,21 +1,42 @@
-<div *ngIf="_song">
-  <div *ngIf="show.published" class="title published">{{_song.title}}</div>
+<div *ngIf="iSong">
+  <div *ngIf="show.published" class="title published">{{ iSong.title }}</div>
 
   <div *ngIf="!show.published" class="song">
-    <app-menu-button (click)="reorder(true)" [icon]="faUp" class="btn-up btn-icon"></app-menu-button>
-    <app-menu-button (click)="reorder(false)" [icon]="faDown" class="btn-down btn-icon"></app-menu-button>
-    <span class="title">{{_song.title}}</span>
+    <app-menu-button
+      (click)="reorder(true)"
+      [icon]="faUp"
+      class="btn-up btn-icon"
+    ></app-menu-button>
+    <app-menu-button
+      (click)="reorder(false)"
+      [icon]="faDown"
+      class="btn-down btn-icon"
+    ></app-menu-button>
+    <span class="title">{{ iSong.title }}</span>
     <span class="keys">
-    <span *ngIf="showSong.keyOriginal!==showSong.key">{{showSong.keyOriginal}}&nbsp;→&nbsp;</span>
-    <mat-form-field *ngIf="keys" appearance="standard">
+      <span *ngIf="showSong.keyOriginal !== showSong.key"
+      >{{ showSong.keyOriginal }}&nbsp;→&nbsp;</span
+      >
+      <mat-form-field *ngIf="keys" appearance="standard">
         <mat-select [formControl]="keyFormControl">
-          <mat-option *ngFor="let key of keys" [value]="key">{{key}}</mat-option>
+          <mat-option *ngFor="let key of keys" [value]="key">{{
+            key
+            }}</mat-option>
         </mat-select>
       </mat-form-field>
-  </span>
-    <app-menu-button (click)="onDelete()" [icon]="faDelete" class="btn-delete btn-icon"></app-menu-button>
+    </span>
+    <app-menu-button
+      (click)="onDelete()"
+      [icon]="faDelete"
+      class="btn-delete btn-icon"
+    ></app-menu-button>
   </div>
-  <app-song-text (chordModeChanged)="onChordModeChanged($event)" *ngIf="showText || show.published"
-                 [chordMode]="showSong.chordMode" [transpose]="{baseKey: showSong.keyOriginal, targetKey: showSong.key}"
-                 [showSwitch]="!show.published" [text]="_song.text"></app-song-text>
+  <app-song-text
+    (chordModeChanged)="onChordModeChanged($event)"
+    *ngIf="showText || show.published"
+    [chordMode]="showSong.chordMode"
+    [showSwitch]="!show.published"
+    [text]="iSong.text"
+    [transpose]="{ baseKey: showSong.keyOriginal, targetKey: showSong.key }"
+  ></app-song-text>
 </div>

src/app/modules/shows/show/song/song.component.spec.ts

@@ -6,12 +6,13 @@ describe('SongComponent', () => {
   let component: SongComponent;
   let fixture: ComponentFixture<SongComponent>;
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [SongComponent]
+  beforeEach(
+    waitForAsync(() => {
+      void TestBed.configureTestingModule({
+        declarations: [SongComponent],
+      }).compileComponents();
     })
-      .compileComponents();
-  }));
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SongComponent);
@@ -20,6 +21,6 @@ describe('SongComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    void expect(component).toBeTruthy();
   });
 });

src/app/modules/shows/show/song/song.component.ts

@@ -13,7 +13,7 @@ import {Show} from '../../services/show';
 @Component({
   selector: 'app-song',
   templateUrl: './song.component.html',
-  styleUrls: ['./song.component.less']
+  styleUrls: ['./song.component.less'],
 })
 export class SongComponent implements OnInit {
   @Input() public show: Show;
@@ -22,30 +22,25 @@ export class SongComponent implements OnInit {
   @Input() public showId: string;
   @Input() public showText: boolean;
 
-
   public keys: string[];
   public faDelete = faTrash;
   public faUp = faCaretUp;
   public faDown = faCaretDown;
   public keyFormControl: FormControl;
+  public iSong: Song;
 
-  constructor(
-    private showSongService: ShowSongService,
-  ) {
-  }
-
-  public _song: Song;
+  public constructor(private showSongService: ShowSongService) {}
 
   @Input()
-  public set song(song: Song) {
-    this._song = song;
-    this.keys = !!song ? getScale(song.key) : [];
+  public set Song(song: Song) {
+    this.iSong = song;
+    this.keys = song ? getScale(song.key) : [];
   }
 
   public ngOnInit(): void {
     this.keyFormControl = new FormControl(this.showSong.key);
-    this.keyFormControl.valueChanges.subscribe(async value => {
-      await this.showSongService.update$(this.showId, this.showSong.id, {key: value});
+    this.keyFormControl.valueChanges.subscribe((value: string) => {
+      void this.showSongService.update$(this.showId, this.showSong.id, {key: value});
     });
   }
 
@@ -53,7 +48,6 @@ export class SongComponent implements OnInit {
     await this.showSongService.delete$(this.showId, this.showSong.id);
   }
 
-
   public async reorder(up: boolean): Promise<void> {
     if (up) {
       await this.reorderUp();
@@ -63,7 +57,7 @@ export class SongComponent implements OnInit {
   }
 
   public async reorderUp(): Promise<void> {
-    const index = this.showSongs.findIndex(_ => _.songId === this._song.id);
+    const index = this.showSongs.findIndex(_ => _.songId === this.iSong.id);
     if (index === 0) {
       return;
     }
@@ -71,12 +65,16 @@ export class SongComponent implements OnInit {
     const song = this.showSongs[index];
     const toggleSong = this.showSongs[index - 1];
 
-    await this.showSongService.update$(this.showId, song.id, {order: toggleSong.order});
-    await this.showSongService.update$(this.showId, toggleSong.id, {order: song.order});
+    await this.showSongService.update$(this.showId, song.id, {
+      order: toggleSong.order,
+    });
+    await this.showSongService.update$(this.showId, toggleSong.id, {
+      order: song.order,
+    });
   }
 
   public async reorderDown(): Promise<void> {
-    const index = this.showSongs.findIndex(_ => _.songId === this._song.id);
+    const index = this.showSongs.findIndex(_ => _.songId === this.iSong.id);
     if (index === this.showSongs.length - 1) {
       return;
     }
@@ -84,11 +82,17 @@ export class SongComponent implements OnInit {
     const song = this.showSongs[index];
     const toggleSong = this.showSongs[index + 1];
 
-    await this.showSongService.update$(this.showId, song.id, {order: toggleSong.order});
-    await this.showSongService.update$(this.showId, toggleSong.id, {order: song.order});
+    await this.showSongService.update$(this.showId, song.id, {
+      order: toggleSong.order,
+    });
+    await this.showSongService.update$(this.showId, toggleSong.id, {
+      order: song.order,
+    });
   }
 
   public async onChordModeChanged(value: ChordMode): Promise<void> {
-    await this.showSongService.update$(this.showId, this.showSong.id, {chordMode: value});
+    await this.showSongService.update$(this.showId, this.showSong.id, {
+      chordMode: value,
+    });
   }
 }