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 95EC891633 for ; Mon, 14 Nov 2022 10:44:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 71B5E21113 for ; Mon, 14 Nov 2022 10:44:16 +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 ; Mon, 14 Nov 2022 10:44:10 +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 92D5D43E26 for ; Mon, 14 Nov 2022 10:44:07 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 14 Nov 2022 10:43:56 +0100 Message-Id: <20221114094404.1241050-13-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114094404.1241050-1-d.csapak@proxmox.com> References: <20221114094404.1241050-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 v9 04/12] ui: parse and save tag infos from /ui-options 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: Mon, 14 Nov 2022 09:44:16 -0000 stores the color-map into a global list of overrides. on update, also parse the values from the browser localstore. Also emits a GlobalEvent 'loadedUiOptions' so that e.g. the tags can listen to that and refresh their colors also saves the list of 'allowed-tags' into PVE.Utils Signed-off-by: Dominik Csapak --- changes from v8: * also parses the allowed tag into the taglist now (and don't parse it from the tree anymore, since that should be the same) www/manager6/Utils.js | 60 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 29bf667b4..9cd3bd6c2 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1860,10 +1860,68 @@ Ext.define('PVE.Utils', { url: '/ui-options', method: 'GET', success: function(response) { - PVE.UIOptions = response?.result?.data ?? {}; + PVE.UIOptions = response?.result?.data ?? { + 'allowed-tags': [], + }; + let colors = PVE.UIOptions?.['tag-style']?.['color-map']; + let shape = PVE.UIOptions?.['tag-style']?.shape; + + PVE.Utils.updateTagSettings(colors, shape); + PVE.Utils.updateTagList(PVE.UIOptions['allowed-tags']); + if (colors) { + // refresh tree once + PVE.data.ResourceStore.fireEvent('load'); + Ext.GlobalEvents.fireEvent('loadedUiOptions'); + } }, }); }, + + tagList: new Set(), + + updateTagList: function(tags) { + PVE.Utils.tagList = [...new Set([...tags])].sort(); + }, + + parseTagOverrides: function(overrides) { + let colors = {}; + (overrides || "").split(';').forEach(color => { + if (!color) { + return; + } + let [tag, color_hex, font_hex] = color.split(':'); + let r = parseInt(color_hex.slice(0, 2), 16); + let g = parseInt(color_hex.slice(2, 4), 16); + let b = parseInt(color_hex.slice(4, 6), 16); + colors[tag] = [r, g, b]; + if (font_hex) { + colors[tag].push(parseInt(font_hex.slice(0, 2), 16)); + colors[tag].push(parseInt(font_hex.slice(2, 4), 16)); + colors[tag].push(parseInt(font_hex.slice(4, 6), 16)); + } + }); + return colors; + }, + + tagOverrides: {}, + + updateTagOverrides: function(colors) { + let sp = Ext.state.Manager.getProvider(); + let color_state = sp.get('colors', ''); + let browser_colors = PVE.Utils.parseTagOverrides(color_state); + PVE.Utils.tagOverrides = Ext.apply({}, browser_colors, colors); + Ext.GlobalEvents.fireEvent('tag-color-override'); + }, + + updateTagSettings: function(overrides, style) { + PVE.Utils.updateTagOverrides(PVE.Utils.parseTagOverrides(overrides ?? "")); + + if (style === undefined || style === '__default__') { + style = 'circle'; + } + + Ext.ComponentQuery.query('pveResourceTree')[0].setUserCls(`proxmox-tags-${style}`); + }, }, singleton: true, -- 2.30.2