@reltio/components 1.4.2177 → 1.4.2179

package/InlineSimpleAttribute/InlineSimpleAttribute.js

@@ -28,7 +28,10 @@ export var InlineSimpleAttribute = function (_a) {
     var id = getLastUriPart(attributeValue.uri);
     var crosswalkDisabled = isCrosswalkDisabled(crosswalk);
     var canModifyAttribute = !attributeType.system && !crosswalkDisabled;
-    var canEdit = canModifyAttribute && !disableEdit && checkMetadataForUpdate(Mode.Editing, attributeType);
+    var canEdit = canModifyAttribute &&
+        !disableEdit &&
+        checkMetadataForUpdate(Mode.Editing, attributeType) &&
+        (!attributeValue.masked || isUnmaskingNeeded);
     var canDelete = canModifyAttribute && !disableDelete && checkMetadataForDelete(Mode.Editing, attributeType);
     var isTemporary = isTempUri(attributeValue.uri);
     var hasBasicPermission = checkBasicMetadataPermission(MetadataPermissions.UPDATE, attributeType) && !disableEdit && canModifyAttribute;

package/InlineSimpleAttribute/InlineSimpleAttribute.spec.js

@@ -50,8 +50,9 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { InlineSimpleAttribute } from './InlineSimpleAttribute';
 import * as crosswalksDisplay from '../contexts/CrosswalksDisplayContext';
-import { createNewAttribute } from '@reltio/mdm-sdk';
+import { createNewAttribute, Mode } from '@reltio/mdm-sdk';
 import { MdmModuleProvider } from '../contexts/MdmModuleContext';
+import { MaskedAttributesProvider } from '../contexts/MaskedAttributesContext';
 jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { debounce: function (x) { return x; } })); });
 var defaultProps = {
     attributeValue: {
@@ -83,13 +84,15 @@ var metadata = {
     entityTypes: [],
     sources: []
 };
-var setUp = function (props, skipHover) {
+var setUp = function (props, skipHover, providerValues) {
     if (props === void 0) { props = {}; }
     if (skipHover === void 0) { skipHover = false; }
+    if (providerValues === void 0) { providerValues = {}; }
     var user = userEvent.setup({ skipHover: skipHover });
     var Providers = function (_a) {
         var children = _a.children;
-        return (React.createElement(MdmModuleProvider, { values: { metadata: metadata } }, children));
+        return (React.createElement(MdmModuleProvider, { values: __assign({ metadata: metadata }, providerValues) },
+            React.createElement(MaskedAttributesProvider, null, children)));
     };
     return __assign({ user: user }, render(React.createElement(InlineSimpleAttribute, __assign({}, defaultProps, props)), { wrapper: Providers }));
 };
@@ -231,7 +234,7 @@ describe('Inline simple attribute tests', function () {
                     deleteButton = screen.getByLabelText("You don't have permissions to delete");
                     expect(deleteButton.children[0]).toHaveAttribute('aria-disabled', 'true');
                     expect(deleteButton).toHaveTextContent('Delete');
-                    expect(screen.getByText('Edit').parentElement).not.toHaveAttribute('aria-disabled', 'true');
+                    expect(screen.getByText('Edit')).not.toBeDisabled();
                     return [2 /*return*/];
             }
         });
@@ -457,4 +460,60 @@ describe('Inline simple attribute tests', function () {
             }
         });
     }); });
+    it('should disable edit action for masked attributes when user has no READ permissions', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var mockEntity, user, editButton;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    mockEntity = {
+                        uri: 'entities/123',
+                        type: 'configuration/entityTypes/Individual',
+                        access: ['READ_MASKED'],
+                        label: 'Test Entity'
+                    };
+                    user = setUp({
+                        attributeType: __assign(__assign({}, defaultProps.attributeType), { access: ['READ_MASKED'], masking: true }),
+                        attributeValue: __assign(__assign({}, defaultProps.attributeValue), { masked: true, value: '****' })
+                    }, true, { entity: mockEntity, showMasking: true, mode: Mode.Viewing }).user;
+                    return [4 /*yield*/, user.hover(screen.getByText('****'))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, user.click(screen.getByLabelText('More actions'))];
+                case 2:
+                    _a.sent();
+                    editButton = screen.getByLabelText("You don't have permissions to edit");
+                    expect(editButton.children[0]).toHaveAttribute('aria-disabled', 'true');
+                    expect(editButton).toHaveTextContent('Edit');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should enable edit action for masked attributes when user has needed permissions including READ', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var mockEntity, user, editButton;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    mockEntity = {
+                        uri: 'entities/123',
+                        type: 'configuration/entityTypes/Individual',
+                        access: ['READ_MASKED', 'READ'],
+                        label: 'Test Entity'
+                    };
+                    user = setUp({
+                        attributeType: __assign(__assign({}, defaultProps.attributeType), { access: ['UPDATE', 'READ_MASKED', 'READ'], masking: true }),
+                        attributeValue: __assign(__assign({}, defaultProps.attributeValue), { masked: true, value: '****' })
+                    }, true, { entity: mockEntity, showMasking: true, mode: Mode.Viewing }).user;
+                    return [4 /*yield*/, user.hover(screen.getByText('****'))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, user.click(screen.getByLabelText('More actions'))];
+                case 2:
+                    _a.sent();
+                    editButton = screen.getByText('Edit');
+                    expect(editButton).not.toBeDisabled();
+                    expect(screen.queryByLabelText("You don't have permissions to edit")).not.toBeInTheDocument();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });

