openwrt-mirror/luci
1
0 Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-10-12 05:07:26 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-banip: correction to the presentation of the ‘worst sets’

Browse Source 
Top- and Worst-Lists rendered the identical 'elements / packets' string, so a
set appearing in both showed the same numbers twice with two very
different bars. Worst Sets now shows the value it is ranked by.

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken committed 2026-08-22 08:05:35 +02:00
1 parent 4b6dda1a83
commit 459941fb2f
2 files changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/luci-app-banip/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for banIP
LUCI_DEPENDS:=+luci-base +banip
PKG_VERSION:=1.8.12
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
applications/luci-app-banip/htdocs/luci-static/resources/view/banip/setreport.js
+9 -8
View File
@@ -408,12 +408,8 @@ return view.extend({
/*
ranked lists with relative bars
A quota only means something once the counters exist. The report
carries an empty string rather than a zero while the 'count' option
is off, which is what separates "not counted" from "counted zero".
*/
function topList(title, hint, entries, color, empty) {
function topList(title, hint, entries, color, empty, fmtValue) {
const list = entries.slice(0, 10);
/* both lists are ranked by their bar metric, so the peak is the head */
const peak = list.reduce(function (max, entry) {
@@ -426,13 +422,17 @@ return view.extend({
} else if (hits.counted === 0) {
note = _('packet counters disabled');
}
const pair = `${_('elements')} / ${_('packets')}`;
const rows = list.map(function (entry) {
const width = peak > 0 ? Math.round(entry.value / peak * 100) : 0;
return E('div', { 'class': 'ban-row' }, [
E('div', { 'class': 'ban-row-top' }, [
E('span', { 'class': 'ban-row-name' }, [entry.name]),
E('span', { 'class': 'ban-row-cnt' }, [
`${fmtCount(entry.elements)} / ${fmtCount(entry.hits)}`
E('span', {
'class': 'ban-row-cnt',
'title': `${fmtCount(entry.elements)} / ${fmtCount(entry.hits)} ${pair}`
}, [
fmtValue ? fmtValue(entry) : `${fmtCount(entry.elements)} / ${fmtCount(entry.hits)}`
])
]),
E('div', { 'class': 'ban-bar' }, [
@@ -470,7 +470,8 @@ return view.extend({
]),
E('div', { 'class': 'ban-grid' }, [
topList(_('Top Sets'), _('elements / packets'), hits.hits, 'info', _('no hits yet')),
topList(_('Worst Sets'), _('elements per packet'), hits.worst, 'err', '-')
topList(_('Worst Sets'), _('elements per packet'), hits.worst, 'err', '-',
function (entry) { return fmtCount(Math.round(entry.value)); })
]),
E('div', { 'class': 'ban-grid' }, [
E('div', { 'class': 'ban-card' }, [