vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-02 17:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed measuremnt count on table update

Browse source
This commit is contained in:
gabryon99 2020-04-29 14:17:47 +02:00
parent 051cf67dc5
commit 797359d86d
1 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

42
scripts/plugins/active_monitoring/httpdocs/active_monitoring_utils.js
View file

@ -201,7 +201,9 @@ $(document).ready(function() {
$('#am-alert .alert-body').text(data.message);
$('#am-alert').fadeIn();
$(`#am-${action}-modal`).modal('hide');
$am_table.ajax.reload();
$am_table.ajax.reload(function(data) {
updateMeasurementFilter(data);
});
return;
}
@ -253,11 +255,16 @@ $(document).ready(function() {
*/
const createEntry = (val, key, callback) => {
const $entry = $(`<li data-filter-key='${key}' class='dropdown-item pointer'>${val}</li>`);
$entry.click(function(e) {
// set active filter title
$dropdownTitle.html(`<i class='fas fa-filter'></i> ${val}`);
const $entry = $(`<li data-filter-key='${key}' class='dropdown-item pointer'>${val}</li>`);
$entry.click(function(e) {
// set active filter title and key
if ($dropdownTitle.parent().find(`i.fas`).length == 0) {
$dropdownTitle.parent().prepend(`<i class='fas fa-filter'></i>`);
}
$dropdownTitle.html($entry.html());
$dropdownTitle.attr(`data-filter-key`, key);
// remove the active class from the li elements
$menuContainer.find('li').removeClass(`active`);
// add active class to current entry
@ -287,7 +294,8 @@ $(document).ready(function() {
// add all filter
const $allEntry = createEntry(i18n.all, 'all', (e) => {
$dropdownTitle.html(`${title}`);
$dropdownTitle.parent().find('i.fas.fa-filter').remove();
$dropdownTitle.html(`${title}`).removeAttr(`data-filter-key`);
table_api.columns(column_index).search('').draw(true);
});
@ -296,8 +304,7 @@ $(document).ready(function() {
}
const addMeasurementFilter = (table_api, data) => {
const getMeasurementCount = (data) => {
// get all the measurements available and their count
const measurements = {};
data.forEach((v) => {
@ -308,6 +315,12 @@ $(document).ready(function() {
}
measurements[measurement]++;
});
return measurements;
}
const addMeasurementFilter = (table_api, data) => {
const measurements = getMeasurementCount(data);
// build filters for datatable
const filters = [];
@ -326,6 +339,15 @@ $(document).ready(function() {
addFilterDropdown(i18n.measurement, filters, MEASUREMENT_COLUMN_INDEX, "#am-table_filter", table_api);
}
const updateMeasurementFilter = (data) => {
const measurements = getMeasurementCount(data);
for (let [measurement, count] of Object.entries(measurements)) {
const label = `${measurements_info[measurement].label} (${count})`;
$(`[data-filter-key='${measurement}']`).text(label);
}
}
const addAlertedFilter = (table_api) => {
const filters = [
@ -372,7 +394,9 @@ $(document).ready(function() {
addAlertedFilter(table);
setInterval(() => {
$am_table.ajax.reload()
$am_table.ajax.reload(function(data) {
updateMeasurementFilter(data);
});
}, 15000);
},
ajax: {