From: "Max R. Carrara" <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Alfonso Kuen <gerencia@idkmanager.com>,
Thomas Ellmenreich <t.ellmenreich@proxmox.com>,
Jakob Klocker <j.klocker@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 [thread overview]
Message-ID: <20261106154554.2182986-13-m.carrara@proxmox.com> (raw)
In-Reply-To: <20261106154554.2182986-1-m.carrara@proxmox.com>
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 <m.carrara@proxmox.com>
---
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
next prev parent reply other threads:[~2026-11-06 15:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-06 15:45 [PATCH common/manager/proxmox-widget-toolkit/storage/storage-plugin-examples v4 00/17] GUI Support for Custom Storage Plugins Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-common v4 01/17] json schema: add multiline string format Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 02/17] api: plugins/storage: add initial routes and endpoints Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 03/17] api: plugins/storage/plugin: include schema in plugin metadata Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 04/17] api: plugins/storage/plugin: mark sensitive properties in schema Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 05/17] api: plugins/storage/plugin: factor plugin metadata code into helper Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 06/17] api: plugins/storage/plugin: add plugins' 'content' to their metadata Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 07/17] all plugins: add 'title' to properties, adapt 'description's Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 08/17] all plugins, api: mark certain properties as advanced in plugindata() Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage v4 09/17] all plugins, api: mark certain properties as hidden " Max R. Carrara
2026-11-06 15:45 ` [PATCH proxmox-widget-toolkit v4 10/17] form: introduce new 'proxmoxtextarea' field Max R. Carrara
2026-11-06 15:45 ` [PATCH proxmox-widget-toolkit v4 11/17] utils: introduce helper function getFieldDefFromPropertySchema Max R. Carrara
2026-11-06 15:45 ` Max R. Carrara [this message]
2026-11-06 15:45 ` [PATCH pve-manager v4 13/17] api: sort modules and API method registrations Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-manager v4 14/17] api: add API routes 'plugins' and 'plugins/storage' Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-manager v4 15/17] ui: storage view: display error when no editor for storage type exists Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-manager v4 16/17] ui: storage: add basic UI integration for custom storage plugins Max R. Carrara
2026-11-06 15:45 ` [PATCH pve-storage-plugin-examples v4 17/17] sshfs: Update SSHFS plugin Max R. Carrara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261106154554.2182986-13-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=gerencia@idkmanager.com \
--cc=j.klocker@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=t.ellmenreich@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox