Re: [pve-devel] [PATCH manager] www: utils: fix inconsistency in host cpu usage display in search view

[Thomas Lamprecht <t.lamprecht@proxmox.com>]

Am 16/07/2024 um 11:31 schrieb Christoph Heiss:
> Between the number of CPUs and the actual label, a space was missing -
> resulting in an inconsistency vs. the "CPU usage" column.
> 
> Also, fix a rather nonsensical check for `maxcpu` above - noticed that
> while comparing the implementation to that of Proxmox.Utils.render_cpu().

can we split this in a different patch? it's rather unrelated.

Also I think the error here was the lacking parenthesis, i.e., the
following minimal change would make the check also correct

if (!(Ext.isNumeric(maxcpu) && maxcpu >= 1)) {

But I still like yours more, just wanted to point out that this was
probably a simple typo or incompletely moving from one variant to
the other, not straight out bogus in intend.

> 
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
>  www/manager6/Utils.js | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
> index f5608944d..6a0ecc98f 100644
> --- a/www/manager6/Utils.js
> +++ b/www/manager6/Utils.js
> @@ -1073,13 +1073,14 @@ Ext.define('PVE.Utils', {
>  	}
>  	var maxcpu = node.data.maxcpu || 1;
>  
> -	if (!Ext.isNumeric(maxcpu) && (maxcpu >= 1)) {
> +	if (!Ext.isNumeric(maxcpu) || maxcpu < 1) {
>  	    return '';
>  	}
>  
>  	var per = (record.data.cpu/maxcpu) * record.data.maxcpu * 100;
> +	const cpu_label = maxcpu > 1 ? 'CPUs' : 'CPU';
>  
> -	return per.toFixed(1) + '% of ' + maxcpu.toString() + (maxcpu > 1 ? 'CPUs' : 'CPU');
> +	return `${per.toFixed(1)}% of ${maxcpu} ${cpu_label}`;
>      },
>  
>      render_bandwidth: function(value) {



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel