Project

General

Profile

« Previous | Next » 

Revision 61118

[Library | Angular 11]: Merge changes from angular-10

View differences:

help-content.service.ts
1 1
/**
2 2
 * Created by stefania on 7/13/17.
3 3
 */
4
import { Injectable } from '@angular/core';
4
import {Injectable} from '@angular/core';
5 5
import {HttpClient, HttpErrorResponse} from "@angular/common/http";
6
import { Observable } from 'rxjs';
7
import { Page } from "../utils/entities/adminTool/page";
8
import { PageHelpContent } from "../utils/entities/adminTool/page-help-content";
9
import { Portal } from "../utils/entities/adminTool/portal";
10
import { Entity } from "../utils/entities/adminTool/entity";
11
import { DivId } from "../utils/entities/adminTool/divId";
12
import { DivHelpContent } from "../utils/entities/adminTool/div-help-content";
6
import {Observable, throwError} from 'rxjs';
7
import {Page} from "../utils/entities/adminTool/page";
8
import {PageHelpContent} from "../utils/entities/adminTool/page-help-content";
9
import {Portal} from "../utils/entities/adminTool/portal";
10
import {Entity} from "../utils/entities/adminTool/entity";
11
import {DivId} from "../utils/entities/adminTool/divId";
12
import {DivHelpContent} from "../utils/entities/adminTool/div-help-content";
13 13
import {StatisticsDisplay, StatisticsSummary} from '../connect/statistics/statisticsEntities';
14
import { CustomOptions } from './servicesUtils/customOptions.class';
14
import {CustomOptions} from './servicesUtils/customOptions.class';
15 15
import {catchError, map} from "rxjs/operators";
16 16
import {properties} from "../../../environments/environment";
17 17

  
......
373 373
    // in a real world app, we may send the error to some remote logging infrastructure
374 374
    // instead of just logging it to the console
375 375
    console.error(error);
376
    return Observable.throw(error.error || 'Server error');
376
    return throwError(error.error || 'Server error');
377 377
  }
378 378

  
379 379
  // getDataProviders() {

Also available in: Unified diff