@reltio/components 1.4.2253 → 1.4.2254

package/ConfigureColumnsPopup/ConfigureColumnsPopup.d.ts

@@ -11,14 +11,14 @@ type Item = AttributeOption & {
     children?: Item[];
     attributes?: Item[];
 };
-type Props = Omit<React.ComponentProps<typeof SelectionPopup>, 'title'> & {
-    hideCheckBox: boolean;
+type Props = Omit<React.ComponentProps<typeof SelectionPopup>, 'title' | 'children' | 'containerWidth' | 'searchInputOnKeyDown'> & {
+    hideCheckBox?: boolean;
     titleText?: string;
     filterText?: string;
     selected: Item[];
     data: Item[];
     onListItemClick: (item: Item, checked: boolean) => void;
-    renderGroupTitle: VirtualGroupedListRenderGroupTitle<Item>;
+    renderGroupTitle?: VirtualGroupedListRenderGroupTitle<Item>;
 };
 export declare const ConfigureColumnsPopup: ({ open, anchorEl, data, onSearch, onClose, titleText, filterText, onListItemClick, selected, hideCheckBox, renderGroupTitle, ...otherProps }: Props) => React.JSX.Element;
 export {};

package/ConfigureColumnsPopup/ConfigureColumnsPopup.js

@@ -42,9 +42,9 @@ import { useKeyboardNavigation } from '../hooks/useKeyboardNavigation';
 import { useStyles } from './styles';
 var ITEM_HEIGHT = 32;
 var LIST_CONTAINER_HEIGHT = 300;
-var DEFAULT_MIN_CONTAINER_WIDTH = 308;
+var DEFAULT_MIN_CONTAINER_WIDTH = 318;
 export var ConfigureColumnsPopup = function (_a) {
-    var open = _a.open, anchorEl = _a.anchorEl, _b = _a.data, data = _b === void 0 ? [] : _b, onSearch = _a.onSearch, onClose = _a.onClose, _c = _a.titleText, titleText = _c === void 0 ? i18n.text('Show/hide columns') : _c, _d = _a.filterText, filterText = _d === void 0 ? '' : _d, onListItemClick = _a.onListItemClick, _e = _a.selected, selected = _e === void 0 ? [] : _e, hideCheckBox = _a.hideCheckBox, renderGroupTitle = _a.renderGroupTitle, otherProps = __rest(_a, ["open", "anchorEl", "data", "onSearch", "onClose", "titleText", "filterText", "onListItemClick", "selected", "hideCheckBox", "renderGroupTitle"]);
+    var open = _a.open, anchorEl = _a.anchorEl, _b = _a.data, data = _b === void 0 ? [] : _b, onSearch = _a.onSearch, onClose = _a.onClose, _c = _a.titleText, titleText = _c === void 0 ? i18n.text('Show/hide columns') : _c, _d = _a.filterText, filterText = _d === void 0 ? '' : _d, onListItemClick = _a.onListItemClick, _e = _a.selected, selected = _e === void 0 ? [] : _e, _f = _a.hideCheckBox, hideCheckBox = _f === void 0 ? false : _f, renderGroupTitle = _a.renderGroupTitle, otherProps = __rest(_a, ["open", "anchorEl", "data", "onSearch", "onClose", "titleText", "filterText", "onListItemClick", "selected", "hideCheckBox", "renderGroupTitle"]);
     var filterItem = useCallback(function (item) {
         return item.label.toLowerCase().includes(filterText.toLowerCase());
     }, [filterText]);
@@ -81,12 +81,12 @@ export var ConfigureColumnsPopup = function (_a) {
     }, [onListItemClick, selected]);
     var groupedItems = useMemo(function () { return (renderGroupTitle ? getGroupsData : getAttributesData)(data); }, [data, renderGroupTitle, getGroupsData, getAttributesData]);
     var items = useMemo(function () { return flattenGroupedItemsData(groupedItems); }, [groupedItems]);
-    var _f = useKeyboardNavigation({
+    var _g = useKeyboardNavigation({
         items: items,
         open: open,
         onSelectFocusedItem: handleSearchOnEnter,
         selectedItems: selected
-    }), focusIndex = _f.focusIndex, handleKeyDown = _f.handleKeyDown;
+    }), focusIndex = _g.focusIndex, handleKeyDown = _g.handleKeyDown;
     var focusIndexRef = useRef(null);
     focusIndexRef.current = focusIndex;
     var renderListItem = useCallback(function (style, _a, index) {
@@ -95,7 +95,7 @@ export var ConfigureColumnsPopup = function (_a) {
         var isFocused = focusIndexRef.current === index;
         return (React.createElement(AttributeListItem, { key: item.id, onClick: onListItemClick, checked: checked, level: level, data: item, label: React.createElement(Highlighter, { text: item.label, highlight: item.filterText }), labelInText: item.label, style: style, hideCheckBox: hideCheckBox, isFocused: isFocused, notSelectable: item.notSelectable, LogoIcon: item.LogoIcon }));
     }, [hideCheckBox, onListItemClick, selected]);
-    var containerWidth = getMaxItemWidth('label')(groupedItems) || DEFAULT_MIN_CONTAINER_WIDTH;
+    var containerWidth = Math.max(getMaxItemWidth('label')(groupedItems), DEFAULT_MIN_CONTAINER_WIDTH);
     var classes = useStyles();
     return (React.createElement(SelectionPopup, __assign({ open: open, className: classnames(classes.container, classes.popupContainer), anchorEl: anchorEl, onClose: onClose, onSearch: onSearch, title: titleText, containerWidth: containerWidth, searchInputOnKeyDown: handleKeyDown }, otherProps),
         React.createElement(VirtualGroupedList, { height: LIST_CONTAINER_HEIGHT, renderItem: renderListItem, items: items, hideSubtitles: true, getItemSize: getItemSize, focusIndex: focusIndex, renderGroupTitle: renderGroupTitle })));

package/SelectionPopup/SelectionPopup.d.ts

@@ -1,20 +1,20 @@
 import React from 'react';
 import { PopoverProps } from '@mui/material/Popover';
 type Props = {
-    title: string;
+    title?: string;
     additionalInfo?: string;
     containerWidth: number;
-    containerHeight: number;
+    containerHeight?: number;
     children: React.ReactNode;
     PaperProps?: Record<string, unknown>;
     searchInputOnKeyDown: (event: React.KeyboardEvent) => void;
     onSearch?: (value?: string) => void;
     className?: string;
-    hideTitle?: boolean;
     hideSearchInput?: boolean;
     inputPlaceholder?: string;
     headerPlacement?: 'top' | 'bottom';
     searchInputRef?: React.Ref<unknown>;
+    toolbar?: React.ReactNode;
 } & PopoverProps;
-export declare const SelectionPopup: ({ title, className, onSearch, hideTitle, hideSearchInput, inputPlaceholder, headerPlacement, containerWidth, containerHeight, searchInputOnKeyDown, children, searchInputRef, anchorOrigin, transformOrigin, additionalInfo, ...otherProps }: Props) => React.JSX.Element;
+export declare const SelectionPopup: ({ title, className, onSearch, hideSearchInput, inputPlaceholder, headerPlacement, containerWidth, containerHeight, searchInputOnKeyDown, children, searchInputRef, anchorOrigin, transformOrigin, additionalInfo, toolbar, ...otherProps }: Props) => React.JSX.Element;
 export {};

package/SelectionPopup/SelectionPopup.js

@@ -31,19 +31,20 @@ import { useTheme } from '@mui/styles';
 import styles from './SelectionPopup.module.css';
 export var SelectionPopup = function (_a) {
     var _b;
-    var title = _a.title, className = _a.className, onSearch = _a.onSearch, hideTitle = _a.hideTitle, hideSearchInput = _a.hideSearchInput, inputPlaceholder = _a.inputPlaceholder, _c = _a.headerPlacement, headerPlacement = _c === void 0 ? 'top' : _c, containerWidth = _a.containerWidth, _d = _a.containerHeight, containerHeight = _d === void 0 ? 553 : _d, searchInputOnKeyDown = _a.searchInputOnKeyDown, children = _a.children, searchInputRef = _a.searchInputRef, _e = _a.anchorOrigin, anchorOrigin = _e === void 0 ? {
+    var title = _a.title, className = _a.className, onSearch = _a.onSearch, hideSearchInput = _a.hideSearchInput, inputPlaceholder = _a.inputPlaceholder, _c = _a.headerPlacement, headerPlacement = _c === void 0 ? 'top' : _c, containerWidth = _a.containerWidth, _d = _a.containerHeight, containerHeight = _d === void 0 ? 553 : _d, searchInputOnKeyDown = _a.searchInputOnKeyDown, children = _a.children, searchInputRef = _a.searchInputRef, _e = _a.anchorOrigin, anchorOrigin = _e === void 0 ? {
         vertical: 'top',
         horizontal: 'right'
     } : _e, _f = _a.transformOrigin, transformOrigin = _f === void 0 ? {
         vertical: 'top',
         horizontal: 'right'
-    } : _f, additionalInfo = _a.additionalInfo, otherProps = __rest(_a, ["title", "className", "onSearch", "hideTitle", "hideSearchInput", "inputPlaceholder", "headerPlacement", "containerWidth", "containerHeight", "searchInputOnKeyDown", "children", "searchInputRef", "anchorOrigin", "transformOrigin", "additionalInfo"]);
+    } : _f, additionalInfo = _a.additionalInfo, toolbar = _a.toolbar, otherProps = __rest(_a, ["title", "className", "onSearch", "hideSearchInput", "inputPlaceholder", "headerPlacement", "containerWidth", "containerHeight", "searchInputOnKeyDown", "children", "searchInputRef", "anchorOrigin", "transformOrigin", "additionalInfo", "toolbar"]);
     var currentTheme = useTheme();
     var variableStyles = useCssVariableStyles({
         '--container-height': "".concat(containerHeight, "px")
     });
     var header = (React.createElement(React.Fragment, null,
-        !hideTitle && (React.createElement("div", { className: styles.header },
+        toolbar,
+        title && !toolbar && (React.createElement("div", { className: styles.header },
             title,
             additionalInfo && React.createElement(InfoIcon, { className: styles.infoIcon, tooltipTitle: additionalInfo }))),
         !hideSearchInput && (React.createElement(SearchInput, { onSearch: onSearch, autofocus: true, onKeyDown: searchInputOnKeyDown, inputRef: searchInputRef, classes: { root: styles.searchInputContainer }, placeholder: inputPlaceholder || i18n.text('Search & add attributes'), height: 40 }))));

package/SelectionPopup/SelectionPopup.spec.js

@@ -90,8 +90,8 @@ describe('SelectionPopup tests', function () {
             }
         });
     }); });
