public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Matthias Heiserer <m.heiserer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH widget-toolkit 1/2] api-viewer: fix #4271: display nested formats instead of [object Object]
Date: Wed, 12 Oct 2022 15:23:31 +0200	[thread overview]
Message-ID: <20221012132332.301805-1-m.heiserer@proxmox.com> (raw)

I tried to keep the format as close to the HTML docs as possible, but there are a few discrepancies between HTML docs and how this patch displays parameters:
Instead of <enum>,the enum variants are displayed. [1]
Instead of <0|1>, <boolean> is displayed.

[1] The HTML docs explain parameters after the initial format string, which the GUI doesn't (and there's no space for that).
Showing the variants inline is the easiest way to not loose information here.

Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
---
 src/api-viewer/APIViewer.js | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/api-viewer/APIViewer.js b/src/api-viewer/APIViewer.js
index c6580bb..2b04b8c 100644
--- a/src/api-viewer/APIViewer.js
+++ b/src/api-viewer/APIViewer.js
@@ -79,6 +79,27 @@ Ext.onReady(function() {
 	return pdef.enum ? 'enum' : pdef.type || 'string';
     };
 
+    const renderFormatString = function(obj) {
+	if (!Ext.isObject(obj)) {
+	    return obj;
+	}
+	const mandatory = [];
+	const optional = [];
+	Object.entries(obj).forEach(function([name, param]) {
+	    let list = param.optional ? optional : mandatory;
+	    let str = param.default_key ? `[${name}=]` : `${name}=`;
+	    if (param.alias) {
+		return;
+	    } else if (param.enum) {
+		str += `(${param.enum?.join(' | ')})`;
+	    } else {
+		str += `<${param.format_description || param.pattern || param.type}>`;
+	    }
+	    list.push(str);
+	});
+	return mandatory.join(", ") + ' ' + optional.map(each => `[,${each}]`).join(' ');
+    };
+
     let render_simple_format = function(pdef, type_fallback) {
 	if (pdef.typetext) {
 	    return pdef.typetext;
@@ -87,7 +108,7 @@ Ext.onReady(function() {
 	    return pdef.enum.join(' | ');
 	}
 	if (pdef.format) {
-	    return pdef.format;
+	    return renderFormatString(pdef.format);
 	}
 	if (pdef.pattern) {
 	    return pdef.pattern;
-- 
2.30.2





             reply	other threads:[~2022-10-12 13:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-12 13:23 Matthias Heiserer [this message]
2022-10-12 13:23 ` [pve-devel] [PATCH widget-toolkit 2/2] show min/max for values without any other format Matthias Heiserer
2022-11-17  7:30 ` [pve-devel] applied: [PATCH widget-toolkit 1/2] api-viewer: fix #4271: display nested formats instead of [object Object] Thomas Lamprecht

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=20221012132332.301805-1-m.heiserer@proxmox.com \
    --to=m.heiserer@proxmox.com \
    --cc=pve-devel@lists.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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal