From: Vijay Venkatesh Kumar Date: Tue, 14 Jan 2020 23:02:47 +0000 (+0000) Subject: Merge "To optimize the shared module and apply it into the page" X-Git-Tag: 2.0.0~27 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=16ff8de967914791eb7bd1b61f95587c5ef0ac84;p=dcaegen2%2Fservices.git Merge "To optimize the shared module and apply it into the page" --- 16ff8de967914791eb7bd1b61f95587c5ef0ac84 diff --cc components/datalake-handler/admin/src/src/app/core/services/rest-api.service.ts index dc1a0231,b3ed616f..98eef9ab --- a/components/datalake-handler/admin/src/src/app/core/services/rest-api.service.ts +++ b/components/datalake-handler/admin/src/src/app/core/services/rest-api.service.ts @@@ -126,41 -144,15 +144,15 @@@ export class RestApiService /* Database */ + public getAllDbs(): Observable { + return this.http + .get(prefix + "dbs/list?isDb=true") + .pipe(retry(1), catchError(this.handleError)); + } + getDbEncryptList(flag): Observable { return this.http - .get(prefix + "dbs/list?tool=" + flag) + .get(prefix + "dbs/list?isDb=" + flag) .pipe(retry(1), map(this.extractData), catchError(this.handleError)); }