fixing table views

Author: kevinchekovfeeney

lib/query/woqlLibrary.js

@@ -781,12 +781,12 @@ WOQLLibrary.prototype.active_commit_id = function(branch, ts, commit_var) {
 
 //includes passed commit id in list
 WOQLLibrary.prototype.history_ids = function(commit_id, count, commit_var) {
-    count = count || 10
     commit_var = commit_var || "Commit ID"
     let [commit_iri, cpath, tail_iri, cid] = this
         .vars("My Head IRI", "Commit Path", "My Tail IRI", commit_var)
-    let q = new WOQLQuery().using("_commits").select(cid).limit(count)
-        .triple(commit_iri, "ref:commit_id", commit_id)
+    let q = new WOQLQuery().using("_commits").select(cid)
+    if(count) q.limit(count)
+    q.triple(commit_iri, "ref:commit_id", commit_id)
         .or(
             new WOQLQuery().eq(cid, commit_id),
             new WOQLQuery().path(commit_iri, "ref:commit_parent+", tail_iri, cpath)

lib/viewer/tableConfig.js

@@ -185,11 +185,44 @@ WOQLTableRule.prototype.header = function(hdr){
 	return this;
 }
 
+WOQLTableRule.prototype.width = function(wid){
+	if(typeof wid == "undefined"){
+		return this.rule.width;
+	}
+	this.rule.width = wid;
+	return this;
+}
+
+WOQLTableRule.prototype.maxWidth = function(wid){
+	if(typeof wid == "undefined"){
+		return this.rule.maxWidth;
+	}
+	this.rule.maxWidth = wid;
+	return this;
+}
+
+WOQLTableRule.prototype.minWidth = function(wid){
+	if(typeof wid == "undefined"){
+		return this.rule.minWidth;
+	}
+	this.rule.minWidth = wid;
+	return this;
+}
+
 WOQLTableRule.prototype.prettyPrint = function(type){
 	var str = Config.WOQLViewRule.prototype.prettyPrint.apply(this);
     if(typeof this.header() != "undefined"){
 	    str += ".header(" + this.header() + ")";
 	}
+    if(typeof this.width() != "undefined"){
+	    str += ".width(" + this.width() + ")";
+	}
+    if(typeof this.maxWidth() != "undefined"){
+	    str += ".maxWidth(" + this.maxWidth() + ")";
+	}
+    if(typeof this.minWidth() != "undefined"){
+	    str += ".minWidth(" + this.minWidth() + ")";
+	}
 	return str;
 }
 

lib/viewer/woqlResult.js

@@ -16,7 +16,8 @@ function WOQLResult(results, query, config) {
     this.insert_count = results ? results.inserts : 0
     this.delete_count = results ? results.deletes : 0
     this.transaction_retry_count = results ? results.transaction_retry_count : 0
-    this.variable_names = results ? results['api:variables_names'] : false
+    this.variable_names = results ? results['api:variable_names'] : false
+    //console.log(results, this.variable_names)
     this.query = query ? query : WOQL.query()
     this.cursor = 0
     if (!(config && config.no_compress)) {
@@ -83,6 +84,10 @@ WOQLResult.prototype.getBindings = function() {
     return this.bindings
 }
 
+WOQLResult.prototype.rows = function() {
+    return this.bindings
+}
+
 /**
  * Returns list of variables returned in bindings from API
  */

lib/viewer/woqlTable.js

@@ -85,7 +85,7 @@ WOQLTable.prototype.getColumnsToRender = function(){
         var cols = this.getColumnOrder();
 	}
 	else {
-		var cols = this.result.getVariableList();
+        var cols = this.result.getVariableList();
 	}
 	var self = this;
 	return (cols ? cols.filter(col => !self.hidden(col)) : []);
@@ -119,7 +119,7 @@ WOQLTable.prototype.getColumnHeaderContents = function(colid){
 
 
 WOQLTable.prototype.hidden = function(col){
-	colid = UTILS.addNamespaceToVariable(col);
+	colid = UTILS.removeNamespaceFromVariable(col);
 	let matched_rules = new WOQLRule().matchColumn(this.config.rules, colid, "hidden");
 	if(matched_rules.length){
 		return matched_rules[matched_rules.length-1].rule.hidden;
@@ -141,21 +141,21 @@ WOQLTable.prototype.update = function(nquery){
 
 WOQLTable.prototype.hasDefinedEvent = function(row, key, scope, action, rownum){
 	if(scope == "row"){
-		var matched_rules = new WOQLRule().matchRow(this.config.rules, row, this.result.cursor, action);	
+		var matched_rules = new WOQLRule().matchRow(this.config.rules, row, rownum, action);	
 	}
 	else {
-		var matched_rules = new WOQLRule().matchCell(this.config.rules, row, key, this.result.cursor, action);	
+		var matched_rules = new WOQLRule().matchCell(this.config.rules, row, key, rownum, action);	
 	}
 	if(matched_rules && matched_rules.length) return true;
 	return false;
 }
 
 WOQLTable.prototype.getDefinedEvent = function(row, key, scope, action, rownum){
 	if(scope == "row"){
-		var matched_rules = new WOQLRule().matchRow(this.config.rules, row, this.result.cursor, action);	
+		var matched_rules = new WOQLRule().matchRow(this.config.rules, row, rownum, action);	
 	}
 	else {
-		var matched_rules = new WOQLRule().matchCell(this.config.rules, row, key, this.result.cursor, action);	
+		var matched_rules = new WOQLRule().matchCell(this.config.rules, row, key, rownum, action);	
 	}
 	if(matched_rules && matched_rules.length) {
 		var l = (matched_rules.length - 1);
@@ -185,6 +185,19 @@ WOQLTable.prototype.getColumnOrder = function(){
 	return this.config.column_order();
 }
 
+WOQLTable.prototype.getColumnDimensions = function(key){
+    let cstyle = {}
+	let w = new WOQLRule().matchColumn(this.config.rules, key, "width");
+    if(w && w.length && w[w.length-1].rule.width) {
+        cstyle.width = w[w.length-1].rule.width;
+    }
+	let max = new WOQLRule().matchColumn(this.config.rules, key, "maxWidth");
+    if(max && max.length) cstyle.maxWidth = max[max.length-1].rule.maxWidth;
+	let min = new WOQLRule().matchColumn(this.config.rules, key, "minWidth");
+    if(min && min.length) cstyle.minWidth = min[min.length-1].rule.minWidth;
+    return cstyle
+}
+
 WOQLTable.prototype.hasColumnOrder = WOQLTable.prototype.getColumnOrder;
 WOQLTable.prototype.hasCellClick = WOQLTable.prototype.getCellClick;
 WOQLTable.prototype.hasRowClick = WOQLTable.prototype.getRowClick;