fix show filter
This commit is contained in:
@@ -37,9 +37,15 @@ export class ListComponent {
|
|||||||
return filterValues?.owner;
|
return filterValues?.owner;
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
public showType$ = this.activatedRoute.queryParams.pipe(
|
||||||
|
map(params => {
|
||||||
|
const filterValues = params as FilterValues;
|
||||||
|
return filterValues?.showType;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
public publicShows$ = combineLatest([this.shows$, this.lastMonths$, this.owner$]).pipe(
|
public publicShows$ = combineLatest([this.shows$, this.lastMonths$, this.owner$, this.showType$]).pipe(
|
||||||
map(([shows, lastMonths, owner]) =>
|
map(([shows, lastMonths, owner, showType]) =>
|
||||||
shows
|
shows
|
||||||
.filter(f => {
|
.filter(f => {
|
||||||
const d = new Date();
|
const d = new Date();
|
||||||
@@ -47,6 +53,7 @@ export class ListComponent {
|
|||||||
return f.published && f.date.toDate() >= d;
|
return f.published && f.date.toDate() >= d;
|
||||||
})
|
})
|
||||||
.filter(show => !owner || show.owner === owner)
|
.filter(show => !owner || show.owner === owner)
|
||||||
|
.filter(show => !showType || show.showType === showType)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user