@ -1,8 +1,7 @@
|
||||
import { Injectable, OnDestroy } from '@angular/core';
|
||||
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of } from 'rxjs/observable/of';
|
||||
import { delay } from 'rxjs/operator/delay';
|
||||
import { Observable, of } from 'rxjs';
|
||||
import { delay } from 'rxjs/operators';
|
||||
|
||||
export class Contact {
|
||||
constructor(public id: number, public name: string) { }
|
||||
@ -24,12 +23,12 @@ export class ContactService implements OnDestroy {
|
||||
ngOnDestroy() { console.log('ContactService instance destroyed.'); }
|
||||
|
||||
getContacts(): Observable<Contact[]> {
|
||||
return delay.call(of(CONTACTS), FETCH_LATENCY);
|
||||
return of(CONTACTS).pipe(delay(FETCH_LATENCY));
|
||||
}
|
||||
|
||||
getContact(id: number | string): Observable<Contact> {
|
||||
const contact$ = of(CONTACTS.find(contact => contact.id === +id));
|
||||
return delay.call(contact$, FETCH_LATENCY);
|
||||
return contact$.pipe(delay(FETCH_LATENCY));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
import { Customer,
|
||||
CustomersService } from './customers.service';
|
||||
|
@ -1,8 +1,7 @@
|
||||
import { Injectable, OnDestroy } from '@angular/core';
|
||||
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of } from 'rxjs/observable/of';
|
||||
import { delay } from 'rxjs/operator/delay';
|
||||
import { Observable, of } from 'rxjs';
|
||||
import { delay } from 'rxjs/operators';
|
||||
|
||||
export class Customer {
|
||||
constructor(public id: number, public name: string) { }
|
||||
@ -27,11 +26,11 @@ export class CustomersService implements OnDestroy {
|
||||
ngOnDestroy() { console.log('CustomersService instance destroyed.'); }
|
||||
|
||||
getCustomers(): Observable<Customer[]> {
|
||||
return delay.call(of(CUSTOMERS), FETCH_LATENCY);
|
||||
return of(CUSTOMERS).pipe(delay(FETCH_LATENCY));
|
||||
}
|
||||
|
||||
getCustomer(id: number | string): Observable<Customer> {
|
||||
const customer$ = of(CUSTOMERS.find(customer => customer.id === +id));
|
||||
return delay.call(customer$, FETCH_LATENCY);
|
||||
return customer$.pipe(delay(FETCH_LATENCY));
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Observable }from 'rxjs/Observable';
|
||||
import { Observable }from 'rxjs';
|
||||
|
||||
import { Item,
|
||||
ItemService } from './items.service';
|
||||
|
@ -1,6 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
import { ItemsComponent } from './items.component';
|
||||
import { ItemsListComponent } from './items-list.component';
|
||||
import { ItemsDetailComponent } from './items-detail.component';
|
||||
import { ItemService } from './items.service';
|
||||
@ -8,7 +9,7 @@ import { ItemsRoutingModule } from './items-routing.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [ CommonModule, ItemsRoutingModule ],
|
||||
declarations: [ ItemsDetailComponent, ItemsListComponent ],
|
||||
declarations: [ ItemsComponent, ItemsDetailComponent, ItemsListComponent ],
|
||||
providers: [ ItemService ]
|
||||
})
|
||||
export class ItemsModule {}
|
||||
|
@ -1,8 +1,7 @@
|
||||
import { Injectable, OnDestroy } from '@angular/core';
|
||||
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of } from 'rxjs/observable/of';
|
||||
import { delay } from 'rxjs/operator/delay';
|
||||
import { Observable, of } from 'rxjs';
|
||||
import { delay } from 'rxjs/operators';
|
||||
|
||||
export class Item {
|
||||
constructor(public id: number, public name: string) { }
|
||||
@ -25,12 +24,12 @@ export class ItemService implements OnDestroy {
|
||||
ngOnDestroy() { console.log('ItemService instance destroyed.'); }
|
||||
|
||||
getItems(): Observable<Item[]> {
|
||||
return delay.call(of(ITEMS), FETCH_LATENCY);
|
||||
return of(ITEMS).pipe(delay(FETCH_LATENCY));
|
||||
}
|
||||
|
||||
getItem(id: number | string): Observable<Item> {
|
||||
const item$ = of(ITEMS.find(item => item.id === +id));
|
||||
return delay.call(item$, FETCH_LATENCY);
|
||||
return item$.pipe(delay(FETCH_LATENCY));
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user