Re: [pve-devel] [PATCH v1 pve-manager 8/8] ui: ceph: osd: rework rendering of version field & show build commit

[Lukas Wagner <l.wagner@proxmox.com>]

On  2024-04-30 17:28, Max Carrara wrote:
> The logic of the `render_version` function is split up in order to
> handle how the version is displayed depending on the type of the row.
> 
> If the parsed version is `undefined` or the row marks the beginning of
> the tree, an empty string is now returned. This behaviour is
> equivalent to before, it just makes the overall logic easier.
> 
> If the row belongs to a node, the build commit is now additionally
> displayed in parentheses next to the installed Ceph version:
> 
>   18.2.2 (abcd1234)
> 
> If the row belongs to an osd, the build commit is also additionally
> displayed in parentheses next to the installed Ceph version.
> Furthermore, should the build commit of the running osd differ from
> the one that's installed on the host, the new hash will also be shown
> in parentheses:
> 
>   18.2.2 (abcd1234 -> 5678fedc)
> 
> The icon displayed for running an osd with an outdated build is the
> same as for running an outdated version. The conditional display of
> cluster health-related icons remains the same otherwise.
> 
> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
> ---
>  www/manager6/ceph/OSD.js | 55 ++++++++++++++++++++++++++++++++--------
>  1 file changed, 45 insertions(+), 10 deletions(-)
> 
> diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js
> index d2caafa4..988962b1 100644
> --- a/www/manager6/ceph/OSD.js
> +++ b/www/manager6/ceph/OSD.js
> @@ -642,23 +642,58 @@ Ext.define('PVE.node.CephOsdTree', {
>  	},
>  
>  	render_version: function(value, metadata, rec) {
> +	    if (value === undefined || rec.data.type === 'root') {
> +		return '';
> +	    }
> +
>  	    let vm = this.getViewModel();
> -	    let versions = vm.get('versions');
>  	    let icon = "";
> -	    let version = value || "";
> -	    let maxversion = vm.get('maxversion');
> -	    if (value && PVE.Utils.compare_ceph_versions(value, maxversion) !== 0) {
> -		let host_version = rec.parentNode?.data?.version || versions[rec.data.host] || "";
> -		if (rec.data.type === 'host' || PVE.Utils.compare_ceph_versions(host_version, maxversion) !== 0) {
> +	    const maxversion = vm.get('maxversion');
> +	    const mixedversions = vm.get('mixedversions');
> +
> +	    if (rec.data.type === 'host') {
> +		const bc = rec.data.buildcommit ?? '';
> +
> +		if (PVE.Utils.compare_ceph_versions(maxversion, value) > 0) {
>  		    icon = PVE.Utils.get_ceph_icon_html('HEALTH_UPGRADE');
> -		} else {
> -		    icon = PVE.Utils.get_ceph_icon_html('HEALTH_OLD');
> +		} else if (mixedversions) {
> +		    icon = PVE.Utils.get_ceph_icon_html('HEALTH_OK');
>  		}
> -	    } else if (value && vm.get('mixedversions')) {
> +
> +		if (bc === '') {
> +		    return `${icon}${value}`;
> +		}
> +
> +		return `${icon}${value} (${bc.substring(0, 9)})`;
> +	    }
> +
> +	    const versionNode = rec.parentNode?.data?.version ?? '';
> +
> +	    const bc = PVE.Utils.parse_ceph_buildcommit(rec.data) ?? '';
> +	    const bcNode = rec.parentNode?.data?.buildcommit ?? '';

same as before, rather use `let` than `const` and maybe use a longer, more
clear name.

> +
> +	    let bcChanged = bc !== '' && bcNode !== '' && bc !== bcNode;
> +
> +	    if (PVE.Utils.compare_ceph_versions(maxversion, value) > 0) {
> +		icon = PVE.Utils.get_ceph_icon_html('HEALTH_UPGRADE');
> +	    } else if (versionNode && PVE.Utils.compare_ceph_versions(versionNode, value) > 0) {
> +		icon = PVE.Utils.get_ceph_icon_html('HEALTH_OLD');
> +	    } else if (mixedversions && !bcChanged) {
>  		icon = PVE.Utils.get_ceph_icon_html('HEALTH_OK');
>  	    }
>  
> -	    return icon + version;
> +	    let bcPart = bc.substring(0, 9);
> +	    if (bcChanged) {
> +		const arrow = '<i class="fa fa-fw fa-long-arrow-right"></i>';
> +		icon ||= PVE.Utils.get_ceph_icon_html('HEALTH_OLD');
> +		bcPart = `${bc.substring(0, 9)}${arrow}${bcNode.substring(0, 9)}`;
> +	    }
> +
> +	    if (bcPart === '') {
> +		return `${icon}${value}`;
> +	    }
> +
> +	    return `${icon}${value} (${bcPart})`;
>  	},
>  
>  	render_osd_val: function(value, metaData, rec) {

-- 
- Lukas


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