From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F4072632D2 for ; Mon, 24 Jan 2022 16:26:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F1A21247D1 for ; Mon, 24 Jan 2022 16:26:45 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4B0A0247C5 for ; Mon, 24 Jan 2022 16:26:45 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 23246417AF for ; Mon, 24 Jan 2022 16:26:45 +0100 (CET) Message-ID: <993d6b7d-0099-915d-55cf-7c7e9455c5a5@proxmox.com> Date: Mon, 24 Jan 2022 16:26:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: Fabian Ebner , pve-devel@lists.proxmox.com References: <20211126164446.2558368-1-a.lauterer@proxmox.com> <31f9023f-17cc-44d5-f30c-3f2f1ecec4ba@proxmox.com> From: Aaron Lauterer In-Reply-To: <31f9023f-17cc-44d5-f30c-3f2f1ecec4ba@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.001 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH manager] ui: rbd: cephfs: add keyring/secret field for external clusters X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2022 15:26:46 -0000 On 1/24/22 13:54, Fabian Ebner wrote: > Am 26.11.21 um 17:44 schrieb Aaron Lauterer: >> Manual switching of xtype because binding 'hidden' does not work with >> pmxDisplayEditField. >> > > Except for two style nits: > > Reviewed-by: Fabian Ebner > Tested-by: Fabian Ebner > >> Signed-off-by: Aaron Lauterer >> --- >>   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', > > Should there be a gettext or is this enough of a technical term in this context? That was what I thought. But some time has passed since, and I am not sure anymore if we should not place it in a gettext. > >> +        value: me.isCreate? '' : '***********', > > Style nit: no space before '?' and eslint doesn't seem to catch it ;) Thanks for catching that :) > >> +        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', > > Same question here Here I rather stick with the keyring as a technical term that is used for Ceph throughout. But then again, there might be a case I did not think of and putting it in a gettext is the sensible thing to do. > >> +        value: me.isCreate? '' : '***********', > > and style nit here. > >> +        allowBlank: false, >> +        bind: { >> +            hidden: '{pveceph}', >> +            disabled: '{pveceph}', >> +        }, >> +        }, >>           { >>           xtype: 'proxmoxcheckbox', >>           name: 'pveceph',