clean up and lint files

This commit is contained in:
2025-01-05 10:29:29 +01:00
parent 54ee9a5b11
commit 189478f078
137 changed files with 1096 additions and 1340 deletions

View File

@@ -8,8 +8,7 @@ import {DbService} from '../../../services/db.service';
providedIn: 'root',
})
export class FileDataService {
public constructor(private db: DbService) {
}
public constructor(private db: DbService) {}
public async set(songId: string, file: FileServer): Promise<string> {
const songRef = this.db.doc('songs/' + songId);

View File

@@ -7,8 +7,10 @@ import {FileDataService} from './file-data.service';
providedIn: 'root',
})
export class FileService {
public constructor(private storage: AngularFireStorage, private fileDataService: FileDataService) {
}
public constructor(
private storage: AngularFireStorage,
private fileDataService: FileDataService
) {}
public getDownloadUrl(path: string): Observable<string> {
const ref = this.storage.ref(path);

View File

@@ -19,7 +19,7 @@ describe('SongDataService', () => {
() =>
void TestBed.configureTestingModule({
providers: [{provide: AngularFirestore, useValue: mockAngularFirestore}],
}),
})
);
it('should be created', () => {
@@ -27,13 +27,10 @@ describe('SongDataService', () => {
void expect(service).toBeTruthy();
});
it(
'should list songs',
waitForAsync(() => {
const service: SongDataService = TestBed.inject(SongDataService);
service.list$().subscribe(s => {
void expect(s[0].title).toEqual('title1');
});
}),
);
it('should list songs', waitForAsync(() => {
const service: SongDataService = TestBed.inject(SongDataService);
service.list$().subscribe(s => {
void expect(s[0].title).toEqual('title1');
});
}));
});

View File

@@ -14,6 +14,7 @@ export class SongDataService {
public constructor(private dbService: DbService) {
this.dbService.col$<Song>(this.collection).subscribe(_ => this.list$.next(_));
}
// public list$ = (): Observable<Song[]> => this.dbService.col$(this.collection);
//public read$ = (songId: string): Observable<Song | null> => this.dbService.doc$(this.collection + '/' + songId);

View File

@@ -9,8 +9,7 @@ import {filter} from 'rxjs/operators';
providedIn: 'root',
})
export class SongListResolver {
public constructor(private songService: SongService) {
}
public constructor(private songService: SongService) {}
public resolve(): Observable<Song[]> {
return this.songService.list$().pipe(filter(_ => _.length > 0));

View File

@@ -15,7 +15,7 @@ describe('SongService', () => {
() =>
void TestBed.configureTestingModule({
providers: [{provide: SongDataService, useValue: mockSongDataService}],
}),
})
);
it('should be created', () => {
@@ -23,13 +23,10 @@ describe('SongService', () => {
void expect(service).toBeTruthy();
});
it(
'should list songs',
waitForAsync(() => {
const service: SongService = TestBed.inject(SongService);
service.list$().subscribe(s => {
void expect(s[0].title).toEqual('title1');
});
}),
);
it('should list songs', waitForAsync(() => {
const service: SongService = TestBed.inject(SongService);
service.list$().subscribe(s => {
void expect(s[0].title).toEqual('title1');
});
}));
});

View File

@@ -27,7 +27,7 @@ export class SongService {
public constructor(
private songDataService: SongDataService,
private userService: UserService,
private userService: UserService
) {
// importCCLI = (songs: Song[]) => this.updateFromCLI(songs);
}

View File

@@ -10,7 +10,10 @@ import {FileServer} from './fileServer';
providedIn: 'root',
})
export class UploadService extends FileBase {
public constructor(private fileDataService: FileDataService, private angularFireStorage: AngularFireStorage) {
public constructor(
private fileDataService: FileDataService,
private angularFireStorage: AngularFireStorage
) {
super();
}

View File

@@ -6,13 +6,11 @@ describe('FilterComponent', () => {
let component: FilterComponent;
let fixture: ComponentFixture<FilterComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [FilterComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [FilterComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FilterComponent);

View File

@@ -1,35 +1,24 @@
import {Component, Input} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import { UntypedFormBuilder, UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
import {ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {SongService} from '../../services/song.service';
import {FilterValues} from './filter-values';
import {Song} from '../../services/song';
import {KEYS} from '../../services/key.helper';
import { MatFormField, MatLabel } from '@angular/material/form-field';
import { MatInput } from '@angular/material/input';
import { MatSelect } from '@angular/material/select';
import { MatOption } from '@angular/material/core';
import { NgFor } from '@angular/common';
import { LegalTypePipe } from '../../../../widget-modules/pipes/legal-type-translator/legal-type.pipe';
import { KeyPipe } from '../../../../widget-modules/pipes/key-translator/key.pipe';
import { SongTypePipe } from '../../../../widget-modules/pipes/song-type-translater/song-type.pipe';
import {MatFormField, MatLabel} from '@angular/material/form-field';
import {MatInput} from '@angular/material/input';
import {MatSelect} from '@angular/material/select';
import {MatOption} from '@angular/material/core';
import {NgFor} from '@angular/common';
import {LegalTypePipe} from '../../../../widget-modules/pipes/legal-type-translator/legal-type.pipe';
import {KeyPipe} from '../../../../widget-modules/pipes/key-translator/key.pipe';
import {SongTypePipe} from '../../../../widget-modules/pipes/song-type-translater/song-type.pipe';
@Component({
selector: 'app-filter',
templateUrl: './filter.component.html',
styleUrls: ['./filter.component.less'],
imports: [
ReactiveFormsModule,
MatFormField,
MatLabel,
MatInput,
MatSelect,
MatOption,
NgFor,
LegalTypePipe,
KeyPipe,
SongTypePipe,
],
selector: 'app-filter',
templateUrl: './filter.component.html',
styleUrls: ['./filter.component.less'],
imports: [ReactiveFormsModule, MatFormField, MatLabel, MatInput, MatSelect, MatOption, NgFor, LegalTypePipe, KeyPipe, SongTypePipe],
})
export class FilterComponent {
public filterFormGroup: UntypedFormGroup;
@@ -39,7 +28,11 @@ export class FilterComponent {
public legalType = SongService.LEGAL_TYPE;
public keys = KEYS;
public constructor(private router: Router, activatedRoute: ActivatedRoute, fb: UntypedFormBuilder) {
public constructor(
private router: Router,
activatedRoute: ActivatedRoute,
fb: UntypedFormBuilder
) {
this.filterFormGroup = fb.group({
q: '',
type: '',

View File

@@ -15,15 +15,13 @@ describe('SongListComponent', () => {
list: () => of(songs),
};
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [SongListComponent],
providers: [{ provide: SongService, useValue: mockSongService }],
schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [SongListComponent],
providers: [{provide: SongService, useValue: mockSongService}],
schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SongListComponent);

View File

@@ -4,35 +4,25 @@ import {Song} from '../services/song';
import {map} from 'rxjs/operators';
import {combineLatest, Observable} from 'rxjs';
import {fade} from '../../../animations';
import { ActivatedRoute, RouterLink } from '@angular/router';
import {ActivatedRoute, RouterLink} from '@angular/router';
import {filterSong} from '../../../services/filter.helper';
import {FilterValues} from './filter/filter-values';
import {ScrollService} from '../../../services/scroll.service';
import {faBalanceScaleRight, faCheck, faPencilRuler} from '@fortawesome/free-solid-svg-icons';
import { NgIf, NgFor, AsyncPipe } from '@angular/common';
import { ListHeaderComponent } from '../../../widget-modules/components/list-header/list-header.component';
import { FilterComponent } from './filter/filter.component';
import { CardComponent } from '../../../widget-modules/components/card/card.component';
import { RoleDirective } from '../../../services/user/role.directive';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import {AsyncPipe, NgFor, NgIf} from '@angular/common';
import {ListHeaderComponent} from '../../../widget-modules/components/list-header/list-header.component';
import {FilterComponent} from './filter/filter.component';
import {CardComponent} from '../../../widget-modules/components/card/card.component';
import {RoleDirective} from '../../../services/user/role.directive';
import {FaIconComponent} from '@fortawesome/angular-fontawesome';
@Component({
selector: 'app-songs',
templateUrl: './song-list.component.html',
styleUrls: ['./song-list.component.less'],
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [fade],
imports: [
NgIf,
ListHeaderComponent,
FilterComponent,
CardComponent,
NgFor,
RouterLink,
RoleDirective,
FaIconComponent,
AsyncPipe,
],
selector: 'app-songs',
templateUrl: './song-list.component.html',
styleUrls: ['./song-list.component.less'],
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [fade],
imports: [NgIf, ListHeaderComponent, FilterComponent, CardComponent, NgFor, RouterLink, RoleDirective, FaIconComponent, AsyncPipe],
})
export class SongListComponent implements OnInit, OnDestroy {
public anyFilterActive = false;
@@ -40,7 +30,7 @@ export class SongListComponent implements OnInit, OnDestroy {
this.activatedRoute.queryParams.pipe(map(_ => _ as FilterValues)),
this.activatedRoute.data.pipe(
map(data => data.songList as Song[]),
map(songs => songs.sort((a, b) => a.number - b.number)),
map(songs => songs.sort((a, b) => a.number - b.number))
),
]).pipe(
map(_ => {
@@ -48,14 +38,17 @@ export class SongListComponent implements OnInit, OnDestroy {
const filter = _[0];
this.anyFilterActive = this.checkIfFilterActive(filter);
return songs.filter(song => this.filter(song, filter)).sort((a, b) => a.title?.localeCompare(b.title));
}),
})
);
public faLegal = faBalanceScaleRight;
public faDraft = faPencilRuler;
public faFinal = faCheck;
public constructor(private songService: SongService, private activatedRoute: ActivatedRoute, private scrollService: ScrollService) {
}
public constructor(
private songService: SongService,
private activatedRoute: ActivatedRoute,
private scrollService: ScrollService
) {}
public ngOnInit(): void {
setTimeout(() => this.scrollService.restoreScrollPositionFor('songlist'), 100);

View File

@@ -6,13 +6,11 @@ describe('EditFileComponent', () => {
let component: EditFileComponent;
let fixture: ComponentFixture<EditFileComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [EditFileComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [EditFileComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(EditFileComponent);

View File

@@ -6,26 +6,17 @@ import {map, switchMap} from 'rxjs/operators';
import {FileDataService} from '../../../services/file-data.service';
import {Observable} from 'rxjs';
import {File} from '../../../services/file';
import { CardComponent } from '../../../../../widget-modules/components/card/card.component';
import { NgIf, NgStyle, NgFor, AsyncPipe } from '@angular/common';
import { MatIconButton } from '@angular/material/button';
import { MatIcon } from '@angular/material/icon';
import { FileComponent } from './file/file.component';
import {CardComponent} from '../../../../../widget-modules/components/card/card.component';
import {AsyncPipe, NgFor, NgIf, NgStyle} from '@angular/common';
import {MatIconButton} from '@angular/material/button';
import {MatIcon} from '@angular/material/icon';
import {FileComponent} from './file/file.component';
@Component({
selector: 'app-edit-file',
templateUrl: './edit-file.component.html',
styleUrls: ['./edit-file.component.less'],
imports: [
CardComponent,
NgIf,
NgStyle,
MatIconButton,
MatIcon,
NgFor,
FileComponent,
AsyncPipe,
],
selector: 'app-edit-file',
templateUrl: './edit-file.component.html',
styleUrls: ['./edit-file.component.less'],
imports: [CardComponent, NgIf, NgStyle, MatIconButton, MatIcon, NgFor, FileComponent, AsyncPipe],
})
export class EditFileComponent {
public selectedFiles: FileList | null = null;
@@ -33,11 +24,15 @@ export class EditFileComponent {
public songId: string | null = null;
public files$: Observable<File[]>;
public constructor(private activatedRoute: ActivatedRoute, private uploadService: UploadService, private fileService: FileDataService) {
public constructor(
private activatedRoute: ActivatedRoute,
private uploadService: UploadService,
private fileService: FileDataService
) {
this.activatedRoute.params
.pipe(
map(param => param as {songId: string}),
map(param => param.songId),
map(param => param.songId)
)
.subscribe(songId => {
this.songId = songId;
@@ -46,7 +41,7 @@ export class EditFileComponent {
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))
);
}

View File

@@ -6,13 +6,11 @@ describe('FileComponent', () => {
let component: FileComponent;
let fixture: ComponentFixture<FileComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [FileComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [FileComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FileComponent);

View File

@@ -3,19 +3,15 @@ import {Observable} from 'rxjs';
import {File} from '../../../../services/file';
import {faTrashAlt} from '@fortawesome/free-solid-svg-icons';
import {FileService} from '../../../../services/file.service';
import { MatIconButton } from '@angular/material/button';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { AsyncPipe } from '@angular/common';
import {MatIconButton} from '@angular/material/button';
import {FaIconComponent} from '@fortawesome/angular-fontawesome';
import {AsyncPipe} from '@angular/common';
@Component({
selector: 'app-file',
templateUrl: './file.component.html',
styleUrls: ['./file.component.less'],
imports: [
MatIconButton,
FaIconComponent,
AsyncPipe,
],
selector: 'app-file',
templateUrl: './file.component.html',
styleUrls: ['./file.component.less'],
imports: [MatIconButton, FaIconComponent, AsyncPipe],
})
export class FileComponent {
public url$: Observable<string> | null = null;
@@ -25,8 +21,7 @@ export class FileComponent {
private fileId: string | null = null;
private path: string | null = null;
public constructor(private fileService: FileService) {
}
public constructor(private fileService: FileService) {}
@Input()
public set file(file: File) {

View File

@@ -11,7 +11,7 @@ export class EditSongGuard {
component: EditComponent,
currentRoute: ActivatedRouteSnapshot,
currentState: RouterStateSnapshot,
nextState: RouterStateSnapshot,
nextState: RouterStateSnapshot
): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
return component.editSongComponent ? component.editSongComponent.askForSave(nextState) : true;
}

View File

@@ -6,13 +6,11 @@ describe('EditSongComponent', () => {
let component: EditSongComponent;
let fixture: ComponentFixture<EditSongComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [EditSongComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [EditSongComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(EditSongComponent);

View File

@@ -1,64 +1,64 @@
import {Component, OnInit} from '@angular/core';
import {Song} from '../../../services/song';
import { UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
import {ReactiveFormsModule, UntypedFormGroup} from '@angular/forms';
import {ActivatedRoute, Router, RouterStateSnapshot} from '@angular/router';
import {SongService} from '../../../services/song.service';
import {EditService} from '../edit.service';
import {first, map, switchMap} from 'rxjs/operators';
import {KEYS} from '../../../services/key.helper';
import {COMMA, ENTER} from '@angular/cdk/keycodes';
import { MatChipInputEvent, MatChipGrid, MatChipRow, MatChipInput } from '@angular/material/chips';
import {MatChipGrid, MatChipInput, MatChipInputEvent, MatChipRow} from '@angular/material/chips';
import {faExternalLinkAlt, faSave, faTimesCircle} from '@fortawesome/free-solid-svg-icons';
import {MatDialog} from '@angular/material/dialog';
import {SaveDialogComponent} from './save-dialog/save-dialog.component';
import { NgIf, NgFor } from '@angular/common';
import { CardComponent } from '../../../../../widget-modules/components/card/card.component';
import { MatFormField, MatLabel, MatSuffix } from '@angular/material/form-field';
import { MatInput } from '@angular/material/input';
import { MatSelect } from '@angular/material/select';
import { MatOption } from '@angular/material/core';
import { CdkTextareaAutosize } from '@angular/cdk/text-field';
import { SongTextComponent } from '../../../../../widget-modules/components/song-text/song-text.component';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { MatTooltip } from '@angular/material/tooltip';
import { ButtonRowComponent } from '../../../../../widget-modules/components/button-row/button-row.component';
import { ButtonComponent } from '../../../../../widget-modules/components/button/button.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 { LegalTypePipe } from '../../../../../widget-modules/pipes/legal-type-translator/legal-type.pipe';
import { KeyPipe } from '../../../../../widget-modules/pipes/key-translator/key.pipe';
import { StatusPipe } from '../../../../../widget-modules/pipes/status-translater/status.pipe';
import {NgFor, NgIf} from '@angular/common';
import {CardComponent} from '../../../../../widget-modules/components/card/card.component';
import {MatFormField, MatLabel, MatSuffix} from '@angular/material/form-field';
import {MatInput} from '@angular/material/input';
import {MatSelect} from '@angular/material/select';
import {MatOption} from '@angular/material/core';
import {CdkTextareaAutosize} from '@angular/cdk/text-field';
import {SongTextComponent} from '../../../../../widget-modules/components/song-text/song-text.component';
import {FaIconComponent} from '@fortawesome/angular-fontawesome';
import {MatTooltip} from '@angular/material/tooltip';
import {ButtonRowComponent} from '../../../../../widget-modules/components/button-row/button-row.component';
import {ButtonComponent} from '../../../../../widget-modules/components/button/button.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 {LegalTypePipe} from '../../../../../widget-modules/pipes/legal-type-translator/legal-type.pipe';
import {KeyPipe} from '../../../../../widget-modules/pipes/key-translator/key.pipe';
import {StatusPipe} from '../../../../../widget-modules/pipes/status-translater/status.pipe';
@Component({
selector: 'app-edit-song',
templateUrl: './edit-song.component.html',
styleUrls: ['./edit-song.component.less'],
imports: [
NgIf,
CardComponent,
ReactiveFormsModule,
MatFormField,
MatLabel,
MatInput,
MatSelect,
NgFor,
MatOption,
CdkTextareaAutosize,
SongTextComponent,
MatChipGrid,
MatChipRow,
FaIconComponent,
MatChipInput,
MatSuffix,
MatTooltip,
ButtonRowComponent,
ButtonComponent,
SongTypePipe,
LegalOwnerPipe,
LegalTypePipe,
KeyPipe,
StatusPipe,
],
selector: 'app-edit-song',
templateUrl: './edit-song.component.html',
styleUrls: ['./edit-song.component.less'],
imports: [
NgIf,
CardComponent,
ReactiveFormsModule,
MatFormField,
MatLabel,
MatInput,
MatSelect,
NgFor,
MatOption,
CdkTextareaAutosize,
SongTextComponent,
MatChipGrid,
MatChipRow,
FaIconComponent,
MatChipInput,
MatSuffix,
MatTooltip,
ButtonRowComponent,
ButtonComponent,
SongTypePipe,
LegalOwnerPipe,
LegalTypePipe,
KeyPipe,
StatusPipe,
],
})
export class EditSongComponent implements OnInit {
public song: Song | null = null;
@@ -80,9 +80,8 @@ export class EditSongComponent implements OnInit {
private songService: SongService,
private editService: EditService,
private router: Router,
public dialog: MatDialog,
) {
}
public dialog: MatDialog
) {}
public ngOnInit(): void {
this.activatedRoute.params
@@ -90,7 +89,7 @@ export class EditSongComponent implements OnInit {
map(param => param as {songId: string}),
map(param => param.songId),
switchMap(songId => this.songService.read$(songId)),
first(),
first()
)
.subscribe(song => {
this.song = song;

View File

@@ -6,13 +6,11 @@ describe('SaveDialogComponent', () => {
let component: SaveDialogComponent;
let fixture: ComponentFixture<SaveDialogComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
declarations: [SaveDialogComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
declarations: [SaveDialogComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SaveDialogComponent);

View File

@@ -4,7 +4,5 @@ import {Component} from '@angular/core';
selector: 'app-save-dialog',
templateUrl: './save-dialog.component.html',
styleUrls: ['./save-dialog.component.less'],
standalone: false,
})
export class SaveDialogComponent {
}
export class SaveDialogComponent {}

View File

@@ -6,13 +6,11 @@ describe('EditComponent', () => {
let component: EditComponent;
let fixture: ComponentFixture<EditComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [EditComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [EditComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(EditComponent);

View File

@@ -1,17 +1,13 @@
import {Component, ViewChild} from '@angular/core';
import {EditSongComponent} from './edit-song/edit-song.component';
import { EditFileComponent } from './edit-file/edit-file.component';
import { HistoryComponent } from './history/history.component';
import {EditFileComponent} from './edit-file/edit-file.component';
import {HistoryComponent} from './history/history.component';
@Component({
selector: 'app-edit',
templateUrl: './edit.component.html',
styleUrls: ['./edit.component.less'],
imports: [
EditSongComponent,
EditFileComponent,
HistoryComponent,
],
selector: 'app-edit',
templateUrl: './edit.component.html',
styleUrls: ['./edit.component.less'],
imports: [EditSongComponent, EditFileComponent, HistoryComponent],
})
export class EditComponent {
@ViewChild(EditSongComponent) public editSongComponent: EditSongComponent | null = null;

View File

@@ -28,10 +28,10 @@ import {SongTypePipe} from '../../../../widget-modules/pipes/song-type-translate
import {StatusPipe} from '../../../../widget-modules/pipes/status-translater/status.pipe';
@NgModule({
declarations: [SaveDialogComponent],
exports: [EditComponent],
bootstrap: [SaveDialogComponent],
imports: [
declarations: [SaveDialogComponent],
exports: [EditComponent],
bootstrap: [SaveDialogComponent],
imports: [
CommonModule,
SongTypePipe,
ReactiveFormsModule,
@@ -50,7 +50,11 @@ import {StatusPipe} from '../../../../widget-modules/pipes/status-translater/sta
MatTooltipModule,
MatDialogModule,
SongTextComponent,
EditComponent, EditSongComponent, EditFileComponent, FileComponent, HistoryComponent,
],
EditComponent,
EditSongComponent,
EditFileComponent,
FileComponent,
HistoryComponent,
],
})
export class EditModule {}

View File

@@ -6,13 +6,11 @@ describe('HistoryComponent', () => {
let component: HistoryComponent;
let fixture: ComponentFixture<HistoryComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [HistoryComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [HistoryComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(HistoryComponent);

View File

@@ -3,25 +3,22 @@ import {first, map, switchMap} from 'rxjs/operators';
import {ActivatedRoute} from '@angular/router';
import {SongService} from '../../../services/song.service';
import {Song} from '../../../services/song';
import { NgIf, NgFor, DatePipe } from '@angular/common';
import { CardComponent } from '../../../../../widget-modules/components/card/card.component';
import {DatePipe, NgFor, NgIf} from '@angular/common';
import {CardComponent} from '../../../../../widget-modules/components/card/card.component';
@Component({
selector: 'app-history',
templateUrl: './history.component.html',
styleUrls: ['./history.component.less'],
imports: [
NgIf,
CardComponent,
NgFor,
DatePipe,
],
selector: 'app-history',
templateUrl: './history.component.html',
styleUrls: ['./history.component.less'],
imports: [NgIf, CardComponent, NgFor, DatePipe],
})
export class HistoryComponent implements OnInit {
public song: Song | null = null;
public constructor(private activatedRoute: ActivatedRoute, private songService: SongService) {
}
public constructor(
private activatedRoute: ActivatedRoute,
private songService: SongService
) {}
public ngOnInit(): void {
this.activatedRoute.params
@@ -29,7 +26,7 @@ export class HistoryComponent implements OnInit {
map(param => param as {songId: string}),
map(param => param.songId),
switchMap(songId => this.songService.read$(songId)),
first(),
first()
)
.subscribe(song => {
this.song = song;

View File

@@ -6,13 +6,11 @@ describe('FileComponent', () => {
let component: FileComponent;
let fixture: ComponentFixture<FileComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [FileComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [FileComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FileComponent);

View File

@@ -2,20 +2,19 @@ import {Component, Input} from '@angular/core';
import {File} from '../../services/file';
import {AngularFireStorage} from '@angular/fire/compat/storage';
import {Observable} from 'rxjs';
import { AsyncPipe } from '@angular/common';
import {AsyncPipe} from '@angular/common';
@Component({
selector: 'app-file',
templateUrl: './file.component.html',
styleUrls: ['./file.component.less'],
imports: [AsyncPipe],
selector: 'app-file',
templateUrl: './file.component.html',
styleUrls: ['./file.component.less'],
imports: [AsyncPipe],
})
export class FileComponent {
public url$: Observable<string> | null = null;
public name = '';
public constructor(private storage: AngularFireStorage) {
}
public constructor(private storage: AngularFireStorage) {}
@Input()
public set file(file: File) {

View File

@@ -6,13 +6,11 @@ describe('NewComponent', () => {
let component: NewComponent;
let fixture: ComponentFixture<NewComponent>;
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [NewComponent],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [NewComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(NewComponent);

View File

@@ -1,29 +1,21 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import {faSave} from '@fortawesome/free-solid-svg-icons';
import { UntypedFormControl, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import {ReactiveFormsModule, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms';
import {SongService} from '../../services/song.service';
import {Song} from '../../services/song';
import {Router} from '@angular/router';
import {Subscription} from 'rxjs';
import { CardComponent } from '../../../../widget-modules/components/card/card.component';
import { MatFormField, MatLabel } from '@angular/material/form-field';
import { MatInput } from '@angular/material/input';
import { ButtonRowComponent } from '../../../../widget-modules/components/button-row/button-row.component';
import { ButtonComponent } from '../../../../widget-modules/components/button/button.component';
import {CardComponent} from '../../../../widget-modules/components/card/card.component';
import {MatFormField, MatLabel} from '@angular/material/form-field';
import {MatInput} from '@angular/material/input';
import {ButtonRowComponent} from '../../../../widget-modules/components/button-row/button-row.component';
import {ButtonComponent} from '../../../../widget-modules/components/button/button.component';
@Component({
selector: 'app-new',
templateUrl: './new.component.html',
styleUrls: ['./new.component.less'],
imports: [
CardComponent,
ReactiveFormsModule,
MatFormField,
MatLabel,
MatInput,
ButtonRowComponent,
ButtonComponent,
],
selector: 'app-new',
templateUrl: './new.component.html',
styleUrls: ['./new.component.less'],
imports: [CardComponent, ReactiveFormsModule, MatFormField, MatLabel, MatInput, ButtonRowComponent, ButtonComponent],
})
export class NewComponent implements OnInit, OnDestroy {
public faSave = faSave;
@@ -33,8 +25,10 @@ export class NewComponent implements OnInit, OnDestroy {
});
private subs: Subscription[] = [];
public constructor(private songService: SongService, private router: Router) {
}
public constructor(
private songService: SongService,
private router: Router
) {}
public ngOnInit(): void {
this.form.reset();
@@ -43,7 +37,7 @@ export class NewComponent implements OnInit, OnDestroy {
this.songService.list$().subscribe(songs => {
const freeSongnumber = this.getFreeSongNumber(songs);
this.form.controls.number.setValue(freeSongnumber);
}),
})
);
}

View File

@@ -12,14 +12,12 @@ describe('SongComponent', () => {
params: of({songId: '4711'}),
};
beforeEach(
waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [SongComponent],
providers: [{ provide: ActivatedRoute, useValue: mockActivatedRoute }],
}).compileComponents();
}),
);
beforeEach(waitForAsync(() => {
void TestBed.configureTestingModule({
imports: [SongComponent],
providers: [{provide: ActivatedRoute, useValue: mockActivatedRoute}],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SongComponent);

View File

@@ -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()
);
}

View File

@@ -33,5 +33,4 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class SongsRoutingModule {
}
export class SongsRoutingModule {}

View File

@@ -3,13 +3,10 @@ import {CommonModule} from '@angular/common';
import {SongsRoutingModule} from './songs-routing.module';
import {EditModule} from './song/edit/edit.module';
@NgModule({
declarations: [],
imports: [CommonModule, SongsRoutingModule, EditModule],
})
export class SongsModule {
}
export class SongsModule {}