-    it('should hide title if props.hideTitle is true', function () {
-        setUp({ hideTitle: true });
+    it('should hide title when title is not provided', function () {
+        setUp({ title: undefined });
         expect(screen.queryByText('Title')).not.toBeInTheDocument();
     });
     it('should hide search input if props.hideSearchInput is true', function () {

package/cjs/ConfigureColumnsPopup/ConfigureColumnsPopup.d.ts

@@ -11,14 +11,14 @@ type Item = AttributeOption & {
     children?: Item[];
     attributes?: Item[];
 };
-type Props = Omit<React.ComponentProps<typeof SelectionPopup>, 'title'> & {
-    hideCheckBox: boolean;
+type Props = Omit<React.ComponentProps<typeof SelectionPopup>, 'title' | 'children' | 'containerWidth' | 'searchInputOnKeyDown'> & {
+    hideCheckBox?: boolean;
     titleText?: string;
     filterText?: string;
     selected: Item[];
     data: Item[];
     onListItemClick: (item: Item, checked: boolean) => void;
-    renderGroupTitle: VirtualGroupedListRenderGroupTitle<Item>;
+    renderGroupTitle?: VirtualGroupedListRenderGroupTitle<Item>;
 };
 export declare const ConfigureColumnsPopup: ({ open, anchorEl, data, onSearch, onClose, titleText, filterText, onListItemClick, selected, hideCheckBox, renderGroupTitle, ...otherProps }: Props) => React.JSX.Element;
 export {};

package/cjs/ConfigureColumnsPopup/ConfigureColumnsPopup.js

@@ -71,9 +71,9 @@ var useKeyboardNavigation_1 = require("../hooks/useKeyboardNavigation");
 var styles_1 = require("./styles");
 var ITEM_HEIGHT = 32;
 var LIST_CONTAINER_HEIGHT = 300;
-var DEFAULT_MIN_CONTAINER_WIDTH = 308;
+var DEFAULT_MIN_CONTAINER_WIDTH = 318;
 var ConfigureColumnsPopup = function (_a) {
-    var open = _a.open, anchorEl = _a.anchorEl, _b = _a.data, data = _b === void 0 ? [] : _b, onSearch = _a.onSearch, onClose = _a.onClose, _c = _a.titleText, titleText = _c === void 0 ? ui_i18n_1.default.text('Show/hide columns') : _c, _d = _a.filterText, filterText = _d === void 0 ? '' : _d, onListItemClick = _a.onListItemClick, _e = _a.selected, selected = _e === void 0 ? [] : _e, hideCheckBox = _a.hideCheckBox, renderGroupTitle = _a.renderGroupTitle, otherProps = __rest(_a, ["open", "anchorEl", "data", "onSearch", "onClose", "titleText", "filterText", "onListItemClick", "selected", "hideCheckBox", "renderGroupTitle"]);
+    var open = _a.open, anchorEl = _a.anchorEl, _b = _a.data, data = _b === void 0 ? [] : _b, onSearch = _a.onSearch, onClose = _a.onClose, _c = _a.titleText, titleText = _c === void 0 ? ui_i18n_1.default.text('Show/hide columns') : _c, _d = _a.filterText, filterText = _d === void 0 ? '' : _d, onListItemClick = _a.onListItemClick, _e = _a.selected, selected = _e === void 0 ? [] : _e, _f = _a.hideCheckBox, hideCheckBox = _f === void 0 ? false : _f, renderGroupTitle = _a.renderGroupTitle, otherProps = __rest(_a, ["open", "anchorEl", "data", "onSearch", "onClose", "titleText", "filterText", "onListItemClick", "selected", "hideCheckBox", "renderGroupTitle"]);
     var filterItem = (0, react_1.useCallback)(function (item) {
         return item.label.toLowerCase().includes(filterText.toLowerCase());
     }, [filterText]);
@@ -110,12 +110,12 @@ var ConfigureColumnsPopup = function (_a) {
     }, [onListItemClick, selected]);
     var groupedItems = (0, react_1.useMemo)(function () { return (renderGroupTitle ? getGroupsData : getAttributesData)(data); }, [data, renderGroupTitle, getGroupsData, getAttributesData]);
     var items = (0, react_1.useMemo)(function () { return (0, VirtualGroupedList_1.flattenGroupedItemsData)(groupedItems); }, [groupedItems]);
-    var _f = (0, useKeyboardNavigation_1.useKeyboardNavigation)({
+    var _g = (0, useKeyboardNavigation_1.useKeyboardNavigation)({
         items: items,
         open: open,
         onSelectFocusedItem: handleSearchOnEnter,
         selectedItems: selected
-    }), focusIndex = _f.focusIndex, handleKeyDown = _f.handleKeyDown;
+    }), focusIndex = _g.focusIndex, handleKeyDown = _g.handleKeyDown;
     var focusIndexRef = (0, react_1.useRef)(null);
     focusIndexRef.current = focusIndex;
     var renderListItem = (0, react_1.useCallback)(function (style, _a, index) {
@@ -124,7 +124,7 @@ var ConfigureColumnsPopup = function (_a) {
         var isFocused = focusIndexRef.current === index;
         return (react_1.default.createElement(AttributeListItem_1.AttributeListItem, { key: item.id, onClick: onListItemClick, checked: checked, level: level, data: item, label: react_1.default.createElement(Highlighter_1.Highlighter, { text: item.label, highlight: item.filterText }), labelInText: item.label, style: style, hideCheckBox: hideCheckBox, isFocused: isFocused, notSelectable: item.notSelectable, LogoIcon: item.LogoIcon }));
     }, [hideCheckBox, onListItemClick, selected]);
-    var containerWidth = (0, mdm_sdk_1.getMaxItemWidth)('label')(groupedItems) || DEFAULT_MIN_CONTAINER_WIDTH;
+    var containerWidth = Math.max((0, mdm_sdk_1.getMaxItemWidth)('label')(groupedItems), DEFAULT_MIN_CONTAINER_WIDTH);
     var classes = (0, styles_1.useStyles)();
     return (react_1.default.createElement(SelectionPopup_1.SelectionPopup, __assign({ open: open, className: (0, classnames_1.default)(classes.container, classes.popupContainer), anchorEl: anchorEl, onClose: onClose, onSearch: onSearch, title: titleText, containerWidth: containerWidth, searchInputOnKeyDown: handleKeyDown }, otherProps),
         react_1.default.createElement(VirtualGroupedList_1.VirtualGroupedList, { height: LIST_CONTAINER_HEIGHT, renderItem: renderListItem, items: items, hideSubtitles: true, getItemSize: getItemSize, focusIndex: focusIndex, renderGroupTitle: renderGroupTitle })));

package/cjs/SelectionPopup/SelectionPopup.d.ts

@@ -1,20 +1,20 @@
 import React from 'react';
 import { PopoverProps } from '@mui/material/Popover';
 type Props = {
-    title: string;
+    title?: string;
     additionalInfo?: string;
     containerWidth: number;
-    containerHeight: number;
+    containerHeight?: number;
     children: React.ReactNode;
     PaperProps?: Record<string, unknown>;
     searchInputOnKeyDown: (event: React.KeyboardEvent) => void;
     onSearch?: (value?: string) => void;
     className?: string;
-    hideTitle?: boolean;
     hideSearchInput?: boolean;
     inputPlaceholder?: string;
     headerPlacement?: 'top' | 'bottom';
     searchInputRef?: React.Ref<unknown>;
+    toolbar?: React.ReactNode;
 } & PopoverProps;
-export declare const SelectionPopup: ({ title, className, onSearch, hideTitle, hideSearchInput, inputPlaceholder, headerPlacement, containerWidth, containerHeight, searchInputOnKeyDown, children, searchInputRef, anchorOrigin, transformOrigin, additionalInfo, ...otherProps }: Props) => React.JSX.Element;
+export declare const SelectionPopup: ({ title, className, onSearch, hideSearchInput, inputPlaceholder, headerPlacement, containerWidth, containerHeight, searchInputOnKeyDown, children, searchInputRef, anchorOrigin, transformOrigin, additionalInfo, toolbar, ...otherProps }: Props) => React.JSX.Element;
 export {};

package/cjs/SelectionPopup/SelectionPopup.js

@@ -37,19 +37,20 @@ var styles_1 = require("@mui/styles");
 var SelectionPopup_module_css_1 = __importDefault(require("./SelectionPopup.module.css"));
 var SelectionPopup = function (_a) {
     var _b;
-    var title = _a.title, className = _a.className, onSearch = _a.onSearch, hideTitle = _a.hideTitle, hideSearchInput = _a.hideSearchInput, inputPlaceholder = _a.inputPlaceholder, _c = _a.headerPlacement, headerPlacement = _c === void 0 ? 'top' : _c, containerWidth = _a.containerWidth, _d = _a.containerHeight, containerHeight = _d === void 0 ? 553 : _d, searchInputOnKeyDown = _a.searchInputOnKeyDown, children = _a.children, searchInputRef = _a.searchInputRef, _e = _a.anchorOrigin, anchorOrigin = _e === void 0 ? {
+    var title = _a.title, className = _a.className, onSearch = _a.onSearch, hideSearchInput = _a.hideSearchInput, inputPlaceholder = _a.inputPlaceholder, _c = _a.headerPlacement, headerPlacement = _c === void 0 ? 'top' : _c, containerWidth = _a.containerWidth, _d = _a.containerHeight, containerHeight = _d === void 0 ? 553 : _d, searchInputOnKeyDown = _a.searchInputOnKeyDown, children = _a.children, searchInputRef = _a.searchInputRef, _e = _a.anchorOrigin, anchorOrigin = _e === void 0 ? {
         vertical: 'top',
         horizontal: 'right'
     } : _e, _f = _a.transformOrigin, transformOrigin = _f === void 0 ? {
         vertical: 'top',
         horizontal: 'right'
-    } : _f, additionalInfo = _a.additionalInfo, otherProps = __rest(_a, ["title", "className", "onSearch", "hideTitle", "hideSearchInput", "inputPlaceholder", "headerPlacement", "containerWidth", "containerHeight", "searchInputOnKeyDown", "children", "searchInputRef", "anchorOrigin", "transformOrigin", "additionalInfo"]);
+    } : _f, additionalInfo = _a.additionalInfo, toolbar = _a.toolbar, otherProps = __rest(_a, ["title", "className", "onSearch", "hideSearchInput", "inputPlaceholder", "headerPlacement", "containerWidth", "containerHeight", "searchInputOnKeyDown", "children", "searchInputRef", "anchorOrigin", "transformOrigin", "additionalInfo", "toolbar"]);
     var currentTheme = (0, styles_1.useTheme)();
     var variableStyles = (0, useCssVariableStyles_1.useCssVariableStyles)({
         '--container-height': "".concat(containerHeight, "px")
     });
     var header = (react_1.default.createElement(react_1.default.Fragment, null,
-        !hideTitle && (react_1.default.createElement("div", { className: SelectionPopup_module_css_1.default.header },
+        toolbar,
+        title && !toolbar && (react_1.default.createElement("div", { className: SelectionPopup_module_css_1.default.header },
             title,
             additionalInfo && react_1.default.createElement(InfoIcon_1.InfoIcon, { className: SelectionPopup_module_css_1.default.infoIcon, tooltipTitle: additionalInfo }))),
         !hideSearchInput && (react_1.default.createElement(SearchInput_1.SearchInput, { onSearch: onSearch, autofocus: true, onKeyDown: searchInputOnKeyDown, inputRef: searchInputRef, classes: { root: SelectionPopup_module_css_1.default.searchInputContainer }, placeholder: inputPlaceholder || ui_i18n_1.default.text('Search & add attributes'), height: 40 }))));

package/cjs/SelectionPopup/SelectionPopup.spec.js

@@ -95,8 +95,8 @@ describe('SelectionPopup tests', function () {
             }
         });
     }); });
-    it('should hide title if props.hideTitle is true', function () {
-        setUp({ hideTitle: true });
+    it('should hide title when title is not provided', function () {
+        setUp({ title: undefined });
         expect(react_2.screen.queryByText('Title')).not.toBeInTheDocument();
     });
     it('should hide search input if props.hideSearchInput is true', function () {

package/cjs/features/workflow/ChangeRequestEditor/components/EntityChangesGroup/EntityChangesGroup.js

@@ -64,6 +64,22 @@ var EntityChangesGroup = function (_a) {
         relationsInfo: relationsInfo
     });
     var changesList = (0, react_1.useMemo)(function () { return (0, changesList_1.prepareChangesList)(rawChangesList); }, [rawChangesList]);
+    var objectUriByChangeIndex = (0, react_1.useMemo)(function () {
+        var _a, _b;
+        var result = [];
+        var currentObjectUri = entityInfo.uri;
+        for (var _i = 0, changesList_2 = changesList; _i < changesList_2.length; _i++) {
+            var item = changesList_2[_i];
+            if (!(0, helpers_1.isDiffChange)(item)) {
+                currentObjectUri = entityInfo.uri;
+            }
+            else if ((0, helpers_1.isRelationRow)(item)) {
+                currentObjectUri = (_b = (_a = item.attributeValue) === null || _a === void 0 ? void 0 : _a.uri) !== null && _b !== void 0 ? _b : entityInfo.uri;
+            }
+            result.push(currentObjectUri);
+        }
+        return result;
+    }, [changesList, entityInfo.uri]);
     var entityAttributeTypes = (0, react_1.useMemo)(function () {
         if (!(0, ramda_1.isNil)(entityInfo.isExist)) {
             return (0, moreAttributesScope_1.getAvailableAttributeTypesForEntity)(metadata, entityInfo.type);
@@ -93,7 +109,7 @@ var EntityChangesGroup = function (_a) {
             highlight(addedIds);
         };
     }, [addAddedAttributes, highlight]);
-    var handleAddNestedAttributes = (0, react_1.useCallback)(function (change) { return function (attributeTypes) {
+    var handleAddNestedAttributes = (0, react_1.useCallback)(function (change, objectUri) { return function (attributeTypes) {
         var _a, _b, _c, _d, _e;
         var parentUri = (_a = change.attributeType) === null || _a === void 0 ? void 0 : _a.uri;
         var parentAttrs = attributeTypes.filter(function (attr) { return attr.uri === parentUri; });
@@ -105,7 +121,7 @@ var EntityChangesGroup = function (_a) {
             var addedId = (0, addedAttributes_1.getAddedId)(change);
             if (lineId && (0, addedAttributes_1.isRootAddedAttribute)(lineId)) {
                 handleAddAttributes({
-                    objectUri: (0, addedAttributes_1.getObjectIdFromLineId)(lineId),
+                    objectUri: objectUri,
                     changeOverrides: siblingOverrides
                 })(parentAttrs);
             }
@@ -118,7 +134,7 @@ var EntityChangesGroup = function (_a) {
             }
             else {
                 handleAddAttributes({
-                    objectUri: entityInfo.uri,
+                    objectUri: objectUri,
                     changeOverrides: siblingOverrides
                 })(parentAttrs);
             }
@@ -131,12 +147,12 @@ var EntityChangesGroup = function (_a) {
             }
             else {
                 handleAddAttributes({
-                    objectUri: entityInfo.uri,
+                    objectUri: objectUri,
                     changeOverrides: childOverrides
                 })(subAttrs);
             }
         }
-    }; }, [handleAddAttributes, entityInfo.uri]);
+    }; }, [handleAddAttributes]);
     return (react_1.default.createElement(AttributesChangesContext_1.AttributesChangesContext.Provider, { value: objectsInfo },
         react_1.default.createElement(Accordion_1.default, { className: EntityChangesGroup_module_css_1.default.entityGroup, defaultExpanded: true, "data-reltio-id": "entity-changes-group" },
             react_1.default.createElement(AccordionSummary_1.default, { expandIcon: react_1.default.createElement(ExpandMore_1.default, null), className: EntityChangesGroup_module_css_1.default.entityHeader, classes: {
@@ -163,7 +179,7 @@ var EntityChangesGroup = function (_a) {
                                 objectUri: (_e = item === null || item === void 0 ? void 0 : item.attributeValue) === null || _e === void 0 ? void 0 : _e.uri,
                                 parentLineId: (_f = item.lineIds) === null || _f === void 0 ? void 0 : _f[0]
                             }) })),
-                        allowAddAttributes && (0, helpers_1.isNestedOrReferenceParent)(item) && (react_1.default.createElement(editors_1.MoreAttributesEditor, { data: nestedAttrs, change: item, parent: item.attributeType, onApply: handleAddNestedAttributes(item) }))));
+                        allowAddAttributes && (0, helpers_1.isNestedOrReferenceParent)(item) && (react_1.default.createElement(editors_1.MoreAttributesEditor, { data: nestedAttrs, change: item, parent: item.attributeType, onApply: handleAddNestedAttributes(item, objectUriByChangeIndex[index]) }))));
                 })))));
 };
 exports.EntityChangesGroup = EntityChangesGroup;

