From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 2BD9E1FF129 for ; Fri, 17 Jul 2026 17:51:48 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id BE0E021613; Fri, 17 Jul 2026 17:50:45 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-widget-toolkit v2 13/17] acme: use helper to construct ExtJS fields from property schemas Date: Fri, 17 Jul 2026 17:49:20 +0200 Message-ID: <20260717154943.696411-14-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260717154943.696411-1-m.carrara@proxmox.com> References: <20260717154943.696411-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: 1784303389643 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.059 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_LOW -0.7 Sender listed at https://www.dnswl.org/, low 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: IU5DZDA3Q67SID5QGY2JMDQBIYS5AKKF X-Message-ID-Hash: IU5DZDA3Q67SID5QGY2JMDQBIYS5AKKF 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