Skip to content

Commit

Permalink
grouping changes reversed
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shahbaz-dataq
Shahbaz-dataq committed Jan 29, 2025
1 parent 02ef846 commit c6e37ae
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 98 deletions.
85 changes: 12 additions & 73 deletions opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/support/systemReportList.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,102 +35,41 @@
<jsp:directive.include file="/includes/bootstrap.jsp" />

<script type="text/javascript">
// <!-- Begin
<!-- Begin
function checkAll(field)
{
for (i = 0; i < field.length; i++)
field[i].checked = true ;
field[i].checked = true ;
}
function uncheckAll(field)
{
for (i = 0; i < field.length; i++)
field[i].checked = false ;
field[i].checked = false ;
}
function toggle(box, field)
{
if (box.checked == true) {
checkAll(field);
} else {
uncheckAll(field);
}
if (box.checked == true) {
checkAll(field);
} else {
uncheckAll(field);
}
}
function toggleGroup(activeGroup) {
// Select group elements
const group1Checkboxes = document.querySelectorAll("#group1 input[type='checkbox']");
const group2Radios = document.querySelectorAll("#group2 input[type='radio']");
if (activeGroup === 1) {
// Enable and check all checkboxes, disable and uncheck all radios
group1Checkboxes.forEach(checkbox => {
checkbox.disabled = false;
checkbox.checked = true;
});
group2Radios.forEach(radio => {
radio.disabled = true;
radio.checked = false;
});
} else if (activeGroup === 2) {
// Disable and uncheck all checkboxes, enable radios, and check the first one
group1Checkboxes.forEach(checkbox => {
checkbox.disabled = true;
checkbox.checked = false;
});
group2Radios.forEach(radio => {
radio.disabled = false;
});
if (group2Radios.length > 0) {
group2Radios[0].checked = true;
}
}
}
// End -->
</script>


<form role="form" name="report" class="form" action="admin/support/systemReport.htm" method="post" class="normal">

<div class="card">
<div class="card-header">
<span>Plugins</span>
<span>Plugins &nbsp;&nbsp;&nbsp; <input type="checkbox" name="all" onclick="toggle(document.report.all, document.report.plugins)" checked /> All</span>
</div>
<div class="card-body">
<p>Choose which plugins to enable:</p>
<div class="d-flex ml-2">
<!-- Radio Group -->
<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">System Reports</label>
<div id="group1" class="ml-3">
<c:forEach items="${report.plugins}" var="plugin" varStatus="status">
<c:if test="${plugin.fullOutputOnly == false}">
<input type="checkbox" id="checkbox_${status.index}" name="plugins" value="${plugin.name}" checked />
<label for="checkbox_${status.index}"><c:out value="${plugin.name}" />: <c:out value="${plugin.description}" /></label>
<br />
</c:if>
</c:forEach>
</div>
</div>

<div>
<!-- Second Radio Group -->
<input type="radio" id="radio2" name="group" onclick="toggleGroup(2)" />
<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}">
<input type="radio" id="checkbox_${status.index}" name="plugins" value="${plugin.name}" disabled />
<label for="checkbox_${status.index}"><c:out value="${plugin.name}" />: <c:out value="${plugin.description}" /></label>
<br />
</c:if>
</c:forEach>
</div>
</div>
</div>
<c:forEach items="${report.plugins}" var="plugin">
<input type="checkbox" name="plugins" value="${plugin.name}" checked /> <c:out value="${plugin.name}" />: <c:out value="${plugin.description}" /> <br />
</c:forEach>
</div>
</div> <!-- panel -->

Expand Down
31 changes: 6 additions & 25 deletions smoke-test/src/test/java/org/opennms/smoketest/SupportPageIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,12 @@ public void testAllButtonsArePresent() throws Exception {
public void testSystemReport() {
driver.findElement(By.linkText("Generate System Report")).click();

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 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]"));
// checkboxes are selected by default
final WebElement allCheckbox = driver.findElement(By.cssSelector("input[type=checkbox][name=all]"));
assertThat(driver.findElement(By.cssSelector("input[type=checkbox][name=plugins][value=Java]")).isSelected(), is(true));

assertThat(textFileReportRadio.isSelected(), is(true));
assertThat(logFilesRadio.isSelected(), is(false));
assertThat(javaReportCheckbox.isSelected(), is(true));
assertThat(configurationReportRadio.isSelected(), is(false));
assertThat(logsReportRadio.isSelected(), is(false));

javaReportCheckbox.click();
assertThat(javaReportCheckbox.isSelected(), is(false));

logFilesRadio.click();
assertThat(textFileReportRadio.isSelected(), is(false));
assertThat(logFilesRadio.isSelected(), is(true));
assertThat(javaReportCheckbox.isSelected(), is(false));
assertThat(configurationReportRadio.isSelected(), is(true));
assertThat(logsReportRadio.isSelected(), is(false));

logsReportRadio.click();
assertThat(configurationReportRadio.isSelected(), is(false));
assertThat(logsReportRadio.isSelected(), is(true));
// deselect the "all" checkbox
allCheckbox.click();
assertThat(driver.findElement(By.cssSelector("input[type=checkbox][name=plugins][value=Java]")).isSelected(), is(false));
}

}

0 comments on commit c6e37ae

Please sign in to comment.