fix: prepare for future Angular version update

- Bump `ngx-boostrap` version to `2.0.5` - Remove unused deprecated `http` usage in demo - Remove deprecated angular animation usage - Use `InjectionToken` instead of deprecated `OpaqueToken`
fabric8-launcher · Jun 18, 2018 · 0146181 · 0146181
1 parent 5f34637
commit 0146181
Show file tree

Hide file tree

Showing 13 changed files with 3,732 additions and 3,776 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "@thisissoon/angular-inviewport": "^1.3.2",
     "angular-2-dropdown-multiselect": "^1.6.0",
     "fabric8-analytics-dependency-editor": "^0.0.25",
-    "ngx-bootstrap": "^1.9.3",
+    "ngx-bootstrap": "^2.0.5",
     "ngx-modal": "^0.0.29",
     "patternfly": "^3.30.1",
     "patternfly-ng": "^3.1.3",

diff --git a/...reate-app/targetenvironment-createapp-step/target-environment-createapp-step.component.ts b/...reate-app/targetenvironment-createapp-step/target-environment-createapp-step.component.ts
@@ -26,20 +26,7 @@ import { TokenService } from '../../service/token.service';
   encapsulation: ViewEncapsulation.None,
   selector: 'f8launcher-targetenvironment-createapp-step',
   templateUrl: './target-environment-createapp-step.component.html',
