Project

General

Profile

« Previous | Next » 

Revision 57835

[MonitorDashboard]: Fix a bug with subscriptions

View differences:

monitor.component.ts
19 19
import {LayoutService} from "../library/sharedComponents/sidebar/layout.service";
20 20
import {FormBuilder, FormControl} from "@angular/forms";
21 21
import {IDeactivateComponent} from "../openaireLibrary/utils/can-exit.guard";
22
import {Subscription} from "rxjs";
22 23

  
23 24
@Component({
24 25
    selector: 'monitor',
......
29 30
        id;
30 31
        status;
31 32
    };
33
    public subscriptions: any[] = [];
32 34
    public piwiksub: any;
33 35
    public pageContents = null;
34 36
    public divContents = null;
......
78 80
        });
79 81
        this.route.data
80 82
            .subscribe((data: { envSpecific: EnvProperties }) => {
83
                let subscription: Subscription;
81 84
                this.route.params.subscribe(params => {
85
                    if(subscription) {
86
                        subscription.unsubscribe();
87
                    }
82 88
                    this.properties = data.envSpecific;
83 89
                    var url = data.envSpecific.baseLink + this._router.url;
84 90
                    if (!this.stakeholder || this.stakeholder.alias !== params['stakeholder']) {
85 91
                        this.status = this.errorCodes.LOADING;
86 92
                        this.numberResults = new Map<number, number>();
87 93
                        this.chartsActiveType = new Map<number, IndicatorPath>();
88
                        this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
94
                        subscription = this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
89 95
                            /*let stakeholder: Stakeholder = null;
90 96
                            if (params['stakeholder'] == "fwf") {
91 97
                                stakeholder = new Stakeholder(null, "funder", "fwf_________::FWF", "Austrian Science Fund (FWF)", "FWF",
......
125 131
                            }
126 132
                        }, error => {
127 133
                            this.navigateToError();
128
                        })
134
                        });
135
                        this.subscriptions.push(subscription);
129 136
                    } else {
130 137
                        this.setView(params);
131 138
                    }

Also available in: Unified diff