@reltio/components 1.4.2276 → 1.4.2278

package/MatchRulesBlock/MatchRulesBlock.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
-import { Entity, Metadata, Match, EntitiesMap } from '@reltio/mdm-sdk';
+import { Entity, Metadata, EntitiesMap } from '@reltio/mdm-sdk';
 import { MatchRuleVariant } from '../types';
+import type { MatchWithRuleLabels } from '../hooks/useMatchesLoader/types';
 type Props = {
     entitiesMap: EntitiesMap;
     entity: Entity;
-    match: Match;
+    match: MatchWithRuleLabels;
     metadata: Metadata;
     variant?: MatchRuleVariant;
 };

package/MatchRulesBlock/MatchRulesBlock.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import React from 'react';
 import { getMatchRules, getTransitiveMatchRules, isTransitiveMatch, NOT_MATCH } from '@reltio/mdm-sdk';
 import { SimpleMatchRulesBlock } from '../SimpleMatchRulesBlock';
@@ -11,7 +22,10 @@ export var MatchRulesBlock = function (_a) {
         return null;
     }
     var isTransitive = isTransitiveMatch(match);
-    var matchRules = getMatchRules(metadata, entity.type, (match.matchRules || []).concat(match.negativeRules || []));
+    var matchRules = getMatchRules(metadata, entity.type, (match.matchRules || []).concat(match.negativeRules || [])).map(function (matchRule) {
+        var _a;
+        return (__assign(__assign({}, matchRule), { label: ((_a = match.matchRuleLabels) === null || _a === void 0 ? void 0 : _a[matchRule.uri]) || matchRule.label }));
+    });
     var rules = matchRules.filter(function (_a) {
         var uri = _a.uri;
         return uri !== NOT_MATCH;

package/MatchRulesBlock/MatchRulesBlock.test.js

@@ -163,6 +163,31 @@ describe('MatchRulesBlock test', function () {
             matchRules: [metadata.entityTypes[0].matchGroups[2]]
         }));
     });