package/cjs/InlineSimpleAttribute/InlineSimpleAttribute.js

@@ -57,7 +57,10 @@ var InlineSimpleAttribute = function (_a) {
     var id = (0, mdm_sdk_1.getLastUriPart)(attributeValue.uri);
     var crosswalkDisabled = (0, mdm_sdk_1.isCrosswalkDisabled)(crosswalk);
     var canModifyAttribute = !attributeType.system && !crosswalkDisabled;
-    var canEdit = canModifyAttribute && !disableEdit && (0, mdm_sdk_1.checkMetadataForUpdate)(mdm_sdk_1.Mode.Editing, attributeType);
+    var canEdit = canModifyAttribute &&
+        !disableEdit &&
+        (0, mdm_sdk_1.checkMetadataForUpdate)(mdm_sdk_1.Mode.Editing, attributeType) &&
+        (!attributeValue.masked || isUnmaskingNeeded);
     var canDelete = canModifyAttribute && !disableDelete && (0, mdm_sdk_1.checkMetadataForDelete)(mdm_sdk_1.Mode.Editing, attributeType);
     var isTemporary = (0, mdm_sdk_1.isTempUri)(attributeValue.uri);
     var hasBasicPermission = (0, mdm_sdk_1.checkBasicMetadataPermission)(mdm_sdk_1.MetadataPermissions.UPDATE, attributeType) && !disableEdit && canModifyAttribute;

package/cjs/InlineSimpleAttribute/InlineSimpleAttribute.spec.js

@@ -80,6 +80,7 @@ var InlineSimpleAttribute_1 = require("./InlineSimpleAttribute");
 var crosswalksDisplay = __importStar(require("../contexts/CrosswalksDisplayContext"));
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var MdmModuleContext_1 = require("../contexts/MdmModuleContext");
+var MaskedAttributesContext_1 = require("../contexts/MaskedAttributesContext");
 jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { debounce: function (x) { return x; } })); });
 var defaultProps = {
     attributeValue: {
@@ -111,13 +112,15 @@ var metadata = {
     entityTypes: [],
     sources: []
 };
-var setUp = function (props, skipHover) {
+var setUp = function (props, skipHover, providerValues) {
     if (props === void 0) { props = {}; }
     if (skipHover === void 0) { skipHover = false; }
+    if (providerValues === void 0) { providerValues = {}; }
     var user = user_event_1.default.setup({ skipHover: skipHover });
     var Providers = function (_a) {
         var children = _a.children;
-        return (react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: { metadata: metadata } }, children));
+        return (react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: __assign({ metadata: metadata }, providerValues) },
+            react_1.default.createElement(MaskedAttributesContext_1.MaskedAttributesProvider, null, children)));
     };
     return __assign({ user: user }, (0, react_2.render)(react_1.default.createElement(InlineSimpleAttribute_1.InlineSimpleAttribute, __assign({}, defaultProps, props)), { wrapper: Providers }));
 };
@@ -259,7 +262,7 @@ describe('Inline simple attribute tests', function () {
                     deleteButton = react_2.screen.getByLabelText("You don't have permissions to delete");
                     expect(deleteButton.children[0]).toHaveAttribute('aria-disabled', 'true');
                     expect(deleteButton).toHaveTextContent('Delete');
-                    expect(react_2.screen.getByText('Edit').parentElement).not.toHaveAttribute('aria-disabled', 'true');
+                    expect(react_2.screen.getByText('Edit')).not.toBeDisabled();
                     return [2 /*return*/];
             }
         });
@@ -485,4 +488,60 @@ describe('Inline simple attribute tests', function () {
             }
         });
     }); });
