forked from hyperledger-archives/composer
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Simplify code to get playground version in about service (hyperledger…
…-archives#2941) (hyperledger-archives#3062) Contributes to #2936 Signed-off-by: James Taylor <[email protected]>
- Loading branch information
Showing
6 changed files
with
19 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 8 additions & 35 deletions
43
packages/composer-playground/src/app/services/about.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,18 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { Http } from '@angular/http'; | ||
| import { BehaviorSubject, Observable } from 'rxjs/Rx'; | ||
| import * as packageObject from '../../../package.json'; | ||
|
|
||
| @Injectable() | ||
| export class AboutService { | ||
| versions = null; | ||
| constructor(private http: Http) { | ||
| } | ||
|
|
||
| getVersions(): Promise<any> { | ||
| if (!this.versions) { | ||
| return this.getModules() | ||
| .then((modules) => { | ||
| this.versions = { | ||
| playground: { | ||
| name: 'playground', | ||
| version: modules.version | ||
| }, | ||
| common: { | ||
| name: 'composer-common', | ||
| version: modules.dependencies['composer-common'].version | ||
| }, | ||
| client: { | ||
| name: 'composer-client', | ||
| version: modules.dependencies['composer-client'].version, | ||
| }, | ||
| admin: { | ||
| name: 'composer-admin', | ||
| version: modules.dependencies['composer-admin'].version | ||
| } | ||
| }; | ||
| return this.versions; | ||
| }); | ||
| } else { | ||
| return Promise.resolve(this.versions); | ||
| this.versions = { | ||
| playground: { | ||
| name: 'playground', | ||
| version: packageObject.version | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| private getModules(): Promise<any> { | ||
| return this.http.get('assets/npmlist.json') | ||
| .map((res) => res.json()) | ||
| .toPromise(); | ||
| return Promise.resolve(this.versions); | ||
| } | ||
| } |