diff options
| -rw-r--r-- | usecaseui-portal/src/app/views/services/services-list/services-list.component.html | 14 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/views/services/services-list/services-list.component.ts | 15 |
2 files changed, 13 insertions, 16 deletions
diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.html b/usecaseui-portal/src/app/views/services/services-list/services-list.component.html index 216e92df..9bbd7455 100644 --- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.html +++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.html @@ -205,16 +205,16 @@ <img src="assets/images/execute-inproess.png" alt="instance temination is starting"> </span> <div class="ant-notification-notice-message" - *ngIf="thisCreateService['serviceDomain'] === 'CCVPN' || thisService['serviceDomain'] === 'SOTN'"> - {{ thisService['serviceDomain'] }} {{"i18nTextDefine_InstanceCreationStarting" | + *ngIf="createData['commonParams']['templateType'] === 'CCVPN' || thisService['serviceDomain'] === 'SOTN'"> + {{ createData['commonParams']['templateType'] }} {{"i18nTextDefine_InstanceCreationStarting" | translate}} </div> <div class="ant-notification-notice-message" - *ngIf="thisCreateService['serviceDomain'] == 'E2E Service'">E2E + *ngIf="createData['commonParams']['templateType'] == 'E2E Service'">E2E {{"i18nTextDefine_InstanceCreationStarting" | translate}} </div> <div class="ant-notification-notice-message" - *ngIf="thisCreateService['serviceDomain'] == 'Network Service'">NS + *ngIf="createData['commonParams']['templateType'] == 'Network Service'">NS {{"i18nTextDefine_InstanceCreationStarting" | translate}} </div> <div class="ant-notification-notice-description"> @@ -225,11 +225,11 @@ </div> <div class="notificationlist"> <p> {{"i18nTextDefine_Customer" | translate}} :</p> - <span>{{ customerSelected2.name }}</span> + <span>{{ createData['commonParams']['customer'].name }}</span> </div> <div class="notificationlist"> <p> {{"i18nTextDefine_UseCase" | translate}} :</p> - <span>{{ thisCreateService['serviceDomain'] }}</span> + <span>{{ createData['commonParams']['templateType'] }}</span> </div> </div> <div class="close-icons">{{"i18nTextDefine_Close" | translate}}</div> @@ -280,7 +280,7 @@ </div> <div class="notificationlist"> <p> {{"i18nTextDefine_Customer" | translate}} :</p> - <span>{{ customerSelected2.name }}</span> + <span>{{ createData['commonParams']['customer'].name }}</span> </div> <div class="notificationlist"> <p> {{"i18nTextDefine_UseCase" | translate}} :</p> diff --git a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts index da027028..4e57a820 100644 --- a/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts +++ b/usecaseui-portal/src/app/views/services/services-list/services-list.component.ts @@ -53,11 +53,8 @@ export class ServicesListComponent implements OnInit { orchestratorList = []; customerList = []; customerSelected = { name: null, id: null }; - customerSelected2 = { name: null, id: null }; serviceTypeList = []; serviceTypeSelected = { name: '' }; - serviceTypeSelected2 = { name: '' }; - serviceTypeSelectedName = ""; templateTypeSelected = "CCVPN"; orchestratorSelected = { name: null, id: null }; listSortMasters = JSON.parse(sessionStorage.getItem('listSortMasters')); @@ -167,7 +164,7 @@ export class ServicesListComponent implements OnInit { createdModalShow(obj: any): void{ this.createData = obj.createData; - console.log(obj.createData) + console.log(obj,"------obj.createData") if (obj.templateType === "SOTN" || obj.templateType === "CCVPN") { this.ccvpn_temParametersContent = obj.data; this.createshow = true; @@ -518,8 +515,8 @@ export class ServicesListComponent implements OnInit { console.log(obj); let newData; //Newly created service data for the main table - let createParams = "?customerId=" + this.customerSelected2.id + - "&serviceType=" + this.serviceTypeSelected2.name + + let createParams = "?customerId=" + this.createData['commonParams'].customer.id + + "&serviceType=" + this.createData['commonParams'].serviceType.name + "&serviceDomain=" + this.templateTypeSelected; this.createService(obj, createParams, templateCreatestarting, templateCreateSuccessFaild).then((data) => { console.log(data); @@ -584,7 +581,7 @@ export class ServicesListComponent implements OnInit { console.log(obj); let newData; // let createParams = "?customerId=" + this.customerSelected.id + - "&serviceType=" + this.serviceTypeSelected2.name + + "&serviceType=" + this.createData['commonParams'].serviceType.name + "&serviceDomain=" + this.templateTypeSelected + "&parentServiceInstanceId=" + "&uuid=" + obj.service.serviceUuid + @@ -677,8 +674,8 @@ export class ServicesListComponent implements OnInit { return false; } let createParams = "?ns_instance_id=" + data.nsInstanceId + - "&customerId=" + this.customerSelected2.id + - "&serviceType=" + this.serviceTypeSelected2.name + + "&customerId=" + this.createData['commonParams'].customer.id + + "&serviceType=" + this.createData['commonParams'].serviceType.name + "&serviceDomain=" + this.templateTypeSelected + "&parentServiceInstanceId="; // step2 |