dtable-utils 5.0.4 → 5.0.5-beta.1

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,15 @@ var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_definePropert
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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');
+};
 var isCurrentUserDepartment = function isCurrentUserDepartment(departmentId, userDepartmentIdsMap) {
   var _ref = userDepartmentIdsMap || {},
     current_user_department_ids = _ref.current_user_department_ids;
@@ -32,9 +42,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 +67,24 @@ 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);
+        });
+      }
+      availableFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
+        filters: availableSubFilters
+      }));
+    } else if (checkIsAvailableFilter(filter, columns)) {
+      availableFilters.push(filter);
+    }
   });
+  return availableFilters;
 };
 
 /**
@@ -308,9 +346,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,27 +389,37 @@ 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;
 };
 
+exports.checkIsAvailableFilter = checkIsAvailableFilter;
+exports.checkIsFilterGroup = checkIsFilterGroup;
 exports.deleteInvalidFilter = deleteInvalidFilter;
 exports.getFormattedFilter = getFormattedFilter;
 exports.getFormattedFilterOtherDate = getFormattedFilterOtherDate;

package/lib/filter/filter-row.js

@@ -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,

package/package.json

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