dtable-utils 5.0.4 → 5.0.5-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/dist/index.js +1 -1
  2. package/es/archive/clause-module/search.js +3 -3
  3. package/es/archive/sql-generator/filter-condition.js +98 -19
  4. package/es/color/column-color.js +4 -4
  5. package/es/color/gradient-color.js +1 -2
  6. package/es/color/row-color.js +33 -32
  7. package/es/common.js +4 -1
  8. package/es/constants/column.js +7 -7
  9. package/es/constants/filter/filter-column-options.js +25 -25
  10. package/es/constants/filter/filter-modifier.js +1 -1
  11. package/es/constants/filter/filter-predicate.js +1 -1
  12. package/es/constants/formula.js +1 -2
  13. package/es/constants/group.js +2 -3
  14. package/es/date.js +1 -2
  15. package/es/filter/core.js +135 -26
  16. package/es/filter/filter-row.js +20 -4
  17. package/es/group/core.js +2 -2
  18. package/es/group/group-row.js +6 -6
  19. package/es/helper/patch-utils.js +1 -2
  20. package/es/index.js +1 -1
  21. package/es/link/core.js +2 -2
  22. package/es/sort/core.js +2 -2
  23. package/es/validate/filter.js +1 -2
  24. package/es/view/summaries.js +3 -3
  25. package/lib/archive/clause-module/search.js +3 -3
  26. package/lib/archive/sql-generator/filter-condition.js +100 -17
  27. package/lib/color/column-color.js +2 -2
  28. package/lib/color/gradient-color.js +1 -2
  29. package/lib/color/row-color.js +31 -30
  30. package/lib/common.js +4 -0
  31. package/lib/constants/column.js +7 -7
  32. package/lib/constants/filter/filter-column-options.js +25 -25
  33. package/lib/constants/filter/filter-modifier.js +1 -1
  34. package/lib/constants/filter/filter-predicate.js +1 -1
  35. package/lib/constants/formula.js +1 -2
  36. package/lib/constants/group.js +2 -3
  37. package/lib/date.js +1 -2
  38. package/lib/filter/core.js +139 -26
  39. package/lib/filter/filter-row.js +19 -3
  40. package/lib/group/core.js +2 -2
  41. package/lib/group/group-row.js +6 -6
  42. package/lib/helper/patch-utils.js +1 -2
  43. package/lib/index.js +1 -0
  44. package/lib/link/core.js +2 -2
  45. package/lib/sort/core.js +2 -2
  46. package/lib/validate/filter.js +1 -2
  47. package/lib/view/summaries.js +3 -3
  48. package/package.json +1 -1
@@ -8,15 +8,35 @@ var date = require('../date.js');
8
8
  var index = require('../constants/filter/index.js');
9
9
  var cellType = require('../constants/cell-type.js');
10
10
  var formula = require('../constants/formula.js');
11
+ var common = require('../common.js');
11
12
  var filterModifier = require('../constants/filter/filter-modifier.js');
12
13
 
13
14
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
14
15
 
15
16
  var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
16
17
 
17
- 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; }
18
- 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; }
18
+ 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; }
19
+ 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; }
19
20
  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];
