dtable-utils 0.0.3-beta.1 → 0.0.4-beta.1

package/es/column/option.js

@@ -11,6 +11,12 @@ var getColumnOptions = function getColumnOptions(column) {
   }
   return column.data.options;
 };
+
+/**
+ * generate unique option id
+ * @param {array} options e.g. [{ id, ... }, ...]
+ * @returns generated option id, string
+ */
 var generateOptionID = function generateOptionID(options) {
   if (options.length === 1) return String(Math.floor(Math.random() * Math.pow(10, 6)));
   var optionID;
@@ -53,22 +59,38 @@ var getRandomOptionColor = function getRandomOptionColor(options) {
   }
   return defaultOptions[colorIdx] || defaultOptions[0];
 };
+
+/**
+ * generate option
+ * @param {array} options e.g. [{ id, ... }, ...]
+ * @param {string} optionName
+ * @param {string} optionColor used to find system support color options. The new color option will be generated if not found by "optionColor" or not supported
+ * @returns generated option, object
+ */
 var createOption = function createOption(options, optionName) {
-  var selectOptionColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var optionColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   var id = generateOptionID(options);
-  var optionColor = selectOptionColor && SELECT_OPTION_COLORS.find(function (item) {
-    return item.COLOR === selectOptionColor;
+  var colors = optionColor && SELECT_OPTION_COLORS.find(function (systemColor) {
+    return systemColor.COLOR === optionColor;
   });
-  if (!optionColor) {
-    optionColor = getRandomOptionColor(options);
+  if (!colors) {
+    colors = getRandomOptionColor(options);
   }
   return {
     id: id,
     name: optionName,
-    color: optionColor.COLOR,
-    textColor: optionColor.TEXT_COLOR
+    color: colors.COLOR,
+    textColor: colors.TEXT_COLOR
   };
 };
+
+/**
+ * Generate cell option by name.
+ * Return the option id if exist, otherwise generate a new option
+ * @param {array} options e.g. [{ id, ... }, ...]
+ * @param {string} optionName used as the option name
+ * @returns option id and option, object
+ */
 var generatorCellOption = function generatorCellOption(options, optionName) {
   var existOption = options.find(function (option) {
     return option.name === optionName;
@@ -84,6 +106,14 @@ var generatorCellOption = function generatorCellOption(options, optionName) {
     selectedOptionId: newOption.id
   };
 };
+
+/**
+ * Generate cell options by names.
+ * Return the options ids if exist, otherwise generate new options
+ * @param {array} options e.g. [{ id, ... }, ...]
+ * @param {array} optionNames used as the options names
+ * @returns options ids and options, object
+ */
 var generatorCellOptions = function generatorCellOptions(options, optionNames) {
   var cellOptions = [];
   var selectedOptionIds = [];

package/es/common.js

@@ -14,12 +14,33 @@ var generatorBase64Code = function generatorBase64Code() {
   }
   return key;
 };
+
+/**
+ * Check whether the given value is empty
+ * @param {any} val
+ * @returns bool
+ */
 var isEmpty = function isEmpty(val) {
-  if (val == null) return true;
+  if (val === null || val === undefined) return true;
   if (val.length !== undefined) return val.length === 0;
   if (val instanceof Date) return false;
   if (_typeof(val) === 'object') return Object.keys(val).length === 0;
   return false;
 };
 
-export { generatorBase64Code, isEmpty };
+/**
+ * Check whether the object is empty.
+ * The true will be returned if the "obj" is invalid.
+ * @param {object} obj
+ * @returns bool
+ */
+var isEmptyObject = function isEmptyObject(obj) {
+  var name;
+  // eslint-disable-next-line
+  for (name in obj) {
+    return false;
+  }
+  return true;
+};
+
+export { generatorBase64Code, isEmpty, isEmptyObject };

package/es/constants/formula.js

@@ -10,5 +10,6 @@ var FORMULA_RESULT_TYPE = {
   ARRAY: 'array'
 };
 var FORMULA_COLUMN_TYPES_MAP = (_FORMULA_COLUMN_TYPES = {}, _defineProperty(_FORMULA_COLUMN_TYPES, CellType.FORMULA, true), _defineProperty(_FORMULA_COLUMN_TYPES, CellType.LINK_FORMULA, true), _FORMULA_COLUMN_TYPES);
+var DISPLAY_INTERNAL_ERRORS = ['#ERROR!', '#DIV/0!', '#NAME?', '#N/A', '#NULL!', '#NUM!', '#REF!', '#VALUE!', '#GETTING_DATA'];
 
-export { FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE };
+export { DISPLAY_INTERNAL_ERRORS, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE };

package/es/filter/core.js

@@ -11,10 +11,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var EXACT_DATE_TERM_MODIFIER_TYPES = [FILTER_TERM_MODIFIER_TYPE.TODAY, FILTER_TERM_MODIFIER_TYPE.TOMORROW, FILTER_TERM_MODIFIER_TYPE.YESTERDAY, FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_AGO, FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_FROM_NOW, FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_AGO, FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_FROM_NOW, FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_AGO, FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_FROM_NOW, FILTER_TERM_MODIFIER_TYPE.EXACT_DATE];
 
 /**
- * get filters which excludes incomplete
- * @param {array} filters [{ column_key: '', filter_predicate: '' }]
+ * Get filters which excludes incomplete
+ * @param {array} filters e.g. [{ column_key, filter_predicate, ... }]
  * @param {array} columns
- * @returns array
+ * @returns valid filters, array
  */
 var getValidFilters = function getValidFilters(filters, columns) {
   if (!Array.isArray(filters) || !Array.isArray(columns)) {
@@ -28,10 +28,10 @@ var getValidFilters = function getValidFilters(filters, columns) {
 };
 
 /**
- * get filters without error messages
- * @param {array} filters [{ column_key: '', filter_predicate: '' }]
+ * Get filters without error messages
+ * @param {array} filters e.g. [{ column_key, filter_predicate, ... }]
  * @param {array} columns
- * @returns array
+ * @returns valid filters, array
  */
 var getValidFiltersWithoutError = function getValidFiltersWithoutError(filters, columns) {
   if (!Array.isArray(filters) || !Array.isArray(columns)) {
@@ -41,13 +41,21 @@ var getValidFiltersWithoutError = function getValidFiltersWithoutError(filters,
     return !ValidateFilter.validate(filter, columns).error_message;
   });
 };
+
+/**
+ * Generate date for filter
+ * @param {string} filterTermModifier
+ * @param {any} filterTerm
+ * @returns date | date range, object
+ */
 var otherDate = function otherDate(filterTermModifier, filterTerm) {
   var today = new Date();
   var year = today.getFullYear();
   var month = today.getMonth(); // use js month representation: 0 - 11
   var day = today.getDate();
-  var days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
   //          0   1   2   3    4   5   6   7   8   9  10  11
+  var days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
   days[1] = year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0) ? 29 : 28; // is leap year
   switch (filterTermModifier) {
     case FILTER_TERM_MODIFIER_TYPE.TODAY:
@@ -188,19 +196,32 @@ var otherDate = function otherDate(filterTermModifier, filterTerm) {
       }
   }
 };
+
+/**
+ * Generate formatted date for filter
+ * @param {string} filterTermModifier
+ * @param {any} filterTerm
+ * @returns formatted date | date range, object
+ */
 var getFormattedFilterOtherDate = function getFormattedFilterOtherDate(filterTermModifier, filterTerm) {
   var _otherDate = otherDate(filterTermModifier, filterTerm);
   if (EXACT_DATE_TERM_MODIFIER_TYPES.includes(filterTermModifier)) {
     return DateUtils.format(_otherDate);
   }
-  var _ref = _otherDate || {},
-    startDate = _ref.startDate,
-    endDate = _ref.endDate;
+  var startDate = _otherDate.startDate,
+    endDate = _otherDate.endDate;
   return {
-    startDate: DateUtils.format(startDate),
-    endDate: DateUtils.format(endDate)
+    startDate: startDate ? DateUtils.format(startDate) : '',
+    endDate: endDate ? DateUtils.format(endDate) : ''
   };
 };
+
+/**
+ * Format filter with other_date, linked_column etc.
+ * @param {object} filter e.g. { filter_term, filter_term_modifier, ... }
+ * @param {object} column
+ * @returns formatted filter
+ */
 var getFormattedFilter = function getFormattedFilter(filter, column) {
   var filter_term = filter.filter_term,
     filter_term_modifier = filter.filter_term_modifier;
@@ -216,7 +237,8 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
           array_data = columnData.array_data;
         if (result_type === FORMULA_RESULT_TYPE.DATE) {
           formattedFilter.other_date = getFormattedFilterOtherDate(filter_term_modifier, filter_term);
-        } else if (result_type === FORMULA_RESULT_TYPE.ARRAY) {
+        }
+        if (result_type === FORMULA_RESULT_TYPE.ARRAY) {
           var linkedColumn = {
             type: array_type,
             data: array_data
@@ -235,9 +257,9 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
       }
     case CellType.LINK:
       {
-        var _ref2 = columnData || {},
-          _array_type = _ref2.array_type,
-          _array_data = _ref2.array_data;
+        var _ref = columnData || {},
+          _array_type = _ref.array_type,
+          _array_data = _ref.array_data;
         var _linkedColumn = {
           type: _array_type,
           data: _array_data
@@ -256,11 +278,24 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
   }
   return formattedFilter;
 };
+
+/**
+ * Get formatted filters with other_date, linked_column etc.
+ * @param {array} filters [{ filter_term, filter_term_modifier, column, ... }]
+ * @returns formatted filters, array
+ */
 var getFormattedFilters = function getFormattedFilters(filters) {
   return filters.map(function (filter) {
     return getFormattedFilter(filter, filter.column);
   });
 };
+
+/**
+ * Get filters without error messages and formatted with filter column
+ * @param {array} filters e.g. [{ column_key, filter_predicate, ... }]
+ * @param {array} columns
+ * @returns filters, array
+ */
 var deleteInvalidFilter = function deleteInvalidFilter(filters, columns) {
   var cleanFilters = [];
   filters.forEach(function (filter) {
@@ -268,18 +303,18 @@ var deleteInvalidFilter = function deleteInvalidFilter(filters, columns) {
     var _ValidateFilter$valid2 = ValidateFilter.validate(filter, columns),
       error_message = _ValidateFilter$valid2.error_message;
     if (error_message) {
-      if (error_message === FILTER_ERR_MSG.INCOMPLETE_FILTER) {
-        return;
+      if (error_message !== FILTER_ERR_MSG.INCOMPLETE_FILTER) {
+        throw new Error(error_message);
       }
-      throw new Error(error_message);
+    } else {
+      var filterColumn = columns.find(function (column) {
+        return column.key === column_key;
+      });
+      var newFilter = _objectSpread(_objectSpread({}, filter), {}, {
+        column: filterColumn
+      });
+      cleanFilters.push(newFilter);
     }
-    var filterColumn = columns.find(function (column) {
-      return column.key === column_key;
-    });
-    var newFilter = _objectSpread(_objectSpread({}, filter), {}, {
-      column: filterColumn
-    });
-    cleanFilters.push(newFilter);
   });
   return cleanFilters;
 };

package/es/filter/filter-column/array.js

@@ -8,75 +8,80 @@ import { multipleSelectFilter } from './multiple-select.js';
 import { numberFilter } from './number.js';
 import { CellType } from '../../constants/cell-type.js';
 import { DATE_COLUMN_OPTIONS, COLLABORATOR_COLUMN_TYPES } from '../../constants/column.js';
-import '../../constants/filter/filter-column-options.js';
-import '../../constants/filter/filter-modifier.js';
 import { FILTER_PREDICATE_TYPE } from '../../constants/filter/filter-predicate.js';
-import '../../constants/filter/filter-is-within.js';
 
 var TRUE_VALUE = [true, 'true'];
-var filterByArrayType = function filterByArrayType(cellValue, filter, _ref) {
+
+/**
+ * Filter by array type
+ * @param {array} array e.g. [ cellValue, ... ]
+ * @param {object} filter e.g. { filter_predicate, column, ... }
+ * @param {string} username
+ * @param {string} userId
+ * @returns bool
+ */
+var filterByArrayType = function filterByArrayType(array, filter, _ref) {
   var username = _ref.username,
     userId = _ref.userId;
   var column = filter.column,
     linked_column = filter.linked_column;
   var filter_predicate = filter.filter_predicate;
-  if (Array.isArray(cellValue)) {
+  if (Array.isArray(array)) {
     if (filter_predicate === FILTER_PREDICATE_TYPE.EMPTY) {
-      return cellValue.length === 0;
+      return array.length === 0;
     }
     if (filter_predicate === FILTER_PREDICATE_TYPE.NOT_EMPTY) {
-      return cellValue.length > 0;
+      return array.length > 0;
     }
   }
   if (!linked_column) {
     return textFilter('', filter, userId);
   }
-  var data = column.data;
   var linkedColumnType = linked_column.type;
   if (linkedColumnType === CellType.BOOL || linkedColumnType === CellType.CHECKBOX) {
-    var normalizedCellValue = cellValue;
-    if (Array.isArray(cellValue)) {
-      normalizedCellValue = cellValue[0];
+    var normalizedArray = array;
+    if (Array.isArray(array)) {
+      normalizedArray = array[0];
     }
-    normalizedCellValue = TRUE_VALUE.includes(normalizedCellValue);
-    return checkboxFilter(normalizedCellValue, filter);
+    normalizedArray = TRUE_VALUE.includes(normalizedArray);
+    return checkboxFilter(normalizedArray, filter);
   }
   if (linkedColumnType === CellType.SINGLE_SELECT) {
-    var _normalizedCellValue = cellValue;
-    if (cellValue && !Array.isArray(cellValue)) {
-      _normalizedCellValue = [cellValue];
+    var _normalizedArray = array;
+    if (array && !Array.isArray(array)) {
+      _normalizedArray = [array];
     }
-    return multipleSelectFilter(_normalizedCellValue, filter);
+    return multipleSelectFilter(_normalizedArray, filter);
   }
   if (linkedColumnType === CellType.MULTIPLE_SELECT) {
-    return multipleSelectFilter(cellValue, filter);
+    return multipleSelectFilter(array, filter);
   }
   if (isNumericColumn({
     type: linkedColumnType
   })) {
-    var _normalizedCellValue2 = cellValue;
-    if (Array.isArray(cellValue)) {
-      var cellValueLength = cellValue.length;
+    var _normalizedArray2 = array;
+    if (Array.isArray(array)) {
+      var cellValueLength = array.length;
       if (cellValueLength === 0) {
-        _normalizedCellValue2 = '';
+        _normalizedArray2 = '';
       } else if (cellValueLength === 1) {
-        _normalizedCellValue2 = cellValue[0];
+        _normalizedArray2 = array[0];
       }
     }
-    return numberFilter(_normalizedCellValue2, filter);
+    return numberFilter(_normalizedArray2, filter);
   }
   if (DATE_COLUMN_OPTIONS.includes(linkedColumnType)) {
-    var newCellValue = cellValue;
-    if (Array.isArray(cellValue)) {
-      newCellValue = String(cellValue);
+    var newCellValue = array;
+    if (Array.isArray(array)) {
+      newCellValue = String(array);
     }
     return dateFilter(newCellValue, filter);
   }
   if (COLLABORATOR_COLUMN_TYPES.includes(linkedColumnType)) {
-    return collaboratorFilter(cellValue, filter, username);
+    return collaboratorFilter(array, filter, username);
   }
-  var sCellValue = getFormulaDisplayString(cellValue, data) || '';
-  return textFilter(sCellValue, filter, userId);
+  var displayString = getFormulaDisplayString(array, column.data) || '';
+  return textFilter(displayString, filter, userId);
 };
 
 export { filterByArrayType };

package/es/filter/filter-column/checkbox.js

@@ -1,8 +1,14 @@
-var checkboxFilter = function checkboxFilter(cellValue, _ref) {
+/**
+ * Filter checkbox
+ * @param {bool} checked
+ * @param {bool} filter_term
+ * @returns boolean
+ */
+var checkboxFilter = function checkboxFilter(checked, _ref) {
   var filter_term = _ref.filter_term;
   var filterTerm = filter_term || false;
-  var normalizedCellValue = cellValue || false;
-  return normalizedCellValue === filterTerm;
+  var normalizedChecked = checked || false;
+  return normalizedChecked === filterTerm;
 };
 
 export { checkboxFilter };

package/es/filter/filter-column/collaborator.js

@@ -1,32 +1,37 @@
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
-import '../../constants/filter/filter-column-options.js';
-import '../../constants/filter/filter-modifier.js';
 import { FILTER_PREDICATE_TYPE } from '../../constants/filter/filter-predicate.js';
-import '../../constants/filter/filter-is-within.js';
 
-var collaboratorFilter = function collaboratorFilter(cellValue, _ref, username) {
+/**
+ * Filter collaborator
+ * @param {array} emails e.g. [ collaborator.email, ... ]
+ * @param {string} filter_predicate
+ * @param {array} filter_term e.g. [ collaborator.email, ... ]
+ * @param {string} username
+ * @returns bool
+ */
+var collaboratorFilter = function collaboratorFilter(emails, _ref, username) {
   var filter_predicate = _ref.filter_predicate,
     filter_term = _ref.filter_term;
   switch (filter_predicate) {
     case FILTER_PREDICATE_TYPE.HAS_ANY_OF:
       {
-        return !Array.isArray(filter_term) || filter_term.length === 0 || Array.isArray(cellValue) && filter_term.some(function (email) {
-          return cellValue.includes(email);
+        return !Array.isArray(filter_term) || filter_term.length === 0 || Array.isArray(emails) && filter_term.some(function (email) {
+          return emails.includes(email);
         });
       }
     case FILTER_PREDICATE_TYPE.HAS_ALL_OF:
       {
-        return !Array.isArray(filter_term) || filter_term.length === 0 || Array.isArray(cellValue) && filter_term.every(function (email) {
-          return cellValue.includes(email);
+        return !Array.isArray(filter_term) || filter_term.length === 0 || Array.isArray(emails) && filter_term.every(function (email) {
+          return emails.includes(email);
         });
       }
     case FILTER_PREDICATE_TYPE.HAS_NONE_OF:
       {
-        if (!Array.isArray(filter_term) || filter_term.length === 0 || !Array.isArray(cellValue) || cellValue.length === 0) {
+        if (!Array.isArray(filter_term) || filter_term.length === 0 || !Array.isArray(emails) || emails.length === 0) {
           return true;
         }
         return filter_term.every(function (email) {
-          return cellValue.indexOf(email) < 0;
+          return emails.indexOf(email) < 0;
         });
       }
     case FILTER_PREDICATE_TYPE.IS_EXACTLY:
@@ -34,10 +39,10 @@ var collaboratorFilter = function collaboratorFilter(cellValue, _ref, username)
         if (!Array.isArray(filter_term) || filter_term.length === 0) {
           return true;
         }
-        if (!Array.isArray(cellValue) || cellValue.length === 0) {
+        if (!Array.isArray(emails) || emails.length === 0) {
           return false;
         }
-        var nonReptCellValue = _toConsumableArray(new Set(cellValue));
+        var nonReptCellValue = _toConsumableArray(new Set(emails));
         if (nonReptCellValue.length !== filter_term.length) {
           return false;
         }
@@ -47,15 +52,15 @@ var collaboratorFilter = function collaboratorFilter(cellValue, _ref, username)
       }
     case FILTER_PREDICATE_TYPE.EMPTY:
       {
-        return !Array.isArray(cellValue) || cellValue.length === 0;
+        return !Array.isArray(emails) || emails.length === 0;
       }
     case FILTER_PREDICATE_TYPE.NOT_EMPTY:
       {
-        return Array.isArray(cellValue) && cellValue.length > 0;
+        return Array.isArray(emails) && emails.length > 0;
       }
     case FILTER_PREDICATE_TYPE.INCLUDE_ME:
       {
-        return Array.isArray(cellValue) && cellValue.indexOf(username) > -1;
+        return Array.isArray(emails) && emails.indexOf(username) > -1;
       }
     default:
       {

package/es/filter/filter-column/creator.js

@@ -1,9 +1,14 @@
-import '../../constants/filter/filter-column-options.js';
-import '../../constants/filter/filter-modifier.js';
 import { FILTER_PREDICATE_TYPE } from '../../constants/filter/filter-predicate.js';
-import '../../constants/filter/filter-is-within.js';
 
-var creatorFilter = function creatorFilter(cellValue, _ref, username) {
+/**
+ * Filter creator
+ * @param {string} email
+ * @param {string} filter_predicate
+ * @param {array} filter_term e.g. [ collaborator.email, ... ]
+ * @param {string} username
+ * @returns bool
+ */
+var creatorFilter = function creatorFilter(email, _ref, username) {
   var filter_predicate = _ref.filter_predicate,
     filter_term = _ref.filter_term;
   switch (filter_predicate) {
@@ -12,33 +17,37 @@ var creatorFilter = function creatorFilter(cellValue, _ref, username) {
         if (!Array.isArray(filter_term)) {
           return true;
         }
-        if (!cellValue) {
+        if (!email) {
           return false;
         }
-        return filter_term.findIndex(function (item) {
-          return item === cellValue;
+        return filter_term.findIndex(function (filterEmail) {
+          return filterEmail === email;
         }) > -1;
       }
     case FILTER_PREDICATE_TYPE.NOT_CONTAIN:
       {
-        if (!Array.isArray(filter_term) || !cellValue) {
+        if (!Array.isArray(filter_term) || !email) {
           return true;
         }
-        return filter_term.findIndex(function (item) {
-          return item === cellValue;
+        return filter_term.findIndex(function (filterEmail) {
+          return filterEmail === email;
         }) < 0;
       }
     case FILTER_PREDICATE_TYPE.INCLUDE_ME:
       {
-        return cellValue === username;
+        return email === username;
       }
     case FILTER_PREDICATE_TYPE.IS:
       {
-        return !Array.isArray(filter_term) || cellValue === filter_term[0];
+        if (!filter_term) return true;
+        if (!Array.isArray(filter_term)) return email === filter_term;
+        return email === filter_term[0];
       }
     case FILTER_PREDICATE_TYPE.IS_NOT:
       {
-        return !Array.isArray(filter_term) || cellValue !== filter_term[0];
+        if (!filter_term) return true;
+        if (!Array.isArray(filter_term)) return email !== filter_term;
+        return email !== filter_term[0];
       }
     default:
       {

package/es/filter/filter-column/date.js

@@ -1,10 +1,17 @@
 import { DateUtils } from '../../date.js';
-import '../../constants/filter/filter-column-options.js';
-import { FILTER_TERM_MODIFIER_TYPE } from '../../constants/filter/filter-modifier.js';
 import { FILTER_PREDICATE_TYPE } from '../../constants/filter/filter-predicate.js';
-import '../../constants/filter/filter-is-within.js';
+import { FILTER_TERM_MODIFIER_TYPE } from '../../constants/filter/filter-modifier.js';
 
-var dateFilter = function dateFilter(cellValue, _ref) {
+/**
+ * Filter date
+ * @param {string} date
+ * @param {string} filter_predicate
+ * @param {string} filter_term_modifier
+ * @param {any} filter_term date string or number etc.
+ * @param {string|object} other_date date string or { startDate, endDate }
+ * @returns bool
+ */
+var dateFilter = function dateFilter(date, _ref) {
   var filter_predicate = _ref.filter_predicate,
     filter_term_modifier = _ref.filter_term_modifier,
     filter_term = _ref.filter_term,
@@ -12,42 +19,78 @@ var dateFilter = function dateFilter(cellValue, _ref) {
   switch (filter_predicate) {
     case FILTER_PREDICATE_TYPE.IS:
       {
-        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || DateUtils.format(cellValue) === other_date;
+        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || DateUtils.format(date) === other_date;
       }
     case FILTER_PREDICATE_TYPE.IS_WITHIN:
       {
+        if (filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term) {
+          return true;
+        }
+        if (!date) {
+          return false;
+        }
         var startDate = other_date.startDate,
           endDate = other_date.endDate;
-        var currentDate = DateUtils.format(cellValue);
-        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || !!cellValue && currentDate >= startDate && currentDate <= endDate;
+        var currentDate = DateUtils.format(date);
+        return currentDate >= startDate && currentDate <= endDate;
       }
     case FILTER_PREDICATE_TYPE.IS_BEFORE:
       {
-        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || !!cellValue && DateUtils.getValidDate(cellValue) && DateUtils.format(cellValue) < other_date;
+        if (filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term) {
+          return true;
+        }
+        if (!date || !DateUtils.getValidDate(date)) {
+          return false;
+        }
+        return DateUtils.format(date) < other_date;
       }
     case FILTER_PREDICATE_TYPE.IS_AFTER:
       {
-        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || !!cellValue && DateUtils.getValidDate(cellValue) && DateUtils.format(cellValue) > other_date;
+        if (filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term) {
+          return true;
+        }
+        if (!date || !DateUtils.getValidDate(date)) {
+          return false;
+        }
+        return DateUtils.format(date) > other_date;
       }
     case FILTER_PREDICATE_TYPE.IS_ON_OR_BEFORE:
       {
-        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || !!cellValue && DateUtils.getValidDate(cellValue) && DateUtils.format(cellValue) <= other_date;
+        if (filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term) {
+          return true;
+        }
+        if (!date || !DateUtils.getValidDate(date)) {
+          return false;
+        }
+        return DateUtils.format(date) <= other_date;
       }
     case FILTER_PREDICATE_TYPE.IS_ON_OR_AFTER:
       {
-        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || !!cellValue && DateUtils.getValidDate(cellValue) && DateUtils.format(cellValue) >= other_date;
+        if (filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term) {
+          return true;
+        }
+        if (!date || !DateUtils.getValidDate(date)) {
+          return false;
+        }
+        return DateUtils.format(date) >= other_date;
       }
     case FILTER_PREDICATE_TYPE.IS_NOT:
       {
-        return filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term || !cellValue || DateUtils.format(cellValue) !== other_date;
+        if (filter_term_modifier === FILTER_TERM_MODIFIER_TYPE.EXACT_DATE && !filter_term) {
+          return true;
+        }
+        if (!date || !DateUtils.getValidDate(date)) {
+          return false;
+        }
+        return DateUtils.format(date) !== other_date;
       }
     case FILTER_PREDICATE_TYPE.EMPTY:
       {
-        return cellValue && DateUtils.getValidDate(cellValue) ? false : true;
+        return !(date && DateUtils.getValidDate(date));
       }
     case FILTER_PREDICATE_TYPE.NOT_EMPTY:
       {
-        return cellValue && DateUtils.getValidDate(cellValue) ? true : false;
+        return !!(date && DateUtils.getValidDate(date));
       }
     default:
       {