variety of bug fixes and tweaks for terminus

Author: kevinchekovfeeney

lib/viewer/chartConfig.js

@@ -12,25 +12,22 @@ WOQLChartConfig.prototype.constructor = Config.ViewConfig;
 
 
 WOQLChartConfig.prototype.prettyPrint = function(){
-	var str = "view = View.chart();\n";
+    var str = "view = View.chart();\n";
+    str += this.getBasicPrettyPrint();
 	for(var i = 0; i<this.rules.length ; i++){
 		str += "view." + this.rules[i].prettyPrint() + "\n";
 	}
 	return str;
 }
 
 WOQLChartConfig.prototype.json = function(){
-	let jr = [];
-	for(var i = 0; i<this.rules.length; i++){
-		jr.push(this.rules[i].json());
-	}
-	var conf = {};
-	let mj = {"chart" :conf, "rules": jr};
+	let mj = {"chart" :this.getBasicJSON(), "rules": this.getRulesJSON()};
 	return mj;
 }
 
 WOQLChartConfig.prototype.loadJSON = function(config, rules){
-	var jr = [];
+    this.loadBasicJSON(config);
+    var jr = [];
 	for(var i = 0; i<rules.length; i++){
 		var nr = new WOQLChartRule();
 		nr.json(rules[i]);

lib/viewer/chooserConfig.js

@@ -16,7 +16,8 @@ WOQLChooserConfig.prototype.create = function(client){
 }
 
 WOQLChooserConfig.prototype.prettyPrint = function(){
-	var str = "view = View.chooser();\n";
+    var str = "view = View.chooser();\n";
+    str += this.getBasicPrettyPrint();
 	if(typeof this.change() != "undefined"){
 		str += "view.change(" + this.change() + ")\n";
 	}
@@ -45,11 +46,7 @@ WOQLChooserConfig.prototype.prettyPrint = function(){
 }
 
 WOQLChooserConfig.prototype.json = function(){
-	let jr = [];
-	for(var i = 0; i<this.rules.length; i++){
-		jr.push(this.rules[i].json());
-	}
-	var conf = {};
+	var conf = this.getBasicJSON();
 	if(typeof this.change() != "undefined"){
 		conf['change'] = this.change();
 	}
@@ -71,7 +68,7 @@ WOQLChooserConfig.prototype.json = function(){
 	if(typeof this.direction() != "undefined"){
 		conf['direction'] = this.direction();
 	}
-	let mj = {"chooser" :conf, "rules": jr};
+	let mj = {"chooser" :conf, "rules": this.getRulesJSON()};
 	return mj;
 }
 
@@ -82,7 +79,8 @@ WOQLChooserConfig.prototype.loadJSON = function(config, rules){
 		nr.json(rules[i]);
 		jr.push(nr);
 	}
-	this.rules = jr;
+    this.rules = jr;
+    this.loadBasicJSON(config);
 	if(typeof config.change != "undefined"){
 		this.change(config.change);
 	}

lib/viewer/documentFrame.js

@@ -1,5 +1,6 @@
 const ObjectFrame = require("../objectFrame");
 const FrameConfig = require("./frameConfig");
+const FrameHelper = require("../utils");
 
 function DocumentFrame(client, config){
 	this.client = client;

lib/viewer/frameConfig.js

@@ -17,7 +17,8 @@ FrameConfig.prototype.create = function(client){
 }
 
 FrameConfig.prototype.prettyPrint = function(){
-	var str = "view = View.document();\n";
+    var str = "view = View.document();\n";
+    str += this.getBasicPrettyPrint();
 	if(typeof this.load_schema() != "undefined"){
 		str += "view.load_schema(" + this.load_schema() + ")\n";
 	}
@@ -28,18 +29,11 @@ FrameConfig.prototype.prettyPrint = function(){
 }
 
 FrameConfig.prototype.json = function(){
-	let jr = [];
-	for(var i = 0; i<this.rules.length; i++){
-		jr.push(this.rules[i].json());
-	}
-	var conf = {};
-	if(typeof this.renderer() != "undefined"){
-		conf['renderer'] = this.renderer();
-	}
+	var conf = this.getBasicJSON();
 	if(typeof this.load_schema() != "undefined"){
 		conf['load_schema'] = this.load_schema();
 	}
-	let mj = {"frame" :conf, "rules": jr};
+	let mj = {"frame" :conf, "rules": this.getRulesJSON()};
 	return mj;
 }
 
@@ -50,22 +44,14 @@ FrameConfig.prototype.loadJSON = function(config, rules){
 		nr.json(rules[i]);
 		jr.push(nr);
 	}
-	this.rules = jr;
-	if(typeof config.renderer != "undefined"){
-		this.renderer(config.renderer);
-	}
+    this.rules = jr;
+    this.loadBasicJSON(config);
 	if(typeof config.load_schema != "undefined"){
 		this.load_schema(config.load_schema);
 	}
 	return this;
 }
 
-FrameConfig.prototype.renderer = function(rend){
-	if(typeof rend == "undefined") return this.trenderer;
-	this.trenderer = rend;
-	return this;
-}
-
 FrameConfig.prototype.json_rules = function(){
 	let jr = [];
 	for(var i = 0; i<this.rules.length; i++){

lib/viewer/graphConfig.js

@@ -108,8 +108,13 @@ WOQLGraphConfig.prototype.edge = function(source, target){
 }
 
 WOQLGraphConfig.prototype.node = function(...cols){
-	let nr = new WOQLGraphRule().scope("node");
-	nr.setVariables(cols);
+	let nr = new WOQLGraphRule();
+	if(cols && cols.length){
+		nr.scope("node").setVariables(cols);
+	}
+	else {
+		nr.scope("row");
+	}
 	this.rules.push(nr);
 	return nr;
 }
@@ -155,7 +160,7 @@ WOQLGraphConfig.prototype.loadJSON = function(config, rules){
 }
 
 WOQLGraphConfig.prototype.prettyPrint = function(){
-	var str = "view = WOQL.graph();\n";
+	var str = "view = View.graph();\n";
 	if(typeof this.literals() != "undefined"){
 		str += "view.literals('" + this.literals() + "')\n";
 	}
@@ -295,7 +300,7 @@ WOQLGraphRule.prototype.weight = function(w){
 }
 
 WOQLGraphRule.prototype.prettyPrint = function(type){
-	var str = WOQLViewRule.prototype.prettyPrint.apply(this);
+	var str = Config.WOQLViewRule.prototype.prettyPrint.apply(this);
 	if(typeof this.charge() != "undefined"){
 		str += ".charge('" + this.charge() + "')";
 	}

lib/viewer/streamConfig.js

@@ -28,7 +28,7 @@ WOQLStreamConfig.prototype.template = function(template){
 
 
 WOQLStreamConfig.prototype.prettyPrint = function(){
-	var str = "view = WOQL.stream();\n";
+	var str = "view = View.stream();\n";
 	if(typeof this.template() != "undefined"){
 		str += "view.template(" + JSON.stringify(this.template()) + ")\n";
 	}

lib/viewer/tableConfig.js

@@ -180,7 +180,7 @@ WOQLTableRule.prototype.header = function(hdr){
 }
 
 WOQLTableRule.prototype.prettyPrint = function(type){
-	var str = WOQLViewRule.prototype.prettyPrint.apply(this);
+	var str = Config.WOQLViewRule.prototype.prettyPrint.apply(this);
     if(typeof this.header() != "undefined"){
 	    str += ".header(" + this.header() + ")";
 	}

lib/viewer/viewConfig.js

@@ -1,10 +1,55 @@
 
 const WOQLRule = require("../woqlRule");
 
+/**
+ * Generic functions / configs that are available to all config types
+ */
 function ViewConfig(){
     this.rules = [];
 }
 
+ViewConfig.prototype.render = function(func){
+	if(func) this.view_render = func;
+	return this.view_render;
+}
+
+ViewConfig.prototype.renderer = function(val){
+	if(val) this.view_renderer = val;
+	return this.view_renderer;
+}
+
+ViewConfig.prototype.getRulesJSON = function(){
+	let jr = [];
+	for(var i = 0; i<this.rules.length; i++){
+		jr.push(this.rules[i].json());
+	}
+	return jr;
+}
+
+ViewConfig.prototype.getBasicJSON = function(){
+	let jr = {};
+	if(this.view_render) jr.render = this.view_render;
+	if(this.view_renderer) jr.renderer = this.view_renderer;
+	return jr;
+}
+
+ViewConfig.prototype.loadBasicJSON = function(json){
+	if(json.render) this.view_render = json.view_render;
+	if(json.renderer) this.view_renderer = json.view_renderer;
+}
+
+ViewConfig.prototype.getBasicprettyPrint = function(){
+	let str = "";
+	if(typeof this.render() != "undefined"){
+		str += "view.render(" + this.render() + ")\n";
+	}
+	if(typeof this.renderer() != "undefined"){
+		str += "view.renderer('" + this.renderer() + "')\n";
+	}
+	return str;
+}
+
+
 function WOQLViewRule(){
 	WOQLRule.call(this);
 	this.rule = {}; 

lib/viewer/woqlChooser.js

@@ -10,6 +10,7 @@ function WOQLChooser(client, config){
 	this.client = client;
 	this.config = (config ? config : new WOQLChooserConfig());
 	this.selected = false;
+	this.cursor = 0;
 	return this;
 }
 
@@ -36,6 +37,7 @@ WOQLChooser.prototype.setResult = function(result){
 	const variables = result.getVariableList();
 	if(!this.config.values() && variables.length){
 		this.config.values(variables[0]);
+		alert(variables[0]);
 	}
 	//sort it 
 	if(this.config.sort()){
@@ -44,7 +46,7 @@ WOQLChooser.prototype.setResult = function(result){
 	while(row = this.result.next()){
 		if(row && this.includeRow(row, this.result.cursor)){
 			this.choices.push(this.rowToChoice(row, rows++));
-		}
+		}		
 	}
 	return this;
 }
@@ -126,7 +128,7 @@ WOQLChooser.prototype.getSpecialRenderer = function(row, index, type){
 
 WOQLChooser.prototype.renderSpecial = function(rule, row, rownum){
 	if(rule && typeof rule == "function"){
-		return render(row);
+		return rule(row);
 	}
 	if(rule && typeof rule == "string"){
 		return rule;
@@ -142,15 +144,17 @@ WOQLChooser.prototype.first = function(){
 	return this.choices[this.cursor];
 }
 
-WOQLChooser.prototype.prev = function(){
-	if(this.cursor > 0) {
-		return this.choices[--this.cursor];
-	}
-}
-
-WOQLChooser.prototype.next = function(){
-	return this.choices[this.cursor++];
-}
+WOQLChooser.prototype.next = function () {
+	const res = this.choices[this.cursor];
+	this.cursor++;
+	return res;
+};
 
+WOQLChooser.prototype.prev = function () {
+	if (this.cursor > 0) {
+		this.cursor--;
+		return this.choices[this.cursor];
+	}
+};
 
 module.exports = WOQLChooser;