+    it('should use data tenant match rule labels for rules that are not in customer tenant metadata', function () {
+        var _a;
+        var dataTenantMatchRuleUri = 'configuration/entityTypes/HCP/matchGroups/DataTenantRule';
+        var match = {
+            matchRules: [dataTenantMatchRuleUri],
+            matchRuleLabels: (_a = {},
+                _a[dataTenantMatchRuleUri] = 'Data Tenant Match Rule',
+                _a),
+            object: {
+                uri: 'entities/dataTenantEntity',
+                type: 'configuration/entityTypes/HCP',
+                dataTenant: 'dt1'
+            }
+        };
+        render(React.createElement(MatchRulesBlock, { match: match, metadata: metadata, entity: entity, entitiesMap: {} }));
+        expect(mockTransitiveMatchRules).not.toHaveBeenCalled();
+        expect(mockSimpleMatchRulesBuilder).toHaveBeenCalledWith(expect.objectContaining({
+            matchRules: [
+                {
+                    uri: dataTenantMatchRuleUri,
+                    label: 'Data Tenant Match Rule'
+                }
+            ]
+        }));
+    });
     it('should render SimpleMatchRulesBuilder for non transitive match and work correctly with negativeRules', function () {
         render(React.createElement(MatchRulesBlock, { match: potentialMatches[4], metadata: metadata, entity: entity, entitiesMap: {} }));
         expect(mockTransitiveMatchRules).not.toHaveBeenCalled();

package/cjs/MatchRulesBlock/MatchRulesBlock.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
-import { Entity, Metadata, Match, EntitiesMap } from '@reltio/mdm-sdk';
+import { Entity, Metadata, EntitiesMap } from '@reltio/mdm-sdk';
 import { MatchRuleVariant } from '../types';
+import type { MatchWithRuleLabels } from '../hooks/useMatchesLoader/types';
 type Props = {
     entitiesMap: EntitiesMap;
     entity: Entity;
-    match: Match;
+    match: MatchWithRuleLabels;
     metadata: Metadata;
     variant?: MatchRuleVariant;
 };

package/cjs/MatchRulesBlock/MatchRulesBlock.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,7 +28,10 @@ var MatchRulesBlock = function (_a) {
         return null;
     }
     var isTransitive = (0, mdm_sdk_1.isTransitiveMatch)(match);
-    var matchRules = (0, mdm_sdk_1.getMatchRules)(metadata, entity.type, (match.matchRules || []).concat(match.negativeRules || []));
+    var matchRules = (0, mdm_sdk_1.getMatchRules)(metadata, entity.type, (match.matchRules || []).concat(match.negativeRules || [])).map(function (matchRule) {
+        var _a;
+        return (__assign(__assign({}, matchRule), { label: ((_a = match.matchRuleLabels) === null || _a === void 0 ? void 0 : _a[matchRule.uri]) || matchRule.label }));
+    });
     var rules = matchRules.filter(function (_a) {
         var uri = _a.uri;
         return uri !== mdm_sdk_1.NOT_MATCH;

package/cjs/MatchRulesBlock/MatchRulesBlock.test.js

@@ -168,6 +168,31 @@ describe('MatchRulesBlock test', function () {
             matchRules: [metadata.entityTypes[0].matchGroups[2]]
         }));
     });
+    it('should use data tenant match rule labels for rules that are not in customer tenant metadata', function () {
+        var _a;
+        var dataTenantMatchRuleUri = 'configuration/entityTypes/HCP/matchGroups/DataTenantRule';
+        var match = {
+            matchRules: [dataTenantMatchRuleUri],
+            matchRuleLabels: (_a = {},
+                _a[dataTenantMatchRuleUri] = 'Data Tenant Match Rule',
+                _a),
+            object: {
+                uri: 'entities/dataTenantEntity',
+                type: 'configuration/entityTypes/HCP',
+                dataTenant: 'dt1'
+            }
+        };
+        (0, react_2.render)(react_1.default.createElement(MatchRulesBlock_1.MatchRulesBlock, { match: match, metadata: metadata, entity: entity, entitiesMap: {} }));
+        expect(mockTransitiveMatchRules).not.toHaveBeenCalled();
+        expect(mockSimpleMatchRulesBuilder).toHaveBeenCalledWith(expect.objectContaining({
+            matchRules: [
+                {
+                    uri: dataTenantMatchRuleUri,
+                    label: 'Data Tenant Match Rule'
+                }
+            ]
+        }));
+    });
     it('should render SimpleMatchRulesBuilder for non transitive match and work correctly with negativeRules', function () {
         (0, react_2.render)(react_1.default.createElement(MatchRulesBlock_1.MatchRulesBlock, { match: potentialMatches[4], metadata: metadata, entity: entity, entitiesMap: {} }));
         expect(mockTransitiveMatchRules).not.toHaveBeenCalled();

package/cjs/hooks/useAPI/useAPI.js

@@ -36,6 +36,7 @@ var useAPI = function (config) {
     var _j = (0, react_1.useState)({}), customStyles = _j[0], setCustomStyles = _j[1];
     var workerRef = (0, react_1.useRef)(null);
     var entityRef = (0, react_1.useRef)(null);
+    var searchQueryRef = (0, react_1.useRef)(null);
     var requestListeners = (0, react_1.useRef)({});
     var responseListeners = (0, react_1.useRef)({});
     var sanitizeHtml = (0, useHtmlSanitizer_1.useHtmlSanitizer)();
@@ -54,7 +55,6 @@ var useAPI = function (config) {
     var reltioPath = (0, MdmModuleContext_1.useMdmReltioPath)();
     var workflowPath = (0, MdmModuleContext_1.useMdmWorkflowPath)();
     var user = (0, MdmModuleContext_1.useMdmUser)();
-    var entityUri = (0, MdmModuleContext_1.useMdmEntityUri)();
     var isEditableMode = (0, MdmModuleContext_1.useMdmIsEditableMode)();
     var environment = (0, MdmModuleContext_1.useMdmWorkflowEnvironmentUrl)();
     var searchProviderData = (0, MdmModuleContext_1.useMdmSearchProviderData)();
@@ -62,6 +62,7 @@ var useAPI = function (config) {
     var innerText = '';
     var popupText = '';
     var process = function (_a) {
+        var _b;
         var task = _a.task, worker = _a.worker;
         if (task) {
             switch (task.action) {
@@ -147,11 +148,11 @@ var useAPI = function (config) {
                 }
                 case mdm_sdk_1.CustomAction.REQUEST: {
                     var processedTask = (0, customScript_1.getProcessedTask)(task, apiPath, reltioPath, tenant);
-                    (0, API_1.processRequest)(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, servicesPath: servicesPath, apiPath: reltioPath, tenant: tenant, workflowPath: workflowPath, entity: entityRef.current, entityUri: entityUri, environment: environment, query: searchQuery, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
+                    (0, API_1.processRequest)(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, servicesPath: servicesPath, apiPath: reltioPath, tenant: tenant, workflowPath: workflowPath, entity: entityRef.current, entityUri: (_b = entityRef.current) === null || _b === void 0 ? void 0 : _b.uri, environment: environment, query: searchQueryRef.current, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
                     break;
                 }
                 case mdm_sdk_1.CustomAction.RETURN_PROCESSED_API_RESPONSE: {
-                    var _b = task.params, id = _b.id, data = _b.data;
+                    var _c = task.params, id = _c.id, data = _c.data;
                     if (responseListeners.current[id]) {
                         responseListeners.current[id].next(data);
                         responseListeners.current = (0, ramda_1.omit)([id], responseListeners.current);
@@ -159,7 +160,7 @@ var useAPI = function (config) {
                     break;
                 }
                 case mdm_sdk_1.CustomAction.RETURN_PROCESSED_API_REQUEST: {
-                    var _c = task.params, id = _c.id, data = _c.data;
+                    var _d = task.params, id = _d.id, data = _d.data;
                     if (requestListeners.current[id]) {
                         requestListeners.current[id].resolve(data);
                         requestListeners.current = (0, ramda_1.omit)([id], requestListeners.current);
@@ -224,6 +225,7 @@ var useAPI = function (config) {
         postEventMessage('editMode', isEditableMode);
     }, [isEditableMode]);
     (0, react_1.useEffect)(function () {
+        searchQueryRef.current = searchQuery;
         postEventMessage('changeSearchQuery', searchQuery);
     }, [searchQuery]);
     (0, react_1.useEffect)(function () {

package/cjs/hooks/useAPI/useAPI.test.js

@@ -1040,6 +1040,37 @@ describe('useAPI custom sandbox behavior', function () {
         });
         expect(postMessage).toHaveBeenCalledWith(__assign({ action: 'response', result: 'entities/mnGg0XB' }, params));
     });
+    it('should return the current entityUri on getEntityUri after navigating to another entity', function () {
+        var updateMdmValues = setUp().updateMdmValues;
+        (0, react_2.act)(function () {
+            onmessageFromWorker({
+                action: mdm_sdk_1.CustomAction.REQUEST,
+                params: { name: mdm_sdk_1.RequestAction.GET_ENTITY_URI, id: 1 }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/mnGg0XB',
+            name: mdm_sdk_1.RequestAction.GET_ENTITY_URI,
+            id: 1
+        });
+        var newEntity = { uri: 'entities/NEW999', type: 'configuration/entityTypes/HCA', attributes: {} };
+        (0, react_2.act)(function () {
+            updateMdmValues(function (prev) { return (__assign(__assign({}, prev), { entity: newEntity })); });
+        });
+        (0, react_2.act)(function () {
+            onmessageFromWorker({
+                action: mdm_sdk_1.CustomAction.REQUEST,
+                params: { name: mdm_sdk_1.RequestAction.GET_ENTITY_URI, id: 2 }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/NEW999',
+            name: mdm_sdk_1.RequestAction.GET_ENTITY_URI,
+            id: 2
+        });
+    });
     it('should return entity on getEntity request', function () {
         setUp();
         var params = {

package/cjs/hooks/useCustomScripts/useCustomScripts.js

@@ -69,7 +69,6 @@ var useCustomScripts = function (config) {
     var apiPath = (0, MdmModuleContext_1.useMdmApiPath)();
     var workflowPath = (0, MdmModuleContext_1.useMdmWorkflowPath)();
     var user = (0, MdmModuleContext_1.useMdmUser)();
-    var entityUri = (0, MdmModuleContext_1.useMdmEntityUri)();
     var environment = (0, MdmModuleContext_1.useMdmWorkflowEnvironmentUrl)();
     var workflowCheckPermission = (0, workflow_1.useWorkflowCheckPermission)();
     var searchProviderData = (0, MdmModuleContext_1.useMdmSearchProviderData)();
@@ -77,7 +76,10 @@ var useCustomScripts = function (config) {
     var requestListeners = (0, react_1.useRef)({});
     var responseListeners = (0, react_1.useRef)({});
     var workers = (0, react_1.useRef)({});
+    var entityRef = (0, react_1.useRef)(null);
+    var searchQueryRef = (0, react_1.useRef)(null);
     var processMessageFromWorker = function (_a) {
+        var _b;
         var task = _a.task, worker = _a.worker, config = _a.config;
         if (task) {
             switch (task.action) {
@@ -91,11 +93,11 @@ var useCustomScripts = function (config) {
                 }
                 case mdm_sdk_1.CustomAction.REQUEST: {
                     var processedTask = (0, customScript_1.getProcessedTask)(task, apiPath, reltioPath, tenant);
-                    (0, useAPI_1.processRequest)(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, apiPath: reltioPath, servicesPath: servicesPath, tenant: tenant, workflowPath: workflowPath, entity: entity, entityUri: entityUri, environment: environment, query: searchQuery, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
+                    (0, useAPI_1.processRequest)(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, apiPath: reltioPath, servicesPath: servicesPath, tenant: tenant, workflowPath: workflowPath, entity: entityRef.current, entityUri: (_b = entityRef.current) === null || _b === void 0 ? void 0 : _b.uri, environment: environment, query: searchQueryRef.current, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
                     break;
                 }
                 case mdm_sdk_1.CustomAction.RETURN_PROCESSED_API_RESPONSE: {
-                    var _b = task.params, id = _b.id, data = _b.data;
+                    var _c = task.params, id = _c.id, data = _c.data;
                     if (responseListeners.current[id]) {
                         responseListeners.current[id].next(data);
                         responseListeners.current = (0, ramda_1.omit)([id], responseListeners.current);
@@ -103,7 +105,7 @@ var useCustomScripts = function (config) {
                     break;
                 }
                 case mdm_sdk_1.CustomAction.RETURN_PROCESSED_API_REQUEST: {
-                    var _c = task.params, id = _c.id, data = _c.data;
+                    var _d = task.params, id = _d.id, data = _d.data;
                     if (requestListeners.current[id]) {
                         requestListeners.current[id].resolve(data);
                         requestListeners.current = (0, ramda_1.omit)([id], requestListeners.current);
@@ -127,6 +129,12 @@ var useCustomScripts = function (config) {
             };
         }
     }, [config, metadata]);
+    (0, react_1.useEffect)(function () {
+        entityRef.current = entity;
+    }, [entity]);
+    (0, react_1.useEffect)(function () {
+        searchQueryRef.current = searchQuery;
+    }, [searchQuery]);
     var customScriptRequestInterceptor = function (_a) {
         var _b;
         var url = _a.url, next = _a.next, resolve = _a.resolve, _c = _a.options, options = _c === void 0 ? {} : _c;

package/cjs/hooks/useCustomScripts/useCustomScripts.test.js

@@ -122,13 +122,16 @@ describe('useCustomScripts', function () {
     };
     var setUp = function (_a) {
         var _b = _a === void 0 ? {} : _a, _c = _b.mdmValues, mdmValues = _c === void 0 ? defaultMdmValues : _c, _d = _b.config, config = _d === void 0 ? createConfig() : _d;
+        var updateMdmValues;
         var Providers = function (_a) {
             var children = _a.children;
-            return (react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: mdmValues },
+            var _b = react_1.default.useState(mdmValues), mdmValuesState = _b[0], setMdmValuesState = _b[1];
+            updateMdmValues = setMdmValuesState;
+            return (react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: mdmValuesState },
                 react_1.default.createElement(SnackbarContext_1.SnackbarContext.Provider, { value: showSnackbarMessage },
                     react_1.default.createElement(InterceptHandlersContext_1.InterceptHandlersContext.Provider, { value: interceptors }, children))));
         };
-        return (0, react_2.renderHook)(useCustomScripts_1.useCustomScripts, { initialProps: config, wrapper: Providers });
+        return __assign(__assign({}, (0, react_2.renderHook)(useCustomScripts_1.useCustomScripts, { initialProps: config, wrapper: Providers })), { updateMdmValues: updateMdmValues });
     };
     var postMessage = jest.fn();
     var onmessageFromWorker;
@@ -488,4 +491,77 @@ describe('useCustomScripts', function () {
             }
         });
     }); });
+    it('should resolve getEntityUri/getEntity with the current entity after navigation', function () {
+        var entityA = { uri: 'entities/AAA', type: 'configuration/entityTypes/HCA', attributes: {} };
+        var entityB = { uri: 'entities/BBB', type: 'configuration/entityTypes/HCA', attributes: {} };
+        var updateMdmValues = setUp({ mdmValues: __assign(__assign({}, defaultMdmValues), { entity: entityA }) }).updateMdmValues;
+        (0, react_2.act)(function () {
+            onmessageFromWorker({
+                action: mdm_sdk_1.CustomAction.REQUEST,
+                params: { name: mdm_sdk_1.RequestAction.GET_ENTITY_URI, id: 'id1' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/AAA',
+            name: mdm_sdk_1.RequestAction.GET_ENTITY_URI,
+            id: 'id1'
+        });
+        (0, react_2.act)(function () {
+            updateMdmValues(function (prev) { return (__assign(__assign({}, prev), { entity: entityB })); });
+        });
+        (0, react_2.act)(function () {
+            onmessageFromWorker({
+                action: mdm_sdk_1.CustomAction.REQUEST,
+                params: { name: mdm_sdk_1.RequestAction.GET_ENTITY_URI, id: 'id2' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/BBB',
+            name: mdm_sdk_1.RequestAction.GET_ENTITY_URI,
+            id: 'id2'
+        });
+        (0, react_2.act)(function () {
+            onmessageFromWorker({ action: mdm_sdk_1.CustomAction.REQUEST, params: { name: mdm_sdk_1.RequestAction.GET_ENTITY, id: 'id3' } });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: entityB,
+            name: mdm_sdk_1.RequestAction.GET_ENTITY,
+            id: 'id3'
+        });
+    });
+    it('should resolve getSearchQuery with the current query after it changes', function () {
+        var updateMdmValues = setUp({
+            mdmValues: __assign(__assign({}, defaultMdmValues), { searchProviderData: { type: 'search', data: { query: 'q1' } } })
+        }).updateMdmValues;
+        (0, react_2.act)(function () {
+            onmessageFromWorker({
+                action: mdm_sdk_1.CustomAction.REQUEST,
+                params: { name: mdm_sdk_1.RequestAction.GET_SEARCH_QUERY, id: 'id1' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'q1',
+            name: mdm_sdk_1.RequestAction.GET_SEARCH_QUERY,
+            id: 'id1'
+        });
+        (0, react_2.act)(function () {
+            updateMdmValues(function (prev) { return (__assign(__assign({}, prev), { searchProviderData: { type: 'search', data: { query: 'q2' } } })); });
+        });
+        (0, react_2.act)(function () {
+            onmessageFromWorker({
+                action: mdm_sdk_1.CustomAction.REQUEST,
+                params: { name: mdm_sdk_1.RequestAction.GET_SEARCH_QUERY, id: 'id2' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'q2',
+            name: mdm_sdk_1.RequestAction.GET_SEARCH_QUERY,
+            id: 'id2'
+        });
+    });
 });

package/cjs/hooks/useMatchesLoader/types.d.ts

@@ -0,0 +1,4 @@
+import { Match } from '@reltio/mdm-sdk';
+export type MatchWithRuleLabels = Match & {
+    matchRuleLabels?: Record<string, string>;
+};

package/cjs/hooks/useMatchesLoader/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/hooks/useMatchesLoader/useMatchesLoader.d.ts

@@ -1,4 +1,5 @@
-import { Entity, Match, SortingField, EntitiesMap } from '@reltio/mdm-sdk';
+import { Entity, SortingField, EntitiesMap } from '@reltio/mdm-sdk';
+import type { MatchWithRuleLabels } from './types';
 type Props = {
     enabled: boolean;
     entity: Entity;
@@ -17,7 +18,7 @@ type Props = {
 };
 export declare const useMatchesLoader: ({ enabled, entity, filter, rules, onFinishLoading, onStartLoading, options, page, rowsPerPage, sorting, markMatchedValues }: Props) => {
     total: number;
-    matches: Match[];
+    matches: MatchWithRuleLabels[];
     entitiesMap: EntitiesMap<Pick<Entity, "label" | "type" | "uri">>;
     loadMatches: () => void;
 };

package/cjs/hooks/useMatchesLoader/useMatchesLoader.js

@@ -17,18 +17,48 @@ var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var usePagingSimulator_1 = require("../usePagingSimulator");
 var useSafePromise_1 = require("../useSafePromise");
 var MdmModuleContext_1 = require("../../contexts/MdmModuleContext");
+var matchRuleLabelsCache = new Map();
+// Match rule labels are static per (dtssPath, customerTenant), so the request is
+// cached and reused across reloads (paging, filtering, sorting) instead of being
+// refetched every time matches are loaded. Failed requests are evicted so a later
+// load can retry.
+var getCachedDataTenantMatchRuleLabels = function (dtssPath, customerTenant) {
+    var cacheKey = "".concat(dtssPath, "::").concat(customerTenant);
+    var cachedRequest = matchRuleLabelsCache.get(cacheKey);
+    if (cachedRequest !== undefined) {
+        return cachedRequest;
+    }
+    var request = (0, mdm_sdk_1.getDataTenantMatchGroups)({ dtssPath: dtssPath, customerTenant: customerTenant }).catch(function () {
+        matchRuleLabelsCache.delete(cacheKey);
+        return {};
+    });
+    matchRuleLabelsCache.set(cacheKey, request);
+    return request;
+};
+var addDataTenantMatchRuleLabels = function (matches, entity, matchRuleLabels) {
+    if (!Object.keys(matchRuleLabels).length) {
+        return matches;
+    }
+    return matches.map(function (match) {
+        var _a;
+        return ((0, mdm_sdk_1.isDataTenantEntity)(entity) || (0, mdm_sdk_1.isDataTenantEntity)(match.object)) &&
+            ((_a = match.matchRules) === null || _a === void 0 ? void 0 : _a.some(function (matchRuleUri) { return matchRuleLabels[matchRuleUri]; }))
+            ? __assign(__assign({}, match), { matchRuleLabels: matchRuleLabels }) : match;
+    });
+};
 var useMatchesLoader = function (_a) {
     var enabled = _a.enabled, entity = _a.entity, filter = _a.filter, rules = _a.rules, onFinishLoading = _a.onFinishLoading, onStartLoading = _a.onStartLoading, options = _a.options, page = _a.page, rowsPerPage = _a.rowsPerPage, sorting = _a.sorting, markMatchedValues = _a.markMatchedValues;
     var _b = sorting || {}, order = _b.order, field = _b.field;
     var _c = (0, react_1.useState)(0), total = _c[0], setTotal = _c[1];
     var _d = (0, react_1.useState)([]), matches = _d[0], setMatches = _d[1];
-    var _e = (0, react_1.useState)({}), entitiesMap = _e[0], setEntitiesMap = _e[1];
+    var _e = (0, react_1.useState)({}), matchRuleLabels = _e[0], setMatchRuleLabels = _e[1];
+    var _f = (0, react_1.useState)({}), entitiesMap = _f[0], setEntitiesMap = _f[1];
     var metadata = (0, MdmModuleContext_1.useMdmMetadata)();
     var tenant = (0, MdmModuleContext_1.useMdmTenant)();
     var dtssPath = (0, MdmModuleContext_1.useMdmDtssPath)();
     var dataTenants = (0, MdmModuleContext_1.useMdmDataTenantsWithIdBuilder)();
     var showMasking = (0, MdmModuleContext_1.useMdmShowMasking)();
-    var _f = (0, MdmModuleContext_1.useMdmGlobalSearchRequestOptions)() || {}, activityFilter = _f.activityFilter, globalFilter = _f.globalFilter;
+    var _g = (0, MdmModuleContext_1.useMdmGlobalSearchRequestOptions)() || {}, activityFilter = _g.activityFilter, globalFilter = _g.globalFilter;
     var activeness = typeof options.showInactiveEntities === 'boolean'
         ? options.showInactiveEntities
             ? mdm_sdk_1.ActivityFilter.ALL
@@ -51,6 +81,7 @@ var useMatchesLoader = function (_a) {
     var getTransitiveMatchesWithPaging = (0, usePagingSimulator_1.usePagingSimulator)(getTransitiveMatchesWithDtss);
     var getPagedMatchesForDataTenantEntity = (0, usePagingSimulator_1.usePagingSimulator)(mdm_sdk_1.getMatchesForDataTenantEntity);
     var safePromise = (0, useSafePromise_1.useSafePromise)();
+    var safeMatchRuleLabelsPromise = (0, useSafePromise_1.useSafePromise)();
     var getMatches = (0, react_1.useCallback)(function (force) {
         if (force === void 0) { force = false; }
         if (!enabled || (0, mdm_sdk_1.isTempUri)(entityUri)) {
@@ -60,7 +91,7 @@ var useMatchesLoader = function (_a) {
             return;
         }
         onStartLoading === null || onStartLoading === void 0 ? void 0 : onStartLoading();
-        safePromise((0, mdm_sdk_1.isDataTenantEntity)(entity)
+        var matchesRequest = (0, mdm_sdk_1.isDataTenantEntity)(entity)
             ? getPagedMatchesForDataTenantEntity({
                 dtssPath: dtssPath,
                 entity: entity,
@@ -80,7 +111,8 @@ var useMatchesLoader = function (_a) {
                 markMatchedValues: markMatchedValues,
                 deep: options.showTransitiveMatches ? undefined : 1,
                 activeness: activeness
-            }, showMasking)), { offset: page * rowsPerPage, force: force })))
+            }, showMasking)), { offset: page * rowsPerPage, force: force }));
+        safePromise(matchesRequest)
             .then(function (result) {
             var response = result.response, total = result.total, originalResponse = result.originalResponse;
             setTotal(total);
@@ -126,12 +158,27 @@ var useMatchesLoader = function (_a) {
     (0, react_1.useEffect)(function () {
         getMatches();
     }, [getMatches]);
+    // Match rule labels are loaded independently of the matches request so the
+    // matches list renders without waiting for them; they are applied as a
+    // derived layer once available. Keyed on a stable boolean rather than the
+    // dataTenants array reference to avoid re-firing on every render.
+    var hasDataTenants = !!(dataTenants === null || dataTenants === void 0 ? void 0 : dataTenants.length);
+    (0, react_1.useEffect)(function () {
+        if (!dtssPath || !tenant || !hasDataTenants) {
+            setMatchRuleLabels({});
+            return;
+        }
+        safeMatchRuleLabelsPromise(getCachedDataTenantMatchRuleLabels(dtssPath, tenant))
+            .then(setMatchRuleLabels)
+            .catch(function () { return setMatchRuleLabels({}); });
+    }, [dtssPath, tenant, hasDataTenants, safeMatchRuleLabelsPromise]);
+    var matchesWithRuleLabels = (0, react_1.useMemo)(function () { return addDataTenantMatchRuleLabels(matches, entity, matchRuleLabels); }, [matches, entity, matchRuleLabels]);
     var loadMatches = (0, react_1.useCallback)(function () {
         getMatches(true);
     }, [getMatches]);
     return {
         total: total,
-        matches: matches,
+        matches: matchesWithRuleLabels,
         entitiesMap: entitiesMap,
         loadMatches: loadMatches
     };

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

@@ -55,7 +55,7 @@ var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var react_2 = require("@testing-library/react");
 var MdmModuleContext_1 = require("../../contexts/MdmModuleContext");
 var useMatchesLoader_1 = require("./useMatchesLoader");
-jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getTransitiveMatches: jest.fn(), getMatchesForDataTenantEntity: jest.fn(), isDataTenantEntity: jest.fn().mockImplementation(function (entity) { return !!entity.dataTenant; }) })); });
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getTransitiveMatches: jest.fn(), getMatchesForDataTenantEntity: jest.fn(), getDataTenantMatchGroups: jest.fn(), isDataTenantEntity: jest.fn().mockImplementation(function (entity) { return !!entity.dataTenant; }) })); });
 /**
  * useMatchesLoader runs a useEffect that calls getMatches() on mount. getMatches() is async:
  * it calls the SDK (getTransitiveMatches / getMatchesForDataTenantEntity), and when the
@@ -192,4 +192,47 @@ describe('Test useMatchesLoader hook', function () {
             }
         });
     }); });
+    it('should add data tenant match rule labels to DTSS matches', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var matchRuleUri, result;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    matchRuleUri = 'configuration/entityTypes/HCP/matchGroups/DataTenantRule';
+                    mdm_sdk_1.getMatchesForDataTenantEntity.mockResolvedValueOnce([
+                        {
+                            object: {
+                                uri: 'entities/customerTenantMatch',
+                                type: 'configuration/entityTypes/HCP'
+                            },
+                            matchRules: [matchRuleUri]
+                        }
+                    ]);
+                    mdm_sdk_1.getDataTenantMatchGroups.mockResolvedValueOnce((_a = {},
+                        _a[matchRuleUri] = 'Data Tenant Match Rule',
+                        _a));
+                    result = setUp({
+                        props: __assign(__assign({}, defaultProps), { entity: __assign(__assign({}, defaultProps.entity), { dataTenant: 'tenantId4' }) }),
+                        mdmValues: __assign(__assign({}, defaultMdmValues), { dtssPath: 'dtssPath/', tenant: { id: 'customerTenant', name: 'customerTenant' } })
+                    }).result;
+                    return [4 /*yield*/, (0, react_2.waitFor)(function () {
+                            var _a;
+                            expect(result.current.matches).toEqual([
+                                expect.objectContaining({
+                                    matchRuleLabels: (_a = {},
+                                        _a[matchRuleUri] = 'Data Tenant Match Rule',
+                                        _a)
+                                })
+                            ]);
+                        })];
+                case 1:
+                    _b.sent();
+                    expect(mdm_sdk_1.getDataTenantMatchGroups).toHaveBeenCalledWith({
+                        dtssPath: 'dtssPath/',
+                        customerTenant: 'customerTenant'
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });

package/hooks/useAPI/useAPI.js

@@ -17,7 +17,7 @@ import { useHtmlSanitizer } from '../useHtmlSanitizer';
 import { InterceptHandlersContext } from '../../contexts/InterceptHandlersContext';
 import { SandboxAPIContext } from '../../contexts/SandboxAPIContext';
 import { SnackbarContext } from '../../contexts/SnackbarContext';
-import { useMdmAction, useMdmApiPath, useMdmEntity, useMdmEntityUri, useMdmIsEditableMode, useMdmMetadata, useMdmReltioPath, useMdmSearchProviderData, useMdmServicesPath, useMdmTenant, useMdmUiPath, useMdmUser, useMdmWorkflowEnvironmentUrl, useMdmWorkflowPath } from '../../contexts/MdmModuleContext';
+import { useMdmAction, useMdmApiPath, useMdmEntity, useMdmIsEditableMode, useMdmMetadata, useMdmReltioPath, useMdmSearchProviderData, useMdmServicesPath, useMdmTenant, useMdmUiPath, useMdmUser, useMdmWorkflowEnvironmentUrl, useMdmWorkflowPath } from '../../contexts/MdmModuleContext';
 import { processRequest } from './API';
 import { getWorkerURL, isValidCustomScript, resetHtml, getProcessedTask, setUpRequestInterceptor, setUpResponseInterceptor } from '../../helpers/customScript';
 export var useAPI = function (config) {
@@ -33,6 +33,7 @@ export var useAPI = function (config) {
     var _j = useState({}), customStyles = _j[0], setCustomStyles = _j[1];
     var workerRef = useRef(null);
     var entityRef = useRef(null);
+    var searchQueryRef = useRef(null);
     var requestListeners = useRef({});
     var responseListeners = useRef({});
     var sanitizeHtml = useHtmlSanitizer();
@@ -51,7 +52,6 @@ export var useAPI = function (config) {
     var reltioPath = useMdmReltioPath();
     var workflowPath = useMdmWorkflowPath();
     var user = useMdmUser();
-    var entityUri = useMdmEntityUri();
     var isEditableMode = useMdmIsEditableMode();
     var environment = useMdmWorkflowEnvironmentUrl();
     var searchProviderData = useMdmSearchProviderData();
@@ -59,6 +59,7 @@ export var useAPI = function (config) {
     var innerText = '';
     var popupText = '';
     var process = function (_a) {
+        var _b;
         var task = _a.task, worker = _a.worker;
         if (task) {
             switch (task.action) {
@@ -144,11 +145,11 @@ export var useAPI = function (config) {
                 }
                 case CustomAction.REQUEST: {
                     var processedTask = getProcessedTask(task, apiPath, reltioPath, tenant);
-                    processRequest(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, servicesPath: servicesPath, apiPath: reltioPath, tenant: tenant, workflowPath: workflowPath, entity: entityRef.current, entityUri: entityUri, environment: environment, query: searchQuery, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
+                    processRequest(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, servicesPath: servicesPath, apiPath: reltioPath, tenant: tenant, workflowPath: workflowPath, entity: entityRef.current, entityUri: (_b = entityRef.current) === null || _b === void 0 ? void 0 : _b.uri, environment: environment, query: searchQueryRef.current, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
                     break;
                 }
                 case CustomAction.RETURN_PROCESSED_API_RESPONSE: {
-                    var _b = task.params, id = _b.id, data = _b.data;
+                    var _c = task.params, id = _c.id, data = _c.data;
                     if (responseListeners.current[id]) {
                         responseListeners.current[id].next(data);
                         responseListeners.current = omit([id], responseListeners.current);
@@ -156,7 +157,7 @@ export var useAPI = function (config) {
                     break;
                 }
                 case CustomAction.RETURN_PROCESSED_API_REQUEST: {
-                    var _c = task.params, id = _c.id, data = _c.data;
+                    var _d = task.params, id = _d.id, data = _d.data;
                     if (requestListeners.current[id]) {
                         requestListeners.current[id].resolve(data);
                         requestListeners.current = omit([id], requestListeners.current);
@@ -221,6 +222,7 @@ export var useAPI = function (config) {
         postEventMessage('editMode', isEditableMode);
     }, [isEditableMode]);
     useEffect(function () {
+        searchQueryRef.current = searchQuery;
         postEventMessage('changeSearchQuery', searchQuery);
     }, [searchQuery]);
     useEffect(function () {

package/hooks/useAPI/useAPI.test.js

@@ -1015,6 +1015,37 @@ describe('useAPI custom sandbox behavior', function () {
         });
         expect(postMessage).toHaveBeenCalledWith(__assign({ action: 'response', result: 'entities/mnGg0XB' }, params));
     });
+    it('should return the current entityUri on getEntityUri after navigating to another entity', function () {
+        var updateMdmValues = setUp().updateMdmValues;
+        act(function () {
+            onmessageFromWorker({
+                action: CustomAction.REQUEST,
+                params: { name: RequestAction.GET_ENTITY_URI, id: 1 }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/mnGg0XB',
+            name: RequestAction.GET_ENTITY_URI,
+            id: 1
+        });
+        var newEntity = { uri: 'entities/NEW999', type: 'configuration/entityTypes/HCA', attributes: {} };
+        act(function () {
+            updateMdmValues(function (prev) { return (__assign(__assign({}, prev), { entity: newEntity })); });
+        });
+        act(function () {
+            onmessageFromWorker({
+                action: CustomAction.REQUEST,
+                params: { name: RequestAction.GET_ENTITY_URI, id: 2 }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/NEW999',
+            name: RequestAction.GET_ENTITY_URI,
+            id: 2
+        });
+    });
     it('should return entity on getEntity request', function () {
         setUp();
         var params = {

package/hooks/useCustomScripts/useCustomScripts.js

@@ -37,7 +37,7 @@ import { useWorkflowCheckPermission } from '../../features/workflow';
 import { SnackbarContext } from '../../contexts/SnackbarContext';
 import { SandboxAPIContext } from '../../contexts/SandboxAPIContext';
 import { InterceptHandlersContext } from '../../contexts/InterceptHandlersContext';
-import { useMdmAction, useMdmApiPath, useMdmEntity, useMdmEntityUri, useMdmMetadata, useMdmReltioPath, useMdmSearchProviderData, useMdmServicesPath, useMdmTenant, useMdmUiPath, useMdmUser, useMdmWorkflowEnvironmentUrl, useMdmWorkflowPath } from '../../contexts/MdmModuleContext';
+import { useMdmAction, useMdmApiPath, useMdmEntity, useMdmMetadata, useMdmReltioPath, useMdmSearchProviderData, useMdmServicesPath, useMdmTenant, useMdmUiPath, useMdmUser, useMdmWorkflowEnvironmentUrl, useMdmWorkflowPath } from '../../contexts/MdmModuleContext';
 import { processRequest } from '../useAPI';
 import { isValidCustomScript, isURLtoProcess, getProcessedTask, getRequestFakeUrl, getResponseFakeUrl, getWorkerURL } from '../../helpers/customScript';
 var getCustomViewConfig = function (config) {
@@ -66,7 +66,6 @@ export var useCustomScripts = function (config) {
     var apiPath = useMdmApiPath();
     var workflowPath = useMdmWorkflowPath();
     var user = useMdmUser();
-    var entityUri = useMdmEntityUri();
     var environment = useMdmWorkflowEnvironmentUrl();
     var workflowCheckPermission = useWorkflowCheckPermission();
     var searchProviderData = useMdmSearchProviderData();
@@ -74,7 +73,10 @@ export var useCustomScripts = function (config) {
     var requestListeners = useRef({});
     var responseListeners = useRef({});
     var workers = useRef({});
+    var entityRef = useRef(null);
+    var searchQueryRef = useRef(null);
     var processMessageFromWorker = function (_a) {
+        var _b;
         var task = _a.task, worker = _a.worker, config = _a.config;
         if (task) {
             switch (task.action) {
@@ -88,11 +90,11 @@ export var useCustomScripts = function (config) {
                 }
                 case CustomAction.REQUEST: {
                     var processedTask = getProcessedTask(task, apiPath, reltioPath, tenant);
-                    processRequest(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, apiPath: reltioPath, servicesPath: servicesPath, tenant: tenant, workflowPath: workflowPath, entity: entity, entityUri: entityUri, environment: environment, query: searchQuery, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
+                    processRequest(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, apiPath: reltioPath, servicesPath: servicesPath, tenant: tenant, workflowPath: workflowPath, entity: entityRef.current, entityUri: (_b = entityRef.current) === null || _b === void 0 ? void 0 : _b.uri, environment: environment, query: searchQueryRef.current, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
                     break;
                 }
                 case CustomAction.RETURN_PROCESSED_API_RESPONSE: {
-                    var _b = task.params, id = _b.id, data = _b.data;
+                    var _c = task.params, id = _c.id, data = _c.data;
                     if (responseListeners.current[id]) {
                         responseListeners.current[id].next(data);
                         responseListeners.current = omit([id], responseListeners.current);
@@ -100,7 +102,7 @@ export var useCustomScripts = function (config) {
                     break;
                 }
                 case CustomAction.RETURN_PROCESSED_API_REQUEST: {
-                    var _c = task.params, id = _c.id, data = _c.data;
+                    var _d = task.params, id = _d.id, data = _d.data;
                     if (requestListeners.current[id]) {
                         requestListeners.current[id].resolve(data);
                         requestListeners.current = omit([id], requestListeners.current);
@@ -124,6 +126,12 @@ export var useCustomScripts = function (config) {
             };
         }
     }, [config, metadata]);
+    useEffect(function () {
+        entityRef.current = entity;
+    }, [entity]);
+    useEffect(function () {
+        searchQueryRef.current = searchQuery;
+    }, [searchQuery]);
     var customScriptRequestInterceptor = function (_a) {
         var _b;
         var url = _a.url, next = _a.next, resolve = _a.resolve, _c = _a.options, options = _c === void 0 ? {} : _c;

package/hooks/useCustomScripts/useCustomScripts.test.js

@@ -94,13 +94,16 @@ describe('useCustomScripts', function () {
     };
     var setUp = function (_a) {
         var _b = _a === void 0 ? {} : _a, _c = _b.mdmValues, mdmValues = _c === void 0 ? defaultMdmValues : _c, _d = _b.config, config = _d === void 0 ? createConfig() : _d;
+        var updateMdmValues;
         var Providers = function (_a) {
             var children = _a.children;
-            return (React.createElement(MdmModuleProvider, { values: mdmValues },
+            var _b = React.useState(mdmValues), mdmValuesState = _b[0], setMdmValuesState = _b[1];
+            updateMdmValues = setMdmValuesState;
+            return (React.createElement(MdmModuleProvider, { values: mdmValuesState },
                 React.createElement(SnackbarContext.Provider, { value: showSnackbarMessage },
                     React.createElement(InterceptHandlersContext.Provider, { value: interceptors }, children))));
         };
-        return renderHook(useCustomScripts, { initialProps: config, wrapper: Providers });
+        return __assign(__assign({}, renderHook(useCustomScripts, { initialProps: config, wrapper: Providers })), { updateMdmValues: updateMdmValues });
     };
     var postMessage = jest.fn();
     var onmessageFromWorker;
@@ -460,4 +463,77 @@ describe('useCustomScripts', function () {
             }
         });
     }); });
+    it('should resolve getEntityUri/getEntity with the current entity after navigation', function () {
+        var entityA = { uri: 'entities/AAA', type: 'configuration/entityTypes/HCA', attributes: {} };
+        var entityB = { uri: 'entities/BBB', type: 'configuration/entityTypes/HCA', attributes: {} };
+        var updateMdmValues = setUp({ mdmValues: __assign(__assign({}, defaultMdmValues), { entity: entityA }) }).updateMdmValues;
+        act(function () {
+            onmessageFromWorker({
+                action: CustomAction.REQUEST,
+                params: { name: RequestAction.GET_ENTITY_URI, id: 'id1' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/AAA',
+            name: RequestAction.GET_ENTITY_URI,
+            id: 'id1'
+        });
+        act(function () {
+            updateMdmValues(function (prev) { return (__assign(__assign({}, prev), { entity: entityB })); });
+        });
+        act(function () {
+            onmessageFromWorker({
+                action: CustomAction.REQUEST,
+                params: { name: RequestAction.GET_ENTITY_URI, id: 'id2' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'entities/BBB',
+            name: RequestAction.GET_ENTITY_URI,
+            id: 'id2'
+        });
+        act(function () {
+            onmessageFromWorker({ action: CustomAction.REQUEST, params: { name: RequestAction.GET_ENTITY, id: 'id3' } });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: entityB,
+            name: RequestAction.GET_ENTITY,
+            id: 'id3'
+        });
+    });
+    it('should resolve getSearchQuery with the current query after it changes', function () {
+        var updateMdmValues = setUp({
+            mdmValues: __assign(__assign({}, defaultMdmValues), { searchProviderData: { type: 'search', data: { query: 'q1' } } })
+        }).updateMdmValues;
+        act(function () {
+            onmessageFromWorker({
+                action: CustomAction.REQUEST,
+                params: { name: RequestAction.GET_SEARCH_QUERY, id: 'id1' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'q1',
+            name: RequestAction.GET_SEARCH_QUERY,
+            id: 'id1'
+        });
+        act(function () {
+            updateMdmValues(function (prev) { return (__assign(__assign({}, prev), { searchProviderData: { type: 'search', data: { query: 'q2' } } })); });
+        });
+        act(function () {
+            onmessageFromWorker({
+                action: CustomAction.REQUEST,
+                params: { name: RequestAction.GET_SEARCH_QUERY, id: 'id2' }
+            });
+        });
+        expect(postMessage).toHaveBeenLastCalledWith({
+            action: 'response',
+            result: 'q2',
+            name: RequestAction.GET_SEARCH_QUERY,
+            id: 'id2'
+        });
+    });
 });

package/hooks/useMatchesLoader/types.d.ts

@@ -0,0 +1,4 @@
+import { Match } from '@reltio/mdm-sdk';
+export type MatchWithRuleLabels = Match & {
+    matchRuleLabels?: Record<string, string>;
+};

package/hooks/useMatchesLoader/types.js

@@ -0,0 +1 @@
+export {};

package/hooks/useMatchesLoader/useMatchesLoader.d.ts

@@ -1,4 +1,5 @@
-import { Entity, Match, SortingField, EntitiesMap } from '@reltio/mdm-sdk';
+import { Entity, SortingField, EntitiesMap } from '@reltio/mdm-sdk';
+import type { MatchWithRuleLabels } from './types';
 type Props = {
     enabled: boolean;
     entity: Entity;
@@ -17,7 +18,7 @@ type Props = {
 };
 export declare const useMatchesLoader: ({ enabled, entity, filter, rules, onFinishLoading, onStartLoading, options, page, rowsPerPage, sorting, markMatchedValues }: Props) => {
     total: number;
-    matches: Match[];
+    matches: MatchWithRuleLabels[];
     entitiesMap: EntitiesMap<Pick<Entity, "label" | "type" | "uri">>;
     loadMatches: () => void;
 };

package/hooks/useMatchesLoader/useMatchesLoader.js

@@ -10,22 +10,52 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { ActivityFilter, collectAllTransitiveEntitiesUris, getEntitiesMapForTransitiveMatches, getMatchesForDataTenantEntity, getMatchesFromDataTenants, getTransitiveMatches, isDataTenantEntity, isTempUri, withDtssPotentialItems, addGlobalFilterToQuery, addGetTransitiveMatchesMaskingOptions } from '@reltio/mdm-sdk';
+import { ActivityFilter, collectAllTransitiveEntitiesUris, getEntitiesMapForTransitiveMatches, getDataTenantMatchGroups, getMatchesForDataTenantEntity, getMatchesFromDataTenants, getTransitiveMatches, isDataTenantEntity, isTempUri, withDtssPotentialItems, addGlobalFilterToQuery, addGetTransitiveMatchesMaskingOptions } from '@reltio/mdm-sdk';
 import { usePagingSimulator } from '../usePagingSimulator';
 import { useSafePromise } from '../useSafePromise';
 import { useMdmDataTenantsWithIdBuilder, useMdmDtssPath, useMdmGlobalSearchRequestOptions, useMdmMetadata, useMdmTenant, useMdmShowMasking } from '../../contexts/MdmModuleContext';
+var matchRuleLabelsCache = new Map();
+// Match rule labels are static per (dtssPath, customerTenant), so the request is
+// cached and reused across reloads (paging, filtering, sorting) instead of being
+// refetched every time matches are loaded. Failed requests are evicted so a later
+// load can retry.
+var getCachedDataTenantMatchRuleLabels = function (dtssPath, customerTenant) {
+    var cacheKey = "".concat(dtssPath, "::").concat(customerTenant);
+    var cachedRequest = matchRuleLabelsCache.get(cacheKey);
+    if (cachedRequest !== undefined) {
+        return cachedRequest;
+    }
+    var request = getDataTenantMatchGroups({ dtssPath: dtssPath, customerTenant: customerTenant }).catch(function () {
+        matchRuleLabelsCache.delete(cacheKey);
+        return {};
+    });
+    matchRuleLabelsCache.set(cacheKey, request);
+    return request;
+};
+var addDataTenantMatchRuleLabels = function (matches, entity, matchRuleLabels) {
+    if (!Object.keys(matchRuleLabels).length) {
+        return matches;
+    }
+    return matches.map(function (match) {
+        var _a;
+        return (isDataTenantEntity(entity) || isDataTenantEntity(match.object)) &&
+            ((_a = match.matchRules) === null || _a === void 0 ? void 0 : _a.some(function (matchRuleUri) { return matchRuleLabels[matchRuleUri]; }))
+            ? __assign(__assign({}, match), { matchRuleLabels: matchRuleLabels }) : match;
+    });
+};
 export var useMatchesLoader = function (_a) {
     var enabled = _a.enabled, entity = _a.entity, filter = _a.filter, rules = _a.rules, onFinishLoading = _a.onFinishLoading, onStartLoading = _a.onStartLoading, options = _a.options, page = _a.page, rowsPerPage = _a.rowsPerPage, sorting = _a.sorting, markMatchedValues = _a.markMatchedValues;
     var _b = sorting || {}, order = _b.order, field = _b.field;
     var _c = useState(0), total = _c[0], setTotal = _c[1];
     var _d = useState([]), matches = _d[0], setMatches = _d[1];
-    var _e = useState({}), entitiesMap = _e[0], setEntitiesMap = _e[1];
+    var _e = useState({}), matchRuleLabels = _e[0], setMatchRuleLabels = _e[1];
+    var _f = useState({}), entitiesMap = _f[0], setEntitiesMap = _f[1];
     var metadata = useMdmMetadata();
     var tenant = useMdmTenant();
     var dtssPath = useMdmDtssPath();
     var dataTenants = useMdmDataTenantsWithIdBuilder();
     var showMasking = useMdmShowMasking();
-    var _f = useMdmGlobalSearchRequestOptions() || {}, activityFilter = _f.activityFilter, globalFilter = _f.globalFilter;
+    var _g = useMdmGlobalSearchRequestOptions() || {}, activityFilter = _g.activityFilter, globalFilter = _g.globalFilter;
     var activeness = typeof options.showInactiveEntities === 'boolean'
         ? options.showInactiveEntities
             ? ActivityFilter.ALL
@@ -48,6 +78,7 @@ export var useMatchesLoader = function (_a) {
     var getTransitiveMatchesWithPaging = usePagingSimulator(getTransitiveMatchesWithDtss);
     var getPagedMatchesForDataTenantEntity = usePagingSimulator(getMatchesForDataTenantEntity);
     var safePromise = useSafePromise();
+    var safeMatchRuleLabelsPromise = useSafePromise();
     var getMatches = useCallback(function (force) {
         if (force === void 0) { force = false; }
         if (!enabled || isTempUri(entityUri)) {
@@ -57,7 +88,7 @@ export var useMatchesLoader = function (_a) {
             return;
         }
         onStartLoading === null || onStartLoading === void 0 ? void 0 : onStartLoading();
-        safePromise(isDataTenantEntity(entity)
+        var matchesRequest = isDataTenantEntity(entity)
             ? getPagedMatchesForDataTenantEntity({
                 dtssPath: dtssPath,
                 entity: entity,
@@ -77,7 +108,8 @@ export var useMatchesLoader = function (_a) {
                 markMatchedValues: markMatchedValues,
                 deep: options.showTransitiveMatches ? undefined : 1,
                 activeness: activeness
-            }, showMasking)), { offset: page * rowsPerPage, force: force })))
+            }, showMasking)), { offset: page * rowsPerPage, force: force }));
+        safePromise(matchesRequest)
             .then(function (result) {
             var response = result.response, total = result.total, originalResponse = result.originalResponse;
             setTotal(total);
@@ -123,12 +155,27 @@ export var useMatchesLoader = function (_a) {
     useEffect(function () {
         getMatches();
     }, [getMatches]);
+    // Match rule labels are loaded independently of the matches request so the
+    // matches list renders without waiting for them; they are applied as a
+    // derived layer once available. Keyed on a stable boolean rather than the
+    // dataTenants array reference to avoid re-firing on every render.
+    var hasDataTenants = !!(dataTenants === null || dataTenants === void 0 ? void 0 : dataTenants.length);
+    useEffect(function () {
+        if (!dtssPath || !tenant || !hasDataTenants) {
+            setMatchRuleLabels({});
+            return;
+        }
+        safeMatchRuleLabelsPromise(getCachedDataTenantMatchRuleLabels(dtssPath, tenant))
+            .then(setMatchRuleLabels)
+            .catch(function () { return setMatchRuleLabels({}); });
+    }, [dtssPath, tenant, hasDataTenants, safeMatchRuleLabelsPromise]);
+    var matchesWithRuleLabels = useMemo(function () { return addDataTenantMatchRuleLabels(matches, entity, matchRuleLabels); }, [matches, entity, matchRuleLabels]);
     var loadMatches = useCallback(function () {
         getMatches(true);
     }, [getMatches]);
     return {
         total: total,
-        matches: matches,
+        matches: matchesWithRuleLabels,
         entitiesMap: entitiesMap,
         loadMatches: loadMatches
     };

package/hooks/useMatchesLoader/useMatchesLoader.test.js

@@ -46,11 +46,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import React from 'react';
-import { getTransitiveMatches, getMatchesForDataTenantEntity } from '@reltio/mdm-sdk';
+import { getTransitiveMatches, getMatchesForDataTenantEntity, getDataTenantMatchGroups } from '@reltio/mdm-sdk';
 import { renderHook, waitFor } from '@testing-library/react';
 import { MdmModuleProvider } from '../../contexts/MdmModuleContext';
 import { useMatchesLoader } from './useMatchesLoader';
-jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getTransitiveMatches: jest.fn(), getMatchesForDataTenantEntity: jest.fn(), isDataTenantEntity: jest.fn().mockImplementation(function (entity) { return !!entity.dataTenant; }) })); });
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getTransitiveMatches: jest.fn(), getMatchesForDataTenantEntity: jest.fn(), getDataTenantMatchGroups: jest.fn(), isDataTenantEntity: jest.fn().mockImplementation(function (entity) { return !!entity.dataTenant; }) })); });
 /**
  * useMatchesLoader runs a useEffect that calls getMatches() on mount. getMatches() is async:
  * it calls the SDK (getTransitiveMatches / getMatchesForDataTenantEntity), and when the
@@ -187,4 +187,47 @@ describe('Test useMatchesLoader hook', function () {
             }
         });
     }); });
+    it('should add data tenant match rule labels to DTSS matches', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var matchRuleUri, result;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    matchRuleUri = 'configuration/entityTypes/HCP/matchGroups/DataTenantRule';
+                    getMatchesForDataTenantEntity.mockResolvedValueOnce([
+                        {
+                            object: {
+                                uri: 'entities/customerTenantMatch',
+                                type: 'configuration/entityTypes/HCP'
+                            },
+                            matchRules: [matchRuleUri]
+                        }
+                    ]);
+                    getDataTenantMatchGroups.mockResolvedValueOnce((_a = {},
+                        _a[matchRuleUri] = 'Data Tenant Match Rule',
+                        _a));
+                    result = setUp({
+                        props: __assign(__assign({}, defaultProps), { entity: __assign(__assign({}, defaultProps.entity), { dataTenant: 'tenantId4' }) }),
+                        mdmValues: __assign(__assign({}, defaultMdmValues), { dtssPath: 'dtssPath/', tenant: { id: 'customerTenant', name: 'customerTenant' } })
+                    }).result;
+                    return [4 /*yield*/, waitFor(function () {
+                            var _a;
+                            expect(result.current.matches).toEqual([
+                                expect.objectContaining({
+                                    matchRuleLabels: (_a = {},
+                                        _a[matchRuleUri] = 'Data Tenant Match Rule',
+                                        _a)
+                                })
+                            ]);
+                        })];
+                case 1:
+                    _b.sent();
+                    expect(getDataTenantMatchGroups).toHaveBeenCalledWith({
+                        dtssPath: 'dtssPath/',
+                        customerTenant: 'customerTenant'
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2276",
+  "version": "1.4.2278",
   "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.2052",
+    "@reltio/mdm-sdk": "^1.4.2053",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",