@reltio/components 1.4.2143 → 1.4.2145
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.
|
@@ -60,8 +60,9 @@ var useSegmentsLoader = function (_a) {
|
|
|
60
60
|
var _c = (0, react_1.useState)([]), segments = _c[0], setSegments = _c[1];
|
|
61
61
|
var _d = (0, react_1.useState)(0), total = _d[0], setTotal = _d[1];
|
|
62
62
|
var _e = sorting || {}, sort = _e.field, order = _e.order;
|
|
63
|
-
var filterString = (0, segments_1.buildSegmentsFilterString)(filters);
|
|
64
63
|
var hasActiveFilter = (0, segments_1.isActiveFilter)(filters !== null && filters !== void 0 ? filters : {});
|
|
64
|
+
var hasSearchValue = Boolean((filters === null || filters === void 0 ? void 0 : filters.searchValue) && filters.searchValue.length > 0);
|
|
65
|
+
var filterString = (0, segments_1.buildSegmentsFilterString)(__assign(__assign({}, filters), (hasActiveFilter && !hasSearchValue ? { itemType: mdm_sdk_1.NewSegmentItemType.Segment } : {})));
|
|
65
66
|
var params = (0, react_1.useMemo)(function () {
|
|
66
67
|
return (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue, __assign(__assign({ sort: sort, order: order, max: rowsPerPage, offset: page * rowsPerPage, filter: filterString }, (parentId && !hasActiveFilter ? { parentId: parentId } : {})), (hasActiveFilter ? { fetchAll: true } : {})));
|
|
67
68
|
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter]);
|
|
@@ -54,27 +54,33 @@ var useSegmentsSizesLoader = function (segments, signal) {
|
|
|
54
54
|
var _a = (0, react_1.useState)({}), segmentsSizes = _a[0], setSegmentsSizes = _a[1];
|
|
55
55
|
(0, react_1.useEffect)(function () {
|
|
56
56
|
segments.forEach(function (segment) { return __awaiter(void 0, void 0, void 0, function () {
|
|
57
|
-
var total_1, _a;
|
|
58
|
-
return __generator(this, function (
|
|
59
|
-
switch (
|
|
57
|
+
var total_1, _a, _b;
|
|
58
|
+
return __generator(this, function (_c) {
|
|
59
|
+
switch (_c.label) {
|
|
60
60
|
case 0:
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
_c.trys.push([0, 4, , 5]);
|
|
62
|
+
if (!(segment.itemType === mdm_sdk_1.NewSegmentItemType.Folder)) return [3 /*break*/, 1];
|
|
63
|
+
_a = { total: null };
|
|
64
|
+
return [3 /*break*/, 3];
|
|
65
|
+
case 1: return [4 /*yield*/, (0, mdm_sdk_1.getSegmentTotal)({ segmentId: segment.id, signal: signal })];
|
|
66
|
+
case 2:
|
|
67
|
+
_a = _c.sent();
|
|
68
|
+
_c.label = 3;
|
|
69
|
+
case 3:
|
|
70
|
+
total_1 = (_a).total;
|
|
65
71
|
setSegmentsSizes(function (prevSegmentsSize) {
|
|
66
72
|
var _a;
|
|
67
73
|
return __assign(__assign({}, prevSegmentsSize), (_a = {}, _a[segment.id] = total_1, _a));
|
|
68
74
|
});
|
|
69
|
-
return [3 /*break*/,
|
|
70
|
-
case
|
|
71
|
-
|
|
75
|
+
return [3 /*break*/, 5];
|
|
76
|
+
case 4:
|
|
77
|
+
_b = _c.sent();
|
|
72
78
|
setSegmentsSizes(function (prevSegmentsSize) {
|
|
73
79
|
var _a;
|
|
74
80
|
return __assign(__assign({}, prevSegmentsSize), (_a = {}, _a[segment.id] = null, _a));
|
|
75
81
|
});
|
|
76
|
-
return [3 /*break*/,
|
|
77
|
-
case
|
|
82
|
+
return [3 /*break*/, 5];
|
|
83
|
+
case 5: return [2 /*return*/];
|
|
78
84
|
}
|
|
79
85
|
});
|
|
80
86
|
}); });
|
|
@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
47
47
|
};
|
|
48
48
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
|
49
49
|
import { reject } from 'ramda';
|
|
50
|
-
import { getSegments, isAbortError, isEmptyValue } from '@reltio/mdm-sdk';
|
|
50
|
+
import { getSegments, isAbortError, isEmptyValue, NewSegmentItemType } from '@reltio/mdm-sdk';
|
|
51
51
|
import { RequestStates } from '../../types';
|
|
52
52
|
import { buildSegmentsFilterString, isActiveFilter } from '../../helpers/segments';
|
|
53
53
|
import { showDefaultErrorMessage } from '../../helpers/errors';
|
|
@@ -57,8 +57,9 @@ export var useSegmentsLoader = function (_a) {
|
|
|
57
57
|
var _c = useState([]), segments = _c[0], setSegments = _c[1];
|
|
58
58
|
var _d = useState(0), total = _d[0], setTotal = _d[1];
|
|
59
59
|
var _e = sorting || {}, sort = _e.field, order = _e.order;
|
|
60
|
-
var filterString = buildSegmentsFilterString(filters);
|
|
61
60
|
var hasActiveFilter = isActiveFilter(filters !== null && filters !== void 0 ? filters : {});
|
|
61
|
+
var hasSearchValue = Boolean((filters === null || filters === void 0 ? void 0 : filters.searchValue) && filters.searchValue.length > 0);
|
|
62
|
+
var filterString = buildSegmentsFilterString(__assign(__assign({}, filters), (hasActiveFilter && !hasSearchValue ? { itemType: NewSegmentItemType.Segment } : {})));
|
|
62
63
|
var params = useMemo(function () {
|
|
63
64
|
return reject(isEmptyValue, __assign(__assign({ sort: sort, order: order, max: rowsPerPage, offset: page * rowsPerPage, filter: filterString }, (parentId && !hasActiveFilter ? { parentId: parentId } : {})), (hasActiveFilter ? { fetchAll: true } : {})));
|
|
64
65
|
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter]);
|
|
@@ -46,32 +46,38 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
}
|
|
47
47
|
};
|
|
48
48
|
import { useEffect, useState } from 'react';
|
|
49
|
-
import { getSegmentTotal } from '@reltio/mdm-sdk';
|
|
49
|
+
import { getSegmentTotal, NewSegmentItemType } from '@reltio/mdm-sdk';
|
|
50
50
|
export var useSegmentsSizesLoader = function (segments, signal) {
|
|
51
51
|
var _a = useState({}), segmentsSizes = _a[0], setSegmentsSizes = _a[1];
|
|
52
52
|
useEffect(function () {
|
|
53
53
|
segments.forEach(function (segment) { return __awaiter(void 0, void 0, void 0, function () {
|
|
54
|
-
var total_1, _a;
|
|
55
|
-
return __generator(this, function (
|
|
56
|
-
switch (
|
|
54
|
+
var total_1, _a, _b;
|
|
55
|
+
return __generator(this, function (_c) {
|
|
56
|
+
switch (_c.label) {
|
|
57
57
|
case 0:
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
_c.trys.push([0, 4, , 5]);
|
|
59
|
+
if (!(segment.itemType === NewSegmentItemType.Folder)) return [3 /*break*/, 1];
|
|
60
|
+
_a = { total: null };
|
|
61
|
+
return [3 /*break*/, 3];
|
|
62
|
+
case 1: return [4 /*yield*/, getSegmentTotal({ segmentId: segment.id, signal: signal })];
|
|
63
|
+
case 2:
|
|
64
|
+
_a = _c.sent();
|
|
65
|
+
_c.label = 3;
|
|
66
|
+
case 3:
|
|
67
|
+
total_1 = (_a).total;
|
|
62
68
|
setSegmentsSizes(function (prevSegmentsSize) {
|
|
63
69
|
var _a;
|
|
64
70
|
return __assign(__assign({}, prevSegmentsSize), (_a = {}, _a[segment.id] = total_1, _a));
|
|
65
71
|
});
|
|
66
|
-
return [3 /*break*/,
|
|
67
|
-
case
|
|
68
|
-
|
|
72
|
+
return [3 /*break*/, 5];
|
|
73
|
+
case 4:
|
|
74
|
+
_b = _c.sent();
|
|
69
75
|
setSegmentsSizes(function (prevSegmentsSize) {
|
|
70
76
|
var _a;
|
|
71
77
|
return __assign(__assign({}, prevSegmentsSize), (_a = {}, _a[segment.id] = null, _a));
|
|
72
78
|
});
|
|
73
|
-
return [3 /*break*/,
|
|
74
|
-
case
|
|
79
|
+
return [3 /*break*/, 5];
|
|
80
|
+
case 5: return [2 /*return*/];
|
|
75
81
|
}
|
|
76
82
|
});
|
|
77
83
|
}); });
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reltio/components",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2145",
|
|
4
4
|
"license": "SEE LICENSE IN LICENSE FILE",
|
|
5
5
|
"main": "./cjs/index.js",
|
|
6
6
|
"module": "./index.js",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"@fluentui/react-context-selector": "^9.1.26",
|
|
12
12
|
"@googlemaps/markerclusterer": "^2.5.3",
|
|
13
13
|
"@react-sigma/core": "3.4.0",
|
|
14
|
-
"@reltio/mdm-sdk": "^1.4.
|
|
14
|
+
"@reltio/mdm-sdk": "^1.4.1969",
|
|
15
15
|
"@vis.gl/react-google-maps": "^1.3.0",
|
|
16
16
|
"d3-cloud": "^1.2.5",
|
|
17
17
|
"d3-geo": "^2.0.1",
|