Add page that displays rules from GET /rules endpoint (#228)

* Add page for the rules under the Eiffel Intelligence Info menu item.

Author: Christoffer-Cortes

.travis.yml

@@ -70,7 +70,7 @@ jobs:
     - stage: test
       name: integrationTests
       script:
-        - "mvn verify -DskipUTs -Dei.backend.instances.list.json.content=\"[{ 'contextPath': '', 'port': '${EI_BACKEND_PORT}', 'name': 'EI-Backend-1', 'host': 'localhost', 'https': false, 'defaultBackend': true}]\" -B"
+        - "mvn verify -P integrationTest -DskipUTs -Dei.backend.instances.list.json.content=\"[{ 'contextPath': '', 'port': '${EI_BACKEND_PORT}', 'name': 'EI-Backend-1', 'host': 'localhost', 'https': false, 'defaultBackend': true}]\" -B"
     - stage: deploy
       name: deployGitHubPages
       before_install: skip    # do not run again

src/functionaltest/java/com/ericsson/ei/frontend/TestNavigation.java

@@ -26,6 +26,8 @@ public void before() {
     public void testPageNavigationButtons() throws IOException {
         indexPage.clickTestRulesPage();
         indexPage.clickEiInfoBtn();
+        indexPage.clickInformationBtn();
+        indexPage.clickRulesBtn();
         indexPage.clickAdminBackendInstancesBtn();
         indexPage.clickAddBackendInstanceBtn();
         indexPage.clickSwitchBackendInstanceBtn();

src/functionaltest/java/com/ericsson/ei/frontend/pageobjects/IndexPage.java

@@ -66,8 +66,8 @@ public void clickReloadButton() throws IOException {
 
 
     public void clickAdminBackendInstancesBtn() {
-        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='#confBackend']")));
-        WebElement adminBackendInstancesBtn = driver.findElement(By.xpath("//a[@href='#confBackend']"));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='#conf-backend']")));
+        WebElement adminBackendInstancesBtn = driver.findElement(By.xpath("//a[@href='#conf-backend']"));
         adminBackendInstancesBtn.click();
     }
 
@@ -89,9 +89,24 @@ public SwitchBackendPage clickSwitchBackendInstanceBtn() throws IOException {
         return switchBackendPage;
     }
 
-    public InfoPage clickEiInfoBtn() {
+    public void clickEiInfoBtn() {
         new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='#ei-info']")));
-        WebElement eiInfoBtn = driver.findElement(By.xpath("//a[@href='#ei-info']"));
+        WebElement eiffelInfoBtn = driver.findElement(By.xpath("//a[@href='#ei-info']"));
+        eiffelInfoBtn.click();
+    }
+
+    public InfoPage clickInformationBtn() {
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='#information']")));
+        WebElement eiInfoBtn = driver.findElement(By.xpath("//a[@href='#information']"));
+        eiInfoBtn.click();
+        InfoPage infoPage = new InfoPage(mockedHttpClient, driver, baseUrl);
+        waitForJQueryToLoad();
+        return infoPage;
+    }
+
+    public InfoPage clickRulesBtn() {
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath("//a[@href='#rules']")));
+        WebElement eiInfoBtn = driver.findElement(By.xpath("//a[@href='#rules']"));
         eiInfoBtn.click();
         InfoPage infoPage = new InfoPage(mockedHttpClient, driver, baseUrl);
         waitForJQueryToLoad();

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

