Revision 61262
Added by Konstantina Galouni almost 3 years ago
| htmlProjectReport.service.ts | ||
|---|---|---|
| 1 | 1 |
import {Injectable} from '@angular/core';
|
| 2 | 2 |
import {HttpClient} from "@angular/common/http";
|
| 3 |
import {timeout} from "rxjs/operators";
|
|
| 3 | 4 |
|
| 4 | 5 |
@Injectable() |
| 5 | 6 |
export class HtmlProjectReportService {
|
| ... | ... | |
| 12 | 13 |
//'((oaftype exact result) and (resulttypeid exact "'+resultTypeId+'")) and |
| 13 | 14 |
'(relprojectid exact "'+id+'"))'; |
| 14 | 15 |
|
| 15 |
return this.http.get(url,{responseType: 'text'});
|
|
| 16 |
return this.http.get(url,{responseType: 'text'}).pipe(timeout(10000));
|
|
| 16 | 17 |
} |
| 17 | 18 |
} |
Also available in: Unified diff
[Trunk | Library]:
1. timeout-interceptor.service.ts: Added whitelist, so that urls included in the list are not cut by this timeout interceptor.
2. services/reports.service.ts & landingPages/htmlProjectReport/htmlProjectReport.service.ts: In calls for CSV and HTML reports, added timeout 10 in seconds.
3. organization.component.ts: Created array "innerReportSubscriptions" where inner request of "downloading research results of a funder" are added - on error, all innerReportSubscriptions are unsubscribed.