Lowering prominence of progress bars on Status page when they are 0.

This commit is contained in:
Roland 2022-10-26 11:19:50 -06:00
parent 5bf648001b
commit 9694f0deca
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
2 changed files with 26 additions and 15 deletions

View file

@ -342,19 +342,23 @@ export function humanFileSize(bytes, dp = 1) {
}
export function humanBandwidth(bytes) {
// Convert bytes to Mbps and return a string.
bytes /= 125;
let size = 'Kbps';
if (bytes > 1000) {
bytes /= 125_000;
size = 'Mbps';
// Convert bytes to MBps and return a string.
const thresh = 1024;
if (Math.abs(bytes) < thresh) {
return bytes + ' Bps';
}
if (bytes > 1000) {
bytes /= 1000;
size = 'Gbps';
}
bytes = Math.round(bytes);
return `${bytes} ${size}`;
const units = ['KBps', 'MBps', 'GBps', 'TBps', 'PBps', 'EBps', 'ZBps', 'YBps'];
let u = -1;
const r = 10;
do {
bytes /= thresh;
++u;
} while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
return bytes.toFixed(0) + ' ' + units[u];
}
export function humanNumber(num, dp = 1) {

View file

@ -21,7 +21,7 @@ function DriveInfo({used, size, percent, mount}) {
/>
}
function DiskBandwidthProgress({bytes_ps, total, label}) {
function DiskBandwidthProgress({bytes_ps, total, label, ...props}) {
let percent = bytes_ps / total;
percent = percent || 0;
let color = null;
@ -33,7 +33,7 @@ function DiskBandwidthProgress({bytes_ps, total, label}) {
color = 'yellow';
}
label = `${label} ${humanBandwidth(bytes_ps)}`;
return <Progress percent={percent} label={label} color={color} key={label}/>;
return <Progress percent={percent} label={label} color={color} key={label} {...props}/>;
}
function DiskBandwidth({name, bytes_read_ps, bytes_write_ps}) {
@ -43,11 +43,15 @@ function DiskBandwidth({name, bytes_read_ps, bytes_write_ps}) {
bytes_ps={bytes_read_ps}
total={total}
label={`${name} read`}
size='tiny'
disabled={bytes_read_ps === 0}
/>;
const write = <DiskBandwidthProgress
bytes_ps={bytes_write_ps}
total={total}
label={`${name} write`}
size='tiny'
disabled={bytes_write_ps === 0}
/>;
return <Grid columns={2}>
@ -85,7 +89,8 @@ export function BandwidthProgress({label = '', bytes, maxBytes, ...props}) {
} else if (percent > 90) {
props['color'] = 'red';
}
return <Progress percent={percent} label={label} {...props}/>
const disabled = percent === 0;
return <Progress percent={percent} label={label} disabled={disabled} {...props}/>
}
export function BandwidthProgressGroup({bandwidth, ...props}) {
@ -96,6 +101,7 @@ export function BandwidthProgressGroup({bandwidth, ...props}) {
bytes={bandwidth['bytes_recv']}
label={`${bandwidth['name']} In`}
maxBytes={maxBytes}
size='small'
{...props}
/>;
@ -103,6 +109,7 @@ export function BandwidthProgressGroup({bandwidth, ...props}) {
bytes={bandwidth['bytes_sent']}
label={`${bandwidth['name']} Out`}
maxBytes={maxBytes}
size='small'
{...props}
/>;