@@ -71,7 +71,7 @@ public class EIRequestsController {
      */
     @CrossOrigin
     @RequestMapping(value = { "/subscriptions", "/subscriptions/*", "/information", "/download/*", "/auth", "/auth/*",
-            "/queryAggregatedObject", "/queryMissedNotifications", "/query",
+            "/queryAggregatedObject", "/queryMissedNotifications", "/query", "/rules",
             "/rules/rule-check/testRulePageEnabled" }, method = RequestMethod.GET)
     public ResponseEntity<String> getRequests(Model model, HttpServletRequest incomingRequest) {
         String eiRequestUrl;

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

@@ -43,26 +43,32 @@ public String greeting(Model model) {
         return "index";
     }
 
-    @RequestMapping("/subscriptionpage.html")
+    @RequestMapping("/subscriptions.html")
     public String subscription(Model model) {
         model.addAttribute("frontendServiceUrl", frontEndUtils.getFrontEndServiceUrl());
-        return "subscription";
+        return "subscriptions";
     }
 
-    @RequestMapping("/testRules.html")
+    @RequestMapping("/test-rules.html")
     public String testRules(Model model) {
         model.addAttribute("frontendServiceUrl", frontEndUtils.getFrontEndServiceUrl());
-        return "testRules";
+        return "test-rules";
     }
 
-    @RequestMapping("/eiInfo.html")
-    public String eiInfo(Model model, HttpServletRequest request) {
+    @RequestMapping("/information.html")
+    public String info(Model model, HttpServletRequest request) {
         model.addAttribute("frontendServiceUrl", frontEndUtils.getFrontEndServiceUrl());
         model.addAttribute("version", frontEndUtils.getVersion());
         model.addAttribute("applicationPropertiesVersion", frontEndUtils.getApplicationPropertiesVersion());
         model.addAttribute("frontendAppName", frontEndUtils.getApplicationName());
         model.addAttribute("backendServerUrl", frontEndUtils.getBackEndServiceUrl(request.getSession()));
-        return "eiInfo";
+        return "information";
+    }
+
+    @RequestMapping("/rules.html")
+    public String rules(Model model, HttpServletRequest request) {
+        model.addAttribute("frontendServiceUrl", frontEndUtils.getFrontEndServiceUrl());
+        return "rules";
     }
 
     @RequestMapping("/login.html")

src/main/resources/static/css/style.css

@@ -107,10 +107,15 @@
 .pre {
     display: block;
     font-family: monospace;
-    white-space: pre;
+    white-space: pre-wrap;
     margin: 1em;
     font-size: medium;
 }
+.code-block {
+    border: 1px solid #e6e6e6;
+    background: #f7f7f7;
+    padding: 10px;
+}
 .showPasswordButton{
     margin-top: 10px;
 }

src/main/resources/static/js/common.js

@@ -111,17 +111,22 @@ var routes = {};
 routes["subscriptions"] = function () {
     updateBackEndInstanceList();
     $(".app-header").removeClass("header-bar-hidden");
-    $(".main").load("subscriptionpage.html");
+    $(".main").load("subscriptions.html");
 };
 routes["test-rules"] = function () {
     updateBackEndInstanceList();
     $(".app-header").removeClass("header-bar-hidden");
-    $(".main").load("testRules.html");
+    $(".main").load("test-rules.html");
 };
-routes["ei-info"] = function () {
+routes["information"] = function () {
     updateBackEndInstanceList();
     $(".app-header").removeClass("header-bar-hidden");
-    $(".main").load("eiInfo.html");
+    $(".main").load("information.html");
+};
+routes["rules"] = function () {
+    updateBackEndInstanceList();
+    $(".app-header").removeClass("header-bar-hidden");
+    $(".main").load("rules.html");
 };
 routes["switch-backend"] = function () {
     $(".app-header").addClass("header-bar-hidden");
@@ -140,7 +145,8 @@ routes["login"] = function () {
 router.on({
     'subscriptions': routes["subscriptions"],
     'test-rules': routes["test-rules"],
-    'ei-info': routes["ei-info"],
+    'information': routes["information"],
+    'rules': routes["rules"],
     'switch-backend': routes["switch-backend"],
     'add-backend': routes["add-backend"],
     'login': routes["login"],

src/main/resources/static/js/downloadFile.js renamed to src/main/resources/static/js/download-file.js

@@ -17,6 +17,7 @@ var backendEndpoints = {
     DOWNLOAD: "/download/",
     DOWNLOAD_SUBSCRIPTIONS_TEMPLATE: "/download/subscriptionsTemplate",
     INFORMATION: "/information",
+    RULES: "/rules",
     TEST_RULES_PAGE_ENABLED: "/rules/rule-check/testRulePageEnabled",
     CHECK_AGGREGATION: "/rules/rule-check/aggregation"
 };