Updated regarding to updates in REST API (#42)

Author: ValentinTyhonov

src/main/resources/static/js/eiInfo.js

@@ -108,9 +108,7 @@ jQuery(document).ready(function() {
         		tbdy = document.createElement('tbody');
         		tbl = createTable();
 
-        	    console.log(dataSubList);
         	    Object.keys(dataSubList).forEach(function(dataKey) {
-        	    	console.log(dataKey + " : " +  dataSubList[dataKey]);
         	        var tr = document.createElement('tr');
         	        var tdKey = document.createElement('td');
         	        tdKey.setAttribute('width', tableTdKeyWidth);
@@ -146,8 +144,7 @@ jQuery(document).ready(function() {
               },
         	  complete: function (XMLHttpRequest, textStatus) {
         	            var data = JSON.parse(XMLHttpRequest.responseText);
-        	            console.log(data);
-        	            
+
         	            generateGeneralEiInfo(data);
 
         	            generateEIInformationBasedOnList(data.rabbitmq, "Eiffel Intelligence Connected RabbitMq Instances");

src/main/resources/static/js/subscription.js

@@ -420,23 +420,23 @@ jQuery(document).ready(function() {
 
     // /Start ## Bulk delete#################################################
     $('.container').on( 'click', 'button.bulk_delete', function (event) {
-    	var subScriptionsToDelete = [];
+    	var subscriptionsToDelete = [];
     	var data = table.rows().nodes();
     	$.each(data, function (index, value) {
     		if ($(this).find('input').prop('checked') == true){
-    			subScriptionsToDelete.push(table.row(index).data().subscriptionName)
+    			subscriptionsToDelete.push(table.row(index).data().subscriptionName)
     	    }
     	});
 
     	// Check if no Subscription has been marked to be deleted.
-    	if ( subScriptionsToDelete.length < 1 ){
+    	if ( subscriptionsToDelete.length < 1 ){
     		$.alert("No subscriptions has been marked to be deleted.");
     		return;
     	}
 
-    	var subScriptionsToDeleteString = "";
-    	for (i=0; i < subScriptionsToDelete.length; i++) {
-    		subScriptionsToDeleteString += subScriptionsToDelete[i] + "\n";
+    	var subscriptionsToDeleteString = "";
+    	for (i=0; i < subscriptionsToDelete.length; i++) {
+    		subscriptionsToDeleteString += subscriptionsToDelete[i] + "\n";
     	}
 
     	var callback = {
@@ -452,24 +452,25 @@ jQuery(document).ready(function() {
                     reload_table();
                 },
                 error : function (XMLHttpRequest, textStatus, errorThrown) {
-                    $.jGrowl("Error: " + XMLHttpRequest.responseText, {
-                        sticky : true,
-                        theme : 'Error'
-                    });
+                    reload_table();
+                    var responseJSON = JSON.parse(XMLHttpRequest.responseText);
+                    for (var i = 0; i < responseJSON.length; i++) {
+                        $.jGrowl(responseJSON[i].subscription + " :: " + responseJSON[i].reason, {sticky: true, theme: 'Error'});
+                    }
                 },
                 complete : function () {
                 }
             };
 
              $.confirm({
                  title: 'Confirm!',
-                 content: 'Are you sure you want to delete these subscriptions?<pre>' + subScriptionsToDeleteString,
+                 content: 'Are you sure you want to delete these subscriptions?<pre>' + subscriptionsToDeleteString,
                  buttons: {
                      confirm: function () {
                     	 var ajaxHttpSender = new AjaxHttpSender();
-                    	 for (i=0; i < subScriptionsToDelete.length; i++){
-                    		 ajaxHttpSender.sendAjax(frontendServiceUrl + "/subscriptions/"+subScriptionsToDelete[i], "DELETE", null, callback);
-                    	 }
+                    	 // replace all /n with comma
+                    	 subscriptionsToDeleteString = subscriptionsToDeleteString.replace(new RegExp('\n', 'g'), ',').slice(0, -1);
+                    	 ajaxHttpSender.sendAjax(frontendServiceUrl + "/subscriptions/"+subscriptionsToDeleteString, "DELETE", null, callback);
                      },
                      cancel: function () {
                      }
@@ -511,18 +512,20 @@ jQuery(document).ready(function() {
                 success : function (data, textStatus) {
                     var returnData = [data];
                     if (returnData.length > 0) {
-                        $.jGrowl("Successful created subscription " + subscriptionJson.subscriptionName, {
+                        $.jGrowl("Subscriptions are successfully created", {
                             sticky : false,
                             theme : 'Error'
                         });
                         reload_table();
                     }
                 },
                 error : function (XMLHttpRequest, textStatus, errorThrown) {
-                    $.jGrowl("Failed to create Subscription: " + subscriptionJson.subscriptionName + " Error: " + XMLHttpRequest.responseText, {
-                        sticky : false,
-                        theme : 'Error'
-                    });
+                  reload_table();
+                  $.jGrowl("Failed to create next Subscriptions", {sticky: false, theme: 'Error'});
+                  var responseJSON = JSON.parse(XMLHttpRequest.responseText);
+                  for (var i = 0; i < responseJSON.length; i++) {
+                    $.jGrowl(responseJSON[i].subscription + " :: " + responseJSON[i].reason, {sticky: true, theme: 'Error'});
+                  }
                 },
                 complete : function () {
                 }
@@ -548,7 +551,7 @@ jQuery(document).ready(function() {
                 theme : 'Notify'
             });
             var subscriptionJsonList = JSON.parse(fileContent);
-                tryToCreateSubscription(subscriptionJsonList);
+            tryToCreateSubscription(subscriptionJsonList);
             };
             reader.readAsText(subscriptionFile);
         }
@@ -653,6 +656,9 @@ jQuery(document).ready(function() {
             vm.subscription([]);
             // Map JSON to Model and observableArray
             var mappedPackageInfo = $.map(returnData, function (item) {
+                if (item.foundSubscriptions != null) {
+                    item = item.foundSubscriptions;
+                }
                 // Defining Observable on all parameters in Requirements array(which is defined as ObservableArray)
                 for (i=0; i < item[0].requirements.length; i++) {
                     var conditions_array = [];
@@ -847,10 +853,10 @@ jQuery(document).ready(function() {
                 }
             },
             error : function (XMLHttpRequest, textStatus, errorThrown) {
-                $.jGrowl("Error: " + XMLHttpRequest.responseText, {
-                    sticky : true,
-                    theme : 'Error'
-                });
+                var responseJSON = JSON.parse(XMLHttpRequest.responseText);
+                for (var i = 0; i < responseJSON.length; i++) {
+                    $.jGrowl(responseJSON[i].subscription + " :: " + responseJSON[i].reason, {sticky: true, theme: 'Error'});
+                }
             },
             complete : function () {
                 $('#btnSave').text('save'); //change button text

src/main/resources/static/js/testrules.js

@@ -161,7 +161,6 @@ jQuery(document).ready(
           };
 
             var ajaxHttpSender = new AjaxHttpSender();
-            //console.log(JSON.stringify(JSON.parse('{"listRulesJson":' + JSON.stringify(formRules) + ',"listEventsJson":' + events.toString() + '}')));
             ajaxHttpSender.sendAjax(frontendServiceUrl + "/rules/rule-check/aggregation", "POST", JSON.stringify(JSON.parse('{"listRulesJson":'
                 + JSON.stringify(formRules) + ',"listEventsJson":' + JSON.stringify(formEvents) + '}')), callback);
         };

src/test/java/com/ericsson/ei/frontend/WebControllerTest.java

@@ -91,7 +91,6 @@ private void testGet(String path) throws Exception {
             .andExpect(status().isOk())
             .andExpect(content().contentType("text/html;charset=UTF-8"))
             .andExpect(model().attribute("frontendServiceUrl", "http://localhost:9090/somePath"))
-            .andDo(print())
             .andReturn();
     }