Skip to content

Moved About modal to overview page #6366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlmarion merged 4 commits into from
May 13, 2026
Merged

Moved About modal to overview page #6366

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc31903
Moved About modal to overview page
dlmarion May 11, 2026
2195903
Use the css class 'collapse' to hide/show the card
dlmarion May 13, 2026
efbfa5c
Reverted changes for overview table size
dlmarion May 13, 2026
b297113
Update server/monitor/src/main/resources/org/apache/accumulo/monitor/…
dlmarion May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/modals.js
View file
Open in desktop

This file was deleted.

45 changes: 31 additions & 14 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
"use strict";

const deploymentTable = '#deployment-table';
const instanceCard = '#instance-card';
const instanceName = '#instance-name';
const instanceVolumes = '#instance-volumes';
const instanceUUID = '#instance-uuid';
const instanceVersion = '#instance-version';
const instanceZooKeepers = '#instance-zookeepers';

var deploymentBreakdown = [];

Expand All @@ -35,7 +41,10 @@ $(function () {
* Makes the REST calls, generates the table with the new information
*/
function refreshOverview() {
refreshDeploymentTables();
$.when(getInstanceInfo(), getDeployment()).then(function () {
refreshInstanceInfo();
refreshDeploymentTables();
});
Comment thread
dlmarion marked this conversation as resolved.
Outdated
}

/**
Expand All @@ -45,24 +54,32 @@ function refresh() {
refreshOverview();
}

function refreshInstanceInfo() {
const data = JSON.parse(sessionStorage.instance);
$(instanceVersion).text(data.version);
$(instanceName).text(data.instanceName);
$(instanceUUID).text(data.instanceUUID);
$(instanceZooKeepers).text(data.zooKeepers);
$(instanceVolumes).text(data.volumes);
$(instanceCard).removeClass('collapse');
}

/**
* Refreshes the deployment overview tables
*/
function refreshDeploymentTables() {
getDeployment().then(function () {
var data = JSON.parse(sessionStorage.deployment);
var breakdown = Array.isArray(data.breakdown) ? data.breakdown : [];
deploymentBreakdown = breakdown;

if (breakdown.length === 0) {
$('#deploymentWarning').html('<div class="alert alert-warning" role="alert">' +
'No deployment data is currently available.</div>');
} else {
$('#deploymentWarning').empty();
}
var data = JSON.parse(sessionStorage.deployment);
var breakdown = Array.isArray(data.breakdown) ? data.breakdown : [];
deploymentBreakdown = breakdown;

renderDeploymentMatrix(breakdown);
});
if (breakdown.length === 0) {
$('#deploymentWarning').html('<div class="alert alert-warning" role="alert">' +
'No deployment data is currently available.</div>');
} else {
$('#deploymentWarning').empty();
}

renderDeploymentMatrix(breakdown);
}

function renderDeploymentMatrix(breakdown) {
Expand Down
3 changes: 0 additions & 3 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
<script src="resources/js/${js}"></script>
</#if>
<script src="resources/js/navbar.js"></script>
<script src="resources/js/modals.js"></script>
</head>

<body>
Expand All @@ -79,7 +78,5 @@
<div id="main" class="container-fluid">
<#include "${template}">
</div>

<#include "modals.ftl">
</body>
</html>
68 changes: 0 additions & 68 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/modals.ftl
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
</div>
</div>
</li>
<li><a class="link-body-emphasis dropdown-item" data-bs-toggle="modal" href="#aboutModal">About</a></li>
</ul>
</li>
</ul>
Expand Down
27 changes: 27 additions & 0 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/overview.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,33 @@
<h3>${title}</h3>
</div>
</div>
<div class="row d-flex justify-content-center">
<div class="col-xs-12" id="instance-info">
<div class="card mx-auto collapse" style="width: 24rem;" id="instance-card">
<div class="card-header text-center">
<strong id="instance-name"></strong>
</div>
<div class="card-body">
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">Volumes</div>
<div id="instance-volumes" class="col-sm-8 text-start"></div>
</div>
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">ZooKeepers</div>
<div id="instance-zookeepers" class="col-sm-8 text-start"></div>
</div>
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">Version</div>
<div id="instance-version" class="col-sm-8 text-start"></div>
</div>
</div>
<div class="card-footer text-center text-muted" id="instance-uuid">
</div>
</div>
</div>
</div>
<br />
<br />
<div class="row d-flex justify-content-center">
<div class="col-xs-12" id="deploymentOverview">
<div id="deploymentWarning"></div>
Expand Down