clean up and lint files
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import {Component, OnInit} from '@angular/core';
|
||||
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
|
||||
import {ActivatedRoute, Router, RouterLink} from '@angular/router';
|
||||
import {SongService} from '../services/song.service';
|
||||
import {distinctUntilChanged, map, switchMap} from 'rxjs/operators';
|
||||
import {Song} from '../services/song';
|
||||
@@ -12,45 +12,45 @@ import {faEdit, faFileCirclePlus, faTrash} from '@fortawesome/free-solid-svg-ico
|
||||
import {ShowService} from '../../shows/services/show.service';
|
||||
import {Show} from '../../shows/services/show';
|
||||
import {ShowSongService} from '../../shows/services/show-song.service';
|
||||
import { NgIf, NgFor, AsyncPipe, DatePipe } from '@angular/common';
|
||||
import { CardComponent } from '../../../widget-modules/components/card/card.component';
|
||||
import { RoleDirective } from '../../../services/user/role.directive';
|
||||
import { SongTextComponent } from '../../../widget-modules/components/song-text/song-text.component';
|
||||
import { MatChipListbox, MatChipOption } from '@angular/material/chips';
|
||||
import { ButtonRowComponent } from '../../../widget-modules/components/button-row/button-row.component';
|
||||
import { ButtonComponent } from '../../../widget-modules/components/button/button.component';
|
||||
import { MatMenuTrigger, MatMenu } from '@angular/material/menu';
|
||||
import { FileComponent } from './file/file.component';
|
||||
import { SongTypePipe } from '../../../widget-modules/pipes/song-type-translater/song-type.pipe';
|
||||
import { LegalOwnerPipe } from '../../../widget-modules/pipes/legal-owner-translator/legal-owner.pipe';
|
||||
import { StatusPipe } from '../../../widget-modules/pipes/status-translater/status.pipe';
|
||||
import { ShowTypePipe } from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
|
||||
import {AsyncPipe, DatePipe, NgFor, NgIf} from '@angular/common';
|
||||
import {CardComponent} from '../../../widget-modules/components/card/card.component';
|
||||
import {RoleDirective} from '../../../services/user/role.directive';
|
||||
import {SongTextComponent} from '../../../widget-modules/components/song-text/song-text.component';
|
||||
import {MatChipListbox, MatChipOption} from '@angular/material/chips';
|
||||
import {ButtonRowComponent} from '../../../widget-modules/components/button-row/button-row.component';
|
||||
import {ButtonComponent} from '../../../widget-modules/components/button/button.component';
|
||||
import {MatMenu, MatMenuTrigger} from '@angular/material/menu';
|
||||
import {FileComponent} from './file/file.component';
|
||||
import {SongTypePipe} from '../../../widget-modules/pipes/song-type-translater/song-type.pipe';
|
||||
import {LegalOwnerPipe} from '../../../widget-modules/pipes/legal-owner-translator/legal-owner.pipe';
|
||||
import {StatusPipe} from '../../../widget-modules/pipes/status-translater/status.pipe';
|
||||
import {ShowTypePipe} from '../../../widget-modules/pipes/show-type-translater/show-type.pipe';
|
||||
|
||||
@Component({
|
||||
selector: 'app-song',
|
||||
templateUrl: './song.component.html',
|
||||
styleUrls: ['./song.component.less'],
|
||||
imports: [
|
||||
NgIf,
|
||||
CardComponent,
|
||||
RoleDirective,
|
||||
SongTextComponent,
|
||||
MatChipListbox,
|
||||
NgFor,
|
||||
MatChipOption,
|
||||
ButtonRowComponent,
|
||||
ButtonComponent,
|
||||
RouterLink,
|
||||
MatMenuTrigger,
|
||||
MatMenu,
|
||||
FileComponent,
|
||||
AsyncPipe,
|
||||
DatePipe,
|
||||
SongTypePipe,
|
||||
LegalOwnerPipe,
|
||||
StatusPipe,
|
||||
ShowTypePipe,
|
||||
],
|
||||
selector: 'app-song',
|
||||
templateUrl: './song.component.html',
|
||||
styleUrls: ['./song.component.less'],
|
||||
imports: [
|
||||
NgIf,
|
||||
CardComponent,
|
||||
RoleDirective,
|
||||
SongTextComponent,
|
||||
MatChipListbox,
|
||||
NgFor,
|
||||
MatChipOption,
|
||||
ButtonRowComponent,
|
||||
ButtonComponent,
|
||||
RouterLink,
|
||||
MatMenuTrigger,
|
||||
MatMenu,
|
||||
FileComponent,
|
||||
AsyncPipe,
|
||||
DatePipe,
|
||||
SongTypePipe,
|
||||
LegalOwnerPipe,
|
||||
StatusPipe,
|
||||
ShowTypePipe,
|
||||
],
|
||||
})
|
||||
export class SongComponent implements OnInit {
|
||||
public song$: Observable<Song | null> | null = null;
|
||||
@@ -68,7 +68,7 @@ export class SongComponent implements OnInit {
|
||||
private userService: UserService,
|
||||
private router: Router,
|
||||
private showService: ShowService,
|
||||
private showSongService: ShowSongService,
|
||||
private showSongService: ShowSongService
|
||||
) {
|
||||
this.user$ = userService.user$;
|
||||
}
|
||||
@@ -77,13 +77,13 @@ export class SongComponent implements OnInit {
|
||||
this.song$ = this.activatedRoute.params.pipe(
|
||||
map(param => param as {songId: string}),
|
||||
map(param => param.songId),
|
||||
switchMap(songId => this.songService.read$(songId)),
|
||||
switchMap(songId => this.songService.read$(songId))
|
||||
);
|
||||
|
||||
this.files$ = this.activatedRoute.params.pipe(
|
||||
map(param => param as {songId: string}),
|
||||
map(param => param.songId),
|
||||
switchMap(songId => this.fileService.read$(songId)),
|
||||
switchMap(songId => this.fileService.read$(songId))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -111,6 +111,6 @@ export class SongComponent implements OnInit {
|
||||
map(([user, song]) => {
|
||||
return user.songUsage[song.id];
|
||||
}),
|
||||
distinctUntilChanged(),
|
||||
distinctUntilChanged()
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user