@reltio/components 1.4.2140 → 1.4.2141
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/cjs/helpers/segments.d.ts +1 -0
- package/cjs/helpers/segments.js +7 -2
- package/cjs/hooks/useSegmentsLoader/useSegmentsLoader.d.ts +2 -1
- package/cjs/hooks/useSegmentsLoader/useSegmentsLoader.js +4 -9
- package/helpers/segments.d.ts +1 -0
- package/helpers/segments.js +7 -2
- package/hooks/useSegmentsLoader/useSegmentsLoader.d.ts +2 -1
- package/hooks/useSegmentsLoader/useSegmentsLoader.js +5 -10
- package/package.json +2 -2
package/cjs/helpers/segments.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.buildSegmentsFilterString = void 0;
|
|
3
|
+
exports.isActiveFilter = exports.buildSegmentsFilterString = void 0;
|
|
4
4
|
var ramda_1 = require("ramda");
|
|
5
5
|
var mdm_sdk_1 = require("@reltio/mdm-sdk");
|
|
6
6
|
var buildFavoriteFilterClause = function (value) {
|
|
@@ -18,6 +18,9 @@ var buildTypeFilterClause = function (type) {
|
|
|
18
18
|
var buildSharingFilterClause = function (value) {
|
|
19
19
|
return "equals(sharing, '".concat(value, "')");
|
|
20
20
|
};
|
|
21
|
+
var buildItemTypeFilterClause = function (value) {
|
|
22
|
+
return "equals(itemType, '".concat(value, "')");
|
|
23
|
+
};
|
|
21
24
|
var buildDestinationFilterClause = function (value) {
|
|
22
25
|
return "contains(integrationIDs, '".concat(value, "')");
|
|
23
26
|
};
|
|
@@ -32,10 +35,12 @@ var getFilterClauseBuilder = (0, ramda_1.cond)([
|
|
|
32
35
|
[(0, ramda_1.equals)('createdBy'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildOwnerFilterClause); }],
|
|
33
36
|
[(0, ramda_1.equals)('sharedWith'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildSharingFilterClause); }],
|
|
34
37
|
[(0, ramda_1.equals)('destinations'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildDestinationFilterClause); }],
|
|
35
|
-
[(0, ramda_1.equals)('searchValue'), function () { return buildSearchValueFilterClause; }]
|
|
38
|
+
[(0, ramda_1.equals)('searchValue'), function () { return buildSearchValueFilterClause; }],
|
|
39
|
+
[(0, ramda_1.equals)('itemType'), function () { return buildItemTypeFilterClause; }]
|
|
36
40
|
]);
|
|
37
41
|
exports.buildSegmentsFilterString = (0, ramda_1.pipe)((0, ramda_1.defaultTo)({}), (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), ramda_1.toPairs, (0, ramda_1.map)(function (_a) {
|
|
38
42
|
var _b;
|
|
39
43
|
var key = _a[0], value = _a[1];
|
|
40
44
|
return (_b = getFilterClauseBuilder(key)) === null || _b === void 0 ? void 0 : _b(value);
|
|
41
45
|
}), (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), (0, ramda_1.map)(mdm_sdk_1.wrapInBrackets), (0, ramda_1.join)(' and '));
|
|
46
|
+
exports.isActiveFilter = (0, ramda_1.pipe)((0, ramda_1.omit)(['itemType']), ramda_1.values, (0, ramda_1.filter)(Boolean), (0, ramda_1.any)((0, ramda_1.complement)(ramda_1.isEmpty)));
|
|
@@ -7,8 +7,9 @@ type Props = {
|
|
|
7
7
|
enabled: boolean;
|
|
8
8
|
filters?: SegmentationFilters;
|
|
9
9
|
abortControllerRef?: React.MutableRefObject<AbortController | null>;
|
|
10
|
+
parentId?: string;
|
|
10
11
|
};
|
|
11
|
-
export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef }: Props) => {
|
|
12
|
+
export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef, parentId }: Props) => {
|
|
12
13
|
state: RequestStates;
|
|
13
14
|
segments: NewSegment[];
|
|
14
15
|
total: number;
|
|
@@ -55,21 +55,16 @@ var types_1 = require("../../types");
|
|
|
55
55
|
var segments_1 = require("../../helpers/segments");
|
|
56
56
|
var errors_1 = require("../../helpers/errors");
|
|
57
57
|
var useSegmentsLoader = function (_a) {
|
|
58
|
-
var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef;
|
|
58
|
+
var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef, parentId = _a.parentId;
|
|
59
59
|
var _b = (0, react_1.useState)(types_1.RequestStates.INIT), requestState = _b[0], setRequestState = _b[1];
|
|
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
63
|
var filterString = (0, segments_1.buildSegmentsFilterString)(filters);
|
|
64
|
+
var hasActiveFilter = (0, segments_1.isActiveFilter)(filters !== null && filters !== void 0 ? filters : {});
|
|
64
65
|
var params = (0, react_1.useMemo)(function () {
|
|
65
|
-
return (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue, {
|
|
66
|
-
|
|
67
|
-
order: order,
|
|
68
|
-
max: rowsPerPage,
|
|
69
|
-
offset: page * rowsPerPage,
|
|
70
|
-
filter: filterString
|
|
71
|
-
});
|
|
72
|
-
}, [sort, order, rowsPerPage, page, filterString]);
|
|
66
|
+
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
|
+
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter]);
|
|
73
68
|
var loadRequest = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
74
69
|
var signal, response, error_1;
|
|
75
70
|
var _a;
|
package/helpers/segments.d.ts
CHANGED
package/helpers/segments.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { cond, defaultTo, equals, join, map, pipe, reject, toPairs } from 'ramda';
|
|
1
|
+
import { cond, defaultTo, equals, join, map, pipe, reject, toPairs, omit, values, filter, any, complement, isEmpty } from 'ramda';
|
|
2
2
|
import { isEmptyValue, wrapInBrackets, multiValueFilter } from '@reltio/mdm-sdk';
|
|
3
3
|
var buildFavoriteFilterClause = function (value) {
|
|
4
4
|
return value ? "equals(favorite, 'true')" : '';
|
|
@@ -15,6 +15,9 @@ var buildTypeFilterClause = function (type) {
|
|
|
15
15
|
var buildSharingFilterClause = function (value) {
|
|
16
16
|
return "equals(sharing, '".concat(value, "')");
|
|
17
17
|
};
|
|
18
|
+
var buildItemTypeFilterClause = function (value) {
|
|
19
|
+
return "equals(itemType, '".concat(value, "')");
|
|
20
|
+
};
|
|
18
21
|
var buildDestinationFilterClause = function (value) {
|
|
19
22
|
return "contains(integrationIDs, '".concat(value, "')");
|
|
20
23
|
};
|
|
@@ -29,10 +32,12 @@ var getFilterClauseBuilder = cond([
|
|
|
29
32
|
[equals('createdBy'), function () { return multiValueFilter(buildOwnerFilterClause); }],
|
|
30
33
|
[equals('sharedWith'), function () { return multiValueFilter(buildSharingFilterClause); }],
|
|
31
34
|
[equals('destinations'), function () { return multiValueFilter(buildDestinationFilterClause); }],
|
|
32
|
-
[equals('searchValue'), function () { return buildSearchValueFilterClause; }]
|
|
35
|
+
[equals('searchValue'), function () { return buildSearchValueFilterClause; }],
|
|
36
|
+
[equals('itemType'), function () { return buildItemTypeFilterClause; }]
|
|
33
37
|
]);
|
|
34
38
|
export var buildSegmentsFilterString = pipe(defaultTo({}), reject(isEmptyValue), toPairs, map(function (_a) {
|
|
35
39
|
var _b;
|
|
36
40
|
var key = _a[0], value = _a[1];
|
|
37
41
|
return (_b = getFilterClauseBuilder(key)) === null || _b === void 0 ? void 0 : _b(value);
|
|
38
42
|
}), reject(isEmptyValue), map(wrapInBrackets), join(' and '));
|
|
43
|
+
export var isActiveFilter = pipe(omit(['itemType']), values, filter(Boolean), any(complement(isEmpty)));
|
|
@@ -7,8 +7,9 @@ type Props = {
|
|
|
7
7
|
enabled: boolean;
|
|
8
8
|
filters?: SegmentationFilters;
|
|
9
9
|
abortControllerRef?: React.MutableRefObject<AbortController | null>;
|
|
10
|
+
parentId?: string;
|
|
10
11
|
};
|
|
11
|
-
export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef }: Props) => {
|
|
12
|
+
export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef, parentId }: Props) => {
|
|
12
13
|
state: RequestStates;
|
|
13
14
|
segments: NewSegment[];
|
|
14
15
|
total: number;
|
|
@@ -49,24 +49,19 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
|
|
|
49
49
|
import { reject } from 'ramda';
|
|
50
50
|
import { getSegments, isAbortError, isEmptyValue } from '@reltio/mdm-sdk';
|
|
51
51
|
import { RequestStates } from '../../types';
|
|
52
|
-
import { buildSegmentsFilterString } from '../../helpers/segments';
|
|
52
|
+
import { buildSegmentsFilterString, isActiveFilter } from '../../helpers/segments';
|
|
53
53
|
import { showDefaultErrorMessage } from '../../helpers/errors';
|
|
54
54
|
export var useSegmentsLoader = function (_a) {
|
|
55
|
-
var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef;
|
|
55
|
+
var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef, parentId = _a.parentId;
|
|
56
56
|
var _b = useState(RequestStates.INIT), requestState = _b[0], setRequestState = _b[1];
|
|
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
60
|
var filterString = buildSegmentsFilterString(filters);
|
|
61
|
+
var hasActiveFilter = isActiveFilter(filters !== null && filters !== void 0 ? filters : {});
|
|
61
62
|
var params = useMemo(function () {
|
|
62
|
-
return reject(isEmptyValue, {
|
|
63
|
-
|
|
64
|
-
order: order,
|
|
65
|
-
max: rowsPerPage,
|
|
66
|
-
offset: page * rowsPerPage,
|
|
67
|
-
filter: filterString
|
|
68
|
-
});
|
|
69
|
-
}, [sort, order, rowsPerPage, page, filterString]);
|
|
63
|
+
return reject(isEmptyValue, __assign(__assign({ sort: sort, order: order, max: rowsPerPage, offset: page * rowsPerPage, filter: filterString }, (parentId && !hasActiveFilter ? { parentId: parentId } : {})), (hasActiveFilter ? { fetchAll: true } : {})));
|
|
64
|
+
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter]);
|
|
70
65
|
var loadRequest = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
71
66
|
var signal, response, error_1;
|
|
72
67
|
var _a;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reltio/components",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2141",
|
|
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.1966",
|
|
15
15
|
"@vis.gl/react-google-maps": "^1.3.0",
|
|
16
16
|
"d3-cloud": "^1.2.5",
|
|
17
17
|
"d3-geo": "^2.0.1",
|