@reltio/components 1.4.2140 → 1.4.2142

package/cjs/helpers/segments.d.ts

@@ -1 +1,2 @@
 export declare const buildSegmentsFilterString: any;
+export declare const isActiveFilter: any;

package/cjs/helpers/segments.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSegmentsFilterString = void 0;
+exports.isActiveFilter = exports.buildSegmentsFilterString = void 0;
 var ramda_1 = require("ramda");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var buildFavoriteFilterClause = function (value) {
@@ -18,6 +18,9 @@ var buildTypeFilterClause = function (type) {
 var buildSharingFilterClause = function (value) {
     return "equals(sharing, '".concat(value, "')");
 };
+var buildItemTypeFilterClause = function (value) {
+    return "equals(itemType, '".concat(value, "')");
+};
 var buildDestinationFilterClause = function (value) {
     return "contains(integrationIDs, '".concat(value, "')");
 };
@@ -32,10 +35,12 @@ var getFilterClauseBuilder = (0, ramda_1.cond)([
     [(0, ramda_1.equals)('createdBy'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildOwnerFilterClause); }],
     [(0, ramda_1.equals)('sharedWith'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildSharingFilterClause); }],
     [(0, ramda_1.equals)('destinations'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildDestinationFilterClause); }],
-    [(0, ramda_1.equals)('searchValue'), function () { return buildSearchValueFilterClause; }]
+    [(0, ramda_1.equals)('searchValue'), function () { return buildSearchValueFilterClause; }],
+    [(0, ramda_1.equals)('itemType'), function () { return buildItemTypeFilterClause; }]
 ]);
 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) {
     var _b;
     var key = _a[0], value = _a[1];
     return (_b = getFilterClauseBuilder(key)) === null || _b === void 0 ? void 0 : _b(value);
 }), (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), (0, ramda_1.map)(mdm_sdk_1.wrapInBrackets), (0, ramda_1.join)(' and '));
+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)));

package/cjs/hooks/useMatchesLoader/useMatchesLoader.test.js

@@ -72,14 +72,14 @@ describe('Test useMatchesLoader hook', function () {
             metadata.entityTypes[0].attributes[0].masking = { regexPattern: '.{4}$' };
             setUp({ mdmValues: { metadata: metadata } });
             expect(mdm_sdk_1.getTransitiveMatches).toHaveBeenCalledTimes(1);
-            expect(mdm_sdk_1.getTransitiveMatches).toHaveBeenCalledWith(expect.objectContaining({ options: 'sendMasked' }));
+            expect(mdm_sdk_1.getTransitiveMatches).toHaveBeenCalledWith(expect.objectContaining({ options: 'sendMasked,showAccess' }));
         });
-        it('should not add sendMasked option if showMasking configuration property is false', function () {
+        it('should not add sendMasked or showAccess option if showMasking configuration property is false', function () {
             var metadata = getMetadata();
             metadata.entityTypes[0].attributes[0].masking = { regexPattern: '.{4}$' };
             setUp({ mdmValues: { metadata: metadata, showMasking: false } });
             expect(mdm_sdk_1.getTransitiveMatches).toHaveBeenCalledTimes(1);
-            expect(mdm_sdk_1.getTransitiveMatches).toHaveBeenCalledWith(expect.not.objectContaining({ options: 'sendMasked' }));
+            expect(mdm_sdk_1.getTransitiveMatches).not.toHaveBeenCalledWith(expect.objectContaining({ options: expect.anything() }));
         });
     });
 });

package/cjs/hooks/useSegmentsLoader/useSegmentsLoader.d.ts

@@ -7,8 +7,9 @@ type Props = {
     enabled: boolean;
     filters?: SegmentationFilters;
     abortControllerRef?: React.MutableRefObject<AbortController | null>;
+    parentId?: string;
 };
