From ae24adb337bd7f362c2a5e8fb6ef92e2f02ccd8b Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Tue, 17 Dec 2019 12:22:15 +0800
Subject: feat:Optimize service instance creation parameter passing

Change-Id: I0ccf20c574f004f3fd39a223052f002099451560
Issue-ID: USECASEUI-370
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../services/services-list/services-list.component.html  | 16 ++++++++--------
 .../services/services-list/services-list.component.ts    | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'usecaseui-portal/src/app/views')

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 9bbd7455..8e07eea0 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
@@ -246,29 +246,29 @@
                             *ngIf="thisCreateService.status == 'Failed'">
                     </span>
                     <div class="ant-notification-notice-message"
-                        *ngIf="(thisCreateService['serviceDomain'] == 'CCVPN' || thisCreateService['serviceDomain'] == 'SOTN') && thisCreateService.status == 'Successful'">
-                        {{ thisCreateService['serviceDomain'] }} &nbsp; {{"i18nTextDefine_InstanceCreatedSuccessfully" |
+                        *ngIf="(createData['commonParams']['templateType'] == 'CCVPN' || thisCreateService['serviceDomain'] == 'SOTN') && thisCreateService.status == 'Successful'">
+                        {{ createData['commonParams']['templateType'] }} &nbsp; {{"i18nTextDefine_InstanceCreatedSuccessfully" |
                         translate}}
                     </div>
                     <div class="ant-notification-notice-message"
-                        *ngIf="(thisCreateService['serviceDomain'] == 'E2E Service') && thisCreateService.status == 'Successful'">
+                        *ngIf="(createData['commonParams']['templateType'] == 'E2E Service') && thisCreateService.status == 'Successful'">
                         E2E &nbsp; {{"i18nTextDefine_InstanceCreatedSuccessfully" | translate}}
                     </div>
                     <div class="ant-notification-notice-message"
-                        *ngIf="(thisCreateService['serviceDomain'] == 'Network Service') && thisCreateService.status == 'Successful'">
+                        *ngIf="(createData['commonParams']['templateType'] == 'Network Service') && thisCreateService.status == 'Successful'">
                         NS &nbsp; {{"i18nTextDefine_InstanceCreatedSuccessfully" | translate}}
                     </div>
                     <div class="ant-notification-notice-message"
-                        *ngIf="(thisCreateService['serviceDomain'] == 'CCVPN' || thisCreateService['serviceDomain'] == 'SOTN') && thisCreateService.status == 'Failed'">
-                        {{ thisCreateService['serviceDomain'] }} &nbsp; {{"i18nTextDefine_InstanceCreationFailed" |
+                        *ngIf="(createData['commonParams']['templateType'] == 'CCVPN' || thisCreateService['serviceDomain'] == 'SOTN') && thisCreateService.status == 'Failed'">
+                        {{ createData['commonParams']['templateType'] }} &nbsp; {{"i18nTextDefine_InstanceCreationFailed" |
                         translate}}
                     </div>
                     <div class="ant-notification-notice-message"
-                        *ngIf="(thisCreateService['serviceDomain'] == 'E2E Service') && thisCreateService.status == 'Failed'">
+                        *ngIf="(createData['commonParams']['templateType'] == 'E2E Service') && thisCreateService.status == 'Failed'">
                         E2E &nbsp; {{"i18nTextDefine_InstanceCreationFailed" | translate}}
                     </div>
                     <div class="ant-notification-notice-message"
-                        *ngIf="(thisCreateService['serviceDomain'] == 'Network Service') && thisCreateService.status == 'Failed'">
+                        *ngIf="(createData['commonParams']['templateType'] == 'Network Service') && thisCreateService.status == 'Failed'">
                         NS &nbsp; {{"i18nTextDefine_InstanceCreationFailed" | translate}}
                     </div>
                     <div class="ant-notification-notice-description">
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 4e57a820..6ee5c27d 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
@@ -517,14 +517,14 @@ export class ServicesListComponent implements OnInit {
 
         let createParams = "?customerId=" + this.createData['commonParams'].customer.id +
             "&serviceType=" + this.createData['commonParams'].serviceType.name +
-            "&serviceDomain=" + this.templateTypeSelected;
+            "&serviceDomain=" + this.createData['commonParams'].templateType;
         this.createService(obj, createParams, templateCreatestarting, templateCreateSuccessFaild).then((data) => {
             console.log(data);
             this.loadingAnimateShow = false;
             newData = {  //Newly created service data in the main form
                 'service-instance-id': data["serviceId"],
                 'service-instance-name': obj.service.name,
-                serviceDomain: this.templateTypeSelected,
+                serviceDomain: this.createData['commonParams'].templateType,
                 childServiceInstances: [],
                 status: "In Progress",
                 rate: 0,
@@ -582,7 +582,7 @@ export class ServicesListComponent implements OnInit {
         let newData; //
         let createParams = "?customerId=" + this.customerSelected.id +
             "&serviceType=" + this.createData['commonParams'].serviceType.name +
-            "&serviceDomain=" + this.templateTypeSelected +
+            "&serviceDomain=" + this.createData['commonParams'].templateType +
             "&parentServiceInstanceId=" +
             "&uuid=" + obj.service.serviceUuid +
             "&invariantUuuid=" + obj.service.serviceInvariantUuid;
@@ -592,7 +592,7 @@ export class ServicesListComponent implements OnInit {
             newData = {  //
                 'service-instance-id': data["serviceId"],
                 'service-instance-name': obj.service.name,
-                serviceDomain: this.templateTypeSelected,
+                serviceDomain: this.createData['commonParams'].templateType,
                 childServiceInstances: [],
                 status: "In Progress",
                 statusClass: 1001,
@@ -657,7 +657,7 @@ export class ServicesListComponent implements OnInit {
                 newData = {  //
                     'service-instance-id': data.nsInstanceId,
                     'service-instance-name': obj.step1.nsName,
-                    serviceDomain: this.templateTypeSelected,
+                    serviceDomain: this.createData['commonParams'].templateType,
                     childServiceInstances: [],
                     status: "In Progress",
                     statusClass: 1001,
@@ -676,7 +676,7 @@ export class ServicesListComponent implements OnInit {
                 let createParams = "?ns_instance_id=" + data.nsInstanceId +
                     "&customerId=" + this.createData['commonParams'].customer.id +
                     "&serviceType=" + this.createData['commonParams'].serviceType.name +
-                    "&serviceDomain=" + this.templateTypeSelected +
+                    "&serviceDomain=" + this.createData['commonParams'].templateType +
                     "&parentServiceInstanceId=";
                 // step2
                 this.createNsService(createParams, obj.step2).then((jobid) => {
-- 
cgit 1.2.3-korg