X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=static%2Fsrc%2Finstancehandler%2Finstance_list.js;h=db22bc26b03e4b574d03c185c3350f2e0e48aff5;hb=8c35a0fcca1548bbf99e6b4464e039971c96ecc7;hp=88a1f577abc84fb30d80b6b6416759f83134eefb;hpb=b58d5d8e177049ab63587f4329f282bc206352ec;p=osm%2FLW-UI.git

diff --git a/static/src/instancehandler/instance_list.js b/static/src/instancehandler/instance_list.js
index 88a1f57..db22bc2 100644
--- a/static/src/instancehandler/instance_list.js
+++ b/static/src/instancehandler/instance_list.js
@@ -20,18 +20,6 @@ function performAction(instance_name, instance_id) {
     $('#modal_instance_new_action').modal('show');
 }
 
-function exportMetricNs(instance_name, instance_id) {
-    var url = '/instances/ns/'+instance_id+'/monitoring/metric';
-    $("#formExportMetricNS").attr("action", url);
-    $('#modal_instance_export_metric').modal('show');
-}
-
-function newAlarmNs(instance_name, instance_id) {
-    var url = '/instances/ns/'+instance_id+'/monitoring/alarm';
-    $("#formAlarmNS").attr("action", url);
-    $('#modal_instance_new_alarm').modal('show');
-}
-
 function deleteNs(instance_name, instance_id, force) {
     var url = '/instances/ns/'+instance_id+'/delete';
     bootbox.confirm("Are you sure want to delete " + instance_name + "?", function (result) {
@@ -54,12 +42,64 @@ function deleteNs(instance_name, instance_id, force) {
                     }
                     else {
                         dialog.modal('hide');
-                        location.reload();
+                        table.ajax.reload();
                     }
                 },
-                error: function (error) {
+                error: function (result) {
                     dialog.modal('hide');
-                    bootbox.alert("An error occurred.");
+                    var data = result.responseJSON;
+                        var title = "Error " + (data && data.code ? data.code : 'unknown');
+                        var message = data && data.detail ? data.detail : 'No detail available.';
+                        bootbox.alert({
+                            title: title,
+                            message: message
+                        });
+                }
+            });
+        }
+    })
+}
+function deleteNsi(instance_name, instance_id, force) {
+    var url = '/instances/nsi/'+instance_id+'/delete';
+    bootbox.confirm("Are you sure want to delete " + instance_name + "?", function (result) {
+        if (result) {
+            if (force)
+                url = url + '?force=true';
+            var dialog = bootbox.dialog({
+                message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
+                closeButton: true
+            });
+            $.ajax({
+                url: url,
+                type: 'GET',
+                dataType: "json",
+                contentType: "application/json;charset=utf-8",
+                success: function (result) {
+                    console.log(result)
+                    if (result['error'] == true){
+                        dialog.modal('hide');
+                        var data = result.responseJSON;
+                        var title = "Error " + (data && data.code ? data.code : 'unknown');
+                        var message = data && data.detail ? data.detail : 'No detail available.';
+                        bootbox.alert({
+                            title: title,
+                            message: message
+                        });
+                    }
+                    else {
+                        dialog.modal('hide');
+                        table.ajax.reload();
+                    }
+                },
+                error: function (result) {
+                    dialog.modal('hide');
+                    var data = result.responseJSON;
+                        var title = "Error " + (data && data.code ? data.code : 'unknown');
+                        var message = data && data.detail ? data.detail : 'No detail available.';
+                        bootbox.alert({
+                            title: title,
+                            message: message
+                        });
                 }
             });
         }
@@ -86,7 +126,7 @@ function deletePDU(instance_name, instance_id) {
                     }
                     else {
                         dialog.modal('hide');
-                        location.reload();
+                        table.ajax.reload();
                     }
                 },
                 error: function (error) {
@@ -104,11 +144,9 @@ var addFormGroup = function (event) {
     var $formGroup = $(this).closest('.form-group');
     var $formGroupClone = $formGroup.clone();
 
-    $(this)
-        .toggleClass('btn-success btn-add btn-danger btn-remove')
-        .html('–');
-
     $formGroupClone.find('input').val('');
+    $formGroupClone.find('button').toggleClass('btn-success btn-add btn-danger btn-remove');
+    $formGroupClone.find('button').text('–');
     $formGroupClone.insertAfter($formGroup);
 
 };
@@ -215,7 +253,8 @@ $(document).ready(function () {
     $(document).on('click', '.interface-group .btn-add', addInterfaceGroup);
     $(document).on('click', '.interface-group .btn-remove', removeInterfaceGroup);
 
-    $("#formCreatePDU").submit(function (event) {
+    
+    $("#formCreateNS").submit(function (event) {
         event.preventDefault(); //prevent default action
         var post_url = $(this).attr("action"); //get form action url
         var request_method = $(this).attr("method"); //get form GET/POST method
@@ -231,7 +270,7 @@ $(document).ready(function () {
             processData: false
         }).done(function (response, textStatus, jqXHR) {
             table.ajax.reload();
-            $('#modal_new_pdu').modal('hide');
+            $('#modal_new_instance').modal('hide');
         }).fail(function (result) {
             var data = result.responseJSON;
             var title = "Error " + (data.code ? data.code : 'unknown');
@@ -243,44 +282,11 @@ $(document).ready(function () {
         });
     });
 
-    $("#formActionNS").submit(function (event) {
-        event.preventDefault(); //prevent default action
-        var post_url = $(this).attr("action"); //get form action url
-        var request_method = $(this).attr("method"); //get form GET/POST method
-        var form_data = new FormData(this); //Encode form elements for submission
-        console.log(post_url);
-        $.ajax({
-            url: post_url,
-            type: request_method,
-            data: form_data,
-            headers: {
-                "Accept": 'application/json'
-            },
-            contentType: false,
-            processData: false
-        }).done(function (response, textStatus, jqXHR) {
-            $('#modal_instance_new_action').modal('hide');
-            bootbox.alert({
-                title: "Action",
-                message: "Action received."
-            });
-        }).fail(function (result) {
-            var data = result.responseJSON;
-            var title = "Error " + (data.code ? data.code : 'unknown');
-            var message = data.detail ? data.detail : 'No detail available.';
-            bootbox.alert({
-                title: title,
-                message: message
-            });
-        });
-    });
-
-    $("#formAlarmNS").submit(function (event) {
+    $("#formCreatePDU").submit(function (event) {
         event.preventDefault(); //prevent default action
         var post_url = $(this).attr("action"); //get form action url
         var request_method = $(this).attr("method"); //get form GET/POST method
         var form_data = new FormData(this); //Encode form elements for submission
-        console.log(post_url);
         $.ajax({
             url: post_url,
             type: request_method,
@@ -291,11 +297,8 @@ $(document).ready(function () {
             contentType: false,
             processData: false
         }).done(function (response, textStatus, jqXHR) {
-            $('#modal_instance_new_action').modal('hide');
-            bootbox.alert({
-                title: "Metric",
-                message: "Alarm created."
-            });
+            table.ajax.reload();
+            $('#modal_new_pdu').modal('hide');
         }).fail(function (result) {
             var data = result.responseJSON;
             var title = "Error " + (data.code ? data.code : 'unknown');
@@ -307,7 +310,7 @@ $(document).ready(function () {
         });
     });
 
-    $("#formExportMetricNS").submit(function (event) {
+    $("#formActionNS").submit(function (event) {
         event.preventDefault(); //prevent default action
         var post_url = $(this).attr("action"); //get form action url
         var request_method = $(this).attr("method"); //get form GET/POST method
@@ -325,8 +328,8 @@ $(document).ready(function () {
         }).done(function (response, textStatus, jqXHR) {
             $('#modal_instance_new_action').modal('hide');
             bootbox.alert({
-                title: "Metric",
-                message: "Metric exported."
+                title: "Action",
+                message: "Action received."
             });
         }).fail(function (result) {
             var data = result.responseJSON;