AMP/task7/features: load-spinner like service in service

Author: ArlinskiEV

angular-starter/src/app/angular-intro/angular-intro.component.ts

@@ -2,7 +2,9 @@ import {
   Component,
   OnInit,
   ChangeDetectionStrategy,
+  Inject,
 } from '@angular/core';
+import { LoaderBlockServices } from './core';
 
 @Component({
   selector: 'intro',
@@ -12,6 +14,9 @@ import {
 })
 
 export class IntroComponent  implements OnInit {
+  constructor(
+    @Inject('load-spinner') private _loaderBlockServices: LoaderBlockServices,
+  ) {}
   public ngOnInit() {
     console.log('hello `INTRO` component');
   }

angular-starter/src/app/angular-intro/angular-intro.module.ts

@@ -20,7 +20,7 @@ import {
   LoaderBlockServices,
   SearchService,
   AuthorizationService,
-  AuthorizedHttpService,
+  // AuthorizedHttpService,
 } from './core/services';
 
 // function toArray(obj) {
@@ -65,12 +65,13 @@ export class IntroModule {
       providers: [
         // --------------------------------------------------------------------
         // AuthorizedHttpService,
-        {provide: 'ext-http', useClass: AuthorizedHttpService},
+        // {provide: 'ext-http', useClass: AuthorizedHttpService},
         AuthorizationService,
 
         ModalWindowServices,
-        LoaderBlockServices,
 
+        // {provide: LoaderBlockServices, useClass: LoaderBlockServices},
+        {provide: 'load-spinner', useClass: LoaderBlockServices},
         CourseServices,
 
         SearchService,

angular-starter/src/app/angular-intro/core/services/course.services.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
@@ -24,15 +24,15 @@ import {
   RequestMethod
 } from '@angular/http';
 
-// import { LoaderBlockServices } from '../services';
+import { LoaderBlockServices } from '../services';
 
 @Injectable()
 export class CourseServices {
   private sourceList: BehaviorSubject<Course[]>;
   private baseUrl = BASE_URL;
   private end = 0;
   constructor(
-    // private _loaderBlockServices: LoaderBlockServices,
+    @Inject('load-spinner') private _loaderBlockServices: LoaderBlockServices,
     private _http: Http,
   ) {
     console.log('### CourseService constructor ###');
@@ -72,7 +72,7 @@ export class CourseServices {
   }
 
   public removeItem(id: number): void {
-    // this._loaderBlockServices.Show();
+    this._loaderBlockServices.Show();
 
     // const currentID = this.sourceList.value.findIndex((item) => item.id === id);
     // if (currentID >= 0) {
@@ -120,7 +120,7 @@ export class CourseServices {
         }
       )
     ;
-    // settimeout(() =>this._loaderBlockServices.Hide(), 1000);
+    setTimeout(() => this._loaderBlockServices.Hide(), 1000);
   }
 
   public loadMoreItem(count: number): void {

angular-starter/src/app/angular-intro/courses/courses.component.ts

@@ -8,7 +8,7 @@ import {
 
 import {
   CourseServices,
-  LoaderBlockServices,
+  // LoaderBlockServices,
   SearchService,
 } from '../core/services';
 import { FilterPipe } from '../core/pipes';
@@ -30,7 +30,7 @@ export class CoursesComponent implements OnInit, OnDestroy {
   private listeners: Subscription[] = [];
 
   constructor(
-    private _loaderBlockServices: LoaderBlockServices,
+    // private _loaderBlockServices: LoaderBlockServices,
     private _courseServices: CourseServices,
     private _filter: FilterPipe<Course>,
     private _searchService: SearchService,
@@ -72,10 +72,10 @@ export class CoursesComponent implements OnInit, OnDestroy {
     console.log(`courses.handler emit.type=${emit.type}`);
     switch (emit.type) {
       case 'deletter': {
-        this._loaderBlockServices.Show();
+        // this._loaderBlockServices.Show();
         this._courseServices.removeItem(emit.value);
         // ...no service in service?
-        setTimeout( () => this._loaderBlockServices.Hide(), 1500);
+        // setTimeout( () => this._loaderBlockServices.Hide(), 1500);
         break;
       }
     }

angular-starter/src/app/angular-intro/loaderBlock/loaderBlock.component.ts

@@ -4,6 +4,7 @@ import {
   OnDestroy,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
+  Inject,
 } from '@angular/core';
 
 import { LoaderBlockServices } from '../core/services';
@@ -21,7 +22,7 @@ export class LoaderBlockComponent implements OnInit, OnDestroy {
   private listener: Subscription;
 
   constructor(
-    private _loaderBlockServices: LoaderBlockServices,
+    @Inject('load-spinner') private _loaderBlockServices: LoaderBlockServices,
     private _changeDetectorRef: ChangeDetectorRef,
   ) {}