Fixed few ajax calls regarding to improves in REST API (#44)

Author: ValentinTyhonov

src/main/java/com/ericsson/ei/frontend/EIRequestsController.java

@@ -190,7 +190,7 @@ private ResponseEntity<String> getResponse(HttpRequestBase request) {
         try (CloseableHttpResponse eiResponse = client.execute(request)) {
             responseBody = StringUtils.defaultIfBlank(EntityUtils.toString(eiResponse.getEntity(), "utf-8"), "[]");
             statusCode = eiResponse.getStatusLine().getStatusCode();
-            LOG.info("EI Http response status code: " + eiResponse.getStatusLine().getStatusCode()
+            LOG.info("EI Http response status code: " + statusCode
                     + "\nEI Received response body:\n" + responseBody
                     + "\nForwarding response back to EI Frontend WebUI.");
         } catch (IOException e) {

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

@@ -131,36 +131,35 @@ jQuery(document).ready(function() {
 	}
 
     function getInstanceInfo() {
-        var eiInfoContainer = document.getElementById('eiInfoContainer');
         $.ajax({
               url: frontendServiceUrl + "/information",
               contentType : 'application/json;charset=UTF-8',
               type: 'GET',
               error : function (XMLHttpRequest, textStatus, errorThrown) {
-                      document.getElementById('info_text').innerHTML = errorThrown;
+                  if (XMLHttpRequest.responseText == "") {
+                      document.getElementById("eiPageFrame").innerHTML = "<h3 style=\"text-align: center;\">There is no response from backend</h3>";
+                  } else {
+                      document.getElementById("eiPageFrame").innerHTML = "<h3 style=\"text-align: center;\">" + XMLHttpRequest.responseText + "</h3>";
+                  }
               },
               success : function (data, textStatus, xhr) {
-
+                  var eiInfoContainer = document.getElementById('eiInfoContainer');
+	                var data = JSON.parse(xhr.responseText);
+	                generateGeneralEiInfo(data);
+	                generateEIInformationBasedOnList(data.rabbitmq, "Eiffel Intelligence Connected RabbitMq Instances");
+	                generateEIInformationBasedOnList(data.mongodb, "Eiffel Intelligence Connected MongoDb Instances");
+	                generateEIInformationBasedOnList(data.threads, "Eiffel Intelligence Backend Java Threads Settings");
+	                generateEIInformationBasedOnList(data.email, "Eiffel Intelligence Backend E-Mail Settings");
+	                generateEIInformationBasedOnList(data.mailServerValues, "Eiffel Intelligence Backend SMTP Settings");
+	                generateEIInformationBasedOnList(data.waitList, "Eiffel Intelligence Backend WaitList settings");
+	                generateEIInformationBasedOnList([data.objectHandler], "Eiffel Intelligence Backend ObjectHandler Settings");
+	                generateEIInformationBasedOnList([data.subscriptionHandler], "Eiffel Intelligence Backend SubscriptionHandler Settings");
+	                generateEIInformationBasedOnList([data.informSubscription], "Eiffel Intelligence Backend InformSubscription Settings");
+	                generateEIInformationBasedOnList([data.erUrl], "Eiffel Intelligence Backend EventRepository Url");
+	                generateEIInformationBasedOnList([data.ldap], "Eiffel Intelligence Backend LDAP Settings");
               },
-        	  complete: function (XMLHttpRequest, textStatus) {
-        	            var data = JSON.parse(XMLHttpRequest.responseText);
-
-        	            generateGeneralEiInfo(data);
-        	            
-        	            generateEIInformationBasedOnList(data.rabbitmq, "Eiffel Intelligence Connected RabbitMq Instances");
-        	            generateEIInformationBasedOnList(data.mongodb, "Eiffel Intelligence Connected MongoDb Instances");
-        	            generateEIInformationBasedOnList(data.threads, "Eiffel Intelligence Backend Java Threads Settings");
-        	            generateEIInformationBasedOnList(data.email, "Eiffel Intelligence Backend E-Mail Settings");
-        	            generateEIInformationBasedOnList(data.mailServerValues, "Eiffel Intelligence Backend SMTP Settings");
-        	            generateEIInformationBasedOnList(data.waitList, "Eiffel Intelligence Backend WaitList settings");
-        	            generateEIInformationBasedOnList([data.objectHandler], "Eiffel Intelligence Backend ObjectHandler Settings");
-        	            generateEIInformationBasedOnList([data.subscriptionHandler], "Eiffel Intelligence Backend SubscriptionHandler Settings");
-        	            generateEIInformationBasedOnList([data.informSubscription], "Eiffel Intelligence Backend InformSubscription Settings");
-        	            generateEIInformationBasedOnList([data.erUrl], "Eiffel Intelligence Backend EventRepository Url");
-        	            generateEIInformationBasedOnList([data.ldap], "Eiffel Intelligence Backend LDAP Settings");
-        	  		}
+              complete: function (XMLHttpRequest, textStatus) {}
         	  });
-
     }
 
     getInstanceInfo();

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

@@ -51,10 +51,12 @@ jQuery(document).ready(function() {
     var green="#00ff00";
 		$.ajax({
 			url: frontendServiceUrl + "/auth/checkStatus",
-			contentType: 'application/json; charset=utf-8',
-			type: 'GET',
-			error: function (XMLHttpRequest) {
-				if(XMLHttpRequest.status == 401) {
+			type: "GET",
+			contentType: "application/string; charset=utf-8",
+			dataType: "text",
+			cache: false,
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				if (XMLHttpRequest.status == 401) {
 					doIfUserLoggedOut();
 					EIConnBtn.style.background = green;
 					backendStatus = true;
@@ -63,7 +65,7 @@ jQuery(document).ready(function() {
 					backendStatus = false;
 				}
 			},
-			success: function () {
+			success: function (data, textStatus) {
 				EIConnBtn.style.background = green;
 				backendStatus = true;
 			}