@reltio/components 1.4.2044 → 1.4.2046

package/HierarchicalAttributeTooltip/HierarchicalAttributeTooltip.test.js

@@ -1,27 +1,117 @@
+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 __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 = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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 };
+    }
+};
 import React from 'react';
-import { shallow } from 'enzyme';
-import Tooltip from '@mui/material/Tooltip';
+import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { HierarchicalAttributeTooltip } from './HierarchicalAttributeTooltip';
-describe('HierarchicalAttributeTooltip', function () {
-    var children = React.createElement("div", null, "children");
-    it('should render Tooltip over children with empty value if pathToTitle is empty array', function () {
-        var wrapper = shallow(React.createElement(HierarchicalAttributeTooltip, { pathToTitle: [] }, children));
-        var tooltip = wrapper.find(Tooltip);
-        expect(tooltip.prop('title')).toEqual('');
-        expect(tooltip.prop('children')).toEqual(children);
-    });
-    it('should render Tooltip over children only with title if pathToTitle.length is 2', function () {
-        var pathToTitle = ['HCP', 'Title'];
-        var wrapper = shallow(React.createElement(HierarchicalAttributeTooltip, { pathToTitle: pathToTitle }, children));
-        var tooltip = wrapper.find(Tooltip);
-        expect(tooltip.prop('title')).toMatchSnapshot();
-        expect(tooltip.prop('children')).toEqual(children);
-    });
-    it('should render Tooltip over children only with path if pathToTitle.length more than 2', function () {
-        var pathToTitle = ['HCP', 'Test', 'Title'];
-        var wrapper = shallow(React.createElement(HierarchicalAttributeTooltip, { pathToTitle: pathToTitle }, children));
-        var tooltip = wrapper.find(Tooltip);
-        expect(tooltip.prop('title')).toMatchSnapshot();
-        expect(tooltip.prop('children')).toEqual(children);
-    });
+var defaultProps = {
+    children: React.createElement("div", null, "children"),
+    pathToTitle: []
+};
+var setUp = function (props) {
+    if (props === void 0) { props = defaultProps; }
+    var user = userEvent.setup();
+    return __assign(__assign({}, render(React.createElement(HierarchicalAttributeTooltip, __assign({}, props)))), { user: user });
+};
+describe('Hierarchical attribute tooltip tests', function () {
+    it('should render children and tooltip correctly if pathToTitle is empty array', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var user;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    user = setUp().user;
+                    return [4 /*yield*/, user.hover(screen.getByText('children'))];
+                case 1:
+                    _a.sent();
+                    expect(screen.queryByRole('tooltip')).not.toBeInTheDocument();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should render children and tooltip correctly if pathToTitle.length is 2', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var props, user, tooltip;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    props = __assign(__assign({}, defaultProps), { pathToTitle: ['HCP', 'Title'] });
+                    user = setUp(props).user;
+                    expect(screen.queryByRole('tooltip')).not.toBeInTheDocument();
+                    return [4 /*yield*/, user.hover(screen.getByText('children'))];
+                case 1:
+                    _a.sent();
+                    tooltip = screen.getByRole('tooltip');
+                    within(tooltip).getByText('Title');
+                    expect(screen.queryByRole('list')).not.toBeInTheDocument();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should render children and tooltip correctly if pathToTitle.length more than 2', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var props, user, tooltip, list, items;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    props = __assign(__assign({}, defaultProps), { pathToTitle: ['HCP', 'Test', 'Title'] });
+                    user = setUp(props).user;
+                    expect(screen.queryByRole('tooltip')).not.toBeInTheDocument();
+                    return [4 /*yield*/, user.hover(screen.getByText('children'))];
+                case 1:
+                    _a.sent();
+                    tooltip = screen.getByRole('tooltip');
+                    list = within(tooltip).getByRole('list');
+                    items = within(list).getAllByRole('listitem');
+                    expect(within(tooltip).getAllByText('Title')).toHaveLength(2);
+                    expect(items).toHaveLength(3);
+                    expect(items[0]).toHaveTextContent('HCP');
+                    expect(items[1]).toHaveTextContent('Test');
+                    expect(items[2]).toHaveTextContent('Title');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });

package/HierarchyNodeTitle/HierarchyNodeTitle.test.js

@@ -46,143 +46,104 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import React from 'react';
-import { act } from 'react-dom/test-utils';
-import { mount } from 'enzyme';
-import { getEntity } from '@reltio/mdm-sdk';
-import { Link } from '../Link';
-import { Popper } from '../Popper';
-import { ProfileCard } from '../ProfileCard';
+import { render, screen, within, act } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { getEntity, debounce } from '@reltio/mdm-sdk';
 import { MdmModuleProvider } from '../contexts/MdmModuleContext';
 import { HierarchyNodeTitle } from './HierarchyNodeTitle';
-jest.mock('../ProfileCard', function () { return ({ ProfileCard: function () { return null; } }); });
-jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getEntity: jest.fn() })); });
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getEntity: jest.fn(), debounce: jest.fn() })); });
 var entity = {
     uri: 'entities/123',
+    label: 'perfect entity',
     type: 'configuration/entityTypes/HCP'
 };
 var defaultProps = {
     title: 'Title',
-    isSelected: true,
+    isSelected: false,
     entityUri: 'entities/123',
     anchorEl: document.createElement('div')
 };
