Version 1.0.10

- Server and Group views now remember their previous state when user navs away then back (using tab).
- Server and Group views now remember the last group ID / hostname in prefs (localStorage) for future visits.
- Cosmetic: Changed Groups/Servers tabs to read "Group View" and "Server View" respectively.

Author: jhuckaby

htdocs/index-dev.html

@@ -40,8 +40,8 @@
 			<div class="tab_bar" style="display:none">
 				<div id="tab_Login" class="tab inactive" style="display:none"><span class="content"></span></div>
 				<div id="tab_Home" class="tab inactive"><span class="content"><i class="mdi mdi-chart-areaspline mdi-lg">&nbsp;&nbsp;</i>Overview</span></div>
-				<div id="tab_Group" class="tab inactive"><span class="content"><i class="mdi mdi-server-network mdi-lg">&nbsp;&nbsp;</i>Groups</span></div>
-				<div id="tab_Server" class="tab inactive"><span class="content"><i class="mdi mdi-desktop-tower mdi-lg">&nbsp;</i>Servers</span></div>
+				<div id="tab_Group" class="tab inactive"><span class="content"><i class="mdi mdi-server-network mdi-lg">&nbsp;&nbsp;</i>Group View</span></div>
+				<div id="tab_Server" class="tab inactive"><span class="content"><i class="mdi mdi-desktop-tower mdi-lg">&nbsp;</i>Server View</span></div>
 				<div id="tab_Snapshot" class="tab inactive"><span class="content"><i class="mdi mdi-history mdi-lg">&nbsp;&nbsp;</i>Snapshots</span></div>
 				<div id="tab_MyAccount" class="tab inactive"><span class="content"><i class="fa fa-user fa-lg2">&nbsp;&nbsp;</i>My Account</span></div>
 				<div id="tab_Admin" class="tab inactive" style="display:none"><span class="content"><i class="mdi mdi-lock mdi-lg">&nbsp;&nbsp;</i>Admin</span></div>

htdocs/js/pages/Base.class.js

@@ -566,6 +566,13 @@ Class.subclass( Page, "Page.Base", {
 		Nav.go( '#' + this.ID + compose_query_string(this.args) );
 	},
 
+	navReplaceArgs: function() {
+		// recompose args into #URI and replace the current history state with it
+		// (this does NOT fire a hashchange)
+		delete this.args.cachebust;
+		history.replaceState( {}, "", '#' + this.ID + compose_query_string(this.args) );
+	},
+	
 	setControlMode: function(mode) {
 		// set new control (zoom) mode
 		if (!mode) mode = $('#fe_ctrl_mode').val();

htdocs/js/pages/Group.class.js

@@ -14,27 +14,36 @@ Class.subclass( Page.Base, "Page.Group", {
 
 		if (!args) args = {};
 		this.args = args;
+		var renav = false;
 
 		// default to hourly (which is also real-time)
-		if (!args.sys) args.sys = 'hourly';
+		if (!args.sys) {
+			args.sys = 'hourly';
+			renav = true;
+		}
 
 		// if no group specified in args, default to first group in list
-		if (!args.group && this.lastGroupID) {
-			args.group = this.lastGroupID;
+		if (!args.group && app.getPref('last_group_id')) {
+			args.group = app.getPref('last_group_id');
+			renav = true;
 		}
 		if (!args.group) {
 			args.group = config.groups[0].id;
+			renav = true;
 		}
-		this.lastGroupID = args.group;
+		app.setPref('last_group_id', args.group);
 
 		if (!args.date && !args.length) {
 			// default to realtime hourly
 			args.offset = -60;
 			args.length = 60;
+			renav = true;
 		}
 		// date always needs to be treated as a string
 		if (args.date) args.date = '' + args.date;
 
+		if (renav) this.navReplaceArgs();
+		
 		// store group and monitors in page
 		this.group = find_object( config.groups, { id: args.group } );
 		if (!this.group) {
@@ -49,6 +58,7 @@ Class.subclass( Page.Base, "Page.Group", {
 		app.setWindowTitle('Group Detail: ' + this.group.title);
 		app.showTabBar(true);
 		this.showControls(true);
+		this.tab[0]._page_id = Nav.currentAnchor();
 
 		// Realtime views:
 		// #Group?group=main&sys=hourly&offset=-60&length=60

htdocs/js/pages/Server.class.js

@@ -14,34 +14,44 @@ Class.subclass( Page.Base, "Page.Server", {
 
 		if (!args) args = {};
 		this.args = args;
+		var renav = false;
 
 		// default to hourly (which is also used for real-time)
-		if (!args.sys) args.sys = 'hourly';
+		if (!args.sys) {
+			args.sys = 'hourly';
+			renav = true;
+		}
 
 		// if no server specified in args, default to first server in recent contrib list
-		if (!args.hostname && this.lastHostname) {
-			args.hostname = this.lastHostname;
+		if (!args.hostname && app.getPref('last_hostname')) {
+			args.hostname = app.getPref('last_hostname');
+			renav = true;
 		}
 		if (!args.hostname) {
 			args.hostname = hash_keys_to_array(app.recent_hostnames).sort().shift();
+			renav = true;
 		}
 		if (!args.hostname) {
 			this.doInlineError('No Servers Found', 'No servers have submitted any monitoring data yet.');
 			return true;
 		}
-		this.lastHostname = args.hostname;
+		app.setPref('last_hostname', args.hostname);
 
 		if (!args.date && !args.length) {
 			// default to realtime hourly
 			args.offset = -60;
 			args.length = 60;
+			renav = true;
 		}
 		// date always needs to be treated as a string
 		if (args.date) args.date = '' + args.date;
 
+		if (renav) this.navReplaceArgs();
+		
 		app.setWindowTitle('Server Detail: ' + args.hostname);
 		app.showTabBar(true);
 		this.showControls(true);
+		this.tab[0]._page_id = Nav.currentAnchor();
 
 		// Realtime views:
 		// #Server?hostname=foo.com&sys=hourly&offset=-60&length=60

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "performa",
-	"version": "1.0.9",
+	"version": "1.0.10",
 	"description": "A multi-server monitoring system with a web based UI.",
 	"author": "Joseph Huckaby <jhuckaby@gmail.com>",
 	"homepage": "https://github.com/jhuckaby/performa",