From 4ebbba85e797a2d38047537925e3f0a4eb0f9c8e Mon Sep 17 00:00:00 2001
From: Simon Hanna <simhnna@gmail.com>
Date: Mon, 20 Aug 2018 14:16:15 +0200
Subject: [PATCH] Showing the slides works

---
 src/app/openlp.service.ts   | 58 ++++---------------------------------
 src/app/slides.component.ts |  2 +-
 2 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/src/app/openlp.service.ts b/src/app/openlp.service.ts
index d45b5fe..80ec3df 100644
--- a/src/app/openlp.service.ts
+++ b/src/app/openlp.service.ts
@@ -20,18 +20,6 @@ let deserialize = (json, cls) => {
     return inst;
   }
 
-let buildTextParams = id => {
-    let params: URLSearchParams = new URLSearchParams();
-    params.set('data', '{"request": {"text": "' + id + '"}}');
-    return {search: params}
-}
-
-let buildNumberParams = id => {
-    let params: URLSearchParams = new URLSearchParams();
-    params.set('data', '{"request": {"id": ' + id + '}}');
-    return {search: params}
-}
-
 @Injectable()
 export class OpenLPService {
   private apiURL: string = 'http://localhost:4316';
@@ -53,43 +41,13 @@ export class OpenLPService {
   }
 
   getItemSlides(): Observable<Slide[]> {
-    return this.http.get<SlideOuterResponse>('http://localhost:4316/controller/live/text')
-    .pipe(
-      take(1),
-      map(result => result.results.slides));
+    return this.http.get<Slide[]>('http://localhost:4316/controller/live/text');
   }
 
-  // getItemSlides() {
-  //   return this.http.get('http://localhost:4316/api/controller/live/text')
-  //     .toPromise()
-  //     .then(response => {
-  //       let slides:Slide[] = [];
-  //       response.json().results.slides.forEach(item => {
-  //         let slide = deserialize(item, Slide);
-  //         slide.lines = slide.text.split('\n');
-  //         slides.push(slide);
-  //       });
-  //       return slides;
-  //     })
-  //     .catch(this.handleError);
-  // }
-
   getServiceItems(): Observable<ServiceItem[]> {
     return this.http.get<ServiceItem[]>('http://localhost:4316/service/list');
   }
 
-
-  // getServiceItems() {
-  //   return this.http.get('http://localhost:4316/api/service/list')
-  //     .toPromise()
-  //     .then(response => {
-  //       let serviceItems:ServiceItem[] = [];
-  //       response.json().results.items.forEach(item => serviceItems.push(deserialize(item, ServiceItem)));
-  //       return serviceItems;
-  //     })
-  //     .catch(this.handleError);
-  // }
-
   sendItemLive(plugin, id) {}
   showAlert(text) {}
   addItemToService(plugin, id) {}
@@ -98,16 +56,13 @@ export class OpenLPService {
     return this.http.get<PluginDescription[]>(`${this.apiURL}/plugin/search`);
   }
 
-  // getSearchablePlugins() {
-  //   return this.http.get('http://localhost:4316/plugin/search')
-  //     .toPromise()
-  //     .then(response => response.json().results.items)
-  //     .catch(this.handleError);
-  // }
-
   setServiceItem(id:number) {
   }
 
+  search(plugin, text) {
+    return this.http.get(`${this.apiURL}/${plugin}/search?q=${text}`);
+  }
+
 
   // setServiceItem(id:number) {
   //   this.http.get('http://localhost:4316/service/set', buildNumberParams(id))
@@ -187,9 +142,6 @@ export class OpenLPService {
       .catch(this.dropError);
   }
   */
-  search(plugin, text) {
-    return this.http.get(`${this.apiURL}/${plugin}/search?q=${text}`);
-  }
 
   /*
 
diff --git a/src/app/slides.component.ts b/src/app/slides.component.ts
index 02e311c..7631181 100644
--- a/src/app/slides.component.ts
+++ b/src/app/slides.component.ts
@@ -32,7 +32,7 @@ export class OpenLPSlidesComponent implements OnInit {
   }
 
   getSlides() {
-    // this.openlpService.getItemSlides().then(slides=> {this.slides = slides;console.log(slides);});
+    this.openlpService.getItemSlides().subscribe(slides => this.slides = slides);
   }
 
   constructor(private openlpService: OpenLPService) {