-var uiPath = 'http://localhost:3000/ui/sokol/';
-var openEntity = jest.fn();
-var setUp = function (props) {
-    if (props === void 0) { props = defaultProps; }
-    return mount(React.createElement(MdmModuleProvider, { values: { uiPath: uiPath }, actions: { openEntity: openEntity } },
-        React.createElement(HierarchyNodeTitle, __assign({}, props))));
+var defaultMdmValues = { uiPath: 'http://localhost:3000/ui/sokol/', metadata: { entityTypes: [], relationTypes: [] } };
+var defaultMdmActions = { openEntity: jest.fn() };
+var setUp = function (_a) {
+    var _b = _a === void 0 ? {} : _a, _c = _b.props, props = _c === void 0 ? defaultProps : _c, _d = _b.mdmValues, mdmValues = _d === void 0 ? defaultMdmValues : _d, _e = _b.mdmActions, mdmActions = _e === void 0 ? defaultMdmActions : _e;
+    var user = userEvent.setup();
+    var Providers = function (_a) {
+        var children = _a.children;
+        return (React.createElement(MdmModuleProvider, { values: mdmValues, actions: mdmActions }, children));
+    };
+    return __assign(__assign({}, render(React.createElement(HierarchyNodeTitle, __assign({}, props)), { wrapper: Providers })), { user: user });
 };
-describe('HierarchyNodeTitle tests', function () {
+describe('Hierarchy node title tests', function () {
+    var resolveGetEntity;
     beforeEach(function () {
-        getEntity.mockResolvedValue(entity);
+        debounce.mockImplementation(function (fn) { return jest.requireActual('@reltio/mdm-sdk').debounce(fn, 0); });
+        getEntity.mockImplementation(function () {
+            return new Promise(function (resolve) {
+                resolveGetEntity = resolve;
+            });
+        });
     });
     afterEach(function () {
         jest.clearAllMocks();
     });
-    it('should pass correct className to link if isSelected prop is true', function () {
-        var props = __assign(__assign({}, defaultProps), { isSelected: true });
-        var component = setUp(props);
-        expect(component.find('span.link').prop('className')).toBe('link selected');
-    });
     it('should pass correct className to link if isSelected prop is false', function () {
-        var props = __assign(__assign({}, defaultProps), { isSelected: false });
-        var component = setUp(props);
-        expect(component.find('span.link').prop('className')).toBe('link');
+        setUp();
+        expect(screen.getByTestId('reltio-hierarchy-node-title')).not.toHaveClass('selected');
     });
-    it('should render Link with correct props', function () {
-        var component = setUp();
-        expect(component.find(Link).prop('to')).toBe('http://localhost:3000/ui/sokol/#p~com.reltio.plugins.entity.default.DefaultPerspective_e~entities/123');
-        expect(component.find(Link).prop('children')).toBe(defaultProps.title);
-    });
-    it('click by link should dispatch correct action', function () {
-        var component = setUp();
-        var onClick = component.find(Link).prop('onClick');
-        act(function () {
-            if (onClick) {
-                onClick();
-            }
-        });
-        expect(openEntity).toHaveBeenCalledWith({ uri: defaultProps.entityUri });
+    it('should pass correct className to link if isSelected prop is true', function () {
+        var props = __assign(__assign({}, defaultProps), { isSelected: true });
+        setUp({ props: props });
+        expect(screen.getByTestId('reltio-hierarchy-node-title')).toHaveClass('selected');
     });
-    it('should show entity details if cursor was hovered on node', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var component, onMouseEnter;
+    it('should render link correctly and dispatch correct action on click it', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var user, link;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.useFakeTimers();
-                    component = setUp();
-                    expect(component.find(Popper).prop('open')).toBe(false);
-                    expect(component.find(ProfileCard)).toHaveLength(0);
-                    onMouseEnter = component.find('span.link').prop('onMouseEnter');
-                    act(function () {
-                        if (onMouseEnter)
-                            onMouseEnter(null);
-                    });
-                    component.update();
-                    expect(component.find(Popper).prop('open')).toBe(false);
-                    expect(component.find(ProfileCard)).toHaveLength(0);
-                    act(function () {
-                        jest.runAllTimers();
-                    });
-                    component.update();
-                    expect(component.find(Popper).prop('open')).toBe(true);
-                    expect(component.find(ProfileCard).props()).toMatchObject({
-                        entity: null,
-                        variant: 'loading'
-                    });
-                    expect(getEntity).toHaveBeenCalledWith(defaultProps.entityUri);
-                    return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                return [2 /*return*/, Promise.resolve()];
-                            });
-                        }); })];
+                    user = setUp().user;
+                    link = screen.getByText('Title');
+                    expect(link).toHaveAttribute('href', 'http://localhost:3000/ui/sokol/#p~com.reltio.plugins.entity.default.DefaultPerspective_e~entities/123');
+                    return [4 /*yield*/, user.click(link)];
                 case 1:
                     _a.sent();
-                    component.update();
-                    expect(component.find(Popper).prop('open')).toBe(true);
-                    expect(component.find(ProfileCard).props()).toMatchObject({
-                        entity: entity,
-                        variant: 'normal'
-                    });
-                    jest.useRealTimers();
+                    expect(defaultMdmActions.openEntity).toHaveBeenCalledWith({ uri: 'entities/123' });
                     return [2 /*return*/];
             }
         });
     }); });
