Fix the alert message while onboard package.

[vnfsdk/refrepo.git] / openo-portal / portal-catalog / src / main / webapp / catalog / js / package / pmUtil.js

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 c694c51..d69be0a 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,65 +29,17 @@ 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
     }\r
 }\r
 \r
-pmUtil.isRowDeletingStatus = function(name) {\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
-           tableData[i]["status"].indexOf($.i18n.prop("nfv-package-iui-status-deleting")) > -1) {\r
-            return true;            \r
-        }\r
-    }\r
-    return false;\r
-}\r
-\r
-pmUtil.delPackage = function(csarId) {\r
-    if(pmUtil.isRowDeletingStatus(csarId)){\r
-        return;\r
-    }\r
-       bootbox.confirm($.i18n.prop("nfv-package-iui-message-delete-confirm"), function(result){\r
-               if(result) {\r
-            pmUtil.changeTableStatus(csarId, "deleting");\r
-                       var url = vm.$restUrl.delPackageUrl + csarId;\r
-                       commonUtil.delete(url, function(resp) {\r
-                               \r
-                       });\r
-               }\r
-       });             \r
-}\r
-\r
-pmUtil.isRowOnBoardingStatus = function(name) {\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
-            tableData[i]["status"].indexOf($.i18n.prop("nfv-package-iui-status-onboarding")) > -1) {\r
-            return true;\r
-        }\r
-    }\r
-    return false;\r
-}\r
-\r
-pmUtil.onBoardPackage = function(name) {\r
-    if(pmUtil.isRowOnBoardingStatus(name)){\r
-        return;\r
-    }\r
-    pmUtil.changeTableStatus(name, "onboarding");\r
-    var url = vm.$restUrl.delPackageUrl + "?csarName=" + name;\r
-    commonUtil.delete(url, function(resp) {\r
-    });\r
-}\r
 //query packages exist\r
 //0: the package does not exist \r
 //1: the package does not exist, but the instance cite this package\r
@@ -99,7 +51,7 @@ pmUtil.getExistPackageByName = function(name) {
     }\r
     var result = $.ajax({\r
         type : "GET",\r
-        url : vm.$restUrl.queryPackageInfoUrl + "?csarName=" + name,\r
+        url : vm.$restUrl.queryPackageInfoUrl + "?name=" + name,\r
         async: false\r
     });        \r
     var data = result.responseJSON;\r
@@ -115,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
@@ -150,8 +103,10 @@ pmUtil.doOnBoard = function(url,param) {
             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-onBoarded"), "failed");\r
+                if(resp != "" && 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
@@ -170,6 +125,11 @@ pmUtil.doNFAROnboard = function(extData) {
         contentType : "application/json",\r
         dataType : "json",\r
         success : function(resp) {\r
+            if(resp != "" && 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
@@ -177,3 +137,62 @@ pmUtil.doNFAROnboard = function(extData) {
         }\r
     });\r
 }\r
+\r
+pmUtil.doSSAROnboard = function(url) {\r
+    $.ajax({\r
+        type : "PUT",\r
+        url : url,\r
+        contentType : "application/json",\r
+        success : function(resp) {\r
+            if(resp != "" && 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
+            commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
+        }\r
+    });\r
+}\r
+\r
+pmUtil.delPackage = function (url) {\r
+    $.ajax({\r
+        type : "DELETE",\r
+        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
+        },\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
+                //refreshByCond();\r
+            } else {\r
+                commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-error"), "failed");\r
+                refreshByCond();\r
+            }\r
+        }\r
+    });\r
+}\r
+\r
+pmUtil.nameRender = function(obj) {\r
+    return '<a href="#" onclick="vm.packageDetail.$showDetails('\r
+        + '\'block\',\'' + obj.aData.id + '\', \'' + obj.aData.name + '\')">' + obj.aData.name + '</a>';\r
+}\r
+\r
+pmUtil.onBoardRender = function(obj) {\r
+    var attr;\r
+    attr = 'class="label label-info status" data-toggle="tooltip" title="nfv-package-iui-status-tip"';\r
+    return '<span class="label label-info status" data-toggle="tooltip" title="nfv-package-iui-status-tip" onclick="vm.onBoardPackage(\'' + obj.aData.csarId\r
+        + '\',\''+ obj.aData.type + '\', \''+ obj.aData.onBoardState +'\')">' + obj.aData.onBoardState + '</span>';\r
+}\r
+\r
+pmUtil.operationRender = function(obj) {\r
+    return '<a href="#" class="btn-xs grey btn-editable" onclick="vm.$delPackage(\'' + obj.aData.csarId\r
+        + '\',\''+ obj.aData.type + '\')">' + '<i class=\"ict-delete\"></i>' + $.i18n.prop('nfv-software-iui-action-delete') + '</a>';\r
+}
\ No newline at end of file