-export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef }: Props) => {
+export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef, parentId }: Props) => {
     state: RequestStates;
     segments: NewSegment[];
     total: number;

package/cjs/hooks/useSegmentsLoader/useSegmentsLoader.js

@@ -55,21 +55,16 @@ var types_1 = require("../../types");
 var segments_1 = require("../../helpers/segments");
 var errors_1 = require("../../helpers/errors");
 var useSegmentsLoader = function (_a) {
-    var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef;
+    var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef, parentId = _a.parentId;
     var _b = (0, react_1.useState)(types_1.RequestStates.INIT), requestState = _b[0], setRequestState = _b[1];
     var _c = (0, react_1.useState)([]), segments = _c[0], setSegments = _c[1];
     var _d = (0, react_1.useState)(0), total = _d[0], setTotal = _d[1];
     var _e = sorting || {}, sort = _e.field, order = _e.order;
     var filterString = (0, segments_1.buildSegmentsFilterString)(filters);
+    var hasActiveFilter = (0, segments_1.isActiveFilter)(filters !== null && filters !== void 0 ? filters : {});
     var params = (0, react_1.useMemo)(function () {
-        return (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue, {
-            sort: sort,
-            order: order,
-            max: rowsPerPage,
-            offset: page * rowsPerPage,
-            filter: filterString
-        });
-    }, [sort, order, rowsPerPage, page, filterString]);
+        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 } : {})));
+    }, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter]);
     var loadRequest = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
         var signal, response, error_1;
         var _a;

package/helpers/segments.d.ts

@@ -1 +1,2 @@
 export declare const buildSegmentsFilterString: any;
+export declare const isActiveFilter: any;

package/helpers/segments.js

@@ -1,4 +1,4 @@
-import { cond, defaultTo, equals, join, map, pipe, reject, toPairs } from 'ramda';
+import { cond, defaultTo, equals, join, map, pipe, reject, toPairs, omit, values, filter, any, complement, isEmpty } from 'ramda';
 import { isEmptyValue, wrapInBrackets, multiValueFilter } from '@reltio/mdm-sdk';
 var buildFavoriteFilterClause = function (value) {
     return value ? "equals(favorite, 'true')" : '';
@@ -15,6 +15,9 @@ var buildTypeFilterClause = function (type) {
 var buildSharingFilterClause = function (value) {
     return "equals(sharing, '".concat(value, "')");
 };
+var buildItemTypeFilterClause = function (value) {
+    return "equals(itemType, '".concat(value, "')");
+};
 var buildDestinationFilterClause = function (value) {
     return "contains(integrationIDs, '".concat(value, "')");
 };
@@ -29,10 +32,12 @@ var getFilterClauseBuilder = cond([
     [equals('createdBy'), function () { return multiValueFilter(buildOwnerFilterClause); }],
     [equals('sharedWith'), function () { return multiValueFilter(buildSharingFilterClause); }],
     [equals('destinations'), function () { return multiValueFilter(buildDestinationFilterClause); }],
-    [equals('searchValue'), function () { return buildSearchValueFilterClause; }]
+    [equals('searchValue'), function () { return buildSearchValueFilterClause; }],
+    [equals('itemType'), function () { return buildItemTypeFilterClause; }]
 ]);
 export var buildSegmentsFilterString = pipe(defaultTo({}), reject(isEmptyValue), toPairs, map(function (_a) {
     var _b;
     var key = _a[0], value = _a[1];
     return (_b = getFilterClauseBuilder(key)) === null || _b === void 0 ? void 0 : _b(value);
 }), reject(isEmptyValue), map(wrapInBrackets), join(' and '));
+export var isActiveFilter = pipe(omit(['itemType']), values, filter(Boolean), any(complement(isEmpty)));

package/hooks/useMatchesLoader/useMatchesLoader.test.js

@@ -67,14 +67,14 @@ describe('Test useMatchesLoader hook', function () {
             metadata.entityTypes[0].attributes[0].masking = { regexPattern: '.{4}$' };
             setUp({ mdmValues: { metadata: metadata } });
             expect(getTransitiveMatches).toHaveBeenCalledTimes(1);
-            expect(getTransitiveMatches).toHaveBeenCalledWith(expect.objectContaining({ options: 'sendMasked' }));
+            expect(getTransitiveMatches).toHaveBeenCalledWith(expect.objectContaining({ options: 'sendMasked,showAccess' }));
         });
-        it('should not add sendMasked option if showMasking configuration property is false', function () {
+        it('should not add sendMasked or showAccess option if showMasking configuration property is false', function () {
             var metadata = getMetadata();
             metadata.entityTypes[0].attributes[0].masking = { regexPattern: '.{4}$' };
             setUp({ mdmValues: { metadata: metadata, showMasking: false } });
             expect(getTransitiveMatches).toHaveBeenCalledTimes(1);
-            expect(getTransitiveMatches).toHaveBeenCalledWith(expect.not.objectContaining({ options: 'sendMasked' }));
+            expect(getTransitiveMatches).not.toHaveBeenCalledWith(expect.objectContaining({ options: expect.anything() }));
         });
     });
 });