-    it('should hide entity details if cursor was removed from node', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var component, onMouseEnter, onMouseLeave;
+    it('should show and hide entity details correctly on node hover', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var user, tooltip;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.useFakeTimers();
-                    component = setUp();
-                    onMouseEnter = component.find('span.link').prop('onMouseEnter');
+                    user = setUp().user;
+                    return [4 /*yield*/, user.hover(screen.getByText('Title'))];
+                case 1:
+                    _a.sent();
+                    tooltip = screen.getByRole('tooltip');
+                    within(tooltip).getByTestId('profile-card-placeholder-avatar');
+                    within(tooltip).getByTestId('profile-card-placeholder-info');
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                if (onMouseEnter)
-                                    onMouseEnter(null);
-                                jest.runAllTimers();
-                                return [2 /*return*/, Promise.resolve()];
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, resolveGetEntity(entity)];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
                             });
                         }); })];
-                case 1:
+                case 2:
+                    _a.sent();
+                    within(tooltip).getByAltText('fallback entity avatar');
+                    within(tooltip).getByText('perfect entity');
+                    within(tooltip).getByText('ID:');
+                    within(tooltip).getByText('123');
+                    return [4 /*yield*/, user.unhover(screen.getByText('Title'))];
+                case 3:
                     _a.sent();
-                    component.update();
-                    expect(component.find(Popper).prop('open')).toBe(true);
-                    expect(component.find(ProfileCard).props()).toMatchObject({
-                        entity: entity,
-                        variant: 'normal'
-                    });
-                    onMouseLeave = component.find('span.link').prop('onMouseLeave');
-                    act(function () {
-                        if (onMouseLeave)
-                            onMouseLeave(null);
-                    });
-                    component.update();
-                    expect(component.find(Popper).prop('open')).toBe(false);
-                    expect(component.find(ProfileCard)).toHaveLength(0);
-                    jest.useRealTimers();
+                    expect(tooltip).not.toBeInTheDocument();
                     return [2 /*return*/];
             }
         });

package/OvIcon/OvIcon.js

@@ -23,9 +23,9 @@ export var OvIcon = function (_a) {
         return null;
     }
     var tooltipTitle = nonOvValues.length
