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 54C219D016 for ; Thu, 23 Nov 2023 09:26:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 33768331F9 for ; Thu, 23 Nov 2023 09:25:44 +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, 23 Nov 2023 09:25:43 +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 48D6642C9E for ; Thu, 23 Nov 2023 09:25:43 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 23 Nov 2023 09:25:41 +0100 Message-Id: <20231123082542.872569-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231123082542.872569-1-d.csapak@proxmox.com> References: <20231123082542.872569-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.017 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 - Subject: [pve-devel] [PATCH manager 2/3] ui: resource tree: consistently apply the tooltip and 'setText' method 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, 23 Nov 2023 08:26:14 -0000 'setText' is meant to augment the content of the tree node with additional information and add markup so that the tooltips work properly. Previously this was overwritten for grouping types (e.g. nodes when in the server view), but we want to put the elements through every time the text gets set so the html markup is consistent. (E.g. without this, the node text in the server view gets wrapped in a span, but only if a relevant property of the node changes, for instance 'running'). To not mark all tree elements changed all the time, replace 'text' with 'name' in the 'changedFields' array, so they get only changed when the name changes. The text changing from the backend can only happen for guests anyway and the name field is the correct one for this. Also change it so that the nodes get their tooltip also when they are the grouping type in the server view. Signed-off-by: Dominik Csapak --- www/manager6/tree/ResourceTree.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index 7b2934ae..8856bedf 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -135,7 +135,7 @@ Ext.define('PVE.tree.ResourceTree', { }, getToolTip: function(info) { - if (info.type === 'pool' || info.groupbyid !== undefined) { + if (info.type === 'pool' || (info.groupbyid !== undefined && info.type !== 'node')) { return undefined; } @@ -167,10 +167,12 @@ Ext.define('PVE.tree.ResourceTree', { if (info.groupbyid) { info.text = info.groupbyid; + me.setText(info); if (info.type === 'type') { let defaults = PVE.tree.ResourceTree.typeDefaults[info.groupbyid]; if (defaults && defaults.text) { info.text = defaults.text; + me.setText(info); } } } @@ -265,7 +267,7 @@ Ext.define('PVE.tree.ResourceTree', { let stateid = 'rid'; const changedFields = [ - 'text', 'running', 'template', 'status', 'qmpstatus', 'hastate', 'lock', 'tags', + 'name', 'running', 'template', 'status', 'qmpstatus', 'hastate', 'lock', 'tags', ]; let updateTree = function() { -- 2.30.2