-  styleUrls: ['./target-environment-createapp-step.component.less'],
-  animations:
-  [
-    trigger('toggleAnimation', [
-      state('active', style({
-        display: 'inline'
-      })),
-      state('inactive', style({
-        opacity: '0',
-        display: 'none'
-      })),
-      transition('active <=> inactive', animate('500ms ease-in-out'))
-    ])
-  ]
+  styleUrls: ['./target-environment-createapp-step.component.less']
 })
 export class TargetEnvironmentCreateappStepComponent extends LauncherStep implements OnDestroy {
   @Input() id: string;

diff --git a/src/app/launcher/service/auth-provider.service.ts b/src/app/launcher/service/auth-provider.service.ts
@@ -1,12 +1,12 @@
-import { Injectable, OpaqueToken } from '@angular/core';
+import { Injectable, InjectionToken } from '@angular/core';
 
 @Injectable()
 export class AuthHelperService  {
 
-    AUTH_API_URL: OpaqueToken;
+    AUTH_API_URL: InjectionToken<String>;
     constructor() {}
 
-    getAuthApiURl(): OpaqueToken {
+    getAuthApiURl(): InjectionToken<String> {
         return this.AUTH_API_URL;
     }
 }
diff --git a/src/demo/app.module.ts b/src/demo/app.module.ts
@@ -1,17 +1,15 @@
 // import './rxjs-extensions';
 
-import { NgModule, Provider } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { DependencyEditorTokenProvider, URLProvider } from 'fabric8-analytics-dependency-editor';
-
 // App components
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-
 // Main areas
 import { CreateAppComponent } from './create-app/create-app.component';
 import { GettingStartedLauncherComponent } from './getting-started-launcher/getting-started-launcher.component';

diff --git a/src/demo/service/demo-dependency-check.service.ts b/src/demo/service/demo-dependency-check.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { Headers, Http, RequestOptions, Response } from '@angular/http';
 
 import { DependencyCheck } from '../../app/launcher/launcher.module';
 import { DependencyCheckService } from '../../app/launcher/launcher.module';
@@ -17,7 +16,6 @@ export class DemoDependencyCheckService implements DependencyCheckService {
   private ORIGIN: string = '';
 
   constructor(
-    private http: Http,
     private helperService: HelperService,
     private tokenProvider: TokenProvider
   ) {
@@ -106,28 +104,4 @@ export class DemoDependencyCheckService implements DependencyCheckService {
     return pattern.test(projectVersion);
   }
 
-  private get options(): Observable<RequestOptions> {
-    let headers = new Headers();
-    headers.append('X-App', this.ORIGIN);
-    return Observable.fromPromise(this.tokenProvider.token.then((token) => {
-      headers.append('Authorization', 'Bearer ' + token);
-      return new RequestOptions({
-          headers: headers
-      });
-    }));
-  }
-
-
-  private handleError(error: Response | any) {
-    let errMsg: string;
-    if (error instanceof Response) {
-      const body = error.json() || '';
-      const err = body.error || JSON.stringify(body);
-      errMsg = `${error.status} - ${error.statusText || ''} ${err}`;
-    } else {
-      errMsg = error.message ? error.message : error.toString();
-    }
-    console.error(errMsg);
-    return Observable.throw(errMsg);
-  }
 }
diff --git a/src/demo/service/demo-dependency-editor.service.ts b/src/demo/service/demo-dependency-editor.service.ts
@@ -1,13 +1,8 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { Headers, Http, RequestOptions, Response } from '@angular/http';
-
 import { DependencyEditorService } from '../../app/launcher/launcher.module';
 
-import { HelperService } from '../../app/launcher/service/helper.service';
-import { TokenProvider } from '../../app/service/token-provider';
-
 @Injectable()
 export class DemoDependencyEditorService implements DependencyEditorService {
 

diff --git a/src/demo/service/demo-git-provider.service.ts b/src/demo/service/demo-git-provider.service.ts
@@ -3,7 +3,6 @@ import { Observable } from 'rxjs';
 
 import { GitHubDetails } from '../../app/launcher/model/github-details.model';
 import { GitProviderService } from '../../app/launcher/launcher.module';
-import { AuthHelperService } from '../../app/launcher/service/auth-provider.service';
 
 const GitHubMock = require('../../assets/mock/demo-git-provider.json');
 

diff --git a/src/demo/service/demo-pipeline.service.ts b/src/demo/service/demo-pipeline.service.ts
@@ -1,13 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { Headers, Http, RequestOptions, Response } from '@angular/http';
 
 import { Pipeline } from '../../app/launcher/model/pipeline.model';
 import { PipelineService } from '../../app/launcher/service/pipeline.service';
 
-import { HelperService } from '../../app/launcher/service/helper.service';
-import { TokenProvider } from '../../app/service/token-provider';
-
 const MockPipeline = require('../../assets/mock/demo-pipeline.json');
 
 @Injectable()

diff --git a/src/demo/service/demo-project-progress.service.ts b/src/demo/service/demo-project-progress.service.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Observable, Observer, Subscription, Subject } from 'rxjs';
+import { Observable, Subject, Subscription } from 'rxjs';
 
-import { Progress } from '../../app/launcher/launcher.module';
 import { ProjectProgressService } from '../../app/launcher/launcher.module';
-import { HelperService } from '../../app/launcher/service/helper.service';
-import { TokenProvider } from '../../app/service/token-provider';
 
 @Injectable()
 export class DemoProjectProgressService implements ProjectProgressService {

diff --git a/src/demo/service/demo-project-summary.service.ts b/src/demo/service/demo-project-summary.service.ts
@@ -1,14 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Observable, Subject, Subscription } from 'rxjs';
-import { Headers, Http, RequestOptions, Response } from '@angular/http';
+import { Observable } from 'rxjs';
 
 import { ProjectSummaryService } from '../../app/launcher/service/project-summary.service';
 import { Summary } from '../../app/launcher/model/summary.model';
 
-import { HelperService } from '../../app/launcher/service/helper.service';
-import { TokenProvider } from '../../app/service/token-provider';
-import { Progress } from '../../app/launcher/model/progress.model';
-
 @Injectable()
 export class DemoProjectSummaryService implements ProjectSummaryService {
 

diff --git a/src/demo/service/demo-target-environment.service.ts b/src/demo/service/demo-target-environment.service.ts
@@ -1,7 +1,7 @@
-import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
 
-import {TargetEnvironment, TargetEnvironmentService} from '../../app/launcher/launcher.module';
+import { TargetEnvironment, TargetEnvironmentService } from '../../app/launcher/launcher.module';
 
 const MockTargetEnvironmments = require('../../assets/mock/demo-target-environment.json');
 

diff --git a/src/demo/service/demo-token.service.ts b/src/demo/service/demo-token.service.ts
@@ -1,8 +1,8 @@
-import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
 
-import {TokenService} from '../../app/launcher/service/token.service';
-import {Cluster} from '../../app/launcher/model/cluster.model';
+import { TokenService } from '../../app/launcher/service/token.service';
+import { Cluster } from '../../app/launcher/model/cluster.model';
 
 const MockClusters = require('../../assets/mock/demo-token.json');
 @Injectable()