Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions src/app/shared/google-books.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import 'rxjs/add/operator/map';
/*import 'rxjs/add/operator/map';
import 'rxjs/add/operator/do';
import 'rxjs/add/operator/toPromise';
import 'rxjs/add/operator/toPromise';*/

//rxjs 6 imorts
//do operator was renamed to tap
import {Observable,} from 'rxjs';
import { map,tap } from 'rxjs/operators';

import {Injectable} from '@angular/core';
import {Http} from '@angular/http';
import {Observable} from 'rxjs/Observable';
Expand Down Expand Up @@ -52,19 +58,19 @@ export class GoogleBooksService {
this.initialised = true;
this.books = [];
this.http.get(`${this.API_PATH}?q=${this.query}&maxResults=${this.pageSize}&startIndex=${this.startIndex}`)
.map(res => res.json())
.do(data => {
this.totalItems = data.totalItems;
})
.map(data => {
return data.items ? data.items : [];
})
.map(items => {
return items.map(item => this.bookFactory(item))
})
// .do(books => console.log(books))
.do(_ => this.loading = false)
.subscribe((books) => this.books = books)
.pipe(
map(res => res.json()),
tap(data => {
this.totalItems = data.totalItems;
}),
map(data => {
return data.items ? data.items : [];
}),
map(items => {
return items.map(item => this.bookFactory(item))
}),
tap(_ => this.loading = false)
).subscribe((books) => this.books = books)
}

retrieveBook(bookId: string) {
Expand Down