improving table config api

Author: kevinchekovfeeney

lib/viewer/tableConfig.js

@@ -209,11 +209,23 @@ WOQLTableRule.prototype.minWidth = function(wid){
 	return this;
 }
 
+WOQLTableRule.prototype.sortable = function(sortable){
+	if(typeof sortable == "undefined"){
+		return this.rule.sortable;
+	}
+	this.rule.sortable = sortable;
+	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(this.sortable()){
+	    str += ".sortable(true)";
+	}
     if(typeof this.width() != "undefined"){
 	    str += ".width(" + this.width() + ")";
 	}

lib/viewer/woqlTable.js

@@ -91,15 +91,6 @@ WOQLTable.prototype.getColumnsToRender = function(){
 	return (cols ? cols.filter(col => !self.hidden(col)) : []);
 }
 
-WOQLTable.prototype.isSortableColumn = function(){
-    return true
-}
-
-WOQLTable.prototype.isFilterableColumn = function(){
-    return true
-}
-
-
 WOQLTable.prototype.getColumnHeaderContents = function(colid){
 	colid = UTILS.removeNamespaceFromVariable(colid);
 	let hr = new WOQLRule().matchColumn(this.config.rules, colid, "header");
@@ -205,10 +196,8 @@ WOQLTable.prototype.hasCellHover = WOQLTable.prototype.getCellHover;
 WOQLTable.prototype.hasRowHover = WOQLTable.prototype.getRowHover;
 
 WOQLTable.prototype.getRenderer = function(key, row, rownum){
-	var rend = this.getSpecificRender(key, row);
-	if(rend) return rend;
-	let renderer = this.getDefinedEvent(row, key, "column", "renderer", rownum);
-	let args =  this.getDefinedEvent(row, key, "column", "args", rownum);
+	return this.getDefinedEvent(row, key, "column", "renderer", rownum);
+	//let args =  this.getDefinedEvent(row, key, "column", "args", rownum);
 	if(!renderer){
 		let r = this.getRendererForDatatype(row[key]);
 		renderer = r.name;
@@ -219,6 +208,11 @@ WOQLTable.prototype.getRenderer = function(key, row, rownum){
 	}
 }
 
+WOQLTable.prototype.isSortableColumn = function(key){
+	return this.getDefinedEvent(false, key, "column", "sortable") || false
+}
+
+
 WOQLTable.prototype.renderValue = function(renderer, val, key, row){
 	if(val && val['@type']){
 		renderer.type = val['@type'];