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 E5F2069447 for ; Wed, 23 Mar 2022 11:35:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C7E99258E8 for ; Wed, 23 Mar 2022 11:34:51 +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 id 1D2E62589D for ; Wed, 23 Mar 2022 11:34:50 +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 EAA6646F8A for ; Wed, 23 Mar 2022 11:34:49 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 23 Mar 2022 11:34:38 +0100 Message-Id: <20220323103445.2075649-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220323103445.2075649-1-d.csapak@proxmox.com> References: <20220323103445.2075649-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.100 Adjusted score from AWL reputation of From: address 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 Alignment POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager v4 03/10] ui: parse and save tag color overrides from /version 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: Wed, 23 Mar 2022 10:35:21 -0000 and implement a convenience function that also parses the 'color' state from the browser storage for overrides Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 34 ++++++++++++++++++++++++++++++++++ www/manager6/Workspace.js | 13 +++++++++++++ 2 files changed, 47 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index aafe359a..0ad3a482 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1803,6 +1803,40 @@ Ext.define('PVE.Utils', { return undefined; }, + + parseTagOverrides: function(overrides) { + let colors = {}; + (overrides || "").split(/[;, ]/).forEach(color => { + if (!color) { + return; + } + let [tag, color_hex] = color.split('=', 2); + 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, 1.0]; + }); + return colors; + }, + + getTagOverrides: function() { + let sp = Ext.state.Manager.getProvider(); + let color_state = sp.get('colors', ''); + let browser_colors = PVE.Utils.parseTagOverrides(color_state); + return Ext.apply({}, browser_colors, PVE.TagColors); + }, + + updateTagSettings: function(overrides, style) { + if (overrides) { + PVE.TagColors = PVE.Utils.parseTagOverrides(overrides); + } + + if (style === undefined || style === '__default__') { + style = 'circle'; + } + + Ext.ComponentQuery.query('pveResourceTree')[0].setUserCls(`proxmox-tags-${style}`); + }, }, singleton: true, diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index 37d772b8..d9875c18 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -155,6 +155,7 @@ Ext.define('PVE.StdWorkspace', { success: function(response) { PVE.VersionInfo = response.result.data; me.updateVersionInfo(); + me.updateTags(); }, }); @@ -213,6 +214,18 @@ Ext.define('PVE.StdWorkspace', { ui.updateLayout(); }, + updateTags: function() { + let me = this; + let colors = PVE.VersionInfo?.['tag-colors']; + let style = PVE.VersionInfo?.['tag-tree-style']; + + PVE.Utils.updateTagSettings(colors, style); + if (colors) { + // refresh tree once + PVE.data.ResourceStore.fireEvent('load'); + } + }, + initComponent: function() { let me = this; -- 2.30.2