From: Luji7 <lu.ji3@zte.com.cn>
Date: Tue, 14 Nov 2017 15:26:29 +0000 (+0800)
Subject: Fix vf onboard issue.
X-Git-Tag: v1.0.1~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F23473%2F1;p=usecase-ui.git

Fix vf onboard issue.

Change-Id: Id4d0a23de8199e6f289a589c628ae2bc95e0da96
Issue-id: USECASEUI-55
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
---

diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
index 498d0ac7..6b47353a 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
@@ -186,16 +186,50 @@ app.controller('lcmCtrl', ['$scope', '$uibModal', '$log', '$http', '$timeout', '
       };
 
       ctrl.packageDelete = function (deletePackage) {
-        var processFun = function (response) {
-          if('failed' === response.status) {
-            ctrl.alerts.push({type: 'danger',msg: 'Operation failed! ' + response.statusDescription});
-          } else {
-            ctrl.alerts.push({type: 'success',msg: 'Operation is finished!'});
-          }
-        };
         if(deletePackage.type === 'NS') {
+            var processFun = function (response) {
+              if('failed' === response.status) {
+                ctrl.alerts.push({type: 'danger',msg: 'Operation failed! ' + response.statusDescription});
+              } else {
+                ctrl.alerts.push({type: 'success',msg: 'Operation is finished!'});
+              }
+            };
           ServiceTemplateService.nsPackageDelete(deletePackage, processFun);
         } else {
+            var openOnboardProgressDialog = function (jobId, title, successFun, failFun) {
+              var onboardProgressInstance = $uibModal.open({
+                ariaLabelledBy: 'modal-title',
+                ariaDescribedBy: 'modal-body',
+                templateUrl : 'app/uui/fusion/scripts/view-models/progress-dialog.html',
+                controller : 'VfOnboardProgressCtrl',
+                controllerAs : 'ctrl',
+                resolve: {
+                  jobId: function () {
+                    return jobId;
+                  },
+                  operationTitle: function () {
+                    return title;
+                  }
+                }
+              });
+              onboardProgressInstance.result.then(
+                function (result) {
+                  successFun(result);
+                },
+                function (reason) {
+                  failFun(reason);
+                }
+              );
+            };
+            var successFun = function (result) {
+              ctrl.alerts.push({type: 'success',msg: 'Operation is finished!'});
+            };
+            var failFun = function (reason) {
+              ctrl.alerts.push({type: 'danger',msg: 'Operation is failed! ' + reason});
+            };
+            var processFun = function (response) {
+              openOnboardProgressDialog(response.jobId, 'Delete VF package', successFun, failFun);
+            };
           ServiceTemplateService.vfPackageDelete(deletePackage, processFun);
         }
       };