[Library|Trunk]
code cleaning - Monitor -add method to remove subscriptions from stakeholders service git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59839 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
c30d10ee1f
commit
4e455a9e0d
|
@ -1,9 +1,9 @@
|
|||
import {Injectable} from "@angular/core";
|
||||
import {HttpClient} from "@angular/common/http";
|
||||
import {BehaviorSubject, from, Observable} from "rxjs";
|
||||
import {BehaviorSubject, from, Observable, Subscriber} from "rxjs";
|
||||
import {Indicator, Section, Stakeholder, StakeholderInfo, Visibility} from "../entities/stakeholder";
|
||||
import {HelperFunctions} from "../../utils/HelperFunctions.class";
|
||||
import {catchError, map} from "rxjs/operators";
|
||||
import {map} from "rxjs/operators";
|
||||
import {ActivatedRoute} from "@angular/router";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
import {CustomOptions} from "../../services/servicesUtils/customOptions.class";
|
||||
|
@ -17,15 +17,23 @@ export class StakeholderService {
|
|||
|
||||
private stakeholderSubject: BehaviorSubject<Stakeholder> = null;
|
||||
private promise: Promise<any>;
|
||||
|
||||
private sub;
|
||||
constructor(private http: HttpClient, private route: ActivatedRoute) {
|
||||
this.stakeholderSubject = new BehaviorSubject<Stakeholder>(null);
|
||||
}
|
||||
ngOnDestroy() {
|
||||
this.clearSubscriptions();
|
||||
}
|
||||
|
||||
clearSubscriptions(){
|
||||
if (this.sub instanceof Subscriber) {
|
||||
this.sub.unsubscribe();
|
||||
}
|
||||
}
|
||||
getStakeholder(alias:string): Observable<Stakeholder> {
|
||||
if(!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== alias) {
|
||||
this.promise = new Promise<any>((resolve, reject) => {
|
||||
this.http.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(alias), CustomOptions.registryOptions()).pipe(map(stakeholder => {
|
||||
this.sub = this.http.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(alias), CustomOptions.registryOptions()).pipe(map(stakeholder => {
|
||||
return this.formalize(stakeholder);
|
||||
})).subscribe(stakeholder => {
|
||||
this.stakeholderSubject.next(stakeholder);
|
||||
|
@ -41,6 +49,7 @@ export class StakeholderService {
|
|||
|
||||
async getStakeholderAsync() {
|
||||
await this.promise;
|
||||
this.clearSubscriptions();
|
||||
return this.stakeholderSubject.getValue();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue