ui: MainView/NavigationTree: improve tree selection handling

this fixes some bugs related to selection handling in the treelist:
* datastores were not selected after a reload
* reloading when in a tabpanel on any tab but the first, would
  not select a treenode
* changing between datastores on any tab but the first would
  not select the same tab on the new datastore

fixed those by mostly rewriting the changePath handling for
datastores and tabpanels in general

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

www/MainView.js

@@ -67,46 +67,48 @@ Ext.define('PBS.MainView', {
 	    var contentpanel = me.lookupReference('contentpanel');
 	    var lastpanel = contentpanel.getLayout().getActiveItem();
 
+	    let tabChangeListener = function(tp, newc, oldc) {
+		let newpath = path;
+
+		// only add the subpath part for the
+		// non-default tabs
+		if (tp.items.findIndex('id', newc.id) !== 0) {
+		    newpath += `:${newc.getItemId()}`;
+		}
+
+		me.redirectTo(newpath);
+	    };
+
+	    let xtype = path;
 	    var obj;
+	    let datastore;
 	    if (PBS.Utils.isDataStorePath(path)) {
-		let datastore = PBS.Utils.getDataStoreFromPath(path);
+		datastore = PBS.Utils.getDataStoreFromPath(path);
-		obj = contentpanel.add({
+		if (lastpanel && lastpanel.xtype === 'pbsDataStorePanel' && !subpath) {
-		    xtype: 'pbsDataStorePanel',
+		    let activeTab = lastpanel.getActiveTab();
-		    nodename: 'localhost',
+		    let newpath = path;
-		    datastore,
+		    if (lastpanel.items.indexOf(activeTab) !== 0) {
-		});
+			subpath = activeTab.getItemId();
-	    } else {
+			newpath += `:${subpath}`;
-		obj = contentpanel.add({
+		    }
-		    xtype: path,
+		    me.redirectTo(newpath);
-		    nodename: 'localhost',
+		}
-		    border: false,
+		xtype = 'pbsDataStorePanel';
-		});
 	    }
+	    obj = contentpanel.add({
+		xtype,
+		datastore,
+		nodename: 'localhost',
+		border: false,
+		activeTab: subpath || 0,
+		listeners: {
+		    tabchange: tabChangeListener,
+		},
+	    });
 
 	    var treelist = me.lookupReference('navtree');
 
-	    treelist.suspendEvents();
+	    treelist.select(path, true);
-	    if (subpath === undefined) {
-		treelist.select(path);
-	    } else {
-		treelist.select(path + ':' + subpath);
-	    }
-	    treelist.resumeEvents();
-
-	    if (Ext.isFunction(obj.setActiveTab)) {
-		obj.setActiveTab(subpath || 0);
-		obj.addListener('tabchange', function(tabpanel, newc, oldc) {
-		    var newpath = path;
-
-		    // only add the subpath part for the
-		    // non-default tabs
-		    if (tabpanel.items.findIndex('id', newc.id) !== 0) {
-			newpath += ":" + newc.getItemId();
-		    }
-
-		    me.redirectTo(newpath);
-		});
-	    }
 
 	    contentpanel.setActiveItem(obj);
 

www/NavigationTree.js

@@ -163,6 +163,12 @@ Ext.define('PBS.view.main.NavigationTree', {
 	    });
 
 	    Ext.Array.forEach(erase_list, function(node) { list.removeChild(node, true); });
+
+	    if (view.pathToSelect !== undefined) {
+		let path = view.pathToSelect;
+		delete view.pathToSelect;
+		view.select(path, true);
+	    }
 	},
     },
 
@@ -186,10 +192,20 @@ Ext.define('PBS.view.main.NavigationTree', {
 	},
     },
 
-    select: function(path) {
+    select: function(path, silent) {
 	var me = this;
-	var item = me.getStore().findRecord('path', path, 0, false, true, true);
+	if (me.rstore.isLoaded()) {
-	me.setSelection(item);
+	    if (silent) {
+		me.suspendEvents(false);
+	    }
+	    var item = me.getStore().findRecord('path', path, 0, false, true, true);
+	    me.setSelection(item);
+	    if (silent) {
+		me.resumeEvents(true);
+	    }
+	} else {
+	    me.pathToSelect = path;
+	}
     },
 
     animation: false,