benjamin/wgenerator
1
0
Fork 0
Code Releases Activity

activated typescript strict mode

Browse Source
This commit is contained in:
smuddyx
2021-05-22 15:30:04 +02:00
parent a195fafa6b
commit cb2c028ca4
76 changed files with 511 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/modules/shows/list/list-item/list-item.component.html
View File

@@ -1,4 +1,4 @@
<div class="list-item">
<div class="list-item" *ngIf="show">
<div>{{ show.date.toDate() | date: "dd.MM.yyyy" }}</div>
<div>{{ show.showType | showType }}</div>
</div>

2
src/app/modules/shows/list/list-item/list-item.component.ts
View File

@@ -7,5 +7,5 @@ import {Show} from '../../services/show';
styleUrls: ['./list-item.component.less'],
})
export class ListItemComponent {
@Input() public show: Show;
@Input() public show: Show | null = null;
}

12
src/app/modules/shows/new/new.component.ts
View File

@@ -16,7 +16,10 @@ export class NewComponent implements OnInit {
public shows$: Observable<Show[]>;
public showTypePublic = ShowService.SHOW_TYPE_PUBLIC;
public showTypePrivate = ShowService.SHOW_TYPE_PRIVATE;
public form: FormGroup;
public form: FormGroup = new FormGroup({
date: new FormControl(null, Validators.required),
showType: new FormControl(null, Validators.required),
});
public faSave = faSave;
public constructor(private showService: ShowService, showDataService: ShowDataService, private router: Router) {
@@ -24,10 +27,7 @@ export class NewComponent implements OnInit {
}
public ngOnInit(): void {
this.form = new FormGroup({
date: new FormControl(null, Validators.required),
showType: new FormControl(null, Validators.required),
});
this.form.reset();
}
public async onSave(): Promise<void> {
@@ -37,6 +37,6 @@ export class NewComponent implements OnInit {
}
const id = await this.showService.new$(this.form.value);
await this.router.navigateByUrl('/shows/' + id);
await this.router.navigateByUrl(`/shows/${id ?? ''}`);
}
}

49
src/app/modules/shows/services/docx.service.ts
View File

@@ -37,7 +37,9 @@ export class DocxService {
) {}
public async create(showId: string, options: DownloadOptions = {}): Promise<void> {
const {show, songs, user, config} = await this.prepareData(showId);
const data = await this.prepareData(showId);
if (!data) return;
const {show, songs, user, config} = data;
const type = new ShowTypePipe().transform(show.showType);
const title = `${type} ${show.date.toDate().toLocaleDateString()}`;
@@ -61,7 +63,12 @@ export class DocxService {
this.saveAs(blob, `${title}.docx`);
}
private prepareNewDocument(type: string, name: string, options: DownloadOptions, sections: ISectionOptions[]): Document {
private prepareNewDocument(
type: string,
name: string,
options: DownloadOptions,
sections: ISectionOptions[]
): Document {
return new Document({
creator: name,
title: type,
@@ -92,16 +99,29 @@ export class DocxService {
});
}
private renderSongs(songs: {showSong: ShowSong; song: Song; sections: Section[]}[], options: DownloadOptions, config: Config): Paragraph[] {
return songs.reduce((p: Paragraph[], song) => [...p, ...this.renderSong(song.showSong, song.song, song.sections, options, config)], []);
private renderSongs(
songs: {showSong: ShowSong; song: Song; sections: Section[]}[],
options: DownloadOptions,
config: Config
): Paragraph[] {
return songs.reduce(
(p: Paragraph[], song) => [...p, ...this.renderSong(song.showSong, song.song, song.sections, options, config)],
[]
);
}
private renderSong(showSong: ShowSong, song: Song, sections: Section[], options: DownloadOptions, config: Config): Paragraph[] {
private renderSong(
showSong: ShowSong,
song: Song,
sections: Section[],
options: DownloadOptions,
config: Config
): Paragraph[] {
const songTitle = this.renderSongTitle(song);
const copyright = this.renderCopyright(song, options, config);
const songText = this.renderSongText(sections, options?.chordMode ?? showSong.chordMode);
return [songTitle, copyright, ...songText].filter(_ => _);
return copyright ? [songTitle, copyright, ...songText] : [songTitle, ...songText];
}
private renderSongText(sections: Section[], chordMode: ChordMode): Paragraph[] {
@@ -119,7 +139,7 @@ export class DocxService {
});
}
private renderCopyright(song: Song, options: DownloadOptions, config: Config): Paragraph {
private renderCopyright(song: Song, options: DownloadOptions, config: Config): Paragraph | null {
if (!options?.copyright) {
return null;
}
@@ -128,7 +148,10 @@ export class DocxService {
const artist = song.artist ? song.artist + ', ' : '';
const termsOfUse = song.termsOfUse ? song.termsOfUse + ', ' : '';
const origin = song.origin ? song.origin + ', ' : '';
const licence = song.legalOwner === 'CCLI' ? 'CCLI-Liednummer: ' + song.legalOwnerId + ', CCLI-Lizenz: ' + config.ccliLicenseId : 'CCLI-Liednummer: ' + song.legalOwnerId;
const licence =
song.legalOwner === 'CCLI'
? 'CCLI-Liednummer: ' + song.legalOwnerId + ', CCLI-Lizenz: ' + config.ccliLicenseId
: 'CCLI-Liednummer: ' + song.legalOwnerId;
return new Paragraph({
text: artist + label + termsOfUse + origin + licence,
@@ -178,14 +201,18 @@ export class DocxService {
show: Show;
user: User;
config: Config;
}> {
} | null> {
const show = await this.showService.read$(showId).pipe(first()).toPromise();
if (!show) return null;
const user = await this.userService.getUserbyId(show.owner);
if (!user) return null;
const config = await this.configService.get();
if (!config) return null;
const showSongs = await this.showSongService.list(showId);
const songsAsync = showSongs.map(async showSong => {
const song = await this.songService.read(showSong.songId);
if (!song) return null;
const sections = this.textRenderingService.parse(song.text, {
baseKey: showSong.keyOriginal,
targetKey: showSong.key,
@@ -196,7 +223,9 @@ export class DocxService {
sections,
};
});
const songs = await Promise.all(songsAsync);
const songs = (await Promise.all(songsAsync))
.filter(_ => !!_)
.map(_ => _ as {showSong: ShowSong; song: Song; sections: Section[]});
return {songs, show, user, config};
}

5
src/app/modules/shows/services/show-data.service.ts
View File

@@ -13,7 +13,8 @@ export class ShowDataService {
public constructor(private dbService: DbService) {}
public list$ = (queryFn?: QueryFn): Observable<Show[]> => this.dbService.col$(this.collection, queryFn);
public read$ = (showId: string): Observable<Show | undefined> => this.dbService.doc$(`${this.collection}/${showId}`);
public update = async (showId: string, data: Partial<Show>): Promise<void> => await this.dbService.doc(`${this.collection}/${showId}`).update(data);
public read$ = (showId: string): Observable<Show | null> => this.dbService.doc$(`${this.collection}/${showId}`);
public update = async (showId: string, data: Partial<Show>): Promise<void> =>
await this.dbService.doc(`${this.collection}/${showId}`).update(data);
public add = async (data: Partial<Show>): Promise<string> => (await this.dbService.col(this.collection).add(data)).id;
}

12
src/app/modules/shows/services/show-song-data.service.ts
View File

@@ -13,10 +13,14 @@ export class ShowSongDataService {
public constructor(private dbService: DbService) {}
public list$ = (showId: string, queryFn?: QueryFn): Observable<ShowSong[]> => this.dbService.col$(`${this.collection}/${showId}/${this.subCollection}`, queryFn);
public read$ = (showId: string, songId: string): Observable<ShowSong | undefined> => this.dbService.doc$(`${this.collection}/${showId}/${this.subCollection}/${songId}`);
public list$ = (showId: string, queryFn?: QueryFn): Observable<ShowSong[]> =>
this.dbService.col$(`${this.collection}/${showId}/${this.subCollection}`, queryFn);
public read$ = (showId: string, songId: string): Observable<ShowSong | null> =>
this.dbService.doc$(`${this.collection}/${showId}/${this.subCollection}/${songId}`);
public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> =>
await this.dbService.doc(`${this.collection}/${showId}/${this.subCollection}/${songId}`).update(data);
public delete = async (showId: string, songId: string): Promise<void> => await this.dbService.doc(`${this.collection}/${showId}/${this.subCollection}/${songId}`).delete();
public add = async (showId: string, data: Partial<ShowSong>): Promise<string> => (await this.dbService.col(`${this.collection}/${showId}/${this.subCollection}`).add(data)).id;
public delete = async (showId: string, songId: string): Promise<void> =>
await this.dbService.doc(`${this.collection}/${showId}/${this.subCollection}/${songId}`).delete();
public add = async (showId: string, data: Partial<ShowSong>): Promise<string> =>
(await this.dbService.col(`${this.collection}/${showId}/${this.subCollection}`).add(data)).id;
}

15
src/app/modules/shows/services/show-song.service.ts
View File

@@ -10,11 +10,16 @@ import {UserService} from '../../../services/user/user.service';
providedIn: 'root',
})
export class ShowSongService {
public constructor(private showSongDataService: ShowSongDataService, private songDataService: SongDataService, private userService: UserService) {}
public constructor(
private showSongDataService: ShowSongDataService,
private songDataService: SongDataService,
private userService: UserService
) {}
public async new$(showId: string, songId: string, order: number, addedLive = false): Promise<string> {
public async new$(showId: string, songId: string, order: number, addedLive = false): Promise<string | null> {
const song = await this.songDataService.read$(songId).pipe(take(1)).toPromise();
const user = await this.userService.user$.pipe(take(1)).toPromise();
if (!song || !user) return null;
const data: Partial<ShowSong> = {
songId,
order,
@@ -26,8 +31,10 @@ export class ShowSongService {
return await this.showSongDataService.add(showId, data);
}
public list$ = (showId: string): Observable<ShowSong[]> => this.showSongDataService.list$(showId, _ => _.orderBy('order'));
public list$ = (showId: string): Observable<ShowSong[]> =>
this.showSongDataService.list$(showId, _ => _.orderBy('order'));
public list = (showId: string): Promise<ShowSong[]> => this.list$(showId).pipe(first()).toPromise();
public delete$ = (showId: string, songId: string): Promise<void> => this.showSongDataService.delete(showId, songId);
public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> => await this.showSongDataService.update$(showId, songId, data);
public update$ = async (showId: string, songId: string, data: Partial<ShowSong>): Promise<void> =>
await this.showSongDataService.update$(showId, songId, data);
}

37
src/app/modules/shows/services/show.service.ts
View File

@@ -10,30 +10,51 @@ import {User} from '../../../services/user/user';
providedIn: 'root',
})
export class ShowService {
public static SHOW_TYPE = ['service-worship', 'service-praise', 'home-group-big', 'home-group', 'prayer-group', 'teens-group', 'kids-group', 'misc-public', 'misc-private'];
public static SHOW_TYPE_PUBLIC = ['service-worship', 'service-praise', 'home-group-big', 'teens-group', 'kids-group', 'misc-public'];
public static SHOW_TYPE = [
'service-worship',
'service-praise',
'home-group-big',
'home-group',
'prayer-group',
'teens-group',
'kids-group',
'misc-public',
'misc-private',
];
public static SHOW_TYPE_PUBLIC = [
'service-worship',
'service-praise',
'home-group-big',
'teens-group',
'kids-group',
'misc-public',
];
public static SHOW_TYPE_PRIVATE = ['home-group', 'prayer-group', 'misc-private'];
private user: User;
private user: User | null = null;
public constructor(private showDataService: ShowDataService, private userService: UserService) {
userService.user$.subscribe(_ => (this.user = _));
}
public read$ = (showId: string): Observable<Show> => this.showDataService.read$(showId);
public read$ = (showId: string): Observable<Show | null> => this.showDataService.read$(showId);
public list$(publishedOnly = false): Observable<Show[]> {
return this.userService.user$.pipe(
switchMap(
() => this.showDataService.list$(),
(user: User, shows: Show[]) => ({user, shows})
(user: User | null, shows: Show[]) => ({user, shows})
),
map(s => s.shows.filter(_ => !_.archived).filter(show => show.published || (show.owner === s.user.id && !publishedOnly)))
map(s =>
s.shows.filter(_ => !_.archived).filter(show => show.published || (show.owner === s.user?.id && !publishedOnly))
)
);
}
public update$ = async (showId: string, data: Partial<Show>): Promise<void> => this.showDataService.update(showId, data);
public update$ = async (showId: string, data: Partial<Show>): Promise<void> =>
this.showDataService.update(showId, data);
public async new$(data: Partial<Show>): Promise<string> {
public async new$(data: Partial<Show>): Promise<string | null> {
if (!data.showType || !this.user) return null;
const calculatedData: Partial<Show> = {
...data,
owner: this.user.id,

34
src/app/modules/shows/show/show.component.ts
View File

@@ -23,11 +23,11 @@ import {faUsers} from '@fortawesome/free-solid-svg-icons/faUsers';
styleUrls: ['./show.component.less'],
})
export class ShowComponent implements OnInit {
public show$: Observable<Show>;
public songs: Song[];
public showSongs: ShowSong[];
public showId: string;
public showText: boolean;
public show$: Observable<Show | null> | null = null;
public songs: Song[] | null = null;
public showSongs: ShowSong[] | null = null;
public showId: string | null = null;
public showText = false;
public faBox = faBox;
public faBoxOpen = faBoxOpen;
@@ -47,13 +47,15 @@ export class ShowComponent implements OnInit {
public ngOnInit(): void {
this.show$ = this.activatedRoute.params.pipe(
map((param: {showId: string}) => param.showId),
map(param => param as {showId: string}),
map(param => param.showId),
tap((_: string) => (this.showId = _)),
switchMap((showId: string) => this.showService.read$(showId))
);
this.activatedRoute.params
.pipe(
map((param: {showId: string}) => param.showId),
map(param => param as {showId: string}),
map(param => param.showId),
switchMap(showId => this.showSongService.list$(showId)),
filter(_ => !!_)
)
@@ -64,17 +66,18 @@ export class ShowComponent implements OnInit {
.subscribe(_ => (this.songs = _));
}
public getSong(songId: string): Song {
public getSong(songId: string): Song | null {
if (!this.songs) return null;
const filtered = this.songs.filter(_ => _.id === songId);
return filtered.length > 0 ? filtered[0] : null;
}
public async onArchive(archived: boolean): Promise<void> {
await this.showService.update$(this.showId, {archived});
if (this.showId != null) await this.showService.update$(this.showId, {archived});
}
public async onPublish(published: boolean): Promise<void> {
await this.showService.update$(this.showId, {published});
if (this.showId != null) await this.showService.update$(this.showId, {published});
}
public getStatus(show: Show): string {
@@ -88,13 +91,14 @@ export class ShowComponent implements OnInit {
}
public async onDownload(): Promise<void> {
await this.docxService.create(this.showId);
if (this.showId != null) await this.docxService.create(this.showId);
}
public async onDownloadHandout(): Promise<void> {
await this.docxService.create(this.showId, {
chordMode: 'hide',
copyright: true,
});
if (this.showId != null)
await this.docxService.create(this.showId, {
chordMode: 'hide',
copyright: true,
});
}
}

2
src/app/modules/shows/show/song/song.component.html
View File

@@ -1,4 +1,4 @@
<div *ngIf="iSong">
<div *ngIf="iSong && showSong && show">
<div *ngIf="show.published" class="title published">{{ iSong.title }}</div>
<div *ngIf="!show.published" class="song">

26
src/app/modules/shows/show/song/song.component.ts
View File

@@ -16,18 +16,18 @@ import {Show} from '../../services/show';
styleUrls: ['./song.component.less'],
})
export class SongComponent implements OnInit {
@Input() public show: Show;
@Input() public showSong: ShowSong;
@Input() public showSongs: ShowSong[];
@Input() public showId: string;
@Input() public showText: boolean;
@Input() public show: Show | null = null;
@Input() public showSong: ShowSong | null = null;
@Input() public showSongs: ShowSong[] | null = null;
@Input() public showId: string | null = null;
@Input() public showText: boolean | null = null;
public keys: string[];
public keys: string[] = [];
public faDelete = faTrash;
public faUp = faCaretUp;
public faDown = faCaretDown;
public keyFormControl: FormControl;
public iSong: Song;
public keyFormControl: FormControl = new FormControl();
public iSong: Song | null = null;
public constructor(private showSongService: ShowSongService) {}
@@ -38,13 +38,16 @@ export class SongComponent implements OnInit {
}
public ngOnInit(): void {
if (!this.showSong) return;
this.keyFormControl = new FormControl(this.showSong.key);
this.keyFormControl.valueChanges.subscribe((value: string) => {
if (!this.showId || !this.showSong) return;
void this.showSongService.update$(this.showId, this.showSong.id, {key: value});
});
}
public async onDelete(): Promise<void> {
if (!this.showId || !this.showSong) return;
await this.showSongService.delete$(this.showId, this.showSong.id);
}
@@ -57,7 +60,8 @@ export class SongComponent implements OnInit {
}
public async reorderUp(): Promise<void> {
const index = this.showSongs.findIndex(_ => _.songId === this.iSong.id);
if (!this.showSongs || !this.showId) return;
const index = this.showSongs.findIndex(_ => _.songId === this.iSong?.id);
if (index === 0) {
return;
}
@@ -74,7 +78,8 @@ export class SongComponent implements OnInit {
}
public async reorderDown(): Promise<void> {
const index = this.showSongs.findIndex(_ => _.songId === this.iSong.id);
if (!this.showSongs || !this.showId) return;
const index = this.showSongs.findIndex(_ => _.songId === this.iSong?.id);
if (index === this.showSongs.length - 1) {
return;
}
@@ -91,6 +96,7 @@ export class SongComponent implements OnInit {
}
public async onChordModeChanged(value: ChordMode): Promise<void> {
if (!this.showId || !this.showSong) return;
await this.showSongService.update$(this.showId, this.showSong.id, {
chordMode: value,
});