Feature: Config Editor UI: Support newly introduced config properties, even if they don't exist in old config files.

Author: jhuckaby

htdocs/js/pages/admin/Config.class.js

@@ -34,7 +34,7 @@ Page.Config = class Config extends Page.PageUtils {
 		// receive config from server
 		var self = this;
 		this.lastResp = resp;
-		var { config, overrides, markdown } = resp;
+		var { config, overrides, sample, markdown } = resp;
 
 		// parse markdown into sections
 		var rows = [];
@@ -73,9 +73,14 @@ Page.Config = class Config extends Page.PageUtils {
 				else row.value = get_path( config, path );
 
 				if (row.value === undefined) {
-					// should never happen, but who knows
-					row = null;
-					return;
+					// try sample config
+					row.value = get_path( sample, path );
+					
+					if (row.value === undefined) {
+						// should never happen, but who knows
+						row = null;
+						return;
+					}
 				}
 
 				row.type = typeof(row.value);

lib/api/config.js

@@ -184,10 +184,16 @@ class Configuration {
 				}
 			}
 
-			fs.readFile( 'docs/config.md', 'utf8', function(err, markdown) {
-				if (err) return self.doError('fs', "Failed to load config doc: " + err, callback);
-				callback({ code: 0, config, overrides, markdown });
-			}); // fs.readFile
+			fs.readFile( 'sample_conf/config.json', 'utf8', function(err, raw_sample) {
+				var sample = null;
+				try { sample = JSON.parse(raw_sample || '{}'); }
+				catch (err) { sample = {}; }
+				
+				fs.readFile( 'docs/config.md', 'utf8', function(err, markdown) {
+					if (err) return self.doError('fs', "Failed to load config doc: " + err, callback);
+					callback({ code: 0, config, overrides, sample, markdown });
+				}); // fs.readFile (md)
+			}); // fs.readFile (sample)
 		}); // loadSession
 	}