From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 4F5E21FF146 for ; Tue, 23 Jun 2026 16:36:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 729D74BBD; Tue, 23 Jun 2026 16:35:15 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-widget-toolkit 10/13] acme: use helper to construct ExtJS fields from property schemas Date: Tue, 23 Jun 2026 16:33:27 +0200 Message-ID: <20260623143402.772452-11-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260623143402.772452-1-m.carrara@proxmox.com> References: <20260623143402.772452-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: 1782225252130 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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: TMXJ2RWWUTFQ2NGW2IQ2BXJFHJ6KD7JC X-Message-ID-Hash: TMXJ2RWWUTFQ2NGW2IQ2BXJFHJ6KD7JC 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 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`. This results in no noticeable difference when setting up ACME challenge plugins, except for the fact that fields not marked as optional are now in fact not optional in the UI. Signed-off-by: Max R. Carrara --- src/window/ACMEPluginEdit.js | 42 +++++++++++------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/src/window/ACMEPluginEdit.js b/src/window/ACMEPluginEdit.js index 900923b..d8591ae 100644 --- a/src/window/ACMEPluginEdit.js +++ b/src/window/ACMEPluginEdit.js @@ -69,45 +69,29 @@ Ext.define('Proxmox.window.ACMEPluginEdit', { 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.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, - }); + }; + + let field = Ext.create({ ...fieldDef, ...extraProps }); me.createdFields[name] = field; container.add(field); -- 2.47.3