[pve-devel] [PATCH v2 manager 2/2] ui: cert upload: fix private key field sending empty string

[Thomas Lamprecht]

Am 03/03/2023 um 18:57 schrieb Max Carrara:
> The private key's field is now excluded from the upload form's
> JSON data if it's considered empty by Ext.js.

nit: Ext JS

> 
> Prior to this change, the form still sent an empty string if no
> private key was provided by the user, even though the private key's
> field is marked as optional in `pve-manager/PVE/API2/Certificates.pm`,

nit: I'd avoid file system paths, they're an internal detail here, if use the
api path or just in "... optional in the upload cert API endpoint"

> causing the JSONSchema validation to fail.
> 
> Signed-off-by: Max Carrara <m.carrara at proxmox.com>
> ---
>  www/manager6/node/Certificates.js | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/www/manager6/node/Certificates.js b/www/manager6/node/Certificates.js
> index 34013b44..84fc12ff 100644
> --- a/www/manager6/node/Certificates.js
> +++ b/www/manager6/node/Certificates.js
> @@ -173,6 +173,9 @@ Ext.define('PVE.node.CertUpload', {
>  	    emptyText: gettext('No change'),
>  	    name: 'key',
>  	    xtype: 'textarea',
> +	    getSubmitValue: function() {
> +		return this.getValue() || null;
> +	    },

This works by luck, submitData is a boolean config for the textarea [0], and
getSubmitValue has nothing to do with the actual value, but just is the getter
for the submitValue bool, which the private actual getSubmitData fn checks [1]

[0]: https://docs.sencha.com/extjs/7.0.0/classic/Ext.form.field.TextArea.html#cfg-submitValue
[1]: https://docs.sencha.com/extjs/7.0.0/classic/src/Base.js-2.html#Ext.form.field.Base-method-getSubmitData

So if, then this would need to return boolean false not null to avoid being
confusing - but there's an alternative: wrap this in a inputpanel and use it's
onGetValues helper to filter this out, as that allows to also set the hard-coded
`force` and `reload` params directly, we could drop the hidden fields too, with
also dropping the now finally visible (but ugly) 'hr' autoEl we actually would
need fewer lines.

I.e., something like:

items: {
    xtype: 'inputpanel',
    onGetValues: function(values) {
        values.restart = 1;
        values.force = 1;
        if (!values.key) {
            delete values.key;
        }
        return values;
    },
    items: [
        ....

>  	},
>  	{
>  	    xtype: 'filebutton',