openlp/web-remote
1
0
Fork 0
mirror of https://gitlab.com/openlp/web-remote.git synced 2024-12-22 11:32:47 +00:00
Code Issues Projects Releases Wiki Activity

Displaying the available plugins works

Browse Source
This commit is contained in:
Simon Hanna 2018-08-20 02:00:32 +02:00
parent b191a1d972
commit 6a8d1a55cc
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/openlp.service.ts
View File

@ -7,7 +7,7 @@ import { Slide } from './slide';
import { ServiceItem } from './service_item'; import { ServiceItem } from './service_item';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map, take } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { SlideOuterResponse } from './responses'; import { SlideOuterResponse, PluginDescription } from './responses';
let deserialize = (json, cls) => { let deserialize = (json, cls) => {
var inst = new cls(); var inst = new cls();
@ -92,11 +92,10 @@ export class OpenLPService {
sendItemLive(plugin, id) {} sendItemLive(plugin, id) {}
showAlert(text) {} showAlert(text) {}
search(plugin, text) {}
addItemToService(plugin, id) {} addItemToService(plugin, id) {}
getSearchablePlugins() { getSearchablePlugins(): Observable<PluginDescription[]> {
return this.http.get(`${this.apiURL}/plugin/search`); return this.http.get<PluginDescription[]>(`${this.apiURL}/plugin/search`);
} }
// getSearchablePlugins() { // getSearchablePlugins() {
@ -187,7 +186,12 @@ export class OpenLPService {
.then(response => console.log(response.json().results)) .then(response => console.log(response.json().results))
.catch(this.dropError); .catch(this.dropError);
} }
*/
search(plugin, text) {
return this.http.get(`${this.apiURL}/${plugin}/search`);
}
/*
search(plugin, text) { search(plugin, text) {
return this.http.get('http://localhost:4316/' + plugin + '/search', buildTextParams(text)) return this.http.get('http://localhost:4316/' + plugin + '/search', buildTextParams(text))
.toPromise() .toPromise()

5
src/app/responses.ts
View File

@ -7,4 +7,9 @@ interface SlideResponse {
export interface SlideOuterResponse { export interface SlideOuterResponse {
results: SlideResponse; results: SlideResponse;
}
export interface PluginDescription {
key: string;
name: string;
} }

28
src/app/search.component.ts
View File

@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { OpenLPService } from './openlp.service'; import { OpenLPService } from './openlp.service';
import { PluginDescription } from './responses';
@Component({ @Component({
selector: 'openlp-remote-search', selector: 'openlp-remote-search',
@ -7,11 +8,13 @@ template: `
<h3>Search</h3> <h3>Search</h3>
<form> <form>
<label>Search for:</label> <label>Search for:</label>
<mat-form-field>
<mat-select [(ngModel)]="selectedPlugin" name="selectedPlugin"> <mat-select [(ngModel)]="selectedPlugin" name="selectedPlugin">
<mat-option *ngFor="let plugin of searchPlugins" name="searchPlugins" [value]="plugin.id"> <mat-option *ngFor="let plugin of searchPlugins" name="searchPlugins" [value]="plugin.key">
{{plugin.name}} {{plugin.name}}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field>
<br> <br>
<mat-form-field> <mat-form-field>
<input matInput [(ngModel)]="searchText" name="searchText" placeholder="Search Text"> <input matInput [(ngModel)]="searchText" name="searchText" placeholder="Search Text">
@ -36,7 +39,7 @@ providers: [OpenLPService]
export class OpenLPSearchComponent implements OnInit { export class OpenLPSearchComponent implements OnInit {
public searchPlugins: OpenLPPlugin[] = null; public searchPlugins: PluginDescription[] = [];
public searchText = null; public searchText = null;
public searchResults = null; public searchResults = null;
public selectedPlugin: string; public selectedPlugin: string;
@ -46,7 +49,8 @@ export class OpenLPSearchComponent implements OnInit {
onSubmit() { onSubmit() {
this.currentPlugin = this.selectedPlugin; this.currentPlugin = this.selectedPlugin;
// this.openlpService.search(this.currentPlugin, this.searchText).then(items => this.searchResults = items); this.currentPlugin = "songs";
this.openlpService.search(this.currentPlugin, this.searchText).subscribe(items => this.searchResults = items);
} }
sendLive(id) { sendLive(id) {
@ -58,20 +62,6 @@ export class OpenLPSearchComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.getSearchablePlugins(); this.openlpService.getSearchablePlugins().subscribe(items => this.searchPlugins = items);
} }
}
getSearchablePlugins() {
// this.openlpService.getSearchablePlugins().then(items => {
// this.searchPlugins = [];
// for (var i = items.length - 1; i >= 0; i--) {
// this.searchPlugins.push({id: items[i][0], name: items[i][1]})
// }
// });
}
}
interface OpenLPPlugin {
id: string;
name: string;
}