package/hooks/useSegmentsLoader/useSegmentsLoader.d.ts

@@ -7,8 +7,9 @@ type Props = {
     enabled: boolean;
     filters?: SegmentationFilters;
     abortControllerRef?: React.MutableRefObject<AbortController | null>;
+    parentId?: string;
 };
-export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef }: Props) => {
+export declare const useSegmentsLoader: ({ sorting, rowsPerPage, page, filters, enabled, abortControllerRef, parentId }: Props) => {
     state: RequestStates;
     segments: NewSegment[];
     total: number;

package/hooks/useSegmentsLoader/useSegmentsLoader.js

@@ -49,24 +49,19 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { reject } from 'ramda';
 import { getSegments, isAbortError, isEmptyValue } from '@reltio/mdm-sdk';
 import { RequestStates } from '../../types';
-import { buildSegmentsFilterString } from '../../helpers/segments';
+import { buildSegmentsFilterString, isActiveFilter } from '../../helpers/segments';
 import { showDefaultErrorMessage } from '../../helpers/errors';
 export var useSegmentsLoader = function (_a) {
-    var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef;
+    var sorting = _a.sorting, rowsPerPage = _a.rowsPerPage, page = _a.page, filters = _a.filters, enabled = _a.enabled, abortControllerRef = _a.abortControllerRef, parentId = _a.parentId;
     var _b = useState(RequestStates.INIT), requestState = _b[0], setRequestState = _b[1];
     var _c = useState([]), segments = _c[0], setSegments = _c[1];
     var _d = useState(0), total = _d[0], setTotal = _d[1];
     var _e = sorting || {}, sort = _e.field, order = _e.order;
     var filterString = buildSegmentsFilterString(filters);
+    var hasActiveFilter = isActiveFilter(filters !== null && filters !== void 0 ? filters : {});
     var params = useMemo(function () {
-        return reject(isEmptyValue, {
-            sort: sort,
-            order: order,
-            max: rowsPerPage,
-            offset: page * rowsPerPage,
-            filter: filterString
-        });
-    }, [sort, order, rowsPerPage, page, filterString]);
+        return reject(isEmptyValue, __assign(__assign({ sort: sort, order: order, max: rowsPerPage, offset: page * rowsPerPage, filter: filterString }, (parentId && !hasActiveFilter ? { parentId: parentId } : {})), (hasActiveFilter ? { fetchAll: true } : {})));
+    }, [sort, order, rowsPerPage, page, filterString, parentId, hasActiveFilter]);
     var loadRequest = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
         var signal, response, error_1;
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2140",
+  "version": "1.4.2142",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./index.js",
@@ -11,7 +11,7 @@
     "@fluentui/react-context-selector": "^9.1.26",
     "@googlemaps/markerclusterer": "^2.5.3",
     "@react-sigma/core": "3.4.0",
-    "@reltio/mdm-sdk": "^1.4.1965",
+    "@reltio/mdm-sdk": "^1.4.1967",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",