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 655F667C5B for ; Tue, 10 Nov 2020 14:16:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6029F21B5F for ; Tue, 10 Nov 2020 14:16:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 DD39821B4F for ; Tue, 10 Nov 2020 14:16:17 +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 AADF046046 for ; Tue, 10 Nov 2020 14:16:17 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 10 Nov 2020 14:16:16 +0100 Message-Id: <20201110131616.3802-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.377 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [state.tab] Subject: [pbs-devel] [PATCH proxmox-backup] ui: improve activeTab selection from fragment and state X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2020 13:16:48 -0000 handle invalid fragments for tabs, as well as not rendered tabpanels Signed-off-by: Dominik Csapak --- www/datastore/DataStoreList.js | 16 +++++++++++++++- www/datastore/Panel.js | 11 ++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/www/datastore/DataStoreList.js b/www/datastore/DataStoreList.js index 12d311a6..284a6340 100644 --- a/www/datastore/DataStoreList.js +++ b/www/datastore/DataStoreList.js @@ -186,8 +186,13 @@ Ext.define('PBS.datastore.DataStores', { applyState: function(state) { let me = this; - if (state.tab !== undefined) { + if (state.tab !== undefined && me.rendered) { me.setActiveTab(state.tab); + } else if (state.tab) { + // if we are not rendered yet, defer setting the activetab + setTimeout(function() { + me.setActiveTab(state.tab); + }, 10); } }, @@ -228,4 +233,13 @@ Ext.define('PBS.datastore.DataStores', { aclPath: '/datastore', }, ], + + initComponent: function() { + let me = this; + // remove invalid activeTab settings + if (me.activeTab && !me.items.some((item) => item.itemId === me.activeTab)) { + delete me.activeTab; + } + me.callParent(); + }, }); diff --git a/www/datastore/Panel.js b/www/datastore/Panel.js index f0d1317c..d767656e 100644 --- a/www/datastore/Panel.js +++ b/www/datastore/Panel.js @@ -17,8 +17,13 @@ Ext.define('PBS.DataStorePanel', { applyState: function(state) { let me = this; - if (state.tab !== undefined) { + if (state.tab !== undefined && me.rendered) { me.setActiveTab(state.tab); + } else if (state.tab) { + // if we are not rendered yet, defer setting the activetab + setTimeout(function() { + me.setActiveTab(state.tab); + }, 10); } }, @@ -101,6 +106,10 @@ Ext.define('PBS.DataStorePanel', { initComponent: function() { let me = this; me.title = `${gettext("Datastore")}: ${me.datastore}`; + // remove invalid activeTab settings + if (me.activeTab && !me.items.some((item) => item.itemId === me.activeTab)) { + delete me.activeTab; + } me.callParent(); }, }); -- 2.20.1