From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5800E7A100 for ; Thu, 6 May 2021 14:20:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 40E06206C7 for ; Thu, 6 May 2021 14:20:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 145C420695 for ; Thu, 6 May 2021 14:20:10 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E06D142934 for ; Thu, 6 May 2021 14:20:09 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 6 May 2021 14:20:08 +0200 Message-Id: <20210506122008.11297-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210506122008.11297-1-d.csapak@proxmox.com> References: <20210506122008.11297-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [metadata.style] Subject: [pbs-devel] [PATCH proxmox-backup v3 7/7] docs/api-viewer: improve rendering of array format X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2021 12:20:41 -0000 by showing '[format, ...]' where 'format' is the simple format from the type of the items Signed-off-by: Dominik Csapak --- docs/api-viewer/PBSAPI.js | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/docs/api-viewer/PBSAPI.js b/docs/api-viewer/PBSAPI.js index 2417b4de..3f08418e 100644 --- a/docs/api-viewer/PBSAPI.js +++ b/docs/api-viewer/PBSAPI.js @@ -86,13 +86,9 @@ Ext.onReady(function() { return pdef['enum'] ? 'enum' : (pdef.type || 'string'); }; - var render_format = function(value, metaData, record) { - var pdef = record.data; - - metaData.style = 'white-space:normal;' - + let render_simple_format = function(pdef, type_fallback) { if (pdef.typetext) - return Ext.htmlEncode(pdef.typetext); + return pdef.typetext; if (pdef['enum']) return pdef['enum'].join(' | '); @@ -101,9 +97,28 @@ Ext.onReady(function() { return pdef.format; if (pdef.pattern) - return Ext.htmlEncode(pdef.pattern); + return pdef.pattern; + + if (pdef.type === 'boolean') + return ``; + + if (type_fallback && pdef.type) + return `<${pdef.type}>`; + + return; + }; + + let render_format = function(value, metaData, record) { + let pdef = record.data; + + metaData.style = 'white-space:normal;' + + if (pdef.type === 'array' && pdef.items) { + let format = render_simple_format(pdef.items, true); + return `[${Ext.htmlEncode(format)}, ...]`; + } - return ''; + return Ext.htmlEncode(render_simple_format(pdef) || ''); }; var real_path = function(path) { -- 2.20.1