+    it('should disable edit action for masked attributes when user has no READ permissions', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var mockEntity, user, editButton;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    mockEntity = {
+                        uri: 'entities/123',
+                        type: 'configuration/entityTypes/Individual',
+                        access: ['READ_MASKED'],
+                        label: 'Test Entity'
+                    };
+                    user = setUp({
+                        attributeType: __assign(__assign({}, defaultProps.attributeType), { access: ['READ_MASKED'], masking: true }),
+                        attributeValue: __assign(__assign({}, defaultProps.attributeValue), { masked: true, value: '****' })
+                    }, true, { entity: mockEntity, showMasking: true, mode: mdm_sdk_1.Mode.Viewing }).user;
+                    return [4 /*yield*/, user.hover(react_2.screen.getByText('****'))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, user.click(react_2.screen.getByLabelText('More actions'))];
+                case 2:
+                    _a.sent();
+                    editButton = react_2.screen.getByLabelText("You don't have permissions to edit");
+                    expect(editButton.children[0]).toHaveAttribute('aria-disabled', 'true');
+                    expect(editButton).toHaveTextContent('Edit');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should enable edit action for masked attributes when user has needed permissions including READ', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var mockEntity, user, editButton;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    mockEntity = {
+                        uri: 'entities/123',
+                        type: 'configuration/entityTypes/Individual',
+                        access: ['READ_MASKED', 'READ'],
+                        label: 'Test Entity'
+                    };
+                    user = setUp({
+                        attributeType: __assign(__assign({}, defaultProps.attributeType), { access: ['UPDATE', 'READ_MASKED', 'READ'], masking: true }),
+                        attributeValue: __assign(__assign({}, defaultProps.attributeValue), { masked: true, value: '****' })
+                    }, true, { entity: mockEntity, showMasking: true, mode: mdm_sdk_1.Mode.Viewing }).user;
+                    return [4 /*yield*/, user.hover(react_2.screen.getByText('****'))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, user.click(react_2.screen.getByLabelText('More actions'))];
+                case 2:
+                    _a.sent();
+                    editButton = react_2.screen.getByText('Edit');
+                    expect(editButton).not.toBeDisabled();
+                    expect(react_2.screen.queryByLabelText("You don't have permissions to edit")).not.toBeInTheDocument();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });

package/cjs/hooks/useRelationsLoader/useRelationsLoader.js

@@ -56,7 +56,7 @@ var useRelationsLoader = function (_a) {
     };
     var suggested = config.suggested;
     var options = (0, react_1.useMemo)(function () {
-        var sendMasked = showMasking && (0, mdm_sdk_1.hasRelationMasking)(metadata) && mode === mdm_sdk_1.Mode.Viewing;
+        var sendMasked = showMasking && ((0, mdm_sdk_1.hasRelationMasking)(metadata) || (0, mdm_sdk_1.hasAttributeMasking)(metadata)) && mode === mdm_sdk_1.Mode.Viewing;
         return (0, mdm_sdk_1.addRelationMaskingOptions)({ searchByOv: searchByOv, searchRelationsWithFilter: searchRelationsWithFilter }, sendMasked);
     }, [searchByOv, showMasking, metadata, mode, searchRelationsWithFilter]);
     var filters = (0, react_1.useMemo)(function () {

package/hooks/useRelationsLoader/useRelationsLoader.js

@@ -12,7 +12,7 @@ var __assign = (this && this.__assign) || function () {
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { cond, pipe, prop, T, evolve, filter as filterFn, when, identity, times, length, ifElse, always } from 'ramda';
 import i18n from 'ui-i18n';
-import { ActivityFilter, addGlobalFilterToQuery, getRelationsForDataTenantEntity, getRelationsForEntity, isAvailableEntityTypeUri, isAvailableRelationTypeUri, isDataTenantEntity, getInOutRelationUri, isTempUri, Mode, wrapInArrayIfNeeded, hasRelationMasking, addRelationMaskingOptions } from '@reltio/mdm-sdk';
+import { ActivityFilter, addGlobalFilterToQuery, getRelationsForDataTenantEntity, getRelationsForEntity, isAvailableEntityTypeUri, isAvailableRelationTypeUri, isDataTenantEntity, getInOutRelationUri, isTempUri, Mode, wrapInArrayIfNeeded, hasRelationMasking, hasAttributeMasking, addRelationMaskingOptions } from '@reltio/mdm-sdk';
 import { useSafePromise } from '../useSafePromise';
 import { usePrevious } from '../usePrevious';
 import { useMdmAction, useMdmDtssPath, useMdmGlobalSearchRequestOptions, useMdmMetadata, useMdmProfileLastLoadedTime, useMdmShowMasking, useMdmTenant } from '../../contexts/MdmModuleContext';
@@ -50,7 +50,7 @@ export var useRelationsLoader = function (_a) {
     };
     var suggested = config.suggested;
     var options = useMemo(function () {
-        var sendMasked = showMasking && hasRelationMasking(metadata) && mode === Mode.Viewing;
+        var sendMasked = showMasking && (hasRelationMasking(metadata) || hasAttributeMasking(metadata)) && mode === Mode.Viewing;
         return addRelationMaskingOptions({ searchByOv: searchByOv, searchRelationsWithFilter: searchRelationsWithFilter }, sendMasked);
     }, [searchByOv, showMasking, metadata, mode, searchRelationsWithFilter]);
     var filters = useMemo(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2177",
+  "version": "1.4.2179",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./index.js",