[pve-devel] [PATCH manager] ui: rbd: cephfs: add keyring/secret field for external clusters

[Aaron Lauterer]

If this gets applied, please fix the commit title by adding the missing f in cehpFs in the last two commits... :)

On 11/26/21 17:44, Aaron Lauterer wrote:
> Manual switching of xtype because binding 'hidden' does not work with
> pmxDisplayEditField.
> 
> Signed-off-by: Aaron Lauterer <a.lauterer at proxmox.com>
> ---
>   www/manager6/storage/CephFSEdit.js | 39 ++++++++++++++++++++----------
>   www/manager6/storage/RBDEdit.js    | 11 +++++++++
>   2 files changed, 37 insertions(+), 13 deletions(-)
> 
> diff --git a/www/manager6/storage/CephFSEdit.js b/www/manager6/storage/CephFSEdit.js
> index 92fdfe63..89459ba8 100644
> --- a/www/manager6/storage/CephFSEdit.js
> +++ b/www/manager6/storage/CephFSEdit.js
> @@ -101,20 +101,33 @@ Ext.define('PVE.storage.CephFSInputPanel', {
>   	    },
>   	];
>   
> -	me.columnB = [{
> -	    xtype: 'proxmoxcheckbox',
> -	    name: 'pveceph',
> -	    reference: 'pvecephRef',
> -	    bind: {
> -		disabled: '{!pvecephPossible}',
> -		value: '{pveceph}',
> +	me.columnB = [
> +	    {
> +		xtype: me.isCreate ? 'textfield' : 'displayfield',
> +		name: 'keyring',
> +		fieldLabel: 'Secret',
> +		value: me.isCreate? '' : '***********',
> +		allowBlank: false,
> +		bind: {
> +		    hidden: '{pveceph}',
> +		    disabled: '{pveceph}',
> +		},
> +	    },
> +	    {
> +		xtype: 'proxmoxcheckbox',
> +		name: 'pveceph',
> +		reference: 'pvecephRef',
> +		bind: {
> +		    disabled: '{!pvecephPossible}',
> +		    value: '{pveceph}',
> +		},
> +		checked: true,
> +		uncheckedValue: 0,
> +		submitValue: false,
> +		hidden: !me.isCreate,
> +		boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS'),
>   	    },
> -	    checked: true,
> -	    uncheckedValue: 0,
> -	    submitValue: false,
> -	    hidden: !me.isCreate,
> -	    boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS'),
> -	}];
> +	];
>   
>   	me.callParent();
>       },
> diff --git a/www/manager6/storage/RBDEdit.js b/www/manager6/storage/RBDEdit.js
> index 35568b98..3dcfea20 100644
> --- a/www/manager6/storage/RBDEdit.js
> +++ b/www/manager6/storage/RBDEdit.js
> @@ -201,6 +201,17 @@ Ext.define('PVE.storage.RBDInputPanel', {
>   	];
>   
>   	me.columnB = [
> +	    {
> +		xtype: me.isCreate ? 'textarea' : 'displayfield',
> +		name: 'keyring',
> +		fieldLabel: 'Keyring',
> +		value: me.isCreate? '' : '***********',
> +		allowBlank: false,
> +		bind: {
> +		    hidden: '{pveceph}',
> +		    disabled: '{pveceph}',
> +		},
> +	    },
>   	    {
>   		xtype: 'proxmoxcheckbox',
>   		name: 'pveceph',
>