dtable-utils 5.0.5-beta.1 → 5.0.5-beta.3

package/lib/filter/core.js

@@ -15,8 +15,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
-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; }
+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];
 
 /**
@@ -27,6 +27,16 @@ var EXACT_DATE_TERM_MODIFIER_TYPES = [filterModifier.FILTER_TERM_MODIFIER_TYPE.T
 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;
+};
 var isCurrentUserDepartment = function isCurrentUserDepartment(departmentId, userDepartmentIdsMap) {
   var _ref = userDepartmentIdsMap || {},
     current_user_department_ids = _ref.current_user_department_ids;
@@ -282,7 +292,7 @@ var getFormattedFilterOtherDate = function getFormattedFilterOtherDate(filterTer
  * @param {object} column
  * @returns formatted filter
  */
-var getFormattedFilter = function getFormattedFilter(filter, column) {
+var _getFormattedFilter = function getFormattedFilter(filter, column) {
   var filter_term = filter.filter_term,
     filter_term_modifier = filter.filter_term_modifier;
   var columnType = column.type,
@@ -304,7 +314,7 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
             data: array_data
           };
           formattedFilter.linked_column = linkedColumn;
-          formattedFilter = getFormattedFilter(formattedFilter, linkedColumn);
+          formattedFilter = _getFormattedFilter(formattedFilter, linkedColumn);
         }
         break;
       }
@@ -332,7 +342,7 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
         });
         formattedFilter.column = filterColumn;
         formattedFilter.linked_column = _linkedColumn;
-        formattedFilter = getFormattedFilter(formattedFilter, _linkedColumn);
+        formattedFilter = _getFormattedFilter(formattedFilter, _linkedColumn);
         break;
       }
   }
@@ -351,14 +361,14 @@ var getFormattedFilters = function getFormattedFilters(filters) {
       var formattedSubFilters = [];
       if (Array.isArray(subFilters) && subFilters.length > 0) {
         formattedSubFilters = subFilters.map(function (subFilter) {
-          return getFormattedFilter(subFilter, subFilter.column);
+          return _getFormattedFilter(subFilter, subFilter.column);
         });
       }
       return _objectSpread(_objectSpread({}, filter), {}, {
         filters: formattedSubFilters
       });
     }
-    return getFormattedFilter(filter, filter.column);
+    return _getFormattedFilter(filter, filter.column);
   });
 };
 var checkFilter = function checkFilter(filter$1, columns) {
@@ -418,10 +428,37 @@ var deleteInvalidFilter = function deleteInvalidFilter(filters, columns) {
   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
+  };
+};
+
 exports.checkIsAvailableFilter = checkIsAvailableFilter;
 exports.checkIsFilterGroup = checkIsFilterGroup;
+exports.checkIsFormulaFilter = checkIsFormulaFilter;
 exports.deleteInvalidFilter = deleteInvalidFilter;
