Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-nlbwmon: fix row sorting

Browse source 
Add raw cell values to support proper numerical row sorting.

Fixes: #6366
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2023-04-29 23:42:55 +02:00
parent 70fb460c00
commit 4f4ad9bff5
1 changed files with 51 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw/display.js
View file

@ -333,15 +333,15 @@ return view.extend({
'data-col': 'ip', 'data-col': 'ip',
'data-tooltip': _('Source IP') 'data-tooltip': _('Source IP')
}, (mac !== '00:00:00:00:00:00') ? mac : _('other')), }, (mac !== '00:00:00:00:00:00') ? mac : _('other')),
E('a', { [ rec.conns, E('a', {
'href': '#' + rec.mac, 'href': '#' + rec.mac,
'data-col': 'layer7', 'data-col': 'layer7',
'data-tooltip': _('Protocol') 'data-tooltip': _('Protocol')
}, '%1000.2m'.format(rec.conns)), }, '%1000.2m'.format(rec.conns)) ],
'%1024.2mB'.format(rec.rx_bytes), [ rec.rx_bytes, '%1024.2mB'.format(rec.rx_bytes) ],
'%1000.2mP'.format(rec.rx_pkts), [ rec.rx_pkts, '%1000.2mP'.format(rec.rx_pkts) ],
'%1024.2mB'.format(rec.tx_bytes), [ rec.tx_bytes, '%1024.2mB'.format(rec.tx_bytes) ],
'%1000.2mP'.format(rec.tx_pkts) [ rec.tx_pkts, '%1000.2mP'.format(rec.tx_pkts) ]
]); ]);
trafData.push({ trafData.push({
@ -389,11 +389,11 @@ return view.extend({
rows.push([ rows.push([
cell, cell,
'%1000m'.format(rec.conns), [ rec.conns, '%1000m'.format(rec.conns) ],
'%1024.2mB'.format(rec.rx_bytes), [ rec.rx_bytes, '%1024.2mB'.format(rec.rx_bytes) ],
'%1000.2mP'.format(rec.rx_pkts), [ rec.rx_pkts, '%1000.2mP'.format(rec.rx_pkts) ],
'%1024.2mB'.format(rec.tx_bytes), [ rec.tx_bytes, '%1024.2mB'.format(rec.tx_bytes) ],
'%1000.2mP'.format(rec.tx_pkts) [ rec.tx_pkts, '%1000.2mP'.format(rec.tx_pkts) ]
]); ]);
rxData.push({ rxData.push({
@ -501,16 +501,41 @@ return view.extend({
rows.push([ rows.push([
this.formatHostname(dns), this.formatHostname(dns),
mac, mac,
[ E('span', _('IPv4')), [
E('span', _('IPv6')) ], 0,
[ E('span', rec4 ? '%1024.2mB'.format(rec4.rx_bytes) : '-'), E([], [
E('span', rec6 ? '%1024.2mB'.format(rec6.rx_bytes) : '-') ], E('span', _('IPv4')),
[ E('span', rec4 ? '%1000.2mP'.format(rec4.rx_pkts) : '-'), E('span', _('IPv6'))
E('span', rec6 ? '%1000.2mP'.format(rec6.rx_pkts) : '-') ], ])
[ E('span', rec4 ? '%1024.2mB'.format(rec4.tx_bytes) : '-'), ],
E('span', rec6 ? '%1024.2mB'.format(rec6.tx_bytes) : '-') ], [
[ E('span', rec4 ? '%1000.2mP'.format(rec4.tx_pkts) : '-'), (rec4 ? rec4.rx_bytes : 0) + (rec6 ? rec6.rx_bytes : 0),
E('span', rec6 ? '%1000.2mP'.format(rec6.tx_pkts) : '-') ] E([], [
E('span', rec4 ? '%1024.2mB'.format(rec4.rx_bytes) : '-'),
E('span', rec6 ? '%1024.2mB'.format(rec6.rx_bytes) : '-')
])
],
[
(rec4 ? rec4.rx_pkts : 0) + (rec6 ? rec6.rx_pkts : 0),
E([], [
E('span', rec4 ? '%1000.2mP'.format(rec4.rx_pkts) : '-'),
E('span', rec6 ? '%1000.2mP'.format(rec6.rx_pkts) : '-')
])
],
[
(rec4 ? rec4.tx_bytes : 0) + (rec6 ? rec6.tx_bytes : 0),
E([], [
E('span', rec4 ? '%1024.2mB'.format(rec4.tx_bytes) : '-'),
E('span', rec6 ? '%1024.2mB'.format(rec6.tx_bytes) : '-')
])
],
[
(rec4 ? rec4.tx_pkts : 0) + (rec6 ? rec6.tx_pkts : 0),
E([], [
E('span', rec4 ? '%1000.2mP'.format(rec4.tx_pkts) : '-'),
E('span', rec6 ? '%1000.2mP'.format(rec6.tx_pkts) : '-')
])
]
]); ]);
} }
@ -617,11 +642,11 @@ return view.extend({
rows.push([ rows.push([
cell, cell,
'%1000.2m'.format(rec.conns), [ rec.conns, '%1000.2m'.format(rec.conns) ],
'%1024.2mB'.format(rec.rx_bytes), [ rec.rx_bytes, '%1024.2mB'.format(rec.rx_bytes) ],
'%1000.2mP'.format(rec.rx_pkts), [ rec.rx_pkts, '%1000.2mP'.format(rec.rx_pkts) ],
'%1024.2mB'.format(rec.tx_bytes), [ rec.tx_bytes, '%1024.2mB'.format(rec.tx_bytes) ],
'%1000.2mP'.format(rec.tx_pkts) [ rec.tx_pkts, '%1000.2mP'.format(rec.tx_pkts) ]
]); ]);
rxData.push({ rxData.push({