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.
- package/dist/index.js +1 -1
- package/es/archive/clause-module/search.js +3 -3
- package/es/archive/sql-generator/filter-condition.js +98 -19
- package/es/color/column-color.js +4 -4
- package/es/color/gradient-color.js +1 -2
- package/es/color/row-color.js +33 -32
- package/es/common.js +4 -1
- package/es/constants/column.js +7 -7
- package/es/constants/filter/filter-column-options.js +25 -25
- package/es/constants/filter/filter-modifier.js +1 -1
- package/es/constants/filter/filter-predicate.js +1 -1
- package/es/constants/formula.js +1 -2
- package/es/constants/group.js +2 -3
- package/es/date.js +1 -2
- package/es/filter/core.js +135 -26
- package/es/filter/filter-row.js +20 -4
- package/es/group/core.js +2 -2
- package/es/group/group-row.js +6 -6
- package/es/helper/patch-utils.js +1 -2
- package/es/index.js +1 -1
- package/es/link/core.js +2 -2
- package/es/sort/core.js +2 -2
- package/es/validate/filter.js +1 -2
- package/es/view/summaries.js +3 -3
- package/lib/archive/clause-module/search.js +3 -3
- package/lib/archive/sql-generator/filter-condition.js +100 -17
- package/lib/color/column-color.js +2 -2
- package/lib/color/gradient-color.js +1 -2
- package/lib/color/row-color.js +31 -30
- package/lib/common.js +4 -0
- package/lib/constants/column.js +7 -7
- package/lib/constants/filter/filter-column-options.js +25 -25
- package/lib/constants/filter/filter-modifier.js +1 -1
- package/lib/constants/filter/filter-predicate.js +1 -1
- package/lib/constants/formula.js +1 -2
- package/lib/constants/group.js +2 -3
- package/lib/date.js +1 -2
- package/lib/filter/core.js +139 -26
- package/lib/filter/filter-row.js +19 -3
- package/lib/group/core.js +2 -2
- package/lib/group/group-row.js +6 -6
- package/lib/helper/patch-utils.js +1 -2
- package/lib/index.js +1 -0
- package/lib/link/core.js +2 -2
- package/lib/sort/core.js +2 -2
- package/lib/validate/filter.js +1 -2
- package/lib/view/summaries.js +3 -3
- package/package.json +1 -1
package/es/filter/core.js
CHANGED
|
@@ -3,12 +3,32 @@ import { ValidateFilter } from '../validate/filter.js';
|
|
|
3
3
|
import { DateUtils } from '../date.js';
|
|
4
4
|
import { FILTER_ERR_MSG } from '../constants/filter/index.js';
|
|
5
5
|
import { CellType } from '../constants/cell-type.js';
|
|
6
|
-
import { FORMULA_RESULT_TYPE } from '../constants/formula.js';
|
|
6
|
+
import { FORMULA_RESULT_TYPE, FORMULA_COLUMN_TYPES_MAP } from '../constants/formula.js';
|
|
7
|
+
import { hasOwnProperty } from '../common.js';
|
|
7
8
|
import { FILTER_TERM_MODIFIER_TYPE } from '../constants/filter/filter-modifier.js';
|
|
8
9
|
|
|
9
|
-
function ownKeys(
|
|
10
|
-
function _objectSpread(
|
|
10
|
+
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; }
|
|
11
|
+
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(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; }
|
|
11
12
|
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];
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Check if is filter group
|
|
16
|
+
* @param {object} filter
|
|
17
|
+
* @returns bool
|
|
18
|
+
*/
|
|
19
|
+
var checkIsFilterGroup = function checkIsFilterGroup(filter) {
|
|
20
|
+
return hasOwnProperty(filter, 'filters');
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Check if is formula/link filter
|
|
25
|
+
* @param {object} filter
|
|
26
|
+
* @returns bool
|
|
27
|
+
*/
|
|
28
|
+
var checkIsFormulaFilter = function checkIsFormulaFilter(filter) {
|
|
29
|
+
var column = filter.column;
|
|
30
|
+
return FORMULA_COLUMN_TYPES_MAP[column.type] || column.type === CellType.LINK;
|
|
31
|
+
};
|
|
12
32
|
var isCurrentUserDepartment = function isCurrentUserDepartment(departmentId, userDepartmentIdsMap) {
|
|
13
33
|
var _ref = userDepartmentIdsMap || {},
|
|
14
34
|
current_user_department_ids = _ref.current_user_department_ids;
|
|
@@ -24,9 +44,24 @@ var isSpecificDepartment = function isSpecificDepartment(departmentId, filterTer
|
|
|
24
44
|
return filterTerm.includes(departmentId);
|
|
25
45
|
};
|
|
26
46
|
|
|
47
|
+
/**
|
|
48
|
+
* Check if the filter is available to display
|
|
49
|
+
* @param {object} filter
|
|
50
|
+
* @param {array} columns
|
|
51
|
+
* @returns bool
|
|
52
|
+
*/
|
|
53
|
+
var checkIsAvailableFilter = function checkIsAvailableFilter(filter, columns) {
|
|
54
|
+
var _ValidateFilter$valid = ValidateFilter.validate(filter, columns),
|
|
55
|
+
error_message = _ValidateFilter$valid.error_message;
|
|
56
|
+
if (error_message && error_message === FILTER_ERR_MSG.INCOMPLETE_FILTER) {
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
return true;
|
|
60
|
+
};
|
|
61
|
+
|
|
27
62
|
/**
|
|
28
63
|
* Get filters which excludes incomplete
|
|
29
|
-
* @param {array} filters e.g. [{ column_key, filter_predicate, ... }]
|
|
64
|
+
* @param {array} filters e.g. [{ column_key, filter_predicate, ... }, { filters: [...]}]
|
|
30
65
|
* @param {array} columns
|
|
31
66
|
* @returns valid filters, array
|
|
32
67
|
*/
|
|
@@ -34,11 +69,24 @@ var getValidFilters = function getValidFilters(filters, columns) {
|
|
|
34
69
|
if (!Array.isArray(filters) || !Array.isArray(columns)) {
|
|
35
70
|
return [];
|
|
36
71
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
72
|
+
var availableFilters = [];
|
|
73
|
+
filters.forEach(function (filter) {
|
|
74
|
+
if (checkIsFilterGroup(filter)) {
|
|
75
|
+
var subFilters = filter.filters;
|
|
76
|
+
var availableSubFilters = [];
|
|
77
|
+
if (Array.isArray(subFilters) && subFilters.length > 0) {
|
|
78
|
+
availableSubFilters = subFilters.filter(function (subFilter) {
|
|
79
|
+
return checkIsAvailableFilter(subFilter, columns);
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
availableFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
|
|
83
|
+
filters: availableSubFilters
|
|
84
|
+
}));
|
|
85
|
+
} else if (checkIsAvailableFilter(filter, columns)) {
|
|
86
|
+
availableFilters.push(filter);
|
|
87
|
+
}
|
|
41
88
|
});
|
|
89
|
+
return availableFilters;
|
|
42
90
|
};
|
|
43
91
|
|
|
44
92
|
/**
|
|
@@ -236,7 +284,7 @@ var getFormattedFilterOtherDate = function getFormattedFilterOtherDate(filterTer
|
|
|
236
284
|
* @param {object} column
|
|
237
285
|
* @returns formatted filter
|
|
238
286
|
*/
|
|
239
|
-
var
|
|
287
|
+
var _getFormattedFilter = function getFormattedFilter(filter, column) {
|
|
240
288
|
var filter_term = filter.filter_term,
|
|
241
289
|
filter_term_modifier = filter.filter_term_modifier;
|
|
242
290
|
var columnType = column.type,
|
|
@@ -258,7 +306,7 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
|
|
|
258
306
|
data: array_data
|
|
259
307
|
};
|
|
260
308
|
formattedFilter.linked_column = linkedColumn;
|
|
261
|
-
formattedFilter =
|
|
309
|
+
formattedFilter = _getFormattedFilter(formattedFilter, linkedColumn);
|
|
262
310
|
}
|
|
263
311
|
break;
|
|
264
312
|
}
|
|
@@ -286,7 +334,7 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
|
|
|
286
334
|
});
|
|
287
335
|
formattedFilter.column = filterColumn;
|
|
288
336
|
formattedFilter.linked_column = _linkedColumn;
|
|
289
|
-
formattedFilter =
|
|
337
|
+
formattedFilter = _getFormattedFilter(formattedFilter, _linkedColumn);
|
|
290
338
|
break;
|
|
291
339
|
}
|
|
292
340
|
}
|
|
@@ -300,8 +348,36 @@ var getFormattedFilter = function getFormattedFilter(filter, column) {
|
|
|
300
348
|
*/
|
|
301
349
|
var getFormattedFilters = function getFormattedFilters(filters) {
|
|
302
350
|
return filters.map(function (filter) {
|
|
303
|
-
|
|
351
|
+
if (checkIsFilterGroup(filter)) {
|
|
352
|
+
var subFilters = filter.filters;
|
|
353
|
+
var formattedSubFilters = [];
|
|
354
|
+
if (Array.isArray(subFilters) && subFilters.length > 0) {
|
|
355
|
+
formattedSubFilters = subFilters.map(function (subFilter) {
|
|
356
|
+
return _getFormattedFilter(subFilter, subFilter.column);
|
|
357
|
+
});
|
|
358
|
+
}
|
|
359
|
+
return _objectSpread(_objectSpread({}, filter), {}, {
|
|
360
|
+
filters: formattedSubFilters
|
|
361
|
+
});
|
|
362
|
+
}
|
|
363
|
+
return _getFormattedFilter(filter, filter.column);
|
|
364
|
+
});
|
|
365
|
+
};
|
|
366
|
+
var checkFilter = function checkFilter(filter, columns) {
|
|
367
|
+
var _ValidateFilter$valid2 = ValidateFilter.validate(filter, columns),
|
|
368
|
+
error_message = _ValidateFilter$valid2.error_message;
|
|
369
|
+
if (error_message) {
|
|
370
|
+
if (error_message === FILTER_ERR_MSG.INCOMPLETE_FILTER) {
|
|
371
|
+
return null;
|
|
372
|
+
}
|
|
373
|
+
throw new Error(error_message);
|
|
374
|
+
}
|
|
375
|
+
var newFilter = _objectSpread({}, filter);
|
|
376
|
+
var column_key = filter.column_key;
|
|
377
|
+
newFilter.column = columns.find(function (column) {
|
|
378
|
+
return column.key === column_key;
|
|
304
379
|
});
|
|
380
|
+
return newFilter;
|
|
305
381
|
};
|
|
306
382
|
|
|
307
383
|
/**
|
|
@@ -316,24 +392,57 @@ var deleteInvalidFilter = function deleteInvalidFilter(filters, columns) {
|
|
|
316
392
|
}
|
|
317
393
|
var cleanFilters = [];
|
|
318
394
|
filters.forEach(function (filter) {
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
395
|
+
if (checkIsFilterGroup(filter)) {
|
|
396
|
+
var subFilters = filter.filters;
|
|
397
|
+
if (Array.isArray(subFilters) && subFilters.length > 0) {
|
|
398
|
+
var cleanSubFilters = [];
|
|
399
|
+
subFilters.forEach(function (subFilter) {
|
|
400
|
+
var newSubFilter = checkFilter(subFilter, columns);
|
|
401
|
+
if (newSubFilter) {
|
|
402
|
+
cleanSubFilters.push(newSubFilter);
|
|
403
|
+
}
|
|
404
|
+
});
|
|
405
|
+
|
|
406
|
+
// just keep the filter group which has valid sub-filters
|
|
407
|
+
if (cleanSubFilters.length > 0) {
|
|
408
|
+
cleanFilters.push(_objectSpread(_objectSpread({}, filter), {}, {
|
|
409
|
+
filters: cleanSubFilters
|
|
410
|
+
}));
|
|
411
|
+
}
|
|
325
412
|
}
|
|
326
413
|
} else {
|
|
327
|
-
var
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
column: filterColumn
|
|
332
|
-
});
|
|
333
|
-
cleanFilters.push(newFilter);
|
|
414
|
+
var newFilter = checkFilter(filter, columns);
|
|
415
|
+
if (newFilter) {
|
|
416
|
+
cleanFilters.push(newFilter);
|
|
417
|
+
}
|
|
334
418
|
}
|
|
335
419
|
});
|
|
336
420
|
return cleanFilters;
|
|
337
421
|
};
|
|
338
422
|
|
|
339
|
-
|
|
423
|
+
/**
|
|
424
|
+
* Categorize filters
|
|
425
|
+
* @param {array} filters
|
|
426
|
+
* @returns {object} { generalFilters, formulaFilters, filterGroups }
|
|
427
|
+
*/
|
|
428
|
+
var getClassifiedFilters = function getClassifiedFilters(filters) {
|
|
429
|
+
var generalFilters = [];
|
|
430
|
+
var formulaFilters = [];
|
|
431
|
+
var filterGroups = [];
|
|
432
|
+
filters.forEach(function (filter) {
|
|
433
|
+
if (checkIsFilterGroup(filter)) {
|
|
434
|
+
filterGroups.push(filter);
|
|
435
|
+
} else if (checkIsFormulaFilter(filter)) {
|
|
436
|
+
formulaFilters.push(filter);
|
|
437
|
+
} else {
|
|
438
|
+
generalFilters.push(filter);
|
|
439
|
+
}
|
|
440
|
+
});
|
|
441
|
+
return {
|
|
442
|
+
generalFilters: generalFilters,
|
|
443
|
+
formulaFilters: formulaFilters,
|
|
444
|
+
filterGroups: filterGroups
|
|
445
|
+
};
|
|
446
|
+
};
|
|
447
|
+
|
|
448
|
+
export { checkIsAvailableFilter, checkIsFilterGroup, checkIsFormulaFilter, deleteInvalidFilter, getClassifiedFilters, _getFormattedFilter as getFormattedFilter, getFormattedFilterOtherDate, getFormattedFilters, getValidFilters, getValidFiltersWithoutError, isCurrentUserDepartment, isCurrentUserDepartmentAndSub, isSpecificDepartment, otherDate };
|
package/es/filter/filter-row.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getFormattedFilters, deleteInvalidFilter } from './core.js';
|
|
1
|
+
import { checkIsFilterGroup, getFormattedFilters, deleteInvalidFilter } from './core.js';
|
|
2
2
|
import { checkboxFilter } from './filter-column/checkbox.js';
|
|
3
3
|
import { collaboratorFilter } from './filter-column/collaborator.js';
|
|
4
4
|
import { creatorFilter } from './filter-column/creator.js';
|
|
@@ -137,7 +137,7 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
|
|
|
137
137
|
* @param {object} userDepartmentIdsMap e.g. { current_user_department_ids: [8, 10], current_user_department_and_sub_ids: [8, 10, 12, 34] }
|
|
138
138
|
* @returns filter result, bool
|
|
139
139
|
*/
|
|
140
|
-
var
|
|
140
|
+
var _filterRow = function filterRow(row, filterConjunction, filters) {
|
|
141
141
|
var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
|
|
142
142
|
formulaRow = _ref2.formulaRow,
|
|
143
143
|
_ref2$username = _ref2.username,
|
|
@@ -147,6 +147,14 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
|
|
|
147
147
|
userDepartmentIdsMap = _ref2$userDepartmentI === void 0 ? {} : _ref2$userDepartmentI;
|
|
148
148
|
if (filterConjunction === FILTER_CONJUNCTION_TYPE.AND) {
|
|
149
149
|
return filters.every(function (filter) {
|
|
150
|
+
if (checkIsFilterGroup(filter)) {
|
|
151
|
+
return _filterRow(row, filter.filter_conjunction, filter.filters, {
|
|
152
|
+
formulaRow: formulaRow,
|
|
153
|
+
username: username,
|
|
154
|
+
userId: userId,
|
|
155
|
+
userDepartmentIdsMap: userDepartmentIdsMap
|
|
156
|
+
});
|
|
157
|
+
}
|
|
150
158
|
return getFilterResult(row, filter, {
|
|
151
159
|
formulaRow: formulaRow,
|
|
152
160
|
username: username,
|
|
@@ -157,6 +165,14 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
|
|
|
157
165
|
}
|
|
158
166
|
if (filterConjunction === FILTER_CONJUNCTION_TYPE.OR) {
|
|
159
167
|
return filters.some(function (filter) {
|
|
168
|
+
if (checkIsFilterGroup(filter)) {
|
|
169
|
+
return _filterRow(row, filter.filter_conjunction, filter.filters, {
|
|
170
|
+
formulaRow: formulaRow,
|
|
171
|
+
username: username,
|
|
172
|
+
userId: userId,
|
|
173
|
+
userDepartmentIdsMap: userDepartmentIdsMap
|
|
174
|
+
});
|
|
175
|
+
}
|
|
160
176
|
return getFilterResult(row, filter, {
|
|
161
177
|
formulaRow: formulaRow,
|
|
162
178
|
username: username,
|
|
@@ -189,7 +205,7 @@ var filterRows = function filterRows(filterConjunction, filters, rows, _ref3) {
|
|
|
189
205
|
rows.forEach(function (row) {
|
|
190
206
|
var rowId = row._id;
|
|
191
207
|
var formulaRow = formulaRows ? formulaRows[rowId] : null;
|
|
192
|
-
if (
|
|
208
|
+
if (_filterRow(row, filterConjunction, formattedFilters, {
|
|
193
209
|
formulaRow: formulaRow,
|
|
194
210
|
username: username,
|
|
195
211
|
userId: userId,
|
|
@@ -253,4 +269,4 @@ var getFilteredRowsWithoutFormulaCalculation = function getFilteredRowsWithoutFo
|
|
|
253
269
|
};
|
|
254
270
|
};
|
|
255
271
|
|
|
256
|
-
export { filterRow, filterRows, getFilteredRowsWithoutFormulaCalculation };
|
|
272
|
+
export { _filterRow as filterRow, filterRows, getFilteredRowsWithoutFormulaCalculation };
|
package/es/group/core.js
CHANGED
|
@@ -6,8 +6,8 @@ import { getTableById } from '../table/core.js';
|
|
|
6
6
|
import { CellType } from '../constants/cell-type.js';
|
|
7
7
|
import { SUPPORT_GROUP_COLUMN_TYPES, GROUP_DATE_GRANULARITY, GROUP_GEOLOCATION_GRANULARITY } from '../constants/group.js';
|
|
8
8
|
|
|
9
|
-
function ownKeys(
|
|
10
|
-
function _objectSpread(
|
|
9
|
+
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; }
|
|
10
|
+
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(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; }
|
|
11
11
|
|
|
12
12
|
/**
|
|
13
13
|
* Check is valid groupby
|
package/es/group/group-row.js
CHANGED
|
@@ -24,8 +24,8 @@ import { sortSingleSelect } from '../sort/sort-column/single-select.js';
|
|
|
24
24
|
import { MAX_GROUP_LEVEL } from '../constants/group.js';
|
|
25
25
|
import { SORT_TYPE, SORT_COLUMN_OPTIONS, TEXT_SORTER_COLUMN_TYPES, NUMBER_SORTER_COLUMN_TYPES } from '../constants/sort.js';
|
|
26
26
|
|
|
27
|
-
function ownKeys(
|
|
28
|
-
function _objectSpread(
|
|
27
|
+
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; }
|
|
28
|
+
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(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; }
|
|
29
29
|
var _getCellValue = function _getCellValue(row, formulaRows, groupby) {
|
|
30
30
|
var column_key = groupby.column_key,
|
|
31
31
|
column = groupby.column;
|
|
@@ -164,7 +164,7 @@ var _findGroupIndex = function _findGroupIndex(sCellValue, cellValue2GroupIndexM
|
|
|
164
164
|
cellValue2GroupIndexMap[sCellValue] = groupsLength;
|
|
165
165
|
return -1;
|
|
166
166
|
};
|
|
167
|
-
var
|
|
167
|
+
var _getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
|
|
168
168
|
var _groupbys$level = groupbys[level],
|
|
169
169
|
column = _groupbys$level.column,
|
|
170
170
|
sort_type = _groupbys$level.sort_type;
|
|
@@ -244,7 +244,7 @@ var getSortedGroups = function getSortedGroups(groups, groupbys, value, level) {
|
|
|
244
244
|
|
|
245
245
|
// eslint-disable-next-line
|
|
246
246
|
groups = groups.map(function (group) {
|
|
247
|
-
var sortedSubgroups =
|
|
247
|
+
var sortedSubgroups = _getSortedGroups(group.subgroups, groupbys, value, nextLevel);
|
|
248
248
|
return _objectSpread(_objectSpread({}, group), {}, {
|
|
249
249
|
subgroups: sortedSubgroups
|
|
250
250
|
});
|
|
@@ -306,7 +306,7 @@ var groupRowsWithMultipleGroupbys = function groupRowsWithMultipleGroupbys(group
|
|
|
306
306
|
}
|
|
307
307
|
}
|
|
308
308
|
});
|
|
309
|
-
groups =
|
|
309
|
+
groups = _getSortedGroups(groups, validGroupbys, value, 0);
|
|
310
310
|
return groups;
|
|
311
311
|
};
|
|
312
312
|
|
|
@@ -353,7 +353,7 @@ var groupTableRows = function groupTableRows(groupbys, rows, formulaRows, value)
|
|
|
353
353
|
});
|
|
354
354
|
|
|
355
355
|
// sort groups
|
|
356
|
-
groups =
|
|
356
|
+
groups = _getSortedGroups(groups, groupbys, value, 0);
|
|
357
357
|
return groups;
|
|
358
358
|
};
|
|
359
359
|
|
package/es/helper/patch-utils.js
CHANGED
|
@@ -5,7 +5,7 @@ var PatchUtils = /*#__PURE__*/function () {
|
|
|
5
5
|
function PatchUtils() {
|
|
6
6
|
_classCallCheck(this, PatchUtils);
|
|
7
7
|
}
|
|
8
|
-
_createClass(PatchUtils, null, [{
|
|
8
|
+
return _createClass(PatchUtils, null, [{
|
|
9
9
|
key: "getUsername",
|
|
10
10
|
value: function getUsername(username) {
|
|
11
11
|
if (typeof window !== 'undefined') {
|
|
@@ -32,7 +32,6 @@ var PatchUtils = /*#__PURE__*/function () {
|
|
|
32
32
|
return userDepartmentIdsMap;
|
|
33
33
|
}
|
|
34
34
|
}]);
|
|
35
|
-
return PatchUtils;
|
|
36
35
|
}();
|
|
37
36
|
|
|
38
37
|
export { PatchUtils as default };
|
package/es/index.js
CHANGED
|
@@ -57,7 +57,7 @@ export { searchCollaborators } from './search.js';
|
|
|
57
57
|
export { ValidateFilter } from './validate/filter.js';
|
|
58
58
|
export { isValidEmail } from './validate/email.js';
|
|
59
59
|
export { isValidPosition } from './validate/geolocation.js';
|
|
60
|
-
export { deleteInvalidFilter, getFormattedFilter, getFormattedFilterOtherDate, getFormattedFilters, getValidFilters, getValidFiltersWithoutError, otherDate } from './filter/core.js';
|
|
60
|
+
export { deleteInvalidFilter, getClassifiedFilters, getFormattedFilter, getFormattedFilterOtherDate, getFormattedFilters, getValidFilters, getValidFiltersWithoutError, otherDate } from './filter/core.js';
|
|
61
61
|
export { checkboxFilter } from './filter/filter-column/checkbox.js';
|
|
62
62
|
export { collaboratorFilter } from './filter/filter-column/collaborator.js';
|
|
63
63
|
export { creatorFilter } from './filter/filter-column/creator.js';
|
package/es/link/core.js
CHANGED
|
@@ -6,8 +6,8 @@ import { getTableById } from '../table/core.js';
|
|
|
6
6
|
import { getRowsByIds } from '../table/row.js';
|
|
7
7
|
import { CellType } from '../constants/cell-type.js';
|
|
8
8
|
|
|
9
|
-
function ownKeys(
|
|
10
|
-
function _objectSpread(
|
|
9
|
+
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; }
|
|
10
|
+
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(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; }
|
|
11
11
|
|
|
12
12
|
/**
|
|
13
13
|
* Get link by id
|
package/es/sort/core.js
CHANGED
|
@@ -3,8 +3,8 @@ import { getColumnOptions } from '../column/option.js';
|
|
|
3
3
|
import { CellType } from '../constants/cell-type.js';
|
|
4
4
|
import { SORT_COLUMN_OPTIONS } from '../constants/sort.js';
|
|
5
5
|
|
|
6
|
-
function ownKeys(
|
|
7
|
-
function _objectSpread(
|
|
6
|
+
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; }
|
|
7
|
+
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(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; }
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
10
|
* Check is valid sort
|
package/es/validate/filter.js
CHANGED
|
@@ -27,7 +27,7 @@ var ValidateFilter = /*#__PURE__*/function () {
|
|
|
27
27
|
function ValidateFilter() {
|
|
28
28
|
_classCallCheck(this, ValidateFilter);
|
|
29
29
|
}
|
|
30
|
-
_createClass(ValidateFilter, null, [{
|
|
30
|
+
return _createClass(ValidateFilter, null, [{
|
|
31
31
|
key: "validate",
|
|
32
32
|
value:
|
|
33
33
|
/**
|
|
@@ -466,7 +466,6 @@ var ValidateFilter = /*#__PURE__*/function () {
|
|
|
466
466
|
return selectedOptionIds.length === validSelectedOptions.length;
|
|
467
467
|
}
|
|
468
468
|
}]);
|
|
469
|
-
return ValidateFilter;
|
|
470
469
|
}();
|
|
471
470
|
|
|
472
471
|
export { DATE_MODIFIERS_REQUIRE_TERM, ValidateFilter };
|
package/es/view/summaries.js
CHANGED
|
@@ -160,7 +160,7 @@ var getSummariesWithSubgroups = function getSummariesWithSubgroups(subgroups, nu
|
|
|
160
160
|
* @param {object} formulaRows for numeric formula columns
|
|
161
161
|
* @returns void
|
|
162
162
|
*/
|
|
163
|
-
var
|
|
163
|
+
var _updateGroupSummaries = function updateGroupSummaries(groups, table, formulaRows) {
|
|
164
164
|
var numericColumns = table.columns.filter(function (column) {
|
|
165
165
|
return isNumericColumn(column);
|
|
166
166
|
});
|
|
@@ -171,7 +171,7 @@ var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaR
|
|
|
171
171
|
var subgroups = group.subgroups,
|
|
172
172
|
row_ids = group.row_ids;
|
|
173
173
|
if (Array.isArray(subgroups) && subgroups.length > 0) {
|
|
174
|
-
|
|
174
|
+
_updateGroupSummaries(subgroups, table, formulaRows);
|
|
175
175
|
group.summaries = getSummariesWithSubgroups(subgroups, numericColumns);
|
|
176
176
|
} else if (row_ids) {
|
|
177
177
|
group.summaries = getSummaries(table, row_ids, formulaRows);
|
|
@@ -179,4 +179,4 @@ var updateGroupSummaries = function updateGroupSummaries(groups, table, formulaR
|
|
|
179
179
|
});
|
|
180
180
|
};
|
|
181
181
|
|
|
182
|
-
export { getSummaries, getSummariesWithSubgroups, updateGroupSummaries };
|
|
182
|
+
export { getSummaries, getSummariesWithSubgroups, _updateGroupSummaries as updateGroupSummaries };
|
|
@@ -24,9 +24,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
24
24
|
var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
|
|
25
25
|
var utc__default = /*#__PURE__*/_interopDefaultLegacy(utc);
|
|
26
26
|
|
|
27
|
-
function _createForOfIteratorHelper(
|
|
28
|
-
function _unsupportedIterableToArray(
|
|
29
|
-
function _arrayLikeToArray(
|
|
27
|
+
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
28
|
+
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
29
|
+
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
30
30
|
dayjs__default["default"].extend(utc__default["default"]);
|
|
31
31
|
var generatorSearchSQL = function generatorSearchSQL(table, view, start, limit, username, userId, userDepartmentIdsMap) {
|
|
32
32
|
// MAIN
|