@reltio/components 1.4.2157 → 1.4.2158
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.
|
@@ -61,10 +61,10 @@ var useSegmentsLoader = function (_a) {
|
|
|
61
61
|
var _e = sorting || {}, sort = _e.field, order = _e.order;
|
|
62
62
|
var hasActiveFilter = (0, mdm_sdk_1.isActiveSegmentsFilter)(filters !== null && filters !== void 0 ? filters : {});
|
|
63
63
|
var hasSearchValue = Boolean((filters === null || filters === void 0 ? void 0 : filters.searchValue) && filters.searchValue.length > 0);
|
|
64
|
-
var filterString = (0, mdm_sdk_1.buildSegmentsFilterString)(
|
|
64
|
+
var filterString = (0, mdm_sdk_1.buildSegmentsFilterString)(filters);
|
|
65
65
|
var params = (0, react_1.useMemo)(function () {
|
|
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]);
|
|
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 && !hasSearchValue ? { parentId: parentId } : {})), (hasActiveFilter || hasSearchValue ? { fetchAll: true } : {})));
|
|
67
|
+
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter, hasSearchValue]);
|
|
68
68
|
var loadRequest = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
69
69
|
var signal, response, error_1;
|
|
70
70
|
var _a;
|
|
@@ -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,
|
|
50
|
+
import { getSegments, isAbortError, isEmptyValue, buildSegmentsFilterString, isActiveSegmentsFilter } from '@reltio/mdm-sdk';
|
|
51
51
|
import { RequestStates } from '../../types';
|
|
52
52
|
import { showDefaultErrorMessage } from '../../helpers/errors';
|
|
53
53
|
export var useSegmentsLoader = function (_a) {
|
|
@@ -58,10 +58,10 @@ export var useSegmentsLoader = function (_a) {
|
|
|
58
58
|
var _e = sorting || {}, sort = _e.field, order = _e.order;
|
|
59
59
|
var hasActiveFilter = isActiveSegmentsFilter(filters !== null && filters !== void 0 ? filters : {});
|
|
60
60
|
var hasSearchValue = Boolean((filters === null || filters === void 0 ? void 0 : filters.searchValue) && filters.searchValue.length > 0);
|
|
61
|
-
var filterString = buildSegmentsFilterString(
|
|
61
|
+
var filterString = buildSegmentsFilterString(filters);
|
|
62
62
|
var params = useMemo(function () {
|
|
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]);
|
|
63
|
+
return reject(isEmptyValue, __assign(__assign({ sort: sort, order: order, max: rowsPerPage, offset: page * rowsPerPage, filter: filterString }, (parentId && !hasActiveFilter && !hasSearchValue ? { parentId: parentId } : {})), (hasActiveFilter || hasSearchValue ? { fetchAll: true } : {})));
|
|
64
|
+
}, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter, hasSearchValue]);
|
|
65
65
|
var loadRequest = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
66
66
|
var signal, response, error_1;
|
|
67
67
|
var _a;
|