From 087d4b667a9c5517ac7d014c2bbdad994b927147 Mon Sep 17 00:00:00 2001 From: Nirvan Ramjuttun Date: Tue, 7 May 2019 12:39:19 -0400 Subject: Modify CDS-UI server to allow communicating with external blueprint mS Issue-ID: CCSDK-1292 Change-Id: I3536437bad334841d7c7ecd577c092cd13f42a9b Signed-off-by: Nirvan Ramjuttun --- cds-ui/client/src/app/common/constants/app-constants.ts | 4 ---- cds-ui/client/src/app/common/core/services/api.service.ts | 1 - .../blueprint/modify-template/editor/editor.service.ts | 9 ++++----- .../blueprint/test-template/test-template.service.ts | 1 - .../resource-creation/existing-model/exsisting-model.service.ts | 4 ++-- .../resource-definition/resource-edit/resource-edit.service.ts | 4 ++-- 6 files changed, 8 insertions(+), 15 deletions(-) (limited to 'cds-ui/client') diff --git a/cds-ui/client/src/app/common/constants/app-constants.ts b/cds-ui/client/src/app/common/constants/app-constants.ts index d4e8989c1..283ce735f 100644 --- a/cds-ui/client/src/app/common/constants/app-constants.ts +++ b/cds-ui/client/src/app/common/constants/app-constants.ts @@ -92,10 +92,6 @@ export const GlobalContants = { } }; -export const LoopbackConfig = { - url: "http://127.0.0.1:3000", - authtoken: "ccsdkapps" -} export const ResourceDictionaryURLs = { saveResourceDictionary: '/resourcedictionary/save', diff --git a/cds-ui/client/src/app/common/core/services/api.service.ts b/cds-ui/client/src/app/common/core/services/api.service.ts index 463ef3827..addf51ca5 100644 --- a/cds-ui/client/src/app/common/core/services/api.service.ts +++ b/cds-ui/client/src/app/common/core/services/api.service.ts @@ -24,7 +24,6 @@ limitations under the License. import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders, HttpResponse, HttpHeaderResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { LoopbackConfig } from '../../constants/app-constants'; @Injectable() export class ApiService { diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts index 63c8019c3..ec2524422 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts @@ -24,7 +24,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, observable } from 'rxjs'; import { ApiService } from '../../../../common/core/services/api.service'; -import { LoopbackConfig } from '../../../../common/constants/app-constants'; import { saveAs } from 'file-saver'; @Injectable() @@ -35,10 +34,10 @@ export class EditorService { } enrich(uri: string, body: FormData): Observable { - return this.api.post(LoopbackConfig.url + uri, body, { responseType: 'blob' }); + return this.api.post(uri, body, { responseType: 'blob' }); } downloadCBA(uri: string): string { - this.api.get(LoopbackConfig.url + uri, { responseType: 'blob' }) + this.api.get(uri, { responseType: 'blob' }) .subscribe(response => { let blob = new Blob([response], { 'type': "application/octet-stream" }); saveAs(blob, "CBA.zip"); @@ -49,11 +48,11 @@ export class EditorService { } post(uri: string, body: any | null, options?: any): Observable { - return this.api.post(LoopbackConfig.url + uri, body, options); + return this.api.post(uri, body, options); } deployPost(uri: string, body: any | null, options?: any): Observable { - return this.api.post(LoopbackConfig.url + uri, body, { responseType: 'text' }); + return this.api.post(uri, body, { responseType: 'text' }); } } \ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts index 8df8e78a6..3896265fe 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.service.ts @@ -24,7 +24,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, observable } from 'rxjs'; import { ApiService } from '../../../common/core/services/api.service'; -import { LoopbackConfig } from '../../../common/constants/app-constants'; @Injectable() export class TestTemplateService { diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts index 7c3bf5465..a4177c176 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/existing-model/exsisting-model.service.ts @@ -24,7 +24,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, observable } from 'rxjs'; import { ApiService } from '../../../../common/core/services/api.service'; -import { LoopbackConfig, ResourceDictionaryURLs } from '../../../../common/constants/app-constants'; +import { ResourceDictionaryURLs } from '../../../../common/constants/app-constants'; @Injectable() export class ExsistingModelService { @@ -34,6 +34,6 @@ export class ExsistingModelService { } searchByTags(tag) { - return this.api.get(LoopbackConfig.url+ ResourceDictionaryURLs.searchResourceDictionaryByTags + '/' + tag); + return this.api.get(ResourceDictionaryURLs.searchResourceDictionaryByTags + '/' + tag); } } \ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts index 982d71d58..bd06abbc1 100644 --- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts +++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.service.ts @@ -24,7 +24,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, observable } from 'rxjs'; import { ApiService } from '../../../common/core/services/api.service'; -import { LoopbackConfig, ResourceDictionaryURLs } from '../../../common/constants/app-constants'; +import { ResourceDictionaryURLs } from '../../../common/constants/app-constants'; @Injectable() export class ResourceEditService { @@ -34,6 +34,6 @@ export class ResourceEditService { } saveResource(resource) { - return this.api.post(LoopbackConfig.url+ ResourceDictionaryURLs.saveResourceDictionary, resource); + return this.api.post(ResourceDictionaryURLs.saveResourceDictionary, resource); } } \ No newline at end of file -- cgit 1.2.3-korg