-        ? nonOvValues.map(function (value, i) { return (React.createElement("div", { key: i }, isComplexAttribute(attributeType) ? (getLabel(value.label)) : (React.createElement(DataTypeValue, { value: getAttributeValue(value), dataTypeDefinition: getAttrDataTypeDefinition(attributeType), rich: false })))); })
+        ? nonOvValues.map(function (value, i) { return (React.createElement("div", { "data-reltio-id": "non-ov-value", key: i }, isComplexAttribute(attributeType) ? (getLabel(value.label)) : (React.createElement(DataTypeValue, { value: getAttributeValue(value), dataTypeDefinition: getAttrDataTypeDefinition(attributeType), rich: false })))); })
         : null;
-    return (React.createElement(ChipWithTooltip, { tooltipTitle: tooltipTitle, tooltipPlacement: "bottom", label: "+ ".concat(nonOvTotal), variant: "outlined", onClick: (linkedEntity === null || linkedEntity === void 0 ? void 0 : linkedEntity.uri) && isSourcesScreenEnabled ? onClick : undefined, classes: {
+    return (React.createElement(ChipWithTooltip, { "data-reltio-id": "ov-icon", tooltipTitle: tooltipTitle, tooltipPlacement: "bottom", label: "+ ".concat(nonOvTotal), variant: "outlined", onClick: (linkedEntity === null || linkedEntity === void 0 ? void 0 : linkedEntity.uri) && isSourcesScreenEnabled ? onClick : undefined, classes: {
             root: classnames(styles.container, className),
             label: styles.label
         } }));

package/ProfileCard/components/ProfileCardPlaceholder/ProfileCardPlaceholder.js

@@ -4,8 +4,8 @@ import { useStyles } from './styles';
 export var ProfileCardPlaceholder = function () {
     var styles = useStyles();
     return (React.createElement(React.Fragment, null,
-        React.createElement("div", { className: classnames(styles.avatar, styles.wave) }),
-        React.createElement("div", { className: styles.info },
+        React.createElement("div", { "data-reltio-id": "profile-card-placeholder-avatar", className: classnames(styles.avatar, styles.wave) }),
+        React.createElement("div", { "data-reltio-id": "profile-card-placeholder-info", className: styles.info },
             React.createElement("div", { className: classnames(styles.label, styles.wave) }),
             React.createElement("div", { className: classnames(styles.secondaryLabel, styles.wave) }),
             React.createElement("div", { className: classnames(styles.thirdRow, styles.wave) }))));

package/ShowLess/ShowLess.js

@@ -6,7 +6,7 @@ import { useStyles } from './styles';
 export var ShowLess = function (_a) {
     var onClick = _a.onClick;
     var styles = useStyles();
-    return (React.createElement(Link, { component: "button", variant: "caption", className: styles.link, onClick: onClick, underline: "none" },
+    return (React.createElement(Link, { "data-reltio-id": "show-less", component: "button", variant: "caption", className: styles.link, onClick: onClick, underline: "none" },
         React.createElement(KeyboardArrowUp, { className: styles.icon }),
         i18n.text('Show less')));
 };

package/SimpleAttributeEditor/SimpleAttributeEditor.js

@@ -107,11 +107,11 @@ var SimpleAttributeEditor = function (_a) {
         attributeTypeUri: attributeType === null || attributeType === void 0 ? void 0 : attributeType.uri,
         valueUri: attributeValue.uri
     }).autopopulationContextValue;
-    return (React.createElement("div", { ref: ref, className: classnames(styles.editor, className, errorClassName) },
+    return (React.createElement("div", { ref: ref, "data-reltio-id": "simple-attribute-editor", className: classnames(styles.editor, className, errorClassName) },
         React.createElement(ErrorWrapper, { errorMessage: errorMessage, className: styles.errorWrapper },
             React.createElement("div", { className: classnames(styles['editor-value'], (_b = {}, _b[styles.deleted] = deleted, _b), (_c = {}, _c[styles['editor-read-only-value']] = !showToEdit, _c)), "data-reltio-id": "reltio-attribute-value" }, showToEdit ? (React.createElement(DependentLookupAutopopulationContext.Provider, { value: autopopulationContextValue },
                 React.createElement(DataTypeValueEditor, __assign({ fieldName: attributeUriToSearchUri(attributeType.uri), value: value, dataTypeDefinition: dataTypeDefinition, error: hasError, onChange: onValueEditorChange, fullWidth: true }, dependentLookupEditorContext, otherProps, deletedProps)))) : (React.createElement(DataTypeValue, { value: getAttributeValue(attributeValue), dataTypeDefinition: dataTypeDefinition })))),
-        React.createElement("div", { className: styles['editor-actions'] },
+        React.createElement("div", { "data-reltio-id": "reltio-attribute-actions", className: styles['editor-actions'] },
             edited && (React.createElement(Typography, { variant: "caption", className: styles.editedLabel },
                 "(",
                 i18n.text('edited'),

package/UploadFileButton/components/UploadMode/UploadMode.js

@@ -22,5 +22,5 @@ export var UploadMode = function (_a) {
     };
     return (React.createElement(React.Fragment, null,
         React.createElement(Button, { variant: "contained", onClick: onSelectFileClick, className: styles.button }, i18n.text('Select File')),
-        React.createElement("input", { type: "file", className: styles.fileUploaderInput, onChange: onUploadListener, ref: fileUploader, name: "uploadfile", accept: supportedFileTypesString })));
+        React.createElement("input", { "data-reltio-id": "file-uploader", type: "file", className: styles.fileUploaderInput, onChange: onUploadListener, ref: fileUploader, name: "uploadfile", accept: supportedFileTypesString })));
 };

package/cjs/AttributesFiltersBuilder/AttributesFiltersBuilder.test.js

@@ -64,7 +64,7 @@ var TestStylesProvider_1 = require("../test-utils/TestStylesProvider");
 var constants_1 = require("../constants");
 var MdmModuleContext_1 = require("../contexts/MdmModuleContext");
 jest.unmock('@mui/styles');
-describe('AttributesFiltersBuilder tests', function () {
+describe('Attributes filters builder tests', function () {
     var onChangeSpy = jest.fn();
     var filters = [
         {
@@ -181,13 +181,7 @@ describe('AttributesFiltersBuilder tests', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    filters = [
-                        {
-                            fieldName: 'attributes.Int',
-                            filter: 'equals',
-                            values: [['1']]
-                        }
-                    ];
+                    filters = [{ fieldName: 'attributes.Int', filter: 'equals', values: [['1']] }];
                     user = setUp({ filters: filters }).user;
                     rows = react_2.screen.getAllByTestId('query-builder-row');
                     selector = (0, react_2.within)(rows[0]).getByTestId('filter-selector');
@@ -197,13 +191,7 @@ describe('AttributesFiltersBuilder tests', function () {
                     return [4 /*yield*/, user.click(react_2.screen.getByRole('option', { name: 'Not' }))];
                 case 2:
                     _a.sent();
-                    expect(onChangeSpy).toHaveBeenCalledWith([
-                        {
-                            fieldName: 'attributes.Int',
-                            filter: 'not equals',
-                            values: []
-                        }
-                    ]);
+                    expect(onChangeSpy).toHaveBeenCalledWith([{ fieldName: 'attributes.Int', filter: 'not equals', values: [] }]);
                     return [2 /*return*/];
             }
         });
@@ -213,13 +201,7 @@ describe('AttributesFiltersBuilder tests', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    filters = [
-                        {
-                            fieldName: 'attributes.Int',
-                            filter: 'equals',
-                            values: [['1']]
-                        }
-                    ];
+                    filters = [{ fieldName: 'attributes.Int', filter: 'equals', values: [['1']] }];
                     user = setUp({ filters: filters }).user;
                     rows = react_2.screen.getAllByTestId('query-builder-row');
                     editor = (0, react_2.within)(rows[0]).getByTestId('filter-value-editor');
@@ -231,11 +213,48 @@ describe('AttributesFiltersBuilder tests', function () {
                 case 2:
                     _a.sent();
                     expect(onChangeSpy).toHaveBeenCalledWith([
-                        {
-                            fieldName: 'attributes.Int',
-                            filter: 'equals',
-                            values: [['1', '12']]
-                        }
+                        { fieldName: 'attributes.Int', filter: 'equals', values: [['1', '12']] }
+                    ]);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should call onChange with correct fieldName for simple attributes', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var user;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    user = setUp({ filters: [] }).user;
+                    return [4 /*yield*/, user.click(react_2.screen.getByRole('button'))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, user.click(react_2.screen.getByRole('menuitem', { name: 'Int' }))];
+                case 2:
+                    _a.sent();
+                    expect(onChangeSpy).toHaveBeenCalledWith([
+                        { fieldName: 'attributes.Int', filter: null, operator: 'and', values: [] }
+                    ]);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should call onChange with correct fieldName for existing simple attribute', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var user, attributeSelectors;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    user = setUp({
+                        filters: [{ fieldName: 'attributes.Int', filter: 'equals', values: [['99']], operator: 'or' }]
+                    }).user;
+                    attributeSelectors = react_2.screen.getAllByTestId('attribute-selector');
+                    return [4 /*yield*/, user.click((0, react_2.within)(attributeSelectors[0]).getByRole('button'))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, user.click(react_2.screen.getByRole('menuitem', { name: 'Country Code' }))];
+                case 2:
+                    _a.sent();
+                    expect(onChangeSpy).toHaveBeenCalledWith([
+                        { fieldName: 'attributes.CountryCode', filter: 'equals', operator: 'or', values: [] }
                     ]);
                     return [2 /*return*/];
             }
@@ -254,12 +273,7 @@ describe('AttributesFiltersBuilder tests', function () {
                 case 2:
                     _a.sent();
                     expect(onChangeSpy).toHaveBeenCalledWith([
-                        {
-                            fieldName: 'attributes.NestedTest.NestedTestL2.DateL2',
-                            filter: null,
-                            operator: 'and',
-                            values: []
-                        }
+                        { fieldName: 'attributes.NestedTest.NestedTestL2.DateL2', filter: null, operator: 'and', values: [] }
                     ]);
                     return [2 /*return*/];
             }
@@ -278,12 +292,7 @@ describe('AttributesFiltersBuilder tests', function () {
                 case 2:
                     _a.sent();
                     expect(onChangeSpy).toHaveBeenCalledWith([
-                        {
-                            fieldName: 'attributes.Affiliations.AffiliatedType',
-                            filter: null,
-                            operator: 'and',
-                            values: []
-                        }
+                        { fieldName: 'attributes.Affiliations.AffiliatedType', filter: null, operator: 'and', values: [] }
                     ]);
                     return [2 /*return*/];
             }
@@ -310,6 +319,28 @@ describe('AttributesFiltersBuilder tests', function () {
             }
         });
     }); });
+    it('should render row actions correctly', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var rows;
+        return __generator(this, function (_a) {
+            setUp();
+            rows = react_2.screen.getAllByTestId('query-builder-row');
+            expect(rows).toHaveLength(4);
+            (0, react_2.within)(rows[0]).getByLabelText('Add');
+            (0, react_2.within)(rows[0]).getByLabelText('Duplicate');
+            (0, react_2.within)(rows[0]).getByLabelText('Delete');
+            expect((0, react_2.within)(rows[0]).getByTestId('query-builder-row-actions')).not.toHaveClass('hidden');
+            (0, react_2.within)(rows[1]).getByLabelText('Add');
+            (0, react_2.within)(rows[1]).getByLabelText('Duplicate');
+            (0, react_2.within)(rows[1]).getByLabelText('Delete');
+            expect((0, react_2.within)(rows[1]).getByTestId('query-builder-row-actions')).not.toHaveClass('hidden');
+            (0, react_2.within)(rows[2]).getByLabelText('Add');
+            (0, react_2.within)(rows[2]).getByLabelText('Delete');
+            expect((0, react_2.within)(rows[2]).queryByLabelText('Duplicate')).not.toBeInTheDocument();
+            expect((0, react_2.within)(rows[2]).getByTestId('query-builder-row-actions')).not.toHaveClass('hidden');
+            expect((0, react_2.within)(rows[3]).getByTestId('query-builder-row-actions')).toHaveClass('hidden');
+            return [2 /*return*/];
+        });
+    }); });
     it('should call onChange prop after add new row', function () { return __awaiter(void 0, void 0, void 0, function () {
         var emptyFilter, user;
         return __generator(this, function (_a) {
@@ -357,17 +388,8 @@ describe('AttributesFiltersBuilder tests', function () {
         var CustomValuesEditor = function () { return react_1.default.createElement("div", { "data-reltio-id": "custom-values-editor" }); };
         var CustomFilterSelector = function () { return react_1.default.createElement("div", { "data-reltio-id": "custom-filter-selector" }); };
         var props = {
-            filters: [
-                {
-                    fieldName: 'attributes.Int',
-                    filter: 'equals',
-                    values: [['12345']]
-                }
-            ],
-            components: {
-                ValuesEditor: CustomValuesEditor,
-                FilterSelector: CustomFilterSelector
-            }
+            filters: [{ fieldName: 'attributes.Int', filter: 'equals', values: [['12345']] }],
+            components: { ValuesEditor: CustomValuesEditor, FilterSelector: CustomFilterSelector }
         };
         setUp(props);
         var editors = react_2.screen.getAllByTestId('custom-values-editor');