NMS-16986 : Handel Merge changes as well as changes suggest in standu…

…p meeting.
OpenNMS · Jan 20, 2025 · 5d696cd · 5d696cd
1 parent edf0c3f
commit 5d696cd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/support/systemReportList.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/support/systemReportList.jsp
@@ -104,7 +104,7 @@ function toggleGroup(activeGroup) {
       <div class="mr-5">
         <!-- First Radio Group -->
         <input type="radio" id="radio1" name="group" onclick="toggleGroup(1)" checked />
-        <label for="radio1" class="font-weight-bold">Text File Report</label>
+        <label for="radio1" class="font-weight-bold">System Reports</label>
         <div id="group1" class="ml-3">
           <c:forEach items="${report.plugins}" var="plugin" varStatus="status">
             <c:if test="${plugin.fullOutputOnly == false}">
@@ -119,7 +119,7 @@ function toggleGroup(activeGroup) {
       <div>
         <!-- Second Radio Group -->
         <input type="radio" id="radio2" name="group" onclick="toggleGroup(2)" />
-        <label for="radio2" class="font-weight-bold">Log Files</label>
+        <label for="radio2" class="font-weight-bold">Configs / Logs</label>
         <div id="group2" class="ml-3">
           <c:forEach items="${report.plugins}" var="plugin" varStatus="status">
             <c:if test="${plugin.fullOutputOnly == true}">

diff --git a/smoke-test/src/test/java/org/opennms/smoketest/SupportPageIT.java b/smoke-test/src/test/java/org/opennms/smoketest/SupportPageIT.java
@@ -64,14 +64,14 @@ public void testSystemReport() {
         final WebElement textFileReportRadio = driver.findElement(By.id("radio1"));
         final WebElement logFilesRadio = driver.findElement(By.id("radio2"));
         final WebElement javaReportCheckbox = driver.findElement(By.cssSelector("input[type=checkbox][name=plugins][value=Java]"));
-        final WebElement threadsReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Threads]"));
-        final WebElement topReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Top]"));
+        final WebElement configurationReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Configuration]"));
+        final WebElement logsReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Logs]"));
 
         assertThat(textFileReportRadio.isSelected(), is(true));
         assertThat(logFilesRadio.isSelected(), is(false));
         assertThat(javaReportCheckbox.isSelected(), is(true));
-        assertThat(threadsReportRadio.isSelected(), is(false));
-        assertThat(topReportRadio.isSelected(), is(false));
+        assertThat(configurationReportRadio.isSelected(), is(false));
+        assertThat(logsReportRadio.isSelected(), is(false));
 
         javaReportCheckbox.click();
         assertThat(javaReportCheckbox.isSelected(), is(false));
@@ -80,11 +80,12 @@ public void testSystemReport() {
         assertThat(textFileReportRadio.isSelected(), is(false));
         assertThat(logFilesRadio.isSelected(), is(true));
         assertThat(javaReportCheckbox.isSelected(), is(false));
-        assertThat(threadsReportRadio.isSelected(), is(true));
-        assertThat(topReportRadio.isSelected(), is(false));
+        assertThat(configurationReportRadio.isSelected(), is(true));
+        assertThat(logsReportRadio.isSelected(), is(false));
 
-        topReportRadio.click();
-        assertThat(threadsReportRadio.isSelected(), is(false));
-        assertThat(topReportRadio.isSelected(), is(true));
+        logsReportRadio.click();
+        assertThat(configurationReportRadio.isSelected(), is(false));
+        assertThat(logsReportRadio.isSelected(), is(true));
     }
+
 }