@reltio/components 1.4.1850 → 1.4.1852

package/cjs/EditModeAttributesList/EditModeAttributesList.js

@@ -53,8 +53,11 @@ var HasDeletionsContext_1 = require("../contexts/HasDeletionsContext");
 var withContext_1 = require("../HOCs/withContext");
 var ConfigPermissionsContext_1 = require("../contexts/ConfigPermissionsContext");
 var ScrollToElementContext_1 = require("../contexts/ScrollToElementContext");
+var contexts_1 = require("../contexts");
 var EditModeAttributesList = function (_a) {
     var parentAttributeType = _a.parentAttributeType, attrTypes = _a.attrTypes, entity = _a.entity, parentUri = _a.parentUri, showEmptyEditors = _a.showEmptyEditors, mode = _a.mode, crosswalks = _a.crosswalks, drawLines = _a.drawLines, children = _a.children, className = _a.className, _b = _a.alwaysVisibleTypeUris, alwaysVisibleTypeUris = _b === void 0 ? constants_1.ALWAYS_VISIBLE_TYPE_URIS : _b, onAddAttributes = _a.onAddAttributes, onChangeAttribute = _a.onChangeAttribute, onDeleteAttribute = _a.onDeleteAttribute, additionalControlsRenderer = _a.additionalControlsRenderer, showNonOv = _a.showNonOv, highlightAttribute = _a.highlightAttribute;
+    var hiddenAttributes = (0, contexts_1.useMdmHiddenAttributes)();
+    var filteredAttrTypes = (0, react_1.useMemo)(function () { return attrTypes.filter(function (attrType) { return !hiddenAttributes.includes(attrType.uri); }); }, [attrTypes, hiddenAttributes]);
     var _c = entity.attributes, attributes = _c === void 0 ? {} : _c;
     var _d = (0, react_1.useState)({}), hasDeletionsMap = _d[0], setHasDeletionsMap = _d[1];
     var setHasDeletions = (0, react_1.useCallback)(function (attrTypeUri, value) {
@@ -68,12 +71,12 @@ var EditModeAttributesList = function (_a) {
     }, [parentUri]);
     var canCreate = (0, react_1.useContext)(ConfigPermissionsContext_1.ConfigPermissionsContext).canCreate;
     var canCreateParentAttrType = (0, react_1.useMemo)(function () { return canCreate && parentAttributeType && (0, mdm_sdk_1.checkCanCreateAttribute)({ attributeType: parentAttributeType, mode: mode }); }, [parentAttributeType, mode, canCreate]);
-    var creatableAttrTypes = (0, react_1.useMemo)(function () { return (canCreate ? (0, mdm_sdk_1.getCreatableAttributeTypes)(mode, attrTypes) : []); }, [attrTypes, mode, canCreate]);
+    var creatableAttrTypes = (0, react_1.useMemo)(function () { return (canCreate ? (0, mdm_sdk_1.getCreatableAttributeTypes)(mode, filteredAttrTypes) : []); }, [filteredAttrTypes, mode, canCreate]);
     var moreAttrTypes = (0, helpers_1.getMoreAttrTypes)(creatableAttrTypes, entity, showEmptyEditors, hasDeletionsMap);
     var pinnedAttributes = (0, react_1.useContext)(PinnedAttributesContext_1.PinnedAttributesContext);
     var pagersData = (0, react_1.useMemo)(function () {
-        return (0, mdm_sdk_1.getAttributesListForEditMode)(attrTypes, mode, entity, showEmptyEditors, showNonOv, pinnedAttributes, canCreate);
-    }, [attrTypes, mode, entity, showEmptyEditors, showNonOv, pinnedAttributes, canCreate]);
+        return (0, mdm_sdk_1.getAttributesListForEditMode)(filteredAttrTypes, mode, entity, showEmptyEditors, showNonOv, pinnedAttributes, canCreate);
+    }, [filteredAttrTypes, mode, entity, showEmptyEditors, showNonOv, pinnedAttributes, canCreate]);
     var _e = (0, react_1.useMemo)(function () { return (0, attributesView_1.splitPagersData)(alwaysVisibleTypeUris, pagersData); }, [pagersData, alwaysVisibleTypeUris]), alwaysVisiblePagersData = _e[0], regularPagersData = _e[1];
     var onAddMoreAttributes = (0, react_1.useCallback)(function (attributeTypes) {
         onAddAttributes(attributeTypes.map(function (attributeType) { return ({

package/cjs/EditModeAttributesView/EditModeAttributesView.test.js

@@ -10,16 +10,54 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var enzyme_1 = require("enzyme");
+var react_2 = require("@testing-library/react");
+var user_event_1 = __importDefault(require("@testing-library/user-event"));
 var PinnedAttributesContext_1 = require("../contexts/PinnedAttributesContext");
 var MdmModuleContext_1 = require("../contexts/MdmModuleContext");
 var EditModeAttributesView_1 = require("./EditModeAttributesView");
-jest.mock('../contexts/MdmModuleContext', function () { return (__assign(__assign({}, jest.requireActual('../contexts/MdmModuleContext')), { useMdmAction: jest.fn(), useMdmMetadata: jest.fn(), useMdmUserRoles: jest.fn(), useMdmModifiedEntity: jest.fn() })); });
+jest.mock('../contexts/MdmModuleContext', function () { return (__assign(__assign({}, jest.requireActual('../contexts/MdmModuleContext')), { useMdmAction: jest.fn(), useMdmMetadata: jest.fn(), useMdmUserRoles: jest.fn(), useMdmModifiedEntity: jest.fn(), useMdmDependentLookupEditorState: jest.fn(), useMdmHiddenAttributes: jest.fn() })); });
 var metadata = {
     entityTypes: []
 };
@@ -35,29 +73,185 @@ var pinnedAttributes = [
 var entity = { uri: 'entities/123' };
 var setUp = function (props) { return (0, enzyme_1.shallow)(react_1.default.createElement(EditModeAttributesView_1.EditModeAttributesView, __assign({ entity: entity }, props))); };
 describe('EditModeAttributesView', function () {
-    beforeEach(function () {
-        MdmModuleContext_1.useMdmMetadata.mockReturnValue(metadata);
-        MdmModuleContext_1.useMdmUserRoles.mockReturnValue([]);
-        MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue(null);
-        MdmModuleContext_1.useMdmAction.mockReturnValue(jest.fn());
-    });
-    afterEach(function () {
-        jest.clearAllMocks();
-    });
-    it('should render PinnedAttributesContext.Provider with passing pinnedAttributes for this user', function () {
-        MdmModuleContext_1.useMdmUserRoles.mockReturnValue(['ROLE_ADMIN']);
-        var component = setUp({ pinnedAttributes: pinnedAttributes });
-        expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider)).toHaveLength(1);
-        expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider).prop('value')).toEqual(pinnedAttributes[0].attributes);
-    });
-    it('should render PinnedAttributesContext.Provider with passing pinnedAttributes as empty array for user without roles', function () {
-        var component = setUp({ pinnedAttributes: pinnedAttributes });
-        expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider)).toHaveLength(1);
-        expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider).prop('value')).toEqual([]);
+    describe('PinnedAttributesContext', function () {
+        beforeEach(function () {
+            MdmModuleContext_1.useMdmMetadata.mockReturnValue(metadata);
+            MdmModuleContext_1.useMdmUserRoles.mockReturnValue([]);
+            MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue(null);
+            MdmModuleContext_1.useMdmAction.mockReturnValue(jest.fn());
+        });
+        afterEach(function () {
+            jest.clearAllMocks();
+        });
+        it('should render PinnedAttributesContext.Provider with passing pinnedAttributes for this user', function () {
+            MdmModuleContext_1.useMdmUserRoles.mockReturnValue(['ROLE_ADMIN']);
+            var component = setUp({ pinnedAttributes: pinnedAttributes });
+            expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider)).toHaveLength(1);
+            expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider).prop('value')).toEqual(pinnedAttributes[0].attributes);
+        });
+        it('should render PinnedAttributesContext.Provider with passing pinnedAttributes as empty array for user without roles', function () {
+            var component = setUp({ pinnedAttributes: pinnedAttributes });
+            expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider)).toHaveLength(1);
+            expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider).prop('value')).toEqual([]);
+        });
+        it('should render PinnedAttributesContext.Provider with passing pinnedAttributes as empty array if no pinnedAttributes', function () {
+            var component = setUp({});
+            expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider)).toHaveLength(1);
+            expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider).prop('value')).toEqual([]);
+        });
     });
