X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fservices%2FRestService.ts;fp=src%2Fservices%2FRestService.ts;h=5f47fb19d268cf291de9766e46f19c7a2c75c642;hb=c84f1123f8ba69f9e2211b2d816bb415e595efaa;hp=d3d9ea0d26ec1edf81e3a1a4305c4fdc10044092;hpb=a91e51fcd2d4fcfc136bdff9f0a7d2c205b135b6;p=osm%2FNG-UI.git diff --git a/src/services/RestService.ts b/src/services/RestService.ts index d3d9ea0..5f47fb1 100644 --- a/src/services/RestService.ts +++ b/src/services/RestService.ts @@ -20,7 +20,6 @@ * @file Provider for REST Service */ -import { isNullOrUndefined } from 'util'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -41,6 +40,9 @@ export class RestService { private http: HttpClient; /** API URL. Disabled tslint since server doesn't support https protocol */ private apiURL: string = ''; + /** Method to handle null or undefined @private */ + // eslint-disable-next-line @typescript-eslint/no-explicit-any + private isNullOrUndefined = (data: any): boolean => data === null || data === undefined; /** Notifier service to popup notification @private */ private notifierService: NotifierService; /** Instance for active modal service @public */ @@ -62,7 +64,7 @@ export class RestService { public getResource(apiURL: string, httpHeaders?: { headers: HttpHeaders }): Observable<{}> { const getRequest: APIURLHEADER = this.getHttpoptions(apiURL); - if (!isNullOrUndefined(httpHeaders)) { + if (!this.isNullOrUndefined(httpHeaders)) { return this.http.get(apiURL, httpHeaders); } else { return this.http.get(getRequest.url, getRequest.httpOptions); @@ -77,7 +79,7 @@ export class RestService { public postResource(apiURLHeader: { url: string, httpOptions?: { headers: HttpHeaders } }, payload: {}): Observable<{}> { const getRequest: APIURLHEADER = this.getHttpoptions(apiURLHeader.url); - if (!isNullOrUndefined(apiURLHeader.httpOptions)) { + if (!this.isNullOrUndefined(apiURLHeader.httpOptions)) { return this.http.post(apiURLHeader.url, payload, apiURLHeader.httpOptions); } else { return this.http.post(getRequest.url, payload, getRequest.httpOptions); @@ -92,7 +94,7 @@ export class RestService { public patchResource(apiURLHeader: { url: string, httpOptions?: { headers: HttpHeaders } }, payload: {}): Observable { const getRequest: APIURLHEADER = this.getHttpoptions(apiURLHeader.url); - if (!isNullOrUndefined(apiURLHeader.httpOptions)) { + if (!this.isNullOrUndefined(apiURLHeader.httpOptions)) { return this.http.patch(apiURLHeader.url, payload, apiURLHeader.httpOptions); } else { return this.http.patch(getRequest.url, payload, getRequest.httpOptions); @@ -107,7 +109,7 @@ export class RestService { public putResource(apiURLHeader: { url: string, httpOptions?: { headers: HttpHeaders } }, payload: {}): Observable { const getRequest: APIURLHEADER = this.getHttpoptions(apiURLHeader.url); - if (!isNullOrUndefined(apiURLHeader.httpOptions)) { + if (!this.isNullOrUndefined(apiURLHeader.httpOptions)) { return this.http.put(apiURLHeader.url, payload, apiURLHeader.httpOptions); } else { return this.http.put(getRequest.url, payload, getRequest.httpOptions); @@ -121,7 +123,7 @@ export class RestService { public deleteResource(apiURL: string, httpHeaders?: { headers: HttpHeaders }): Observable { const getRequest: APIURLHEADER = this.getHttpoptions(apiURL); - if (!isNullOrUndefined(httpHeaders)) { + if (!this.isNullOrUndefined(httpHeaders)) { return this.http.delete(apiURL, httpHeaders); } else { return this.http.delete(getRequest.url, getRequest.httpOptions);