dtable-utils 5.0.7 → 5.0.8

package/lib/archive/sql-generator/filter-condition.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var dayjs = require('dayjs');
 var utc = require('dayjs/plugin/utc');
@@ -18,10 +19,13 @@ var filterModifier = require('../../constants/filter/filter-modifier.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var utc__default = /*#__PURE__*/_interopDefaultLegacy(utc);
 
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 dayjs__default["default"].extend(utc__default["default"]);
 
 // TEXT | GEOLOCATION | EMAIL | AUTO_NUMBER
@@ -124,7 +128,7 @@ var dateSqlCondition = function dateSqlCondition(column, filterItem) {
     filter_term = filterItem.filter_term,
     filter_term_modifier = filterItem.filter_term_modifier;
   var filterLabel = [filterPredicate.FILTER_PREDICATE_TYPE.EMPTY, filterPredicate.FILTER_PREDICATE_TYPE.NOT_EMPTY];
-  if (filter_term.length === 0 && filterLabel.indexOf(filter_predicate) < 0 && filter_term_modifier === filterModifier.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE) {
+  if ((!filter_term || filter_term.length === 0) && filterLabel.indexOf(filter_predicate) < 0 && filter_term_modifier === filterModifier.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE) {
     return '';
   }
   if (filter_predicate === filterPredicate.FILTER_PREDICATE_TYPE.IS) {
@@ -183,7 +187,7 @@ var ctimeSqlCondition = function ctimeSqlCondition(column, filterItem) {
     filter_term = filterItem.filter_term,
     filter_term_modifier = filterItem.filter_term_modifier;
   var filterLabel = [filterPredicate.FILTER_PREDICATE_TYPE.EMPTY, filterPredicate.FILTER_PREDICATE_TYPE.NOT_EMPTY];
-  if (filter_term.length === 0 && filterLabel.indexOf(filter_predicate) < 0 && filter_term_modifier === filterModifier.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE) {
+  if ((!filter_term || filter_term.length === 0) && filterLabel.indexOf(filter_predicate) < 0 && filter_term_modifier === filterModifier.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE) {
     return '';
   }
 
@@ -702,32 +706,103 @@ var getSqlConditionByFilter = function getSqlConditionByFilter(column, filterIte
   }
   return '';
 };
-var filter2SqlCondition = function filter2SqlCondition(table, view, username, userId, userDepartmentIdsMap) {
+
+/**
+ * FilterGroup: {"filter_conjunction": "And", filters: [Filter, ...]}
+ * Filter: {"column_key": "xxx", filter_predicate: "xxx", ...}
+ * @param {array} filters
+ * @param {object} table
+ * @param {string} username
+ * @param {string} userId
+ * @param {object} userDepartmentIdsMap
+ * @returns string
+ */
+var getSqlConditionsByFilters = function getSqlConditionsByFilters(filters, table, username, userId, userDepartmentIdsMap) {
+  var columns = table.columns;
   var patchedUsername = patchUtils["default"].getUsername(username);
   var patchedUserId = patchUtils["default"].getUserId(userId);
   var patchedUserDepartmentIdsMap = patchUtils["default"].getUserDepartmentIdsMap(userDepartmentIdsMap);
+  var sqlConditions = [];
+  filters.forEach(function (filter) {
+    if (core.checkIsFilterGroup(filter)) {
+      var subFilters = filter.filters,
+        sub_filter_conjunction = filter.filter_conjunction;
+      var subSqlConditions = subFilters.map(function (subFilter) {
+        var filterColumn = column$1.getTableColumnByKey(table, subFilter.column_key);
+        return getSqlConditionByFilter(filterColumn, subFilter, patchedUsername, patchedUserId, patchedUserDepartmentIdsMap);
+      });
+      var subSqlConditionsLength = subSqlConditions.length;
+      if (subSqlConditionsLength > 0) {
+        var subSqlConditionsString = subSqlConditions.length === 1 ? subSqlConditions + '' : "(".concat(subSqlConditions.join(' ' + sub_filter_conjunction + ' '), ")");
+        sqlConditions.push(subSqlConditionsString);
+      }
+    } else {
+      var column_key = filter.column_key;
+      var filterColumn = columns.find(function (column) {
+        return column.key === column_key;
+      });
+      sqlConditions.push(getSqlConditionByFilter(filterColumn, filter, patchedUsername, patchedUserId, patchedUserDepartmentIdsMap));
+    }
+  });
+  return sqlConditions;
+};
+var checkFilter = function checkFilter(filter$1, columns) {
+  var _ValidateFilter$valid = filter.ValidateFilter.validate(filter$1, columns),
+    error_message = _ValidateFilter$valid.error_message;
+  if (error_message) {
+    if (error_message === index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
+      return false;
+    }
+    throw new Error(error_message);
+  }
+  return true;
+};
+var validateFilters = function validateFilters(filters, columns) {
+  var validFilters = [];
+  filters.forEach(function (filter) {
+    if (core.checkIsFilterGroup(filter)) {
+      var subFilters = filter.filters;
+      if (!Array.isArray(subFilters) || subFilters.length === 0) {
+        return;
+      }
+      var validSubFilters = subFilters.filter(function (subFilter) {
+        return checkFilter(subFilter, columns);
+      });
+      if (validSubFilters.length === 0) {
+        return;
+      }
+      validFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
+        filters: validSubFilters
+      }));
+    } else {
+      if (!checkFilter(filter, columns)) {
+        return;
+      }
+      validFilters.push(filter);
+    }
+  });
+  return validFilters;
+};
+var filter2SqlCondition = function filter2SqlCondition(table, view, username, userId, userDepartmentIdsMap) {
   var columns = table.columns;
   var filter_conjunction = view.filter_conjunction,
     filters = view.filters;
   if (typeof filter_conjunction !== 'string' || !Array.isArray(filters) || filters.length === 0) {
     return '';
   }
+  var validFilters = [];
+  try {
+    validFilters = validateFilters(filters, columns);
+  } catch (err) {
+    throw new Error(err.message);
+  }
+  if (validFilters.length === 0) {
+    return '';
+  }
 
   // 1. add WHERE condition
   var filterHeader = 'WHERE ';
-  var stringList = filters.map(function (filterItem) {
-    var _ValidateFilter$valid = filter.ValidateFilter.validate(filterItem, columns),
-      error_message = _ValidateFilter$valid.error_message;
-    if (error_message) {
-      if (error_message === index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
-        return '';
-      }
-      throw new Error(error_message);
-    }
-    var column_key = filterItem.column_key;
-    var column = column$1.getTableColumnByKey(table, column_key);
-    return getSqlConditionByFilter(column, filterItem, patchedUsername, patchedUserId, patchedUserDepartmentIdsMap);
-  });
+  var stringList = getSqlConditionsByFilters(validFilters, table, username, userId, userDepartmentIdsMap);
 
   // 2. filtered '' sql clause
   stringList = stringList.filter(function (item) {
@@ -739,21 +814,29 @@ var filter2SqlCondition = function filter2SqlCondition(table, view, username, us
   // const filterContent = stringList.join(' ' + filter_conjunction + ' ');
   var filterContent = stringList[0];
   for (var i = 1; i < stringList.length; i++) {
-    filterContent += " ".concat(filter_conjunction, " (").concat(stringList[i], ")");
+    var currStr = stringList[i];
+    if (currStr.startsWith('(') && currStr.endsWith(')')) {
+      filterContent += " ".concat(filter_conjunction, " ").concat(stringList[i]);
+    } else {
+      filterContent += " ".concat(filter_conjunction, " (").concat(stringList[i], ")");
+    }
   }
   return filterHeader + filterContent;
 };
 
+exports.arrayColumnCondition = arrayColumnCondition;
 exports.checkboxSqlCondition = checkboxSqlCondition;
 exports.collaboratorSqlCondition = collaboratorSqlCondition;
 exports.creatorSqlCondition = creatorSqlCondition;
 exports.ctimeSqlCondition = ctimeSqlCondition;
 exports.dateSqlCondition = dateSqlCondition;
+exports.departmentMultipleSelectSqlCondition = departmentMultipleSelectSqlCondition;
 exports.departmentSingleSelectSqlCondition = departmentSingleSelectSqlCondition;
 exports.fileSqlCondition = fileSqlCondition;
 exports.filter2SqlCondition = filter2SqlCondition;
 exports.formulaSqlCondition = formulaSqlCondition;
 exports.getSqlConditionByFilter = getSqlConditionByFilter;
+exports.getSqlConditionsByFilters = getSqlConditionsByFilters;
 exports.linkSqlCondition = linkSqlCondition;
 exports.longtextSqlCondition = longtextSqlCondition;
 exports.multipleSelectSqlCondition = multipleSelectSqlCondition;

package/lib/common.js

@@ -50,7 +50,11 @@ var isEmptyObject = function isEmptyObject(obj) {
   }
   return true;
 };
+var hasOwnProperty = function hasOwnProperty(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+};
 
 exports.generatorBase64Code = generatorBase64Code;
+exports.hasOwnProperty = hasOwnProperty;
 exports.isEmpty = isEmpty;
 exports.isEmptyObject = isEmptyObject;

package/lib/filter/core.js

@@ -8,6 +8,7 @@ var date = require('../date.js');
 var index = require('../constants/filter/index.js');
 var cellType = require('../constants/cell-type.js');
 var formula = require('../constants/formula.js');
+var common = require('../common.js');
 var filterModifier = require('../constants/filter/filter-modifier.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -17,6 +18,45 @@ var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_definePropert
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var EXACT_DATE_TERM_MODIFIER_TYPES = [filterModifier.FILTER_TERM_MODIFIER_TYPE.TODAY, filterModifier.FILTER_TERM_MODIFIER_TYPE.TOMORROW, filterModifier.FILTER_TERM_MODIFIER_TYPE.YESTERDAY, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_AGO, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_FROM_NOW, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_AGO, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_FROM_NOW, filterModifier.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_AGO, filterModifier.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_FROM_NOW, filterModifier.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE];
+
+/**
+ * Check if is filter group
+ * @param {object} filter
+ * @returns bool
+ */
+var checkIsFilterGroup = function checkIsFilterGroup(filter) {
+  return common.hasOwnProperty(filter, 'filters');
+};
+
+/**
+ * Check if is formula/link filter
+ * @param {object} filter
+ * @returns bool
+ */
+var checkIsFormulaFilter = function checkIsFormulaFilter(filter) {
+  var column = filter.column;
+  return formula.FORMULA_COLUMN_TYPES_MAP[column.type] || column.type === cellType.CellType.LINK;
+};
+
+/**
+ * Check has contains formula filter
+ * @param {array} filters e.g. [{ column_key, column, ...}]
+ * @returns bool
+ */
+var checkHasFormulaFilter = function checkHasFormulaFilter(filters) {
+  return filters.some(function (filter) {
+    if (checkIsFilterGroup(filter)) {
+      var subFilters = filter.filters;
+      if (!Array.isArray(subFilters) || subFilters.length === 0) {
+        return false;
+      }
+      return subFilters.some(function (subFilter) {
+        return checkIsFormulaFilter(subFilter);
+      });
+    }
+    return checkIsFormulaFilter(filter);
+  });
+};
 var isCurrentUserDepartment = function isCurrentUserDepartment(departmentId, userDepartmentIdsMap) {
   var _ref = userDepartmentIdsMap || {},
     current_user_department_ids = _ref.current_user_department_ids;
@@ -32,9 +72,24 @@ var isSpecificDepartment = function isSpecificDepartment(departmentId, filterTer
   return filterTerm.includes(departmentId);
 };
 
+/**
+ * Check if the filter is available to display
+ * @param {object} filter
+ * @param {array} columns
+ * @returns bool
+ */
+var checkIsAvailableFilter = function checkIsAvailableFilter(filter$1, columns) {
+  var _ValidateFilter$valid = filter.ValidateFilter.validate(filter$1, columns),
+    error_message = _ValidateFilter$valid.error_message;
+  if (error_message && error_message === index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
+    return false;
+  }
+  return true;
+};
+
 /**
  * Get filters which excludes incomplete
- * @param {array} filters e.g. [{ column_key, filter_predicate, ... }]
+ * @param {array} filters e.g. [{ column_key, filter_predicate, ... }, { filters: [...]}]
  * @param {array} columns
  * @returns valid filters, array
  */
@@ -42,11 +97,28 @@ var getValidFilters = function getValidFilters(filters, columns) {
   if (!Array.isArray(filters) || !Array.isArray(columns)) {
     return [];
   }
-  return filters.filter(function (filter$1) {
-    var _ValidateFilter$valid = filter.ValidateFilter.validate(filter$1, columns),
-      error_message = _ValidateFilter$valid.error_message;
-    return !error_message || error_message !== index.FILTER_ERR_MSG.INCOMPLETE_FILTER;
+  var availableFilters = [];
+  filters.forEach(function (filter) {
+    if (checkIsFilterGroup(filter)) {
+      var subFilters = filter.filters;
+      var availableSubFilters = [];
+      if (Array.isArray(subFilters) && subFilters.length > 0) {
+        availableSubFilters = subFilters.filter(function (subFilter) {
+          return checkIsAvailableFilter(subFilter, columns);
+        });
+      }
+
+      // just keep the filter group which has valid sub-filters
+      if (availableSubFilters.length > 0) {
+        availableFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
+          filters: availableSubFilters
+        }));
+      }
+    } else if (checkIsAvailableFilter(filter, columns)) {
+      availableFilters.push(filter);
+    }
   });
+  return availableFilters;
 };
 
 /**
@@ -308,9 +380,37 @@ var _getFormattedFilter = function getFormattedFilter(filter, column) {
  */
 var getFormattedFilters = function getFormattedFilters(filters) {
   return filters.map(function (filter) {
+    if (checkIsFilterGroup(filter)) {
+      var subFilters = filter.filters;
+      var formattedSubFilters = [];
+      if (Array.isArray(subFilters) && subFilters.length > 0) {
+        formattedSubFilters = subFilters.map(function (subFilter) {
+          return _getFormattedFilter(subFilter, subFilter.column);
+        });
+      }
+      return _objectSpread(_objectSpread({}, filter), {}, {
+        filters: formattedSubFilters
+      });
+    }
     return _getFormattedFilter(filter, filter.column);
   });
 };
+var checkFilter = function checkFilter(filter$1, columns) {
+  var _ValidateFilter$valid2 = filter.ValidateFilter.validate(filter$1, columns),
+    error_message = _ValidateFilter$valid2.error_message;
+  if (error_message) {
+    if (error_message === index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
+      return null;
+    }
+    throw new Error(error_message);
+  }
+  var newFilter = _objectSpread({}, filter$1);
+  var column_key = filter$1.column_key;
+  newFilter.column = columns.find(function (column) {
+    return column.key === column_key;
+  });
+  return newFilter;
+};
 
 /**
  * Get filters without error messages and formatted with filter column
@@ -323,33 +423,116 @@ var deleteInvalidFilter = function deleteInvalidFilter(filters, columns) {
     return [];
   }
   var cleanFilters = [];
-  filters.forEach(function (filter$1) {
-    var column_key = filter$1.column_key;
-    var _ValidateFilter$valid2 = filter.ValidateFilter.validate(filter$1, columns),
-      error_message = _ValidateFilter$valid2.error_message;
-    if (error_message) {
-      if (error_message !== index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
-        throw new Error(error_message);
+  filters.forEach(function (filter) {
+    if (checkIsFilterGroup(filter)) {
+      var subFilters = filter.filters;
+      if (Array.isArray(subFilters) && subFilters.length > 0) {
+        var cleanSubFilters = [];
+        subFilters.forEach(function (subFilter) {
+          var newSubFilter = checkFilter(subFilter, columns);
+          if (newSubFilter) {
+            cleanSubFilters.push(newSubFilter);
+          }
+        });
+
+        // just keep the filter group which has valid sub-filters
+        if (cleanSubFilters.length > 0) {
+          cleanFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
+            filters: cleanSubFilters
+          }));
+        }
       }
     } else {
-      var filterColumn = columns.find(function (column) {
-        return column.key === column_key;
-      });
-      var newFilter = _objectSpread(_objectSpread({}, filter$1), {}, {
-        column: filterColumn
-      });
-      cleanFilters.push(newFilter);
+      var newFilter = checkFilter(filter, columns);
+      if (newFilter) {
+        cleanFilters.push(newFilter);
+      }
     }
   });
   return cleanFilters;
 };
 
+/**
+ * Categorize filters
+ * @param {array} filters
+ * @returns {object} { generalFilters, formulaFilters, filterGroups }
+ */
+var getClassifiedFilters = function getClassifiedFilters(filters) {
+  var generalFilters = [];
+  var formulaFilters = [];
+  var filterGroups = [];
+  filters.forEach(function (filter) {
+    if (checkIsFilterGroup(filter)) {
+      filterGroups.push(filter);
+    } else if (checkIsFormulaFilter(filter)) {
+      formulaFilters.push(filter);
+    } else {
+      generalFilters.push(filter);
+    }
+  });
+  return {
+    generalFilters: generalFilters,
+    formulaFilters: formulaFilters,
+    filterGroups: filterGroups
+  };
+};
+
+/**
+ * Check if is related filter of given columns
+ * @param {object} filter
+ * @param {object} updatedColumnKeyMap e.g. { [column.key]: true }
+ * @returns bool
+ */
+var checkIsRelatedFilter = function checkIsRelatedFilter(filter, columnKeyMap) {
+  var column_key = filter.column_key;
+  if (!column_key) {
+    return false;
+  }
+  return !!columnKeyMap[column_key];
+};
+
+/**
+ * Check if is related filter group of given columns
+ * @param {object} filterGroup
+ * @param {object} columnKeyMap
+ * @returns bool
+ */
+var checkIsRelatedFilterGroup = function checkIsRelatedFilterGroup(filterGroup, columnKeyMap) {
+  var filters = filterGroup.filters;
+  if (!Array.isArray(filters) || filters.length === 0) {
+    return false;
+  }
+  return filters.some(function (filter) {
+    return checkIsRelatedFilter(filter, columnKeyMap);
+  });
+};
+
+/**
+ * Check if has related filters of given columns
+ * @param {array} filters
+ * @param {object} updatedColumnKeyMap e.g. { [column.key]: true }
+ * @returns bool
+ */
+var hasRelatedFilters = function hasRelatedFilters(filters, columnKeyMap) {
+  return filters.some(function (filter) {
+    return checkIsFilterGroup(filter) ? checkIsRelatedFilterGroup(filter, columnKeyMap) : checkIsRelatedFilter(filter, columnKeyMap);
+  });
+};
+
+exports.checkHasFormulaFilter = checkHasFormulaFilter;
+exports.checkIsAvailableFilter = checkIsAvailableFilter;
+exports.checkIsFilterGroup = checkIsFilterGroup;
+exports.checkIsFormulaFilter = checkIsFormulaFilter;
+exports.checkIsRelatedFilter = checkIsRelatedFilter;
+exports.checkIsRelatedFilterGroup = checkIsRelatedFilterGroup;
 exports.deleteInvalidFilter = deleteInvalidFilter;
+exports.getClassifiedFilters = getClassifiedFilters;
 exports.getFormattedFilter = _getFormattedFilter;
 exports.getFormattedFilterOtherDate = getFormattedFilterOtherDate;
 exports.getFormattedFilters = getFormattedFilters;
 exports.getValidFilters = getValidFilters;
 exports.getValidFiltersWithoutError = getValidFiltersWithoutError;
+exports.hasRelatedFilters = hasRelatedFilters;
 exports.isCurrentUserDepartment = isCurrentUserDepartment;
 exports.isCurrentUserDepartmentAndSub = isCurrentUserDepartmentAndSub;
 exports.isSpecificDepartment = isSpecificDepartment;

package/lib/filter/filter-row.js

@@ -141,7 +141,7 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
  * @param {object} userDepartmentIdsMap e.g. { current_user_department_ids: [8, 10], current_user_department_and_sub_ids: [8, 10, 12, 34] }
  * @returns filter result, bool
  */
-var filterRow = function filterRow(row, filterConjunction, filters) {
+var _filterRow = function filterRow(row, filterConjunction, filters) {
   var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
     formulaRow = _ref2.formulaRow,
     _ref2$username = _ref2.username,
@@ -151,6 +151,14 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
     userDepartmentIdsMap = _ref2$userDepartmentI === void 0 ? {} : _ref2$userDepartmentI;
   if (filterConjunction === index.FILTER_CONJUNCTION_TYPE.AND) {
     return filters.every(function (filter) {
+      if (core.checkIsFilterGroup(filter)) {
+        return _filterRow(row, filter.filter_conjunction, filter.filters, {
+          formulaRow: formulaRow,
+          username: username,
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
+        });
+      }
       return getFilterResult(row, filter, {
         formulaRow: formulaRow,
         username: username,
@@ -161,6 +169,14 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
   }
   if (filterConjunction === index.FILTER_CONJUNCTION_TYPE.OR) {
     return filters.some(function (filter) {
+      if (core.checkIsFilterGroup(filter)) {
+        return _filterRow(row, filter.filter_conjunction, filter.filters, {
+          formulaRow: formulaRow,
+          username: username,
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
+        });
+      }
       return getFilterResult(row, filter, {
         formulaRow: formulaRow,
         username: username,
@@ -193,7 +209,7 @@ var filterRows = function filterRows(filterConjunction, filters, rows, _ref3) {
   rows.forEach(function (row) {
     var rowId = row._id;
     var formulaRow = formulaRows ? formulaRows[rowId] : null;
-    if (filterRow(row, filterConjunction, formattedFilters, {
+    if (_filterRow(row, filterConjunction, formattedFilters, {
       formulaRow: formulaRow,
       username: username,
       userId: userId,
@@ -257,6 +273,6 @@ var getFilteredRowsWithoutFormulaCalculation = function getFilteredRowsWithoutFo
   };
 };
 
-exports.filterRow = filterRow;
+exports.filterRow = _filterRow;
 exports.filterRows = filterRows;
 exports.getFilteredRowsWithoutFormulaCalculation = getFilteredRowsWithoutFormulaCalculation;

package/lib/index.js

@@ -253,12 +253,17 @@ exports.searchCollaborators = search.searchCollaborators;
 exports.ValidateFilter = filter.ValidateFilter;
 exports.isValidEmail = email.isValidEmail;
 exports.isValidPosition = geolocation$2.isValidPosition;
+exports.checkHasFormulaFilter = core$5.checkHasFormulaFilter;
+exports.checkIsFilterGroup = core$5.checkIsFilterGroup;
+exports.checkIsRelatedFilter = core$5.checkIsRelatedFilter;
 exports.deleteInvalidFilter = core$5.deleteInvalidFilter;
+exports.getClassifiedFilters = core$5.getClassifiedFilters;
 exports.getFormattedFilter = core$5.getFormattedFilter;
 exports.getFormattedFilterOtherDate = core$5.getFormattedFilterOtherDate;
 exports.getFormattedFilters = core$5.getFormattedFilters;
 exports.getValidFilters = core$5.getValidFilters;
 exports.getValidFiltersWithoutError = core$5.getValidFiltersWithoutError;
+exports.hasRelatedFilters = core$5.hasRelatedFilters;
 exports.otherDate = core$5.otherDate;
 exports.checkboxFilter = checkbox$1.checkboxFilter;
 exports.collaboratorFilter = collaborator$1.collaboratorFilter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-utils",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "dtable common utils",
   "main": "./lib/index.js",
   "module": "./es/index.js",