-exports.getFormattedFilter = getFormattedFilter;
+exports.getClassifiedFilters = getClassifiedFilters;
+exports.getFormattedFilter = _getFormattedFilter;
 exports.getFormattedFilterOtherDate = getFormattedFilterOtherDate;
 exports.getFormattedFilters = getFormattedFilters;
 exports.getValidFilters = getValidFilters;

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,
@@ -152,7 +152,7 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
   if (filterConjunction === index.FILTER_CONJUNCTION_TYPE.AND) {
     return filters.every(function (filter) {
       if (core.checkIsFilterGroup(filter)) {
-        return filterRow(row, filter.filter_conjunction, filter.filters, {
+        return _filterRow(row, filter.filter_conjunction, filter.filters, {
           formulaRow: formulaRow,
           username: username,
           userId: userId,
@@ -170,7 +170,7 @@ 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, {
+        return _filterRow(row, filter.filter_conjunction, filter.filters, {
           formulaRow: formulaRow,
           username: username,
           userId: userId,
@@ -209,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,
@@ -273,6 +273,6 @@ var getFilteredRowsWithoutFormulaCalculation = function getFilteredRowsWithoutFo
   };
 };
 
-exports.filterRow = filterRow;
+exports.filterRow = _filterRow;
 exports.filterRows = filterRows;
 exports.getFilteredRowsWithoutFormulaCalculation = getFilteredRowsWithoutFormulaCalculation;

package/lib/group/core.js

@@ -14,8 +14,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
-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; }
+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; }
 
 /**
  * Check is valid groupby

package/lib/group/group-row.js

@@ -33,8 +33,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 
-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; }
+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 _getCellValue = function _getCellValue(row, formulaRows, groupby) {
   var column_key = groupby.column_key,
     column = groupby.column;
@@ -173,7 +173,7 @@ var _findGroupIndex = function _findGroupIndex(sCellValue, cellValue2GroupIndexM
   cellValue2GroupIndexMap[sCellValue] = groupsLength;
   return -1;
 };
-var getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
+var _getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
   var _groupbys$level = groupbys[level],
     column$1 = _groupbys$level.column,
     sort_type = _groupbys$level.sort_type;
@@ -253,7 +253,7 @@ var getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
 
     // eslint-disable-next-line
     groups = groups.map(function (group) {
-      var sortedSubgroups = getSortedGroups(group.subgroups, groupbys, value, nextLevel);
+      var sortedSubgroups = _getSortedGroups(group.subgroups, groupbys, value, nextLevel);
       return _objectSpread(_objectSpread({}, group), {}, {
         subgroups: sortedSubgroups
       });
@@ -315,7 +315,7 @@ var groupRowsWithMultipleGroupbys = function groupRowsWithMultipleGroupbys(group
       }
     }
   });
-  groups = getSortedGroups(groups, validGroupbys, value, 0);
+  groups = _getSortedGroups(groups, validGroupbys, value, 0);
   return groups;
 };
 
@@ -362,7 +362,7 @@ var groupTableRows = function groupTableRows(groupbys, rows, formulaRows, value)
   });
 
   // sort groups
-  groups = getSortedGroups(groups, groupbys, value, 0);
+  groups = _getSortedGroups(groups, groupbys, value, 0);
   return groups;
 };
 

package/lib/helper/patch-utils.js

@@ -14,7 +14,7 @@ var PatchUtils = /*#__PURE__*/function () {
   function PatchUtils() {
     _classCallCheck__default["default"](this, PatchUtils);
   }
-  _createClass__default["default"](PatchUtils, null, [{
+  return _createClass__default["default"](PatchUtils, null, [{
     key: "getUsername",
     value: function getUsername(username) {
       if (typeof window !== 'undefined') {
@@ -41,7 +41,6 @@ var PatchUtils = /*#__PURE__*/function () {
       return userDepartmentIdsMap;
     }
   }]);
-  return PatchUtils;
 }();
 
 exports["default"] = PatchUtils;

package/lib/index.js

@@ -253,7 +253,9 @@ exports.searchCollaborators = search.searchCollaborators;
 exports.ValidateFilter = filter.ValidateFilter;
 exports.isValidEmail = email.isValidEmail;
 exports.isValidPosition = geolocation$2.isValidPosition;
+exports.checkIsFilterGroup = core$5.checkIsFilterGroup;
 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;

package/lib/link/core.js

@@ -15,8 +15,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 
-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; }
+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; }
 
 /**
  * Get link by id

package/lib/sort/core.js

@@ -11,8 +11,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
-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; }
+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; }
 
 /**
  * Check is valid sort

package/lib/validate/filter.js

@@ -37,7 +37,7 @@ var ValidateFilter = /*#__PURE__*/function () {
   function ValidateFilter() {
     _classCallCheck__default["default"](this, ValidateFilter);
   }
-  _createClass__default["default"](ValidateFilter, null, [{
+  return _createClass__default["default"](ValidateFilter, null, [{
     key: "validate",
     value:
     /**
@@ -476,7 +476,6 @@ var ValidateFilter = /*#__PURE__*/function () {
       return selectedOptionIds.length === validSelectedOptions.length;
     }
   }]);
-  return ValidateFilter;
 }();
 
 exports.DATE_MODIFIERS_REQUIRE_TERM = DATE_MODIFIERS_REQUIRE_TERM;

package/lib/view/summaries.js

@@ -164,7 +164,7 @@ var getSummariesWithSubgroups = function getSummariesWithSubgroups(subgroups, nu
  * @param {object} formulaRows for numeric formula columns
  * @returns void
  */
-var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaRows) {
+var _updateGroupSummaries = function updateGroupSummaries(groups, table, formulaRows) {
   var numericColumns = table.columns.filter(function (column) {
     return number.isNumericColumn(column);
   });
@@ -175,7 +175,7 @@ var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaR
     var subgroups = group.subgroups,
       row_ids = group.row_ids;
     if (Array.isArray(subgroups) && subgroups.length > 0) {
-      updateGroupSummaries(subgroups, table, formulaRows);
+      _updateGroupSummaries(subgroups, table, formulaRows);
       group.summaries = getSummariesWithSubgroups(subgroups, numericColumns);
     } else if (row_ids) {
       group.summaries = getSummaries(table, row_ids, formulaRows);
@@ -185,4 +185,4 @@ var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaR
 
 exports.getSummaries = getSummaries;
 exports.getSummariesWithSubgroups = getSummariesWithSubgroups;
-exports.updateGroupSummaries = updateGroupSummaries;
+exports.updateGroupSummaries = _updateGroupSummaries;

package/package.json

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