-    it('should render PinnedAttributesContext.Provider with passing pinnedAttributes as empty array if no pinnedAttributes', function () {
-        var component = setUp({});
-        expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider)).toHaveLength(1);
-        expect(component.find(PinnedAttributesContext_1.PinnedAttributesContext.Provider).prop('value')).toEqual([]);
+    describe('rule based attributes', function () {
+        var metadata = {
+            entityTypes: [
+                {
+                    uri: 'configuration/entityTypes/HCP',
+                    attributes: [
+                        {
+                            name: 'Category1',
+                            type: 'String',
+                            uri: 'configuration/entityTypes/HCP/attributes/Category1'
+                        },
+                        {
+                            name: 'Category2',
+                            type: 'String',
+                            uri: 'configuration/entityTypes/HCP/attributes/Category2'
+                        },
+                        {
+                            name: 'Category3',
+                            type: 'String',
+                            uri: 'configuration/entityTypes/HCP/attributes/Category3'
+                        },
+                        {
+                            name: 'Category4',
+                            type: 'String',
+                            uri: 'configuration/entityTypes/HCP/attributes/Category4'
+                        },
+                        {
+                            name: 'Nested1',
+                            label: 'Nested1',
+                            type: 'Nested',
+                            uri: 'configuration/entityTypes/HCP/attributes/Nested1',
+                            attributes: [
+                                {
+                                    name: 'NestedCategory1',
+                                    type: 'String',
+                                    uri: 'configuration/entityTypes/HCP/attributes/Nested1/attributes/NestedCategory1'
+                                },
+                                {
+                                    name: 'NestedCategory2',
+                                    type: 'String',
+                                    uri: 'configuration/entityTypes/HCP/attributes/Nested1/attributes/NestedCategory2'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        };
+        var setUp = function (props) {
+            var user = user_event_1.default.setup();
+            return __assign({ user: user }, (0, react_2.render)(react_1.default.createElement(EditModeAttributesView_1.EditModeAttributesView, __assign({}, props))));
+        };
+        beforeAll(function () {
+            MdmModuleContext_1.useMdmUserRoles.mockReturnValue([]);
+            MdmModuleContext_1.useMdmAction.mockReturnValue(jest.fn());
+            MdmModuleContext_1.useMdmMetadata.mockReturnValue(metadata);
+            MdmModuleContext_1.useMdmHiddenAttributes.mockReturnValue([]);
+        });
+        it('should hide attributes if there are no rules allow to show the attribute', function () {
+            var entity = {
+                type: 'configuration/entityTypes/HCP',
+                uri: 'entities/uri_e'
+            };
+            MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue({
+                type: 'configuration/entityTypes/HCP',
+                uri: 'entities/uri_e',
+                attributes: {
+                    Category1: [
+                        {
+                            uri: 'entities/uri_e/attributes/uri1',
+                            value: 'category1_value1'
+                        }
+                    ],
+                    Category2: [
+                        {
+                            uri: 'entities/uri_e/attributes/uri2',
+                            value: 'category2_value1'
+                        }
+                    ],
+                    Category3: [
+                        {
+                            uri: 'entities/uri_e/attributes/uri3',
+                            value: 'category3_value1'
+                        }
+                    ],
+                    Category4: [
+                        {
+                            uri: 'entities/uri_e/attributes/uri4',
+                            value: 'category4_value1'
+                        }
+                    ]
+                }
+            });
+            MdmModuleContext_1.useMdmHiddenAttributes.mockReturnValue([
+                'configuration/entityTypes/HCP/attributes/Category2',
+                'configuration/entityTypes/HCP/attributes/Category3',
+                'configuration/entityTypes/HCP/attributes/Category4'
+            ]);
+            setUp({ entity: entity });
+            expect(react_2.screen.getByText('category1_value1')).toBeInTheDocument();
+            expect(react_2.screen.queryByText('category2_value1')).not.toBeInTheDocument();
+            expect(react_2.screen.queryByText('category3_value1')).not.toBeInTheDocument();
+            expect(react_2.screen.queryByText('category4_value1')).not.toBeInTheDocument();
+        });
+        it('should hide nested attributes if there are no rules allow to show the attribute', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var entity, user;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        entity = {
+                            type: 'configuration/entityTypes/HCP',
+                            uri: 'entities/uri_e'
+                        };
+                        MdmModuleContext_1.useMdmModifiedEntity.mockReturnValue({
+                            type: 'configuration/entityTypes/HCP',
+                            uri: 'entities/uri_e',
+                            attributes: {
+                                Nested1: [
+                                    {
+                                        uri: 'entities/uri_e/attributes/nesteduri1',
+                                        value: {
+                                            NestedCategory1: [
+                                                {
+                                                    ov: true,
+                                                    uri: 'entities/uri_e/attributes/nesteduri1/attributes/nestedcaturi1',
+                                                    value: 'nested_category1_value1'
+                                                }
+                                            ],
+                                            NestedCategory2: [
+                                                {
+                                                    ov: true,
+                                                    uri: 'entities/uri_e/attributes/nesteduri1/attributes/nestedcaturi2',
+                                                    value: 'nested_category2_value1'
+                                                }
+                                            ]
+                                        }
+                                    }
+                                ]
+                            }
+                        });
+                        MdmModuleContext_1.useMdmHiddenAttributes.mockReturnValue([
+                            'configuration/entityTypes/HCP/attributes/Nested1/attributes/NestedCategory2'
+                        ]);
+                        user = setUp({ entity: entity }).user;
+                        return [4 /*yield*/, user.click(react_2.screen.getByTestId('arrow-expand-button'))];
+                    case 1:
+                        _a.sent();
+                        expect(react_2.screen.getByText('nested_category1_value1')).toBeInTheDocument();
+                        expect(react_2.screen.queryByText('nested_category2_value1')).not.toBeInTheDocument();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     });
 });

package/cjs/ReadOnlyAttributesList/ReadOnlyAttributesList.js

@@ -43,10 +43,13 @@ var ShowMore_1 = require("../ShowMore");
 var ShowLess_1 = require("../ShowLess");
 var constants_1 = require("../constants");
 var attributesView_1 = require("../helpers/attributesView");
+var contexts_1 = require("../contexts");
 var ReadOnlyAttributesList = function (_a) {
     var attrTypes = _a.attrTypes, entity = _a.entity, parentUri = _a.parentUri, drawLines = _a.drawLines, children = _a.children, className = _a.className, max = _a.max, _b = _a.alwaysVisibleTypeUris, alwaysVisibleTypeUris = _b === void 0 ? constants_1.ALWAYS_VISIBLE_TYPE_URIS : _b, showNonOv = _a.showNonOv;
+    var hiddenAttributes = (0, contexts_1.useMdmHiddenAttributes)();
+    var filteredAttrTypes = (0, react_1.useMemo)(function () { return attrTypes.filter(function (attrType) { return !hiddenAttributes.includes(attrType.uri); }); }, [attrTypes, hiddenAttributes]);
     var _c = (0, react_1.useState)(max || Infinity), visibleValuesCount = _c[0], setVisibleValuesCount = _c[1];
-    var pagersData = (0, react_1.useMemo)(function () { return (0, mdm_sdk_1.getAttributesListForReadMode)(attrTypes, entity, showNonOv); }, [attrTypes, entity, showNonOv]);
+    var pagersData = (0, react_1.useMemo)(function () { return (0, mdm_sdk_1.getAttributesListForReadMode)(filteredAttrTypes, entity, showNonOv); }, [filteredAttrTypes, entity, showNonOv]);
     var _d = (0, react_1.useMemo)(function () { return (0, attributesView_1.splitPagersData)(alwaysVisibleTypeUris, pagersData); }, [pagersData, alwaysVisibleTypeUris]), alwaysVisiblePagersData = _d[0], regularPagersData = _d[1];
     var visibleAttributePagersData = regularPagersData.slice(0, visibleValuesCount);
     var showMore = max && visibleAttributePagersData.length < regularPagersData.length;

package/cjs/ReadOnlyAttributesView/ReadOnlyAttributesView.js

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReadOnlyAttributesView = void 0;
 var react_1 = __importStar(require("react"));
-var ramda_1 = require("ramda");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var classnames_1 = __importDefault(require("classnames"));
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
@@ -48,14 +47,7 @@ var ReadOnlyAttributesView = function (_a) {
     var styles = (0, styles_1.useStyles)();
     var metadata = (0, MdmModuleContext_1.useMdmMetadata)();
     var pivotingAttributes = (0, MdmModuleContext_1.useMdmPivotingAttributes)();
-    var filteredAttrTypes = (0, react_1.useMemo)(function () {
-        var dynamicRules = (0, mdm_sdk_1.getRuleBasedAttributes)(metadata, entity.type);
-        var hiddenAttributes = (0, mdm_sdk_1.getHiddenDynamicAttributes)(dynamicRules, entity);
-        return (0, ramda_1.pipe)(attributesView_1.getFilteredAttrTypes, (0, ramda_1.reject)(function (_a) {
-            var uri = _a.uri;
-            return hiddenAttributes.includes(uri);
-        }))(metadata, entity.type, includeUris, excludeUris, hiddenAttributes);
-    }, [excludeUris, includeUris, metadata, entity]);
+    var filteredAttrTypes = (0, react_1.useMemo)(function () { return (0, attributesView_1.getFilteredAttrTypes)(metadata, entity.type, includeUris, excludeUris); }, [excludeUris, includeUris, metadata, entity]);
     var attributesCount = attributesCountProp || DEFAULT_ATTRIBUTES_COUNT;
     var attributesList = (0, mdm_sdk_1.getAttributesListForReadMode)(filteredAttrTypes, entity);
     var isShowAttributeList = attributesList.filter(function (_a) {

package/cjs/ReadOnlyAttributesView/ReadOnlyAttributesView.test.js

@@ -10,6 +10,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -26,6 +62,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var enzyme_1 = require("enzyme");
 var react_2 = require("@testing-library/react");
+var user_event_1 = __importDefault(require("@testing-library/user-event"));
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var Typography_1 = __importDefault(require("@mui/material/Typography"));
 var ReadOnlyAttributesView_1 = require("./ReadOnlyAttributesView");
@@ -34,7 +71,7 @@ var ReadOnlyAttributesList_1 = require("../ReadOnlyAttributesList");
 var FacetViewHeader_1 = require("../FacetViewHeader");
 var PivotingAttributeContext_1 = require("../contexts/PivotingAttributeContext");
 var MdmModuleContext_1 = require("../contexts/MdmModuleContext");
-jest.mock('../contexts/MdmModuleContext', function () { return (__assign(__assign({}, jest.requireActual('../contexts/MdmModuleContext')), { useMdmMetadata: jest.fn(), useMdmPivotingAttributes: jest.fn() })); });
+jest.mock('../contexts/MdmModuleContext', function () { return (__assign(__assign({}, jest.requireActual('../contexts/MdmModuleContext')), { useMdmMetadata: jest.fn(), useMdmPivotingAttributes: jest.fn(), useMdmHiddenAttributes: jest.fn() })); });
 describe('ReadOnlyAttributesView tests', function () {
     var metadata = {
         entityTypes: [
@@ -208,8 +245,8 @@ describe('ReadOnlyAttributesView tests', function () {
         var provider = component.find(PivotingAttributeContext_1.PivotingAttributeContext.Provider);
         expect(provider.prop('value')).toEqual(pivotingAttributes);
     });
-    describe('dynamic rules', function () {
-        var metadataWithDynamicRules = {
+    describe('rule based attributes', function () {
+        var metadata = {
             entityTypes: [
                 {
                     uri: 'configuration/entityTypes/HCP',
@@ -233,93 +270,38 @@ describe('ReadOnlyAttributesView tests', function () {
                             name: 'Category4',
                             type: 'String',
                             uri: 'configuration/entityTypes/HCP/attributes/Category4'
-                        }
-                    ],
-                    ruleBasedAttributes: [
-                        {
-                            uri: 'configuration/entityTypes/HCP/ruleBasedAttributes/DynamicRule1',
-                            label: 'Dynamic Rule 1',
-                            description: 'Dynamic Attributes Rule 1',
-                            name: 'DynamicRule1',
-                            type: 'Dynamic',
-                            controlFunction: {
-                                expression: "listEquals(attributes.Category1.value, 'category1_value1') and listEquals(attributes.Category2.value, 'category2_value1', 'category2_value2')",
-                                showAttributeURI: [
-                                    'configuration/entityTypes/HCP/attributes/Category3',
-                                    'configuration/entityTypes/HCP/attributes/Category4'
-                                ]
-                            }
-                        },
-                        {
-                            uri: 'configuration/entityTypes/HCP/ruleBasedAttributes/DynamicRule2',
-                            label: 'Dynamic Rule 2',
-                            description: 'Dynamic Attributes Rule 2',
-                            name: 'DynamicRule2',
-                            type: 'Dynamic',
-                            controlFunction: {
-                                expression: "listEquals(attributes.Category1.value, 'category1_value1')",
-                                showAttributeURI: ['configuration/entityTypes/HCP/attributes/Category2']
-                            }
                         },
                         {
-                            uri: 'configuration/entityTypes/HCP/ruleBasedAttributes/DynamicRule3',
-                            label: 'Dynamic Rule 3',
-                            description: 'Dynamic Attributes Rule 3',
-                            name: 'DynamicRule3',
-                            type: 'Dynamic',
-                            controlFunction: {
-                                expression: "listEquals(attributes.Category1.value, 'category1_value2')",
-                                showAttributeURI: ['configuration/entityTypes/HCP/attributes/Category4']
-                            }
+                            name: 'Nested1',
+                            label: 'Nested1',
+                            type: 'Nested',
+                            uri: 'configuration/entityTypes/HCP/attributes/Nested1',
+                            attributes: [
+                                {
+                                    name: 'NestedCategory1',
+                                    type: 'String',
+                                    uri: 'configuration/entityTypes/HCP/attributes/Nested1/attributes/NestedCategory1'
+                                },
+                                {
+                                    name: 'NestedCategory2',
+                                    type: 'String',
+                                    uri: 'configuration/entityTypes/HCP/attributes/Nested1/attributes/NestedCategory2'
+                                }
+                            ]
                         }
                     ]
                 }
             ]
         };
         var setUp = function (props) {
-            return (0, react_2.render)(react_1.default.createElement(ReadOnlyAttributesView_1.ReadOnlyAttributesView, __assign({}, props)));
+            var user = user_event_1.default.setup();
+            return __assign(__assign({}, (0, react_2.render)(react_1.default.createElement(ReadOnlyAttributesView_1.ReadOnlyAttributesView, __assign({}, props)))), { user: user });
         };
         beforeAll(function () {
-            MdmModuleContext_1.useMdmMetadata.mockReturnValue(metadataWithDynamicRules);
-        });
-        it('should hide attributes which does not fit dynamic rules', function () {
-            var entity = {
-                type: 'configuration/entityTypes/HCP',
-                uri: 'entities/uri_e',
-                attributes: {
-                    Category1: [
-                        {
-                            uri: 'entities/uri_e/attributes/uri1',
-                            value: 'category1_value1_diff'
-                        }
-                    ],
-                    Category2: [
-                        {
-                            uri: 'entities/uri_e/attributes/uri2',
-                            value: 'category2_value1_diff'
-                        }
-                    ],
-                    Category3: [
-                        {
-                            uri: 'entities/uri_e/attributes/uri3',
-                            value: 'category3_value1'
-                        }
-                    ],
-                    Category4: [
-                        {
-                            uri: 'entities/uri_e/attributes/uri4',
-                            value: 'category4_value1'
-                        }
-                    ]
-                }
-            };
-            setUp({ entity: entity });
-            expect(react_2.screen.getByText('category1_value1_diff')).toBeInTheDocument();
-            expect(react_2.screen.queryByText('category2_value1_diff')).not.toBeInTheDocument();
-            expect(react_2.screen.queryByText('category3_value1')).not.toBeInTheDocument();
-            expect(react_2.screen.queryByText('category4_value1')).not.toBeInTheDocument();
+            MdmModuleContext_1.useMdmMetadata.mockReturnValue(metadata);
+            MdmModuleContext_1.useMdmHiddenAttributes.mockReturnValue([]);
         });
-        it('should show attributes which fits dynamic rules', function () {
+        it('should hide attributes', function () {
             var entity = {
                 type: 'configuration/entityTypes/HCP',
                 uri: 'entities/uri_e',
@@ -350,34 +332,61 @@ describe('ReadOnlyAttributesView tests', function () {
                     ]
                 }
             };
+            MdmModuleContext_1.useMdmHiddenAttributes.mockReturnValue([
+                'configuration/entityTypes/HCP/attributes/Category2',
+                'configuration/entityTypes/HCP/attributes/Category3',
+                'configuration/entityTypes/HCP/attributes/Category4'
+            ]);
             setUp({ entity: entity });
             expect(react_2.screen.getByText('category1_value1')).toBeInTheDocument();
-            expect(react_2.screen.getByText('category2_value1')).toBeInTheDocument();
-            expect(react_2.screen.getByText('category3_value1')).toBeInTheDocument();
-            expect(react_2.screen.getByText('category4_value1')).toBeInTheDocument();
+            expect(react_2.screen.queryByText('category2_value1')).not.toBeInTheDocument();
+            expect(react_2.screen.queryByText('category3_value1')).not.toBeInTheDocument();
+            expect(react_2.screen.queryByText('category4_value1')).not.toBeInTheDocument();
         });
-        it('should show attributes if at least one rule allows to show the attribute from showAttributeURI', function () {
-            var entity = {
-                type: 'configuration/entityTypes/HCP',
-                uri: 'entities/uri_e',
-                attributes: {
-                    Category1: [
-                        {
-                            uri: 'entities/uri_e/attributes/uri1',
-                            value: 'category1_value2'
-                        }
-                    ],
-                    Category4: [
-                        {
-                            uri: 'entities/uri_e/attributes/uri4',
-                            value: 'category4_value1'
-                        }
-                    ]
+        it('should hide nested attributes', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var entity, user;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        entity = {
+                            type: 'configuration/entityTypes/HCP',
+                            uri: 'entities/uri_e',
+                            attributes: {
+                                Nested1: [
+                                    {
+                                        uri: 'entities/uri_e/attributes/nesteduri1',
+                                        value: {
+                                            NestedCategory1: [
+                                                {
+                                                    ov: true,
+                                                    uri: 'entities/uri_e/attributes/nesteduri1/attributes/nestedcaturi1',
+                                                    value: 'nested_category1_value'
+                                                }
+                                            ],
+                                            NestedCategory2: [
+                                                {
+                                                    ov: true,
+                                                    uri: 'entities/uri_e/attributes/nesteduri1/attributes/nestedcaturi2',
+                                                    value: 'nested_category2_value1'
+                                                }
+                                            ]
+                                        }
+                                    }
+                                ]
+                            }
+                        };
+                        MdmModuleContext_1.useMdmHiddenAttributes.mockReturnValue([
+                            'configuration/entityTypes/HCP/attributes/Nested1/attributes/NestedCategory2'
+                        ]);
+                        user = setUp({ entity: entity }).user;
+                        return [4 /*yield*/, user.click(react_2.screen.getByTestId('arrow-expand-button'))];
+                    case 1:
+                        _a.sent();
+                        expect(react_2.screen.getByText('nested_category1_value')).toBeInTheDocument();
+                        expect(react_2.screen.queryByText('nested_category2_value1')).not.toBeInTheDocument();
+                        return [2 /*return*/];
                 }
-            };
-            setUp({ entity: entity });
-            expect(react_2.screen.getByText('category1_value2')).toBeInTheDocument();
-            expect(react_2.screen.getByText('category4_value1')).toBeInTheDocument();
-        });
+            });
+        }); });
     });
 });