Eiffel Documentation Links menu dynamically configured in application.properties file.

tobiasake · tobiasake · commit bdc10992a3ce · 2017-12-18T21:24:25.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
@@ -32,15 +32,15 @@ public class WebController {
     private String backendServerHost;
     private int backendServerPort;
 
-    private String eiffelDocumentationUrl;
+    private String eiffelDocumentationUrls;
 
 
     @RequestMapping("/")
     public String greeting(Model model) {
 
-        String eiffelDocumentationUrlLink = String.format("%s", eiffelDocumentationUrl);
+        String eiffelDocumentationUrlLinks = String.format("%s", eiffelDocumentationUrls);
 
-        model.addAttribute("eiffelDocumentationUrlLink", eiffelDocumentationUrlLink);  // inject in DOM for AJAX etc
+        model.addAttribute("eiffelDocumentationUrlLinks", eiffelDocumentationUrlLinks);  // inject in DOM for AJAX etc
 
     	
     	
@@ -126,11 +126,11 @@ public void setBackendServerPort(int backendServerPort) {
         this.backendServerPort = backendServerPort;
     }
 
-    public String getEiffelDocumentationUrl() {
-        return eiffelDocumentationUrl;
+    public String getEiffelDocumentationUrls() {
+        return eiffelDocumentationUrls;
     }
 
-    public void setEiffelDocumentationUrl(String eiffelDocumentationUrl) {
-        this.eiffelDocumentationUrl = eiffelDocumentationUrl;
+    public void setEiffelDocumentationUrls(String eiffelDocumentationUrls) {
+        this.eiffelDocumentationUrls = eiffelDocumentationUrls;
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -16,7 +16,9 @@ ei.backendServerPort=8090
 ei.subscriptionFilePath=subscriptions/subscriptionsTemplate.json
 
 ###### EI Documentation Link Url ##########
-ei.eiffelDocumentationUrl=https://github.com/Ericsson/eiffel-intelligence-frontend
+ei.eiffelDocumentationUrls={ "EI GitHub": "https://github.com/Ericsson/eiffel-intelligence-frontend",\
+                             "Eiffel Github": "https://github.com/Ericsson/eiffel",\
+                             "Eiffel Github main page": "http://ericsson.github.io/eiffel" }
 
 #### LOGGING #########
 logging.level.root: INFO
diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/main.js
@@ -1,6 +1,9 @@
 
 jQuery(document).ready(function() {
 	
+    // Fetch injected URL from DOM
+    var eiffelDocumentationUrlLinks = $('#eiffelDocumentationUrlLinks').text();
+	
 	document.getElementById("testRulesBtn").onclick = function() {		  
 		
     	var iframe = document.getElementById("mainFrame");
@@ -49,10 +52,36 @@ jQuery(document).ready(function() {
 	document.getElementById("subscriptionBtn").onclick = function() {
 		
     	loadMainPage();    
+	}
+	
+	function loadDocumentLinks(){
+		// eiffelDocumentationUrlLinks variable is configure in application.properties
+		var linksList = JSON.parse(eiffelDocumentationUrlLinks);
+
+	    var docLinksDoc = document.getElementById('collapseDocPages');
+		var liTag = null;
+		var aTag = null;
+		
+    	Object.keys(linksList).forEach(function(linkKey) {
+    			liTag = document.createElement('li');
+    			aTag = document.createElement('a');
+    			aTag.innerHTML = linkKey;
+    			aTag.setAttribute('href', linksList[linkKey]);
+    			aTag.setAttribute('target', '_blanc');
+    			liTag.appendChild(aTag);
+    			docLinksDoc.appendChild(liTag);
+    	    	});
+    	    
+		
+		
+		
+
+		
 	}
 	
 	var initOneTime = function(){
 		initOneTime = function(){}; // kill it as soon as it was called
+		 loadDocumentLinks();
 	     loadMainPage();
 	};
 	
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -19,6 +19,9 @@
 </head>
 
 <body class="fixed-nav bg-dark" id="page-top">
+
+<div class="hidden" id="eiffelDocumentationUrlLinks" th:text="${eiffelDocumentationUrlLinks}"></div>
+
   <!-- Navigation-->
   <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" id="mainNav">
     <a class="navbar-brand" href="/">Eiffel Intelligence</a>
@@ -62,11 +65,14 @@
             </li>
           </ul>
         </li>
-        <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Link">
-          <a class="nav-link" th:href="${eiffelDocumentationUrlLink}" target="_blanc">
-            <i class="fa fa-fw fa-link"></i>
-            <span class="nav-link-text">Documentation Link</span>
+        <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Documentation Links">
+          <a class="nav-link nav-link-collapse collapsed" data-toggle="collapse" href="#collapseDocPages" data-parent="#exampleAccordion">
+            <i class="fa fa-fw fa-file"></i>
+            <span class="nav-link-text">Documentation Links</span>
           </a>
+          <ul class="sidenav-second-level collapse" id="collapseDocPages">
+			<!-- Li and A tags and document links content is injected from main.js  -->
+          </ul>
         </li>
       </ul>
       <ul class="navbar-nav sidenav-toggler">

Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ public class WebController {`
`32`	`32`	`private String backendServerHost;`
`33`	`33`	`private int backendServerPort;`
`34`	`34`
`35`		`- private String eiffelDocumentationUrl;`
	`35`	`+ private String eiffelDocumentationUrls;`
`36`	`36`
`37`	`37`
`38`	`38`	`@RequestMapping("/")`
`39`	`39`	`public String greeting(Model model) {`
`40`	`40`
`41`		`- String eiffelDocumentationUrlLink = String.format("%s", eiffelDocumentationUrl);`
	`41`	`+ String eiffelDocumentationUrlLinks = String.format("%s", eiffelDocumentationUrls);`
`42`	`42`
`43`		`- model.addAttribute("eiffelDocumentationUrlLink", eiffelDocumentationUrlLink); // inject in DOM for AJAX etc`
	`43`	`+ model.addAttribute("eiffelDocumentationUrlLinks", eiffelDocumentationUrlLinks); // inject in DOM for AJAX etc`
`44`	`44`
`45`	`45`
`46`	`46`
`@@ -126,11 +126,11 @@ public void setBackendServerPort(int backendServerPort) {`
`126`	`126`	`this.backendServerPort = backendServerPort;`
`127`	`127`	`}`
`128`	`128`
`129`		`- public String getEiffelDocumentationUrl() {`
`130`		`- return eiffelDocumentationUrl;`
	`129`	`+ public String getEiffelDocumentationUrls() {`
	`130`	`+ return eiffelDocumentationUrls;`
`131`	`131`	`}`
`132`	`132`
`133`		`- public void setEiffelDocumentationUrl(String eiffelDocumentationUrl) {`
`134`		`- this.eiffelDocumentationUrl = eiffelDocumentationUrl;`
	`133`	`+ public void setEiffelDocumentationUrls(String eiffelDocumentationUrls) {`
	`134`	`+ this.eiffelDocumentationUrls = eiffelDocumentationUrls;`
`135`	`135`	`}`
`136`	`136`	`}`