fix: Fix the bug that the model msg is error when deleting the vnf package

Change-Id: I95baaba0184434c0609a9efe1cf0161377726eeb
Issue-ID: USECASEUI-305
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>

3 files changed, 14 insertions, 4 deletions

diff --git a/usecaseui-portal/src/app/views/onboard-vnf-vm/onboard-vnf-vm.component.ts b/usecaseui-portal/src/app/views/onboard-vnf-vm/onboard-vnf-vm.component.ts
index 6bfdf498..98f40637 100644
--- a/usecaseui-portal/src/app/views/onboard-vnf-vm/onboard-vnf-vm.component.ts
+++ b/usecaseui-portal/src/app/views/onboard-vnf-vm/onboard-vnf-vm.component.ts
@@ -14,10 +14,10 @@
     limitations under the License.
 */
 import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http';
-import { Component, OnInit, HostBinding, TemplateRef, ViewChild } from '@angular/core';
+import { Component, OnInit, HostBinding, ViewChild } from '@angular/core';
 import { onboardService } from '../../core/services/onboard.service';
 import { slideToRight } from '../../shared/utils/animates';
-import { NzMessageService, UploadFile, NzModalRef, NzModalService } from 'ng-zorro-antd';
+import { NzMessageService, UploadFile, NzModalService } from 'ng-zorro-antd';
 import { filter } from 'rxjs/operators';
 
 @Component({
@@ -338,8 +338,12 @@ export class OnboardVnfVmComponent implements OnInit {
     }
     this.myhttp[API](pkgid)
       .subscribe((data) => {
-        this.notification.notificationSuccess(this.currentTab, 'OnboardingState', pkgid);
         resolve()
+          if(data.status === 'FAILED'){
+              this.notification.notificationFailed(this.currentTab, 'delete', pkgid);
+          }else {
+              this.notification.notificationSuccess(this.currentTab, 'delete', pkgid);
+          }
         //refresh list after successful deletion
         switch (this.currentTab) {
           case 'NS':
@@ -354,7 +358,7 @@ export class OnboardVnfVmComponent implements OnInit {
         }
       }, (err) => {
         console.log(err);
-        this.notification.notificationFailed(this.currentTab, 'OnboardingState', pkgid);
+        this.notification.notificationFailed(this.currentTab, 'delete', pkgid);
       })
   }
 }
diff --git a/usecaseui-portal/src/assets/i18n/cn.json b/usecaseui-portal/src/assets/i18n/cn.json
index fdee1adf..8690dbda 100644
--- a/usecaseui-portal/src/assets/i18n/cn.json
+++ b/usecaseui-portal/src/assets/i18n/cn.json
@@ -111,6 +111,9 @@
   "i18nTextDefine_Version": "版本",
   "i18nTextDefine_OnboardingState": "分发状态",
   "i18nTextDefine_OperationalState": "操作状态",
+  "i18nTextDefine_NS": "NS",
+  "i18nTextDefine_PNF": "PNF",
+  "i18nTextDefine_VNF": "VNF",
   "i18nTextDefine_UsageState": "使用状态",
   "i18nTextDefine_Operationbutton": "操作按钮",
 
diff --git a/usecaseui-portal/src/assets/i18n/en.json b/usecaseui-portal/src/assets/i18n/en.json
index 9a453e08..5e723917 100644
--- a/usecaseui-portal/src/assets/i18n/en.json
+++ b/usecaseui-portal/src/assets/i18n/en.json
@@ -110,6 +110,9 @@
   "i18nTextDefine_Version": "Version",
   "i18nTextDefine_OnboardingState": "Onboarding State",
   "i18nTextDefine_OperationalState": "Operational State",
+  "i18nTextDefine_NS": "NS",
+  "i18nTextDefine_PNF": "PNF",
+  "i18nTextDefine_VNF": "VNF",
   "i18nTextDefine_UsageState": "Usage State",
   "i18nTextDefine_Operationbutton": "Operation button",