From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id CFE821FF0AF for ; Fri, 06 Nov 2026 16:47:40 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 6667E2177B; Fri, 06 Nov 2026 16:46:51 +0100 (CET) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-widget-toolkit v4 12/17] acme: use helper to construct ExtJS fields from property schemas Date: Fri, 6 Nov 2026 16:45:48 +0100 Message-ID: <20261106154554.2182986-13-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261106154554.2182986-1-m.carrara@proxmox.com> References: <20261106154554.2182986-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793979980090 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.325 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: QC4ZP7L6LKZ3DFWSD7PYYA7HNHO63QTB X-Message-ID-Hash: QC4ZP7L6LKZ3DFWSD7PYYA7HNHO63QTB X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Alfonso Kuen , Thomas Ellmenreich , Jakob Klocker X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Use the new `getFieldDefFromPropertySchema()` helper function to simplify some of the logic in `ACMEPluginEdit.js`. All fields stay optional, as before. The DNS challenge schema only marks a few fields as optional, although many plugins accept alternative sets of credentials, for example either an API token or a key and email address for Cloudflare. Making the remaining fields mandatory would prevent such configurations from being saved. Also never send a 'delete' for emptied fields, as their values are only submitted as part of the 'data' property. This results in no noticeable difference when setting up ACME challenge plugins. Signed-off-by: Max R. Carrara --- src/window/ACMEPluginEdit.js | 47 ++++++++++++++---------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/src/window/ACMEPluginEdit.js b/src/window/ACMEPluginEdit.js index 900923b..6014e6a 100644 --- a/src/window/ACMEPluginEdit.js +++ b/src/window/ACMEPluginEdit.js @@ -67,49 +67,38 @@ Ext.define('Proxmox.window.ACMEPluginEdit', { // create custom fields according to schema let gotSchemaField = false; for (const [name, definition] of Object.entries(schema.fields).sort((a, b) => a[0].localeCompare(b[0]), )) { - let xtype; - switch (definition.type) { - case 'string': - xtype = 'proxmoxtextfield'; - break; - case 'integer': - xtype = 'proxmoxintegerfield'; - break; - case 'number': - xtype = 'numberfield'; - break; - default: - console.warn(`unknown type '${definition.type}'`); - xtype = 'proxmoxtextfield'; - break; - } + let fieldName = `custom_${name}`; + let context = { isCreate: me.up('pmxACMEPluginEdit').isCreate }; + + let fieldDef = Proxmox.Utils.getFieldDefFromPropertySchema( + fieldName, + definition, + {}, + context, + ); let label = name; if (typeof definition.name === 'string') { label = definition.name; } - let field = Ext.create({ - xtype, - name: `custom_${name}`, + let extraProps = { fieldLabel: Ext.htmlEncode(label), width: '100%', labelWidth: 150, labelSeparator: '=', - emptyText: definition.default || '', - autoEl: definition.description - ? { - tag: 'div', - 'data-qtip': Ext.htmlEncode( - Ext.htmlEncode(definition.description), - ), - } - : undefined, - }); + // The DNS plugin schema does not reliably mark fields as optional, and + // some plugins accept alternative sets of credentials. + allowBlank: true, + // The values are submitted as part of 'data', not as fields on their own. + deleteEmpty: false, + }; + + let field = Ext.create({ ...fieldDef, ...extraProps }); me.createdFields[name] = field; container.add(field); gotSchemaField = true; } -- 2.47.3