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 F25E294C4 for ; Thu, 17 Nov 2022 15:56:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C854D2F6D9 for ; Thu, 17 Nov 2022 15:56:26 +0100 (CET) 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 for ; Thu, 17 Nov 2022 15:56:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BF1B544D7A for ; Thu, 17 Nov 2022 15:56:24 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 17 Nov 2022 15:56:23 +0100 Message-Id: <20221117145623.661109-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221117145623.661109-1-d.csapak@proxmox.com> References: <20221117145623.661109-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.065 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 5/5] ui: tags: add preview to tag shape option 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: , X-List-Received-Date: Thu, 17 Nov 2022 14:56:27 -0000 with a combogrid and the example text 'preview' Signed-off-by: Dominik Csapak --- www/manager6/dc/OptionView.js | 37 ++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index aeab024e4..8c0357bbf 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -360,7 +360,7 @@ Ext.define('PVE.dc.OptionView', { if (values.colors) { style['color-map'] = values.colors; } - if (values.shape) { + if (values.shape && values.shape !== '__default__') { style.shape = values.shape; } if (values.ordering) { @@ -378,10 +378,41 @@ Ext.define('PVE.dc.OptionView', { }, items: [ { + name: 'shape', - xtype: 'proxmoxKVComboBox', + xtype: 'proxmoxComboGrid', fieldLabel: gettext('Tree Shape'), - comboItems: Object.entries(PVE.Utils.tagTreeStyles), + valueField: 'value', + displayField:'display', + listConfig: { + columns: [ + { + header: gettext('Option'), + dataIndex: 'display', + flex: 1, + }, + { + header: gettext('Preview'), + dataIndex: 'value', + renderer: function(value) { + let cls = value ?? '__default__'; + if (value === '__default__') { + cls = 'circle' + } + let tags = PVE.Utils.renderTags('preview'); + return `
${tags}
`; + }, + flex: 1, + } + ], + }, + store: { + data: Object.entries(PVE.Utils.tagTreeStyles).map(v => ({ + value: v[0], + display: v[1], + })), + }, + deleteDefault: true, defaultValue: '__default__', deleteEmpty: true, }, -- 2.30.2