db-tabulator: merge in params from wikitext along with ones from lua

!restart

Author: siddharthvp

db-tabulator/app.ts

@@ -249,6 +249,23 @@ export class Query extends EventEmitter {
 				return;
 			}
 			this.template = templates[0];
+
+			// Merge in configs provided in wikitext
+			let templateOverrides = [];
+			for (let origParam of this.originalTemplate.parameters) {
+				if (origParam.value && !origParam.name.toString().startsWith('lua_')) {
+					const param = this.template.parameters.find(p => p.name === origParam.name)
+					if (param) {
+						param.value = origParam.value;
+					} else {
+						this.template.parameters.push(origParam);
+					}
+					templateOverrides.push(origParam.name);
+				}
+			}
+			if (templateOverrides.length > 0) {
+				this.emit('lua-wikitext-overrides', templateOverrides.join(', '));
+			}
 		}
 
 		this.config.interval = parseInt(this.getTemplateValue('interval'));

db-tabulator/database-report.hbs

@@ -53,6 +53,7 @@
         'lua-executing': data => `Executing ${link('Module:' + data.args[0])}, function <code>${data.args[1]}</code> ${data.args[2] ? 'with params ' + data.args[2] : 'without any params.'}`,
         'lua-executed': data => `Lua module output: <pre>${data.args[0]}</pre>`,
         'lua-no-template': _ => 'No <code>{' + '{database report}}</code> template found in Lua module output',
+        'lua-wikitext-overrides': data => `Parameters overridden or defined via template: ${data.args[0]}`,
         'no-sql': _ => 'No <code>|sql=</code> parameter found in {' + '{database report}}',
 		'query-executing': data => `Query (<code>${shorten(data.args[0], 80)}</code>) submitted to database.`,
 		'query-executed': data => `Query finished running in ${data.args[0]} seconds.`,