21
+
22
+ /**
23
+ * Check if is filter group
24
+ * @param {object} filter
25
+ * @returns bool
26
+ */
27
+ var checkIsFilterGroup = function checkIsFilterGroup(filter) {
28
+ return common.hasOwnProperty(filter, 'filters');
29
+ };
30
+
31
+ /**
32
+ * Check if is formula/link filter
33
+ * @param {object} filter
34
+ * @returns bool
35
+ */
36
+ var checkIsFormulaFilter = function checkIsFormulaFilter(filter) {
37
+ var column = filter.column;
38
+ return formula.FORMULA_COLUMN_TYPES_MAP[column.type] || column.type === cellType.CellType.LINK;
39
+ };
20
40
  var isCurrentUserDepartment = function isCurrentUserDepartment(departmentId, userDepartmentIdsMap) {
21
41
  var _ref = userDepartmentIdsMap || {},
22
42
  current_user_department_ids = _ref.current_user_department_ids;
@@ -32,9 +52,24 @@ var isSpecificDepartment = function isSpecificDepartment(departmentId, filterTer
32
52
  return filterTerm.includes(departmentId);
33
53
  };
34
54
 
55
+ /**
56
+ * Check if the filter is available to display
57
+ * @param {object} filter
58
+ * @param {array} columns
59
+ * @returns bool
60
+ */
61
+ var checkIsAvailableFilter = function checkIsAvailableFilter(filter$1, columns) {
62
+ var _ValidateFilter$valid = filter.ValidateFilter.validate(filter$1, columns),
63
+ error_message = _ValidateFilter$valid.error_message;
64
+ if (error_message && error_message === index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
65
+ return false;
66
+ }
67
+ return true;
68
+ };
69
+
35
70
  /**
36
71
  * Get filters which excludes incomplete
37
- * @param {array} filters e.g. [{ column_key, filter_predicate, ... }]
72
+ * @param {array} filters e.g. [{ column_key, filter_predicate, ... }, { filters: [...]}]
38
73
  * @param {array} columns
39
74
  * @returns valid filters, array
40
75
  */
@@ -42,11 +77,24 @@ var getValidFilters = function getValidFilters(filters, columns) {
42
77
  if (!Array.isArray(filters) || !Array.isArray(columns)) {
43
78
  return [];
44
79
  }
45
- return filters.filter(function (filter$1) {
46
- var _ValidateFilter$valid = filter.ValidateFilter.validate(filter$1, columns),
47
- error_message = _ValidateFilter$valid.error_message;
48
- return !error_message || error_message !== index.FILTER_ERR_MSG.INCOMPLETE_FILTER;
80
+ var availableFilters = [];
81
+ filters.forEach(function (filter) {
82
+ if (checkIsFilterGroup(filter)) {
83
+ var subFilters = filter.filters;
84
+ var availableSubFilters = [];
85
+ if (Array.isArray(subFilters) && subFilters.length > 0) {
86
+ availableSubFilters = subFilters.filter(function (subFilter) {
87
+ return checkIsAvailableFilter(subFilter, columns);
88
+ });
89
+ }
90
+ availableFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
91
+ filters: availableSubFilters
92
+ }));
93
+ } else if (checkIsAvailableFilter(filter, columns)) {
94
+ availableFilters.push(filter);
95
+ }
49
96
  });
97
+ return availableFilters;
50
98
  };
51
99
 
52
100
  /**
@@ -244,7 +292,7 @@ var getFormattedFilterOtherDate = function getFormattedFilterOtherDate(filterTer
244
292
  * @param {object} column
245
293
  * @returns formatted filter
246
294
  */
247
- var getFormattedFilter = function getFormattedFilter(filter, column) {
295
+ var _getFormattedFilter = function getFormattedFilter(filter, column) {
248
296
  var filter_term = filter.filter_term,
249
297
  filter_term_modifier = filter.filter_term_modifier;
250
298
  var columnType = column.type,
@@ -266,7 +314,7 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
266
314
  data: array_data
267
315
  };
268
316
  formattedFilter.linked_column = linkedColumn;
269
- formattedFilter = getFormattedFilter(formattedFilter, linkedColumn);
317
+ formattedFilter = _getFormattedFilter(formattedFilter, linkedColumn);
270
318
  }
271
319
  break;
272
320
  }
@@ -294,7 +342,7 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
294
342
  });
295
343
  formattedFilter.column = filterColumn;
296
344
  formattedFilter.linked_column = _linkedColumn;
297
- formattedFilter = getFormattedFilter(formattedFilter, _linkedColumn);
345
+ formattedFilter = _getFormattedFilter(formattedFilter, _linkedColumn);
298
346
  break;
299
347
  }
300
348
  }
@@ -308,8 +356,36 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
308
356
  */
309
357
  var getFormattedFilters = function getFormattedFilters(filters) {
310
358
  return filters.map(function (filter) {
311
- return getFormattedFilter(filter, filter.column);
359
+ if (checkIsFilterGroup(filter)) {
360
+ var subFilters = filter.filters;
361
+ var formattedSubFilters = [];
362
+ if (Array.isArray(subFilters) && subFilters.length > 0) {
363
+ formattedSubFilters = subFilters.map(function (subFilter) {
364
+ return _getFormattedFilter(subFilter, subFilter.column);
365
+ });
366
+ }
367
+ return _objectSpread(_objectSpread({}, filter), {}, {
368
+ filters: formattedSubFilters
369
+ });
370
+ }
371
+ return _getFormattedFilter(filter, filter.column);
372
+ });
373
+ };
374
+ var checkFilter = function checkFilter(filter$1, columns) {
375
+ var _ValidateFilter$valid2 = filter.ValidateFilter.validate(filter$1, columns),
376
+ error_message = _ValidateFilter$valid2.error_message;
377
+ if (error_message) {
378
+ if (error_message === index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
379
+ return null;
380
+ }
381
+ throw new Error(error_message);
382
+ }
383
+ var newFilter = _objectSpread({}, filter$1);
384
+ var column_key = filter$1.column_key;
385
+ newFilter.column = columns.find(function (column) {
386
+ return column.key === column_key;
312
387
  });
388
+ return newFilter;
313
389
  };
