review table

Author: Francesca-Bit

lib/viewer/tableConfig.js

@@ -31,6 +31,12 @@ WOQLTableConfig.prototype.json = function () {
   if (typeof this.renderer() !== 'undefined') {
     conf.renderer = this.renderer();
   }
+  if (typeof this.filter() !== 'undefined') {
+    conf.filter = this.filter();
+  }
+  if (typeof this.filterable() !== 'undefined') {
+    conf.filterable = this.filterable();
+  }
   if (typeof this.pager() !== 'undefined') {
     conf.pager = this.pager();
   }
@@ -68,6 +74,12 @@ WOQLTableConfig.prototype.loadJSON = function (config, rules) {
   if (typeof config.renderer !== 'undefined') {
     this.renderer(config.renderer);
   }
+  if (typeof config.filter !== 'undefined') {
+    this.filter(config.filter);
+  }
+  if (typeof config.filterable !== 'undefined') {
+    this.filterable(config.filterable);
+  }
   if (typeof config.bindings !== 'undefined') {
     this.bindings(config.bindings);
   }
@@ -111,6 +123,27 @@ WOQLTableConfig.prototype.prettyPrint = function () {
   return str;
 };
 
+/**
+ * @param {boolean} canfilter
+ * @returns  WOQLTableConfig
+ */
+
+WOQLTableConfig.prototype.filterable = function (canfilter) {
+  if (!canfilter && canfilter !== false) return this.tfilterable;
+  this.tfilterable = canfilter;
+  return this;
+};
+
+/*
+* default is string
+* filter type number | list | date
+*/
+WOQLTableConfig.prototype.filter = function (filter) {
+  if (!filter) return this.tfilter;
+  this.tfilter = filter;
+  return this;
+};
+
 WOQLTableConfig.prototype.renderer = function (rend) {
   if (!rend) return this.trenderer;
   this.trenderer = rend;
@@ -196,6 +229,22 @@ WOQLTableRule.prototype.header = function (hdr) {
   return this;
 };
 
+WOQLTableRule.prototype.filter = function (hdr) {
+  if (typeof hdr === 'undefined') {
+    return this.rule.filter;
+  }
+  this.rule.filter = hdr;
+  return this;
+};
+
+WOQLTableRule.prototype.filterable = function (hdr) {
+  if (typeof hdr === 'undefined') {
+    return this.rule.filterable;
+  }
+  this.rule.filterable = hdr;
+  return this;
+};
+
 WOQLTableRule.prototype.width = function (wid) {
   if (typeof wid === 'undefined') {
     return this.rule.width;

lib/viewer/terminusRule.js

@@ -112,6 +112,7 @@ TerminusPattern.prototype.testBasics = function (scope, value) {
 };
 
 TerminusPattern.prototype.testValue = function (value, constraint) {
+  if (!value) return null;
   const vundertest = (value['@value'] ? value['@value'] : value);
   if (typeof constraint === 'function') return constraint(vundertest);
   // eslint-disable-next-line no-param-reassign

lib/viewer/woqlTable.js

@@ -191,10 +191,15 @@ WOQLTable.prototype.getDefinedEvent = function (row, key, scope, action, rownum)
   } else {
     var matched_rules = new WOQLRule().matchCell(this.config.rules, row, key, rownum, action);
   }
-  if (matched_rules && matched_rules.length) {
-    const l = matched_rules.length - 1;
-    return matched_rules[l].rule[action];
+  // I get more than one rule it is not always the last
+  if (Array.isArray(matched_rules) && matched_rules.length > 0) {
+    // if I have only one rule
+    if (matched_rules.length === 1) return matched_rules[0].rule[action];
+    // eslint-disable-next-line max-len
+    const findRule = matched_rules.find((item) => item.rule[action] !== undefined || item.rule[action] === false);
+    return findRule && findRule.rule ? findRule.rule[action] : undefined;
   }
+  return undefined;
 };
 
 WOQLTable.prototype.getRowClick = function (row) {
@@ -228,6 +233,15 @@ WOQLTable.prototype.bindings = function () {
   return this.config.bindings();
 };
 
+WOQLTable.prototype.getColumnFilter = function (colid) {
+  const filter = new WOQLRule().matchColumn(this.config.rules, colid, 'filter');
+  // console.log('getColumnFilter', filter);
+  if (Array.isArray(filter) && filter.length > 0 && filter[0].rule) {
+    return filter[0].rule.filter;
+  }
+  return null;
+};
+
 WOQLTable.prototype.getColumnDimensions = function (key) {
   const cstyle = {};
   const w = new WOQLRule().matchColumn(this.config.rules, key, 'width');
@@ -266,6 +280,11 @@ WOQLTable.prototype.isSortableColumn = function (key) {
   return true;
 };
 
+WOQLTable.prototype.isFilterableColumn = function (key) {
+  if (this.getDefinedEvent(false, key, 'column', 'filterable') === false) return false;
+  return true;
+};
+
 WOQLTable.prototype.renderValue = function (renderer, val, key, row) {
   if (val && val['@type']) {
     renderer.type = val['@type'];

lib/woql.js

@@ -33,7 +33,7 @@ const WOQL = {};
 /**
  * Query running against any specific commit Id
  * @param {string}  refPath  - path to specific reference Id or commit Id
- * @param {WOQLQuery} subquery - subquery for the specific commit point
+ * @param {WOQLQuery} [subquery] - subquery for the specific commit point
  * @returns {WOQLQuery}
  * @example
  * let [a, b, c] = vars("a", "b", "c")