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 A8A5D703BE for ; Tue, 21 Jun 2022 11:20:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60A462C22 for ; Tue, 21 Jun 2022 11:20:22 +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 EB7C229B8 for ; Tue, 21 Jun 2022 11:20:14 +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 C434343C3C for ; Tue, 21 Jun 2022 11:20:14 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 21 Jun 2022 11:20:02 +0200 Message-Id: <20220621092012.1776825-15-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621092012.1776825-1-d.csapak@proxmox.com> References: <20220621092012.1776825-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.101 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 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [item.data, data.id, olditem.data] Subject: [pve-devel] [PATCH manager v7 04/14] ui: tree/ResourceTree: collect tags on update 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: Tue, 21 Jun 2022 09:20:54 -0000 into a global list, so that we have it avaiable anywhere also add the tags from the tagOverrides on update into the list Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 7 +++++++ www/manager6/data/ResourceStore.js | 6 ++++++ www/manager6/tree/ResourceTree.js | 16 ++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 8653a4b9..5242e778 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1804,6 +1804,13 @@ Ext.define('PVE.Utils', { notesTemplateVars: ['cluster', 'guestname', 'node', 'vmid'], + tagList: new Set(), + + updateTagList: function(tags) { + let override_tags = Object.keys(PVE.Utils.tagOverrides); + PVE.Utils.tagList = [...new Set([...tags, ...override_tags])].sort(); + }, + parseTagOverrides: function(overrides) { let colors = {}; (overrides || "").split(';').forEach(color => { diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js index c7b72306..b18f7dd8 100644 --- a/www/manager6/data/ResourceStore.js +++ b/www/manager6/data/ResourceStore.js @@ -293,6 +293,12 @@ Ext.define('PVE.data.ResourceStore', { sortable: true, width: 100, }, + tags: { + header: gettext('Tags'), + type: 'string', + hidden: true, + sortable: true, + }, }; let fields = []; diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index be90d4f7..139defab 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -226,6 +226,10 @@ Ext.define('PVE.tree.ResourceTree', { let stateid = 'rid'; + const changedFields = [ + 'text', 'running', 'template', 'status', 'qmpstatus', 'hastate', 'lock', 'tags', + ]; + let updateTree = function() { store.suspendEvents(); @@ -261,7 +265,7 @@ Ext.define('PVE.tree.ResourceTree', { } // tree item has been updated - for (const field of ['text', 'running', 'template', 'status', 'qmpstatus', 'hastate', 'lock']) { + for (const field of changedFields) { if (item.data[field] !== olditem.data[field]) { changed = true; break; @@ -294,7 +298,14 @@ Ext.define('PVE.tree.ResourceTree', { } } - rstore.each(function(item) { // add new items + let tags = new Set(); + + rstore.each(function(item) { // add new items and collect tags + if (item.data.tags) { + item.data.tags.split(/[,; ]/).filter(t => !!t).forEach((tag) => { + tags.add(tag); + }); + } let olditem = index[item.data.id]; if (olditem) { return; @@ -310,6 +321,7 @@ Ext.define('PVE.tree.ResourceTree', { } }); + PVE.Utils.updateTagList(tags); store.resumeEvents(); store.fireEvent('refresh', store); -- 2.30.2