From 89de17b50dcd1d29fb87acfe518d1ddf43c1408a Mon Sep 17 00:00:00 2001 From: Yoav Schneiderman Date: Wed, 18 Dec 2019 21:04:38 +0200 Subject: move templates API to a intended controller Issue-ID: VID-730 Change-Id: Id2aa44803a190333b5a96fda77ca15d254b4c222 Signed-off-by: Einat Vinouze --- .../iFrames/instantiation.templates.modal.e2e.ts | 18 +++++++++--------- .../instantiation.templates.modal.component.ts | 2 +- .../server/serviceInfo/serviceInfo.service.spec.ts | 4 ++-- .../shared/server/serviceInfo/serviceInfo.service.ts | 10 ++++++++-- vid-webpack-master/src/app/shared/utils/constants.ts | 1 + 5 files changed, 21 insertions(+), 14 deletions(-) (limited to 'vid-webpack-master') diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts index b2d3eb578..e55b1dcd1 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts @@ -1,7 +1,7 @@ /// describe('Template', () => { - const asyncInstantiation = [ + const instantiationTemplates = [ { "id": 8, "created": 1525075968000, @@ -102,7 +102,7 @@ describe('Template', () => { }).as('initFlags'); }); - cy.route(Cypress.config('baseUrl') + "/asyncInstantiation**", asyncInstantiation); + cy.route(Cypress.config('baseUrl') + "/instantiationTemplates**", instantiationTemplates); cy.route(Cypress.config('baseUrl') + "/getuserID", '16807000'); cy.openIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true'); @@ -135,13 +135,13 @@ describe('Template', () => { cy.get(`#header-aicZone`).contains('AIC Zone'); // check table body row - cy.getElementByDataTestsId(`userId-${asyncInstantiation[0].jobId}`).contains('16807000'); - cy.getElementByDataTestsId(`createDate-${asyncInstantiation[0].jobId}`).contains('2018-04-30 11:12:48'); - cy.getElementByDataTestsId(`instanceName-${asyncInstantiation[0].jobId}`).contains('nWUfl instance name_002'); - cy.getElementByDataTestsId(`instantiationStatus-${asyncInstantiation[0].jobId}`).contains('FAILED'); - cy.getElementByDataTestsId(`region-${asyncInstantiation[0].jobId}`).contains('hvf6 (WAYNEHOLLAND)'); - cy.getElementByDataTestsId(`tenant-${asyncInstantiation[0].jobId}`).contains('AIN Web Tool-15-D-testalexandria'); - cy.getElementByDataTestsId(`aicZone-${asyncInstantiation[0].jobId}`).contains('NFTJSSSS-NFT1'); + cy.getElementByDataTestsId(`userId-${instantiationTemplates[0].jobId}`).contains('16807000'); + cy.getElementByDataTestsId(`createDate-${instantiationTemplates[0].jobId}`).contains('2018-04-30 11:12:48'); + cy.getElementByDataTestsId(`instanceName-${instantiationTemplates[0].jobId}`).contains('nWUfl instance name_002'); + cy.getElementByDataTestsId(`instantiationStatus-${instantiationTemplates[0].jobId}`).contains('FAILED'); + cy.getElementByDataTestsId(`region-${instantiationTemplates[0].jobId}`).contains('hvf6 (WAYNEHOLLAND)'); + cy.getElementByDataTestsId(`tenant-${instantiationTemplates[0].jobId}`).contains('AIN Web Tool-15-D-testalexandria'); + cy.getElementByDataTestsId(`aicZone-${instantiationTemplates[0].jobId}`).contains('NFTJSSSS-NFT1'); //check load button is disabled diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.ts index b37d7f9a2..6a734161f 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.ts @@ -45,7 +45,7 @@ export class InstantiationTemplatesModalComponent extends DialogComponent { - const getServiceJobInfoRoute = this._serviceInfoService.getServicesJobInfo(true, params['serviceModelId']); + const getServiceJobInfoRoute = this._serviceInfoService.getTemplatesInfo(true, params['serviceModelId']); const getUserIdRoute = this._aaiService.getUserId(); forkJoin([getServiceJobInfoRoute, getUserIdRoute]).subscribe(([jobs]) => { diff --git a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.spec.ts b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.spec.ts index 0234ea514..23d42c972 100644 --- a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.spec.ts +++ b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.spec.ts @@ -50,8 +50,8 @@ describe('Service Info Service', () => { test('should call with serviceModelId', ()=>{ let job: ServiceInfoModel = new ServiceInfoModel(); - service.getServicesJobInfo(true, "123").subscribe(); - const req = httpMock.expectOne(`${Constants.Path.SERVICES_JOB_INFO_PATH}?${Constants.Path.SERVICE_MODEL_ID}=123`); + service.getTemplatesInfo(true, "123").subscribe(); + const req = httpMock.expectOne(`${Constants.Path.INSTANTIATION_TEMPLATES_PATH}?${Constants.Path.SERVICE_MODEL_ID}=123`); expect(req.request.method).toBe('GET'); }); }); diff --git a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.ts b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.ts index 388afdba0..9c4712dc6 100644 --- a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.ts +++ b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.service.ts @@ -12,10 +12,16 @@ export class ServiceInfoService { constructor(private _http: HttpClient) { } - getServicesJobInfo(showSpinner: boolean = true, serviceModelId: string = null): Observable { + getServicesJobInfo(showSpinner: boolean = true): Observable { let pathQuery = Constants.Path.SERVICES_JOB_INFO_PATH; let headers = new HttpHeaders({'x-show-spinner': showSpinner.toString()}); - let params = serviceModelId ? {serviceModelId} : {}; + return this._http.get(pathQuery, { headers: headers}); + } + + getTemplatesInfo(showSpinner: boolean = true, serviceModelId: string): Observable { + let pathQuery = Constants.Path.INSTANTIATION_TEMPLATES_PATH; + let headers = new HttpHeaders({'x-show-spinner': showSpinner.toString()}); + let params = {serviceModelId}; return this._http.get(pathQuery, { headers: headers, params }); } diff --git a/vid-webpack-master/src/app/shared/utils/constants.ts b/vid-webpack-master/src/app/shared/utils/constants.ts index f09ab088d..da717c8f4 100644 --- a/vid-webpack-master/src/app/shared/utils/constants.ts +++ b/vid-webpack-master/src/app/shared/utils/constants.ts @@ -93,6 +93,7 @@ export module Constants { public static WELCOME_PATH = 'welcome.htm'; public static IS_PERMITTED_SUB_PATH = '&isPermitted='; public static SERVICES_JOB_INFO_PATH = '../../asyncInstantiation'; + public static INSTANTIATION_TEMPLATES_PATH = '../../instantiationTemplates'; public static SERVICE_MODEL_ID = 'serviceModelId'; public static SERVICES_RETRY_TOPOLOGY = '../../asyncInstantiation/bulkForRetry'; public static INSTANTIATION_TEMPLATE_TOPOLOGY = '../../instantiationTemplates/templateTopology'; -- cgit 1.2.3-korg