@reltio/components 1.4.2253 → 1.4.2254

package/cjs/features/workflow/helpers/validation.test.js

@@ -215,6 +215,16 @@ describe('getValidationErrors', function () {
             }
         ]);
     });
+    it('should not report a missing required boolean attribute when its value is primitive false', function () {
+        var metadata = (0, metadata_test_data_1.getMetadata)();
+        var result = (0, validation_1.getValidationErrors)({
+            changes: (0, validation_test_data_1.getChangesWithBooleanPrimitiveValue)(),
+            userChanges: [],
+            entitiesOrRelations: (0, validation_test_data_1.getEntitiesOrRelations)(),
+            metadata: metadata
+        });
+        expect(result).toEqual([]);
+    });
     it('should validate required attributes in new entity', function () {
         var metadata = (0, metadata_test_data_1.getMetadata)();
         var result = (0, validation_1.getValidationErrors)({

package/cjs/features/workflow/hooks/useChangeRequest.d.ts

@@ -2,4 +2,5 @@ import { ChangeRequest, GroupedObjectsInfo } from '@reltio/mdm-sdk';
 export declare const useChangeRequest: (dcrUri: string) => {
     dcr: ChangeRequest;
     groupedObjects: GroupedObjectsInfo[];
+    reloadDcr: () => void;
 };

package/cjs/features/workflow/hooks/useChangeRequest.js

@@ -28,8 +28,8 @@ var useChangeRequest = function (dcrUri) {
         }
         return safePromise((0, mdm_sdk_1.getEntitiesByUris)(entityUris, { searchOptions: 'ovOnly', defaultMaxValues: 1 }));
     }, []); // eslint-disable-line
-    (0, react_1.useEffect)(function () {
-        (0, mdm_sdk_1.getDataChangeRequest)(dcrUri)
+    var loadDcr = (0, react_1.useCallback)(function () {
+        safePromise((0, mdm_sdk_1.getDataChangeRequest)(dcrUri))
             .then(function (dcr) {
             var changes = dcr.changes, objectsInfo = dcr.objectsInfo;
             var objectsWithChanges = (0, dcr_1.extractObjectsFromChangeRequest)(changes, objectsInfo);
@@ -40,7 +40,7 @@ var useChangeRequest = function (dcrUri) {
             requestEntities(entityUris)
                 .then(function (entities) {
                 var relationsObjectsWithRequestedEntities = relationsObjectsWithoutEntity.map(function (relationsObject, index) {
-                    return __assign(__assign({}, relationsObject), { entity: entities[index] });
+                    return __assign(__assign({}, relationsObject), { entity: __assign(__assign({}, entities[index]), { isExist: true }) });
                 });
                 (0, ramda_1.pipe)(ramda_1.flatten, (0, ramda_1.reduce)(dcr_1.concatEntityRelationsObjects, {}), ramda_1.values, setGroupedObjects)([
                     entityObjectsWithRelations,
@@ -52,7 +52,10 @@ var useChangeRequest = function (dcrUri) {
             setDcr(dcr);
         })
             .catch(errors_1.showErrorMessage);
-    }, [dcrUri, requestEntities]);
-    return { dcr: dcr, groupedObjects: groupedObjects };
+    }, [dcrUri, requestEntities, safePromise]);
+    (0, react_1.useEffect)(function () {
+        loadDcr();
+    }, [loadDcr]);
+    return { dcr: dcr, groupedObjects: groupedObjects, reloadDcr: loadDcr };
 };
 exports.useChangeRequest = useChangeRequest;

package/cjs/features/workflow/hooks/useChangeRequest.test.js

@@ -129,7 +129,8 @@ describe('useChangeRequest tests', function () {
         expect(mdm_sdk_1.getEntitiesByUris).not.toHaveBeenCalled();
         expect(result.current).toEqual({
             dcr: null,
-            groupedObjects: []
+            groupedObjects: [],
+            reloadDcr: expect.any(Function)
         });
     });
     it('should return empty parameters if dcrUri is undefined', function () {
@@ -138,7 +139,8 @@ describe('useChangeRequest tests', function () {
         expect(mdm_sdk_1.getEntitiesByUris).not.toHaveBeenCalled();
         expect(result.current).toEqual({
             dcr: null,
-            groupedObjects: []
+            groupedObjects: [],
+            reloadDcr: expect.any(Function)
         });
     });
     it('should go to error message in case of getDataChangeRequest error', function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -161,7 +163,8 @@ describe('useChangeRequest tests', function () {
                     });
                     expect(result.current).toEqual({
                         dcr: null,
-                        groupedObjects: []
+                        groupedObjects: [],
+                        reloadDcr: expect.any(Function)
                     });
                     return [2 /*return*/];
             }
@@ -200,7 +203,8 @@ describe('useChangeRequest tests', function () {
                     });
                     expect(result.current).toEqual({
                         dcr: dcr,
-                        groupedObjects: []
+                        groupedObjects: [],
+                        reloadDcr: expect.any(Function)
                     });
                     return [2 /*return*/];
             }
@@ -236,6 +240,7 @@ describe('useChangeRequest tests', function () {
                     expect(ErrorPopup_1.ErrorPopup.addError).not.toHaveBeenCalled();
                     expect(result.current).toEqual({
                         dcr: dcr,
+                        reloadDcr: expect.any(Function),
                         groupedObjects: [
                             {
                                 entity: {
@@ -269,7 +274,8 @@ describe('useChangeRequest tests', function () {
                             },
                             {
                                 entity: {
-                                    uri: 'entities/151gdPs5'
+                                    uri: 'entities/151gdPs5',
+                                    isExist: true
                                 },
                                 relations: [
                                     {

package/cjs/features/workflow/hooks/useWorkflowActions.d.ts

@@ -4,9 +4,10 @@ type Task = Partial<Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assig
 type Props = {
     task: Task;
     onActionSuccess?: (action: string) => void;
+    onError?: () => void;
     beforeAction?: () => Promise<BeforeActionOutcome>;
 };
-export declare const useWorkflowActions: ({ task, onActionSuccess, beforeAction }: Props) => {
+export declare const useWorkflowActions: ({ task, onActionSuccess, onError, beforeAction }: Props) => {
     actions: TaskAction[];
     actionRequestIsInProgress: boolean;
 };

package/cjs/features/workflow/hooks/useWorkflowActions.js

@@ -46,7 +46,7 @@ var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
 var CommentDialogContext_1 = require("../../../contexts/CommentDialogContext");
 var errors_2 = require("../../../helpers/errors");
 var useWorkflowActions = function (_a) {
-    var task = _a.task, onActionSuccess = _a.onActionSuccess, beforeAction = _a.beforeAction;
+    var task = _a.task, onActionSuccess = _a.onActionSuccess, onError = _a.onError, beforeAction = _a.beforeAction;
     var _b = task !== null && task !== void 0 ? task : {}, possibleActions = _b.possibleActions, assignee = _b.assignee, taskId = _b.taskId, isOpen = _b.isOpen;
     var workflowTasks = (0, react_1.useContext)(WorkflowTasksContext_1.WorkflowTasksContext);
     var workflowPath = (0, MdmModuleContext_1.useMdmWorkflowPath)();
@@ -85,6 +85,7 @@ var useWorkflowActions = function (_a) {
                         if (!outcome.proceed) {
                             if (outcome.error) {
                                 (0, errors_2.showDefaultErrorMessage)(outcome.error);
+                                onError === null || onError === void 0 ? void 0 : onError();
                             }
                             setActionRequestIsInProgress(false);
                             return [2 /*return*/];
@@ -93,6 +94,7 @@ var useWorkflowActions = function (_a) {
                     case 5:
                         error_1 = _a.sent();
                         (0, errors_2.showDefaultErrorMessage)(error_1);
+                        onError === null || onError === void 0 ? void 0 : onError();
                         setActionRequestIsInProgress(false);
                         return [2 /*return*/];
                     case 6:
@@ -107,7 +109,10 @@ var useWorkflowActions = function (_a) {
                             .then(function () {
                             handleActionSuccess === null || handleActionSuccess === void 0 ? void 0 : handleActionSuccess(action);
                         })
-                            .catch(errors_1.showWorkflowError)
+                            .catch(function (error) {
+                            (0, errors_1.showWorkflowError)(error);
+                            onError === null || onError === void 0 ? void 0 : onError();
+                        })
                             .finally(function () {
                             setActionRequestIsInProgress(false);
                         });
@@ -116,7 +121,7 @@ var useWorkflowActions = function (_a) {
                 }
             });
         }); };
-    }, [workflowPath, taskId, environment, tenant, handleActionSuccess, showCommentDialog, beforeAction]);
+    }, [workflowPath, taskId, environment, tenant, handleActionSuccess, showCommentDialog, beforeAction, onError]);
     var actions = (0, react_1.useMemo)(function () {
         return username === assignee && (0, common_1.isOpenTask)(isOpen)
             ? (possibleActions || []).map(function (_a) {

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

@@ -16,7 +16,7 @@ import { getDCRUri } from '../../../helpers/common';
 import { getAvailableAttributeTypesForEntity, getAvailableAttributeTypesForRelation, getAvailableSubAttributesForNestedOrReference } from '../../../helpers/moreAttributesScope';
 import { isDiffChange, isRelationRow, isNestedOrReferenceParent } from '../../helpers/helpers';
 import { prepareChangesList } from '../../helpers/changesList';
-import { extractChangeOverrides, getAddedId, getObjectIdFromLineId, getParentAddedId, getParentChangeOverrides, getParentLineId, isRootAddedAttribute } from '../../helpers/addedAttributes';
+import { extractChangeOverrides, getAddedId, getParentAddedId, getParentChangeOverrides, getParentLineId, isRootAddedAttribute } from '../../helpers/addedAttributes';
 import { extractLineIds } from '../../../helpers/merge';
 import { useDcrReviewAllowAddAttributes } from '../../hooks/useDcrReviewAllowAddAttributes';
 import { MoreAttributesEditor } from '../editors';
@@ -35,6 +35,22 @@ export var EntityChangesGroup = function (_a) {
         relationsInfo: relationsInfo
     });
     var changesList = useMemo(function () { return prepareChangesList(rawChangesList); }, [rawChangesList]);
+    var objectUriByChangeIndex = useMemo(function () {
+        var _a, _b;
+        var result = [];
+        var currentObjectUri = entityInfo.uri;
+        for (var _i = 0, changesList_1 = changesList; _i < changesList_1.length; _i++) {
+            var item = changesList_1[_i];
+            if (!isDiffChange(item)) {
+                currentObjectUri = entityInfo.uri;
+            }
+            else if (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 = useMemo(function () {
         if (!isNil(entityInfo.isExist)) {
             return getAvailableAttributeTypesForEntity(metadata, entityInfo.type);
@@ -64,7 +80,7 @@ export var EntityChangesGroup = function (_a) {
             highlight(addedIds);
         };
     }, [addAddedAttributes, highlight]);
-    var handleAddNestedAttributes = useCallback(function (change) { return function (attributeTypes) {
+    var handleAddNestedAttributes = 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; });
@@ -76,7 +92,7 @@ export var EntityChangesGroup = function (_a) {
             var addedId = getAddedId(change);
             if (lineId && isRootAddedAttribute(lineId)) {
                 handleAddAttributes({
-                    objectUri: getObjectIdFromLineId(lineId),
+                    objectUri: objectUri,
                     changeOverrides: siblingOverrides
                 })(parentAttrs);
             }
@@ -89,7 +105,7 @@ export var EntityChangesGroup = function (_a) {
             }
             else {
                 handleAddAttributes({
-                    objectUri: entityInfo.uri,
+                    objectUri: objectUri,
                     changeOverrides: siblingOverrides
                 })(parentAttrs);
             }
@@ -102,12 +118,12 @@ export var EntityChangesGroup = function (_a) {
             }
             else {
                 handleAddAttributes({
-                    objectUri: entityInfo.uri,
+                    objectUri: objectUri,
                     changeOverrides: childOverrides
                 })(subAttrs);
             }
         }
-    }; }, [handleAddAttributes, entityInfo.uri]);
+    }; }, [handleAddAttributes]);
     return (React.createElement(AttributesChangesContext.Provider, { value: objectsInfo },
         React.createElement(Accordion, { className: styles.entityGroup, defaultExpanded: true, "data-reltio-id": "entity-changes-group" },
             React.createElement(AccordionSummary, { expandIcon: React.createElement(ExpandMoreIcon, null), className: styles.entityHeader, classes: {
@@ -134,6 +150,6 @@ export 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 && isNestedOrReferenceParent(item) && (React.createElement(MoreAttributesEditor, { data: nestedAttrs, change: item, parent: item.attributeType, onApply: handleAddNestedAttributes(item) }))));
+                        allowAddAttributes && isNestedOrReferenceParent(item) && (React.createElement(MoreAttributesEditor, { data: nestedAttrs, change: item, parent: item.attributeType, onApply: handleAddNestedAttributes(item, objectUriByChangeIndex[index]) }))));
                 })))));
 };

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

@@ -52,10 +52,13 @@ export 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/features/workflow/ChangeRequestEditor/helpers/changesList.js

@@ -9,6 +9,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));
+};
 import { DCROperationTypes, isComplexAttribute, isImage, isRoleAttrType, isTagAttrType } from '@reltio/mdm-sdk';
 import { getOperationType } from '../../helpers/common';
 import { isDiffChange } from './helpers';
@@ -127,23 +136,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 (!isDiffChange(item) || !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;
 };
 export var prepareChangesList = function (rawChangesList) {
     var withPaths = fillParentPaths(rawChangesList);

package/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/features/workflow/ChangeRequestEditor/helpers/changesList.test-data.js

@@ -0,0 +1,153 @@
+import { DCROperationTypes, DCRTypes } from '@reltio/mdm-sdk';
+export var referenceAttributeType = {
+    uri: 'configuration/entityTypes/HCP/attributes/Affiliations',
+    name: 'Affiliations',
+    label: 'HCP to HCA Affiliations',
+    type: 'Reference',
+    referencedEntityTypeURI: 'configuration/entityTypes/HCA',
+    relationshipTypeURI: 'configuration/relationTypes/HCPtoHCA'
+};
+export var referenceAttributeValue = {
+    id: '0HocGCj',
+    value: {
+        RefFirstLevelNested: [
+            {
+                id: '2Cf73Q29',
+                value: {
+                    FirstLevelNestedSub2: [
+                        {
+                            id: '2ph3wL7h',
+                            value: {
+                                id: '0aDhfxd',
+                                refObjectURI: 'relations/0HocGCj',
+                                type: 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'
+};
+export var affiliationsChangeRow = {
+    level: 0,
+    label: 'HCP to HCA Affiliations',
+    attributeType: referenceAttributeType,
+    attributeValue: referenceAttributeValue,
+    operation: 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'
+};
+export var deepNestedParentFromChildChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'FirstLevelNestedSub2',
+        attributeType: firstLevelNestedSub2FloatType,
+        attributePath: 'DeepNested/2ph3uHFx/FirstLevelNestedSub2/2ph3uPmT',
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export 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: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export var addressDeepNestedThreeLevelChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '4FcgXO5o', value: { SecondLevelNested: [] } },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 2,
+        label: 'SecondLevelNested',
+        attributeType: nestedAttributeType('SecondLevelNested'),
+        attributeValue: { id: '2v13QcOX', value: { FirstLevelNestedSubatr3: [] } },
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    },
+    {
+        level: 3,
+        label: 'FirstLevelNestedSubatr3',
+        attributeType: nestedAttributeType('FirstLevelNestedSubatr3'),
+        attributePath: 'DeepNested/4FcgXO5o/SecondLevelNested/2v13QcOX/FirstLevelNestedSubatr3/2v13Qgen',
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export var addressDeepNestedRefPropagationChanges = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        operation: 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: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };
+export var deepNestedRowWithExistingPath = function () { return [
+    {
+        level: 1,
+        label: 'DeepNested',
+        attributeType: nestedAttributeType('DeepNested'),
+        attributeValue: { id: '2ph3uHFx', value: { FirstLevelNestedSub2: [] } },
+        attributePath: 'DeepNested/2ph3uHFx',
+        operation: DCROperationTypes.EDITED,
+        isReferenceSubAttribute: false
+    }
+]; };

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

@@ -9,8 +9,18 @@ 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));
+};
 import { DataTypes, DCROperationTypes } from '@reltio/mdm-sdk';
 import { prepareChangesList } from './changesList';
+import { addressDeepNestedRefPropagationChanges, addressDeepNestedThreeLevelChanges, affiliationsChangeRow, deepNestedInnerChangeRow, deepNestedParentFromChildChanges, deepNestedRowWithExistingPath } from './changesList.test-data';
 var createDiff = function (overrides) {
     if (overrides === void 0) { overrides = {}; }
     return (__assign({ level: 0, label: 'Test', attributeType: {
@@ -198,4 +208,46 @@ describe('prepareChangesList', function () {
             expect((_b = result[1].displayOptions) === null || _b === void 0 ? void 0 : _b.hasSameAttributeSiblings).toBe(false);
         });
     });
+    describe('fillParentPaths', function () {
+        it('fills parent without attributePath from descendant when value is not inner DCR change', function () {
+            var result = prepareChangesList(deepNestedParentFromChildChanges());
+            expect(result[0].attributePath).toBe('DeepNested/2ph3uHFx');
+        });
+        it('fills nested-in-nested parents without paths when only leaf has attributePath (reverse pass)', function () {
+            var result = prepareChangesList(addressDeepNestedThreeLevelChanges());
+            expect(result[0].attributePath).toBe('DeepNested/4FcgXO5o');
+            expect(result[1].attributePath).toBe('DeepNested/4FcgXO5o/SecondLevelNested/2v13QcOX');
+        });
+        it('fills path from attributeValue.value when inner change carries attributePath', function () {
+            var result = prepareChangesList(deepNestedInnerChangeRow());
+            expect(result[0].attributePath).toBe('DeepNested/4FcgXO5o/SecondLevelNested');
+            expect(result[0].refAttributeType).toBe('configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested/attributes/SecondLevelNested');
+            expect(result[0].refObjectURI).toBe('relations/0LbuUWU');
+        });
+        it('fills parent path and ref fields via descendant when inner change path is absent', function () {
+            var result = prepareChangesList(addressDeepNestedRefPropagationChanges());
+            expect(result[0].attributePath).toBe('DeepNested/2ph3uHFx');
+            expect(result[0].refAttributeType).toBe('configuration/entityTypes/HCP/attributes/Address/attributes/DeepNested');
+            expect(result[0].refObjectURI).toBe('relations/0LbuUWU');
+        });
+        it('does not change attributePath when already set on complex row', function () {
+            var result = prepareChangesList(deepNestedRowWithExistingPath());
+            expect(result[0].attributePath).toBe('DeepNested/2ph3uHFx');
+        });
+        it('leaves reference row paths unset and still fills following nested rows', function () {
+            var _a, _b, _c;
+            var affOnly = prepareChangesList([affiliationsChangeRow]);
+            expect(affOnly).toHaveLength(1);
+            var aff = affOnly[0];
+            expect(aff.attributePath).toBeUndefined();
+            expect((_a = aff.displayOptions) === null || _a === void 0 ? void 0 : _a.showLabel).toBe(false);
+            expect((_b = aff.displayOptions) === null || _b === void 0 ? void 0 : _b.showAddButton).toBe(false);
+            expect((_c = aff.displayOptions) === null || _c === void 0 ? void 0 : _c.hasSameAttributeSiblings).toBe(false);
+            var combined = prepareChangesList(__spreadArray([affiliationsChangeRow], deepNestedParentFromChildChanges(), true));
+            expect(combined).toHaveLength(3);
+            expect(combined[0].attributePath).toBeUndefined();
+            expect(combined[1].attributePath).toBe('DeepNested/2ph3uHFx');
+            expect(combined[0].operation).toBe(DCROperationTypes.EDITED);
+        });
+    });
 });

package/features/workflow/ChangeRequestEditor/helpers/helpers.d.ts

@@ -1,6 +1,6 @@
 import { type DCRChanges, type EnrichedDCRChanges, type GroupedObjectsInfo, type Metadata, type SimpleAttributeValue, type TEntityType } from '@reltio/mdm-sdk';
-export declare const isSimpleAttributeValue: (value: unknown) => value is SimpleAttributeValue;
 import type { Diff, Title } from '../../types';
+export declare const isSimpleAttributeValue: (value: unknown) => value is SimpleAttributeValue;
 export declare const isEditableChange: (change: Diff, entityInfo: GroupedObjectsInfo["entity"]) => boolean;
 export declare const addLineIdToValue: (data: DCRChanges | EnrichedDCRChanges) => EnrichedDCRChanges;
 export declare const isDiffChange: (change: Diff | Title) => change is Diff;

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

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { clone, has, isNil } from 'ramda';
 import { DCROperationTypes, DCRTypes, isComplexAttribute, isImage, isRelationTypeUri, MetadataPermissions, checkMetadataPermission, isRoleAttrType, isTagAttrType, checkSubAttributesPermissions } from '@reltio/mdm-sdk';
+import { isPrimitiveValue } from '../../helpers/common';
 export var isSimpleAttributeValue = function (value) {
     return value !== null && typeof value === 'object' && 'value' in value;
 };
@@ -24,9 +25,6 @@ export var isEditableChange = function (change, entityInfo) {
         !isRelationTypeUri(currentAttributeTypeUri);
     return !!currentAttributeTypeUri && !isExistingReferenceEntityChange && !isNil(change.newValue);
 };
-var isPrimitiveValue = function (value) {
-    return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
-};
 var addLineIdRecursively = function (value, basePath) {
     if (value == null)
         return value;

package/features/workflow/ReviewDCRDialog/ReviewDCRDialog.d.ts

@@ -6,6 +6,7 @@ type Props = {
     dcr: ChangeRequest;
     task: WorkflowTaskData;
     groupedObjects: GroupedObjectsInfo[];
+    onReloadDcr?: () => void;
 };
-export declare const ReviewDCRDialog: ({ open, onClose, dcr, task, groupedObjects }: Props) => React.JSX.Element;
+export declare const ReviewDCRDialog: ({ open, onClose, dcr, task, groupedObjects, onReloadDcr }: Props) => React.JSX.Element;
 export {};