Block requesting invalid Service items from UI.

This commit is contained in:
Tim Bentley 2020-05-20 17:04:52 +00:00 committed by Raoul Snyman
parent 22a1a1cab3
commit ad75ca76ee
3 changed files with 16 additions and 11 deletions

2
.gitignore vendored
View File

@ -21,7 +21,7 @@
.vscode/* .vscode/*
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
!.vscode/launch.json .vscode/launch.json
!.vscode/extensions.json !.vscode/extensions.json
# misc # misc

View File

@ -20,8 +20,10 @@ export class ServiceComponent implements OnInit {
} }
onItemSelected(item) { onItemSelected(item) {
this.openlpService.setServiceItem(item.id).subscribe(); if (item.is_valid) {
this.router.navigate(['slides']); this.openlpService.setServiceItem(item.id).subscribe();
this.router.navigate(['slides']);
}
} }
getServiceItems() { getServiceItems() {
@ -35,7 +37,9 @@ export class ServiceComponent implements OnInit {
} }
getIcon(item: ServiceItem): string { getIcon(item: ServiceItem): string {
if (item.plugin === 'songs') { if (!item.is_valid) {
return 'delete';
} else if (item.plugin === 'songs') {
return 'queue_music'; return 'queue_music';
} else if (item.plugin === 'images') { } else if (item.plugin === 'images') {
return 'image'; return 'image';

View File

@ -27,16 +27,17 @@ export interface Slide {
} }
export interface ServiceItem { export interface ServiceItem {
id: string; id: string;
notes: string; notes: string;
plugin: string; plugin: string;
selected: boolean; selected: boolean;
title: string; title: string;
is_valid: boolean;
} }
export interface Theme { export interface Theme {
selected: boolean; selected: boolean;
name: string; name: string;
} }
export interface MainView { export interface MainView {