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 D0E781FF16B for ; Fri, 21 Nov 2025 17:59:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C7CC3B70; Fri, 21 Nov 2025 17:59:15 +0100 (CET) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Date: Fri, 21 Nov 2025 17:58:36 +0100 Message-ID: <20251121165858.818307-8-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251121165858.818307-1-m.carrara@proxmox.com> References: <20251121165858.818307-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763744320362 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.087 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 Subject: [pve-devel] [RFC proxmox-widget-toolkit master v2 7/10] acme: use helper to construct ExtJS fields from property schemas 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel