[pve-devel] applied: [PATCH manager] ui: lxc: resources: add Detach text for mountpoints

[Thomas Lamprecht]

On 08.11.21 10:56, Aaron Lauterer wrote:
> Instead of showing 'Remove' for a mountpoint, change the text to
> 'Detach' and only show 'Remove' for unused volumes.
> 
> This aligns the behaviour with VMs and will make it clear, that a
> mountpoint first needs to be detached before it can be fully removed.
> 
> Signed-off-by: Aaron Lauterer <a.lauterer at proxmox.com>
> ---
> I took the code from the qemu/HardwareView.js and only made minor
> changes to the check if it is a used disk/volume.
> Since it is only a minor change, I did not go all the way to modernize
> it and also stayed with `var ...` instead of `let ...` when defining the
> `isUsedDisk` variable for consistency.
> 
>  www/manager6/lxc/Resources.js | 31 +++++++++++++++++++++++++++++--
>  1 file changed, 29 insertions(+), 2 deletions(-)
> 
>

applied, thanks! albeit...

> @@ -191,12 +191,21 @@ Ext.define('PVE.lxc.RessourceView', {
>  
>  	var remove_btn = new Proxmox.button.Button({
>  	    text: gettext('Remove'),
> +	    defaultText: gettext('Remove'),
> +	    altText: gettext('Detach'),
>  	    selModel: me.selModel,
>  	    disabled: true,
>  	    dangerous: true,
>  	    confirmMsg: function(rec) {
> -		var msg = Ext.String.format(gettext('Are you sure you want to remove entry {0}'),
> -					    "'" + me.renderKey(rec.data.key, {}, rec) + "'");
> +		let warn = Ext.String.format(gettext('Are you sure you want to remove entry {0}'));
> +		if (this.text === this.altText) {
> +		    warn = gettext('Are you sure you want to detach entry {0}');
> +		}
> +
> +		let key = rec.data.key;

above was only used partially, i.e., in renderKey but not for the match which is actually
new vs. just copypasta'd code from the QEMU variant.

FYI: I dropped it completely and modernized the QEMU variant too in a followup.

> +
> +		let rendered = me.renderKey(key, {}, rec);
> +		let msg = Ext.String.format(warn, "'" + rendered + "'");
>  		if (rec.data.key.match(/^unused\d+$/)) {
>  		    msg += " " + gettext('This will permanently erase all data.');
>  		}