314
390
 
315
391
  /**
@@ -323,29 +399,66 @@ var deleteInvalidFilter = function deleteInvalidFilter(filters, columns) {
323
399
  return [];
324
400
  }
325
401
  var cleanFilters = [];
326
- filters.forEach(function (filter$1) {
327
- var column_key = filter$1.column_key;
328
- var _ValidateFilter$valid2 = filter.ValidateFilter.validate(filter$1, columns),
329
- error_message = _ValidateFilter$valid2.error_message;
330
- if (error_message) {
331
- if (error_message !== index.FILTER_ERR_MSG.INCOMPLETE_FILTER) {
332
- throw new Error(error_message);
402
+ filters.forEach(function (filter) {
403
+ if (checkIsFilterGroup(filter)) {
404
+ var subFilters = filter.filters;
405
+ if (Array.isArray(subFilters) && subFilters.length > 0) {
406
+ var cleanSubFilters = [];
407
+ subFilters.forEach(function (subFilter) {
408
+ var newSubFilter = checkFilter(subFilter, columns);
409
+ if (newSubFilter) {
410
+ cleanSubFilters.push(newSubFilter);
411
+ }
412
+ });
413
+
414
+ // just keep the filter group which has valid sub-filters
415
+ if (cleanSubFilters.length > 0) {
416
+ cleanFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
417
+ filters: cleanSubFilters
418
+ }));
419
+ }
333
420
  }
334
421
  } else {
335
- var filterColumn = columns.find(function (column) {
336
- return column.key === column_key;
337
- });
338
- var newFilter = _objectSpread(_objectSpread({}, filter$1), {}, {
339
- column: filterColumn
340
- });
341
- cleanFilters.push(newFilter);
422
+ var newFilter = checkFilter(filter, columns);
423
+ if (newFilter) {
424
+ cleanFilters.push(newFilter);
425
+ }
342
426
  }
343
427
  });
344
428
  return cleanFilters;
345
429
  };
346
430
 
431
+ /**
432
+ * Categorize filters
433
+ * @param {array} filters
434
+ * @returns {object} { generalFilters, formulaFilters, filterGroups }
435
+ */
436
+ var getClassifiedFilters = function getClassifiedFilters(filters) {
437
+ var generalFilters = [];
438
+ var formulaFilters = [];
439
+ var filterGroups = [];
440
+ filters.forEach(function (filter) {
441
+ if (checkIsFilterGroup(filter)) {
442
+ filterGroups.push(filter);
443
+ } else if (checkIsFormulaFilter(filter)) {
444
+ formulaFilters.push(filter);
445
+ } else {
446
+ generalFilters.push(filter);
447
+ }
448
+ });
449
+ return {
450
+ generalFilters: generalFilters,
451
+ formulaFilters: formulaFilters,
452
+ filterGroups: filterGroups
453
+ };
454
+ };
455
+
456
+ exports.checkIsAvailableFilter = checkIsAvailableFilter;
457
+ exports.checkIsFilterGroup = checkIsFilterGroup;
458
+ exports.checkIsFormulaFilter = checkIsFormulaFilter;
347
459
  exports.deleteInvalidFilter = deleteInvalidFilter;
348
- exports.getFormattedFilter = getFormattedFilter;
460
+ exports.getClassifiedFilters = getClassifiedFilters;
461
+ exports.getFormattedFilter = _getFormattedFilter;
349
462
  exports.getFormattedFilterOtherDate = getFormattedFilterOtherDate;
350
463
  exports.getFormattedFilters = getFormattedFilters;
351
464
  exports.getValidFilters = getValidFilters;
@@ -141,7 +141,7 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
141
141
  * @param {object} userDepartmentIdsMap e.g. { current_user_department_ids: [8, 10], current_user_department_and_sub_ids: [8, 10, 12, 34] }
142
142
  * @returns filter result, bool
143
143
  */
