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 9B720C386 for ; Mon, 28 Nov 2022 13:34:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 787D333A67 for ; Mon, 28 Nov 2022 13:34:02 +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, 28 Nov 2022 13:34:01 +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 0EBAF4497A for ; Mon, 28 Nov 2022 13:34:01 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 28 Nov 2022 13:34:00 +0100 Message-Id: <20221128123400.2969290-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 Subject: [pve-devel] [PATCH manager] fix #4370: ui: fix regression of preselecting tree element on login 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, 28 Nov 2022 12:34:02 -0000 We want to select a tree element based on the fragment in the url after a login. For which we must wait for the tree (ResourceStore) to load. Since we recently introduced the loading of '/cluster/options' to load the overrides of tags, etc. we fire a 'load' event with the intention of triggering a rerender of the tree (to include the new colors). If that triggers before the ResourceStore is loaded, we try to set the element once (which fails) and nothing is selected. To fix this, we only trigger it if it was already loaded and is not currently loading. Otherwise it will be either redrawn after the ongoing load, or by the first load. Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 4dd3cb93e..8c118fa25 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1918,7 +1918,10 @@ Ext.define('PVE.Utils', { } Ext.ComponentQuery.query('pveResourceTree')[0].setUserCls(`proxmox-tags-${shape}`); - PVE.data.ResourceStore.fireEvent('load'); + + if (!PVE.data.ResourceStore.isLoading() && PVE.data.ResourceStore.isLoaded()) { + PVE.data.ResourceStore.fireEvent('load'); + } Ext.GlobalEvents.fireEvent('loadedUiOptions'); }, -- 2.30.2