Merge pull request #27 from joeyJsonar/wip-23

fix(23) - Fix for null displayed as 0.
datasweet · Sep 5, 2018 · 539ebda · 539ebda
2 parents 843dc10 + 4366521
commit 539ebda
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/public/decorators/lib/apply_formula.js b/public/decorators/lib/apply_formula.js
@@ -1,6 +1,16 @@
 import { each, filter, find, get, isArray, isEmpty, isObject, map } from 'lodash';
 import { FormulaParserProvider } from './formula_parser';
 
+/**
+ * A much needed polyfill since isNil is only available for 4.* version of lodash.
+ *
+ * @param {*} x Value to check whether undefined or null.
+ * @return True if x is undefined or null. False otherwise.
+ */
+function isNil(x) {
+  return x == null;
+}
+
 export function AggResponseFormulaProvider(Private)  {
   const aggTypeFormulaId = 'datasweet_formula';
   const FormulaParser = Private(FormulaParserProvider);
@@ -80,7 +90,7 @@ export function AggResponseFormulaProvider(Private)  {
         const isRowValue = isObject(table.rows[0][0]);
         each(table.rows, (row, i) => {
           each(computed, (data, colIndex) => {
-            const value = (data.isArray ? data.value[i] || null : data.value);
+            const value = (data.isArray ? (isNil(data.value[i]) ? null : data.value[i]) : data.value);
             if (isRowValue) {
               row[colIndex].value = value;
             } else {
@@ -96,4 +106,4 @@ export function AggResponseFormulaProvider(Private)  {
     if (columns.length === 0  || resp.length === 0 || !hasFormulas(columns)) return;
     mutate(resp, columns);
   };
-};
+};