144
- var filterRow = function filterRow(row, filterConjunction, filters) {
144
+ var _filterRow = function filterRow(row, filterConjunction, filters) {
145
145
  var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
146
146
  formulaRow = _ref2.formulaRow,
147
147
  _ref2$username = _ref2.username,
@@ -151,6 +151,14 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
151
151
  userDepartmentIdsMap = _ref2$userDepartmentI === void 0 ? {} : _ref2$userDepartmentI;
152
152
  if (filterConjunction === index.FILTER_CONJUNCTION_TYPE.AND) {
153
153
  return filters.every(function (filter) {
154
+ if (core.checkIsFilterGroup(filter)) {
155
+ return _filterRow(row, filter.filter_conjunction, filter.filters, {
156
+ formulaRow: formulaRow,
157
+ username: username,
158
+ userId: userId,
159
+ userDepartmentIdsMap: userDepartmentIdsMap
160
+ });
161
+ }
154
162
  return getFilterResult(row, filter, {
155
163
  formulaRow: formulaRow,
156
164
  username: username,
@@ -161,6 +169,14 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
161
169
  }
162
170
  if (filterConjunction === index.FILTER_CONJUNCTION_TYPE.OR) {
163
171
  return filters.some(function (filter) {
172
+ if (core.checkIsFilterGroup(filter)) {
173
+ return _filterRow(row, filter.filter_conjunction, filter.filters, {
174
+ formulaRow: formulaRow,
175
+ username: username,
176
+ userId: userId,
177
+ userDepartmentIdsMap: userDepartmentIdsMap
178
+ });
179
+ }
164
180
  return getFilterResult(row, filter, {
165
181
  formulaRow: formulaRow,
166
182
  username: username,
@@ -193,7 +209,7 @@ var filterRows = function filterRows(filterConjunction, filters, rows, _ref3) {
193
209
  rows.forEach(function (row) {
194
210
  var rowId = row._id;
195
211
  var formulaRow = formulaRows ? formulaRows[rowId] : null;
196
- if (filterRow(row, filterConjunction, formattedFilters, {
212
+ if (_filterRow(row, filterConjunction, formattedFilters, {
197
213
  formulaRow: formulaRow,
198
214
  username: username,
199
215
  userId: userId,
@@ -257,6 +273,6 @@ var getFilteredRowsWithoutFormulaCalculation = function getFilteredRowsWithoutFo
257
273
  };
258
274
  };
259
275
 
260
- exports.filterRow = filterRow;
276
+ exports.filterRow = _filterRow;
261
277
  exports.filterRows = filterRows;
262
278
  exports.getFilteredRowsWithoutFormulaCalculation = getFilteredRowsWithoutFormulaCalculation;
package/lib/group/core.js CHANGED
@@ -14,8 +14,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
14
14
 
15
15
  var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
16
16
 
17
- 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; }
18
- 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; }
17
+ 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; }
18
+ 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; }
19
19
 
20
20
  /**
21
21
  * Check is valid groupby
@@ -33,8 +33,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
33
33
  var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
34
34
  var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
35
35
 
36
- 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; }
37
- 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; }
36
+ 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; }
37
+ 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; }
38
38
  var _getCellValue = function _getCellValue(row, formulaRows, groupby) {
39
39
  var column_key = groupby.column_key,
40
40
  column = groupby.column;
@@ -173,7 +173,7 @@ var _findGroupIndex = function _findGroupIndex(sCellValue, cellValue2GroupIndexM
173
173
  cellValue2GroupIndexMap[sCellValue] = groupsLength;
174
174
  return -1;
175
175
  };
176
- var getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
176
+ var _getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
177
177
  var _groupbys$level = groupbys[level],
178
178
  column$1 = _groupbys$level.column,
179
179
  sort_type = _groupbys$level.sort_type;
@@ -253,7 +253,7 @@ var getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
253
253
 
254
254
  // eslint-disable-next-line
255
255
  groups = groups.map(function (group) {
256
- var sortedSubgroups = getSortedGroups(group.subgroups, groupbys, value, nextLevel);
256
+ var sortedSubgroups = _getSortedGroups(group.subgroups, groupbys, value, nextLevel);
257
257
  return _objectSpread(_objectSpread({}, group), {}, {
258
258
  subgroups: sortedSubgroups
259
259
  });
@@ -315,7 +315,7 @@ var groupRowsWithMultipleGroupbys = function groupRowsWithMultipleGroupbys(group
315
315
  }
316
316
  }
317
317
  });
318
- groups = getSortedGroups(groups, validGroupbys, value, 0);
318
+ groups = _getSortedGroups(groups, validGroupbys, value, 0);
319
319
  return groups;
320
320
  };
321
321
 
@@ -362,7 +362,7 @@ var groupTableRows = function groupTableRows(groupbys, rows, formulaRows, value)
362
362
  });
363
363
 
364
364
  // sort groups
365
- groups = getSortedGroups(groups, groupbys, value, 0);
365
+ groups = _getSortedGroups(groups, groupbys, value, 0);
366
366
  return groups;
367
367
  };
368
368
 
@@ -14,7 +14,7 @@ var PatchUtils = /*#__PURE__*/function () {
14
14
  function PatchUtils() {
15
15
  _classCallCheck__default["default"](this, PatchUtils);
16
16
  }
17
- _createClass__default["default"](PatchUtils, null, [{
17
+ return _createClass__default["default"](PatchUtils, null, [{
18
18
  key: "getUsername",
19
19
  value: function getUsername(username) {
20
20
  if (typeof window !== 'undefined') {
@@ -41,7 +41,6 @@ var PatchUtils = /*#__PURE__*/function () {
41
41
  return userDepartmentIdsMap;
42
42
  }
43
43
  }]);
44
- return PatchUtils;
45
44
  }();
46
45
 
47
46
  exports["default"] = PatchUtils;
package/lib/index.js CHANGED
@@ -254,6 +254,7 @@ exports.ValidateFilter = filter.ValidateFilter;
254
254
  exports.isValidEmail = email.isValidEmail;
255
255
  exports.isValidPosition = geolocation$2.isValidPosition;
256
256
  exports.deleteInvalidFilter = core$5.deleteInvalidFilter;
257
+ exports.getClassifiedFilters = core$5.getClassifiedFilters;
257
258
  exports.getFormattedFilter = core$5.getFormattedFilter;
258
259
  exports.getFormattedFilterOtherDate = core$5.getFormattedFilterOtherDate;
259
260
  exports.getFormattedFilters = core$5.getFormattedFilters;
package/lib/link/core.js CHANGED
@@ -15,8 +15,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
15
15
  var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
16
16
  var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
17
17
 
18
- 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; }
19
- 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; }
18
+ 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; }
19
+ 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; }
20
20
 
21
21
  /**
22
22
  * Get link by id
package/lib/sort/core.js CHANGED
@@ -11,8 +11,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
11
11
 
12
12
  var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
13
13
 
14
- 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; }
15
- 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; }
14
+ 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; }
15
+ 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; }
16
16
 
17
17
  /**
18
18
  * Check is valid sort
@@ -37,7 +37,7 @@ var ValidateFilter = /*#__PURE__*/function () {
37
37
  function ValidateFilter() {
38
38
  _classCallCheck__default["default"](this, ValidateFilter);
39
39
  }
40
- _createClass__default["default"](ValidateFilter, null, [{
40
+ return _createClass__default["default"](ValidateFilter, null, [{
41
41
  key: "validate",
42
42
  value:
43
43
  /**
@@ -476,7 +476,6 @@ var ValidateFilter = /*#__PURE__*/function () {
476
476
  return selectedOptionIds.length === validSelectedOptions.length;
477
477
  }
478
478
  }]);
479
- return ValidateFilter;
480
479
  }();
481
480
 
482
481
  exports.DATE_MODIFIERS_REQUIRE_TERM = DATE_MODIFIERS_REQUIRE_TERM;
@@ -164,7 +164,7 @@ var getSummariesWithSubgroups = function getSummariesWithSubgroups(subgroups, nu
164
164
  * @param {object} formulaRows for numeric formula columns
165
165
  * @returns void
166
166
  */
167
- var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaRows) {
167
+ var _updateGroupSummaries = function updateGroupSummaries(groups, table, formulaRows) {
168
168
  var numericColumns = table.columns.filter(function (column) {
169
169
  return number.isNumericColumn(column);
170
170
  });
@@ -175,7 +175,7 @@ var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaR
175
175
  var subgroups = group.subgroups,
176
176
  row_ids = group.row_ids;
177
177
  if (Array.isArray(subgroups) && subgroups.length > 0) {
178
- updateGroupSummaries(subgroups, table, formulaRows);
178
+ _updateGroupSummaries(subgroups, table, formulaRows);
179
179
  group.summaries = getSummariesWithSubgroups(subgroups, numericColumns);
180
180
  } else if (row_ids) {
181
181
  group.summaries = getSummaries(table, row_ids, formulaRows);
@@ -185,4 +185,4 @@ var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaR
185
185
 
186
186
  exports.getSummaries = getSummaries;
187
187
  exports.getSummariesWithSubgroups = getSummariesWithSubgroups;
188
- exports.updateGroupSummaries = updateGroupSummaries;
188
+ exports.updateGroupSummaries = _updateGroupSummaries;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dtable-utils",
3
- "version": "5.0.4",
3
+ "version": "5.0.5-beta.2",
4
4
  "description": "dtable common utils",
5
5
  "main": "./lib/index.js",
6
6
  "module": "./es/index.js",