package/cjs/features/workflow/ChangeRequestEditor/helpers/addedAttributes.js

@@ -63,10 +63,13 @@ var getParentChangeOverrides = function (change) {
     if (change.refAttributeType) {
         var parts = change.refAttributeType.split('/');
         if (parts.length > 2) {
-            result.refAttributeType = parts.slice(0, -2).join('/');
+            var parentRefAttributeType = parts.slice(0, -2).join('/');
+            if (parentRefAttributeType.includes('/attributes/')) {
+                result.refAttributeType = parentRefAttributeType;
+            }
         }
     }
-    if (change.refObjectURI) {
+    if (result.refAttributeType && change.refObjectURI) {
         result.refObjectURI = change.refObjectURI;
     }
     return Object.keys(result).length > 0 ? result : undefined;

package/cjs/features/workflow/ChangeRequestEditor/helpers/changesList.js

@@ -10,6 +10,15 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+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)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareChangesList = void 0;
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
@@ -130,23 +139,30 @@ var extractPathFromInnerChange = function (attributeValue) {
     return __assign(__assign({ attributePath: inner.attributePath }, (inner.refAttributeType && { refAttributeType: inner.refAttributeType })), (inner.refObjectURI && { refObjectURI: inner.refObjectURI }));
 };
 var fillParentPaths = function (items) {
-    return items.map(function (item, index) {
-        var _a, _b;
+    var _a, _b;
+    var result = __spreadArray([], items, true);
+    for (var index = result.length - 1; index >= 0; index--) {
+        var item = result[index];
         if (!(0, helpers_1.isDiffChange)(item) || !(0, mdm_sdk_1.isComplexAttribute)(item.attributeType) || item.attributePath)
-            return item;
+            continue;
         var innerPath = extractPathFromInnerChange(item.attributeValue);
-        if (innerPath)
-            return __assign(__assign({}, item), innerPath);
-        var name = (_a = item.attributeType) === null || _a === void 0 ? void 0 : _a.name;
+        if (innerPath) {
+            result[index] = __assign(__assign({}, item), innerPath);
+            continue;
+        }
+        var name_1 = (_a = item.attributeType) === null || _a === void 0 ? void 0 : _a.name;
         var instanceId = (_b = item.attributeValue) === null || _b === void 0 ? void 0 : _b.id;
-        if (!name || !instanceId)
-            return item;
-        var descendant = findDescendantWithPath(items, index, item.level);
+        if (!name_1 || !instanceId)
+            continue;
+        var descendant = findDescendantWithPath(result, index, item.level);
         if (!descendant)
-            return item;
-        var parentPath = deriveParentPath(descendant, name, instanceId);
-        return parentPath ? __assign(__assign({}, item), parentPath) : item;
-    });
+            continue;
+        var parentPath = deriveParentPath(descendant, name_1, instanceId);
+        if (parentPath) {
+            result[index] = __assign(__assign({}, item), parentPath);
+        }
+    }
+    return result;
 };
 var prepareChangesList = function (rawChangesList) {
     var withPaths = fillParentPaths(rawChangesList);

package/cjs/features/workflow/ChangeRequestEditor/helpers/changesList.test-data.d.ts

@@ -0,0 +1,41 @@
+import { DCRTypes, type AttributeType } from '@reltio/mdm-sdk';
+import type { Diff } from '../../types';
+export declare const referenceAttributeType: AttributeType;
+export declare const referenceAttributeValue: {
+    id: string;
+    value: {
+        RefFirstLevelNested: {
+            id: string;
+            value: {
+                FirstLevelNestedSub2: {
+                    id: string;
+                    value: {
+                        id: string;
+                        refObjectURI: string;
+                        type: DCRTypes;
+                        objectType: string;
+                        attributePath: string;
+                        oldValue: {
+                            value: string;
+                            lineIds: string[];
+                        };
+                        newValue: {
+                            value: string;
+                            lineIds: string[];
+                        };
+                        attributeType: string;
+                        refAttributeType: string;
+                        lineIds: string[];
+                    };
+                }[];
+            };
+        }[];
+    };
+    refObjectURI: string;
+};
+export declare const affiliationsChangeRow: Diff;
+export declare const deepNestedParentFromChildChanges: () => Diff[];
+export declare const deepNestedInnerChangeRow: () => Diff[];
+export declare const addressDeepNestedThreeLevelChanges: () => Diff[];
+export declare const addressDeepNestedRefPropagationChanges: () => Diff[];
+export declare const deepNestedRowWithExistingPath: () => Diff[];

package/cjs/features/workflow/ChangeRequestEditor/helpers/changesList.test-data.js

@@ -0,0 +1,161 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deepNestedRowWithExistingPath = exports.addressDeepNestedRefPropagationChanges = exports.addressDeepNestedThreeLevelChanges = exports.deepNestedInnerChangeRow = exports.deepNestedParentFromChildChanges = exports.affiliationsChangeRow = exports.referenceAttributeValue = exports.referenceAttributeType = void 0;
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
+exports.referenceAttributeType = {
+    uri: 'configuration/entityTypes/HCP/attributes/Affiliations',
+    name: 'Affiliations',
+    label: 'HCP to HCA Affiliations',
+    type: 'Reference',
+    referencedEntityTypeURI: 'configuration/entityTypes/HCA',
+    relationshipTypeURI: 'configuration/relationTypes/HCPtoHCA'
+};
+exports.referenceAttributeValue = {
+    id: '0HocGCj',
+    value: {
+        RefFirstLevelNested: [
+            {
+                id: '2Cf73Q29',
+                value: {
+                    FirstLevelNestedSub2: [
+                        {
+                            id: '2ph3wL7h',
+                            value: {
+                                id: '0aDhfxd',
+                                refObjectURI: 'relations/0HocGCj',
+                                type: mdm_sdk_1.DCRTypes.UPDATE_ATTRIBUTE,
+                                objectType: 'configuration/entityTypes/HCP',
+                                attributePath: 'RefFirstLevelNested/2Cf73Q29/FirstLevelNestedSub2/2ph3wL7h',
+                                oldValue: { value: '555756', lineIds: ['BAliEK2/0aDhfxd/oldValue'] },
+                                newValue: { value: '5557563462', lineIds: ['BAliEK2/0aDhfxd/newValue'] },
+                                attributeType: 'configuration/relationTypes/HCPtoHCA/attributes/RefFirstLevelNested/attributes/FirstLevelNestedSub2',
+                                refAttributeType: 'configuration/entityTypes/HCP/attributes/Affiliations/attributes/RefFirstLevelNested/attributes/FirstLevelNestedSub2',
+                                lineIds: ['BAliEK2/0aDhfxd']
+                            }
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    refObjectURI: 'relations/0HocGCj'
+};
+exports.affiliationsChangeRow = {
+    level: 0,
+    label: 'HCP to HCA Affiliations',
+    attributeType: exports.referenceAttributeType,
+    attributeValue: exports.referenceAttributeValue,
+    operation: mdm_sdk_1.DCROperationTypes.EDITED,
+    isReferenceSubAttribute: false
+};
+var nestedAttributeType = function (name) {
+    return ({
+        uri: "configuration/entityTypes/HCP/attributes/".concat(name),
+        name: name,
+        label: name,
+        type: 'Nested'
+    });
+};
+var firstLevelNestedSub2FloatType = {
+    uri: 'configuration/relationTypes/HCPtoHCA/attributes/RefFirstLevelNested/attributes/FirstLevelNestedSub2',
+    name: 'FirstLevelNestedSub2',
+    label: 'float',
+    type: 'Float'
+};
+var deepNestedParentFromChildChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'FirstLevelNestedSub2',
+        attributeType: firstLevelNestedSub2FloatType,
+        attributePath: 'DeepNested/2ph3uHFx/FirstLevelNestedSub2/2ph3uPmT',
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+exports.deepNestedParentFromChildChanges = deepNestedParentFromChildChanges;
+var deepNestedInnerChangeRow = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: {
+            id: '4FcgXO5o',
+            value: {
+                attributePath: 'DeepNested/4FcgXO5o/SecondLevelNested',
+                refAttributeType: 'configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested/attributes/SecondLevelNested',
+                refObjectURI: 'relations/0LbuUWU'
+            }
+        },
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+exports.deepNestedInnerChangeRow = deepNestedInnerChangeRow;
+var addressDeepNestedThreeLevelChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '4FcgXO5o', value: { SecondLevelNested: [] } },
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'SecondLevelNested',
+        attributeType: nestedAttributeType('SecondLevelNested'),
+        attributeValue: { id: '2v13QcOX', value: { FirstLevelNestedSubatr3: [] } },
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 3,
+        label: 'FirstLevelNestedSubatr3',
+        attributeType: nestedAttributeType('FirstLevelNestedSubatr3'),
+        attributePath: 'DeepNested/4FcgXO5o/SecondLevelNested/2v13QcOX/FirstLevelNestedSubatr3/2v13Qgen',
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+exports.addressDeepNestedThreeLevelChanges = addressDeepNestedThreeLevelChanges;
+var addressDeepNestedRefPropagationChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'FirstLevelNestedSub2',
+        attributeType: firstLevelNestedSub2FloatType,
+        attributePath: 'DeepNested/2ph3uHFx/FirstLevelNestedSub2/2ph3uPmT',
+        refAttributeType: 'configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested/attributes/FirstLevelNestedSub2',
+        refObjectURI: 'relations/0LbuUWU',
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+exports.addressDeepNestedRefPropagationChanges = addressDeepNestedRefPropagationChanges;
+var deepNestedRowWithExistingPath = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        attributePath: 'DeepNested/2ph3uHFx',
+        operation: mdm_sdk_1.DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+exports.deepNestedRowWithExistingPath = deepNestedRowWithExistingPath;