Revision 55964
Added by Argiro Kokogiannaki almost 5 years ago
dataProvider.component.ts | ||
---|---|---|
1 |
|
|
2 |
import {merge as observableMerge, Observable} from 'rxjs'; |
|
1 | 3 |
import {Component, ViewChild} from '@angular/core'; |
2 | 4 |
import {Input} from '@angular/core'; |
3 | 5 |
import {ActivatedRoute, Router} from '@angular/router'; |
4 | 6 |
import {Title, Meta} from '@angular/platform-browser'; |
5 | 7 |
|
6 |
import {Observable} from 'rxjs/Observable'; |
|
7 | 8 |
|
8 |
import 'rxjs/add/operator/switch'; |
|
9 |
import 'rxjs/add/operator/switchMap'; |
|
10 | 9 |
|
10 |
|
|
11 | 11 |
import {EnvProperties} from '../../utils/properties/env-properties'; |
12 | 12 |
|
13 | 13 |
import {DataProviderInfo} from '../../utils/entities/dataProviderInfo'; |
... | ... | |
419 | 419 |
&& |
420 | 420 |
( this.fetchAggregatorsOrps.searchUtils.status == this.errorCodes.LOADING || |
421 | 421 |
this.fetchAggregatorsOrps.searchUtils.status == this.errorCodes.DONE )) { |
422 |
this.relatedDatasourcesSub = Observable.merge(this.fetchAggregatorsPublications.requestComplete, this.fetchAggregatorsDatasets.requestComplete, this.fetchAggregatorsSoftware.requestComplete, this.fetchAggregatorsOrps.requestComplete)
|
|
422 |
this.relatedDatasourcesSub = observableMerge(this.fetchAggregatorsPublications.requestComplete, this.fetchAggregatorsDatasets.requestComplete, this.fetchAggregatorsSoftware.requestComplete, this.fetchAggregatorsOrps.requestComplete)
|
|
423 | 423 |
.subscribe( |
424 | 424 |
data => {}, |
425 | 425 |
err => {}, |
Also available in: Unified diff
[Library|Trunk]
Merge into trunk branch angular7 rev 55729