Added info about EI Backend and Frontend connected servers on EiInfo page.

tobiasake · tobiasake · commit 21bf766e8aac · 2017-12-15T12:46:37.000+01:00
diff --git a/src/main/java/com/ericsson/ei/frontend/WebController.java b/src/main/java/com/ericsson/ei/frontend/WebController.java
@@ -29,7 +29,8 @@ public class WebController {
 
     private String frontendServiceHost;
     private int frontendServicePort;
-
+    private String backendServerHost;
+    private int backendServerPort;
 
     @RequestMapping("/")
     public String greeting(Model model) {
@@ -61,8 +62,9 @@ public String testRules(Model model) {
     public String eiInfo(Model model) {
     	
     	String frontendServiceUrl = String.format("http://%s:%d", frontendServiceHost, frontendServicePort);
-
-      	model.addAttribute("frontendServiceUrl", frontendServiceUrl);  // inject in DOM for AJAX etc
+    	model.addAttribute("frontendServiceUrl", frontendServiceUrl);  // inject in DOM for AJAX etc
+    	String backendServerUrl = String.format("http://%s:%d", backendServerHost, backendServerPort);
+    	model.addAttribute("backendServerUrl", backendServerUrl);
 
         return "eiInfo";
     }
@@ -102,5 +104,21 @@ public int getFrontendServicePort() {
     public void setFrontendServicePort(int frontendServicePort) {
         this.frontendServicePort = frontendServicePort;
     }
+    
+    public String getBackendServerHost() {
+        return backendServerHost;
+    }
+
+    public void setBackendServerHost(String backendServerHost) {
+        this.backendServerHost = backendServerHost;
+    }
+
+    public int getBackendServerPort() {
+        return backendServerPort;
+    }
+
+    public void setBackendServerPort(int backendServerPort) {
+        this.backendServerPort = backendServerPort;
+    }
 
 }
diff --git a/src/main/resources/static/js/eiInfo.js b/src/main/resources/static/js/eiInfo.js
@@ -1,5 +1,11 @@
 
+
+
 jQuery(document).ready(function() {
+	
+    // Fetch injected URL from DOM
+    var frontendServiceUrl = $('#frontendServiceUrl').text();
+    var backendServerUrl = $('#backendServerUrl').text();
 
     var body = document.getElementsByTagName('body')[0];
 
@@ -47,6 +53,24 @@ jQuery(document).ready(function() {
         tr.appendChild(tdValue);
         tbdy.appendChild(tr);
         
+        tr = document.createElement('tr');
+        tdKey = document.createElement('td');
+        tdKey.appendChild(document.createTextNode('EI RestApi Requests Via Server'));
+        tr.appendChild(tdKey);
+        tdValue = document.createElement('td');
+        tdValue.appendChild(document.createTextNode(frontendServiceUrl));
+        tr.appendChild(tdValue);
+        tbdy.appendChild(tr);
+        
+        tr = document.createElement('tr');
+        tdKey = document.createElement('td');
+        tdKey.appendChild(document.createTextNode('EI Backend Connected Server'));
+        tr.appendChild(tdKey);
+        tdValue = document.createElement('td');
+        tdValue.appendChild(document.createTextNode(backendServerUrl));
+        tr.appendChild(tdValue);
+        tbdy.appendChild(tr);
+        
         
         tbl.appendChild(tbdy);
         body.appendChild(tbl);
diff --git a/src/main/resources/templates/eiInfo.html b/src/main/resources/templates/eiInfo.html
@@ -33,6 +33,8 @@
 <body class="nav-link">
 	<div class="hidden" id="frontendServiceUrl"
 		th:text="${frontendServiceUrl}"></div>
+	<div class="hidden" id="backendServerUrl"
+		th:text="${backendServerUrl}"></div>
 	
 	<script type="text/javascript" src="js/eiInfo.js"></script>
 </body>
