Fix the bug "delete package, package table would not be refreshed".

Change-Id: Ia2311b7e5e0ecc0f072ab03d064a55764a60d886
Issue-id:GSO-50
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
index fc42739..6c547ce 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
@@ -226,6 +226,7 @@
     <script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
 \r
        <script type="text/javascript" src="../common/thirdparty/cometd/cometd.js"></script>\r
+       <script type="text/javascript" src="../common/thirdparty/cometd/jquery/jquery.cometd.js"></script>\r
        <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>\r
     <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>\r
     <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.fileupload.js"></script>\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
index 9129b9d..3b19d23 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
@@ -326,6 +326,11 @@ var vm = avalon.define({
             }\r
         });\r
     },\r
+    $initCometd : function() {\r
+        commonUtil.registerCometdMessage("/openoapi/catalog/v1/catalognotification", "/package/delete", function(message) {\r
+            pmUtil.updateDeletedPackageStatus(message);\r
+        });\r
+    },\r
     gotoPackageListPage:function(){\r
         window.location.href="./csarPackage.html";\r
         refreshByCond();\r
@@ -333,7 +338,7 @@ var vm = avalon.define({
 });\r
 avalon.scan();\r
 vm.$initUpload();\r
-\r
+vm.$initCometd();\r
 $(function(){\r
     vm.$initTable();\r
 });\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
index 79dd813..ccd0f11 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
@@ -29,11 +29,11 @@ pmUtil.changeStatus = function(csarId, status) {
     });\r
 }\r
 \r
-pmUtil.changeTableStatus = function(name, status) {\r
+pmUtil.changeTableStatus = function(csarId, status) {\r
        var table = $("#" + vm.$tableId).dataTable();\r
        var tableData = table.fnGetData();\r
        for (var i=0; i<tableData.length; i++) {\r
-        if(tableData[i]["name"] == name) {\r
+        if(tableData[i]["csarId"] == csarId) {\r
                table.fnUpdate(status, i, 4, false, false);\r
                break;\r
         }\r
@@ -67,11 +67,12 @@ pmUtil.getExistPackageByName = function(name) {
 }\r
 \r
 pmUtil.updateDeletedPackageStatus = function(message) {\r
-    if(message.status == "true" || message.status == "deletionPending") {                \r
+    var messageobj = JSON.parse(message);\r
+    if(messageobj.status == "true" || messageobj.status == "deletionPending") {\r
         commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
         refreshByCond();\r
     } else {\r
-        pmUtil.changeTableStatus(message.csarid, "deletefail");\r
+        pmUtil.changeTableStatus(messageobj.csarid, "deletefail");\r
     }\r
 }\r
 \r
@@ -103,7 +104,9 @@ pmUtil.doOnBoard = function(url,param) {
             dataType : "json",\r
             success : function(resp) {\r
                 if(resp.data.status == "failed") {\r
-                    commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "failed");\r
+                    commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
+                } else {\r
+                    commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "success");\r
                 }\r
                 refreshByCond();\r
             },\r
@@ -122,6 +125,11 @@ pmUtil.doNFAROnboard = function(extData) {
         contentType : "application/json",\r
         dataType : "json",\r
         success : function(resp) {\r
+            if(resp.data.status == "failed") {\r
+                commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
+            } else {\r
+                commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "success");\r
+            }\r
             refreshByCond();\r
         },\r
         error : function() {\r
@@ -136,6 +144,11 @@ pmUtil.doSSAROnboard = function(url) {
         url : url,\r
         contentType : "application/json",\r
         success : function(resp) {\r
+            if(resp.data.status == "failed") {\r
+                commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
+            } else {\r
+                commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "success");\r
+            }\r
             refreshByCond();\r
         },\r
         error : function() {\r
@@ -150,24 +163,18 @@ pmUtil.delPackage = function (url) {
         url : url,\r
         contentType : "application/json",\r
         success : function(resp) {\r
-            commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
-            setTimeout( function(){\r
-                refreshByCond();\r
-            }, 1 * 1000 );\r
+            //commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
+            //setTimeout( function(){\r
+            //    refreshByCond();\r
+            //}, 1 * 1000 );\r
         },\r
         error : function(resp) {\r
             if(resp.status == 202 || resp.responseText == "success") {\r
-                commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
-                setTimeout( function(){\r
-                    refreshByCond();\r
-                }, 1 * 1000 );\r
+                //commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
                 //refreshByCond();\r
             } else {\r
                 commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-error"), "failed");\r
-                setTimeout( function(){\r
-                    refreshByCond();\r
-                }, 1 * 1000 );\r
-                //refreshByCond();\r
+                refreshByCond();\r
             }\r
         }\r
     });\r