@reltio/components 1.4.2201 → 1.4.2203

package/cjs/features/workflow/helpers/merge.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeChanges = void 0;
+exports.mergeChanges = exports.extractLineIds = void 0;
 var ramda_1 = require("ramda");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var attributes_1 = require("./attributes");
@@ -23,18 +23,30 @@ var SPECIAL_ATTRIBUTES_NAMES = [
     mdm_sdk_1.EntityAttrTypes.startDate.name,
     mdm_sdk_1.EntityAttrTypes.endDate.name
 ];
+var extractLineIds = function (value) {
+    return typeof value === 'object' && 'lineIds' in value ? value.lineIds : undefined;
+};
+exports.extractLineIds = extractLineIds;
 var prepareStartOrEndDate = function (_a) {
     var newValue = _a.newValue, oldValue = _a.oldValue;
+    var actualNewValue = newValue && 'value' in newValue ? newValue.value : newValue;
+    var actualOldValue = oldValue && 'value' in oldValue ? oldValue.value : oldValue;
     var parseValue = function (value) { return (isNaN(value) || (0, mdm_sdk_1.isEmptyValue)(value) ? value : parseInt(value)); };
     var isExistedValue = function (value) { return (value === null || value === void 0 ? void 0 : value.length) && !(0, mdm_sdk_1.isEmptyValue)(value) && !(0, mdm_sdk_1.isEmptyValue)(value[0]); };
-    var isExistNewValue = isExistedValue(newValue);
-    var isExistOldValue = isExistedValue(oldValue);
+    var isExistNewValue = isExistedValue(actualNewValue);
+    var isExistOldValue = isExistedValue(actualOldValue);
     if (isExistNewValue && isExistOldValue) {
         return [
             {
                 type: mdm_sdk_1.DCRTypes.UPDATE_ATTRIBUTE,
-                oldValue: { value: parseValue(oldValue[0]) },
-                newValue: { value: parseValue(newValue[0]) }
+                oldValue: {
+                    value: parseValue(actualOldValue[0]),
+                    lineIds: (0, exports.extractLineIds)(oldValue)
+                },
+                newValue: {
+                    value: parseValue(actualNewValue[0]),
+                    lineIds: (0, exports.extractLineIds)(newValue)
+                }
             }
         ];
     }
@@ -42,7 +54,10 @@ var prepareStartOrEndDate = function (_a) {
         return [
             {
                 type: mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: parseValue(newValue[0]) }
+                newValue: {
+                    value: parseValue(actualNewValue[0]),
+                    lineIds: (0, exports.extractLineIds)(newValue)
+                }
             }
         ];
     }
@@ -50,26 +65,31 @@ var prepareStartOrEndDate = function (_a) {
         return [
             {
                 type: mdm_sdk_1.DCRTypes.DELETE_ATTRIBUTE,
-                oldValue: { value: parseValue(oldValue[0]) }
+                oldValue: {
+                    value: parseValue(actualOldValue[0]),
+                    lineIds: (0, exports.extractLineIds)(oldValue)
+                }
             }
         ];
     }
 };
 var prepareRolesOrTags = function (metadata, change) {
     var _a = change.newValue, newValue = _a === void 0 ? [] : _a, _b = change.oldValue, oldValue = _b === void 0 ? [] : _b;
-    var diffNewValue = (0, ramda_1.difference)(newValue, oldValue);
-    var diffOldValue = (0, ramda_1.difference)(oldValue, newValue);
+    var preparedNewValue = 'value' in newValue ? newValue.value : newValue;
+    var preparedOldValue = 'value' in oldValue ? oldValue.value : oldValue;
+    var diffNewValue = (0, ramda_1.difference)(preparedNewValue, preparedOldValue);
+    var diffOldValue = (0, ramda_1.difference)(preparedOldValue, preparedNewValue);
     var items = [];
     if (diffNewValue.length) {
         items.push({
             type: mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE,
-            newValue: { value: diffNewValue }
+            newValue: { value: diffNewValue, lineIds: (0, exports.extractLineIds)(newValue) }
         });
     }
     if (diffOldValue.length) {
         items.push({
             type: mdm_sdk_1.DCRTypes.DELETE_ATTRIBUTE,
-            oldValue: { value: diffOldValue }
+            oldValue: { value: diffOldValue, lineIds: (0, exports.extractLineIds)(oldValue) }
         });
     }
     return items;
@@ -85,7 +105,7 @@ var getPath = function (change) {
     return path;
 };
 var prepareAttribute = function (container, change) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     var changePath = getPath(change);
     var pathArray = changePath.split(ATTRIBUTE_DELIMITER);
     var holder = container;
@@ -93,9 +113,20 @@ var prepareAttribute = function (container, change) {
         var key = pathArray[i];
         var id = pathArray[i + 1];
         var currentValue = (holder[key] || []).find((0, ramda_1.propEq)('id', id));
+        if (!(0, ramda_1.isNil)(currentValue)) {
+            var newLineIds = (0, exports.extractLineIds)(change.newValue);
+            var oldLineIds = (0, exports.extractLineIds)(change.oldValue);
+            var currentLineId = ((_b = (_a = currentValue.value) === null || _a === void 0 ? void 0 : _a.newValue) === null || _b === void 0 ? void 0 : _b.lineIds) || ((_d = (_c = currentValue.value) === null || _c === void 0 ? void 0 : _c.oldValue) === null || _d === void 0 ? void 0 : _d.lineIds);
+            if (((_f = (_e = currentValue.value) === null || _e === void 0 ? void 0 : _e.newValue) === null || _f === void 0 ? void 0 : _f.lineIds) && newLineIds) {
+                currentValue.value.newValue.lineIds = currentLineId.concat(newLineIds);
+            }
+            if (((_h = (_g = currentValue.value) === null || _g === void 0 ? void 0 : _g.oldValue) === null || _h === void 0 ? void 0 : _h.lineIds) && oldLineIds) {
+                currentValue.value.oldValue.lineIds = currentLineId.concat(oldLineIds);
+            }
+        }
         var newValue = pathArray.length === i + 2 ? change : {};
         var value = currentValue ? currentValue : { id: id, value: newValue };
-        var refObjectURI = ((_a = change.refObjectURI) === null || _a === void 0 ? void 0 : _a.indexOf(id)) >= 0 && change.refObjectURI;
+        var refObjectURI = ((_j = change.refObjectURI) === null || _j === void 0 ? void 0 : _j.indexOf(id)) >= 0 && change.refObjectURI;
         if (refObjectURI) {
             value.refObjectURI = refObjectURI;
         }
@@ -107,7 +138,7 @@ var prepareAttribute = function (container, change) {
     return container;
 };
 var createEntityOrRelation = function (metadata, value) {
-    var _a = value.attributes, attributes = _a === void 0 ? {} : _a, startDate = value.startDate, endDate = value.endDate;
+    var _a = value.attributes, attributes = _a === void 0 ? {} : _a, startDate = value.startDate, endDate = value.endDate, lineIds = value.lineIds;
     var _b = value, roles = _b.roles, tags = _b.tags, defaultProfilePicValue = _b.defaultProfilePicValue;
     var newObject = __assign({}, attributes);
     if (defaultProfilePicValue) {
@@ -117,7 +148,10 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[mdm_sdk_1.EntityAttrTypes.roles.name] = [
             {
                 type: mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: roles.map((0, mdm_sdk_1.getRoleLabel)(metadata)).join(', ') }
+                newValue: {
+                    value: roles.map((0, mdm_sdk_1.getRoleLabel)(metadata)).join(', '),
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(mdm_sdk_1.EntityAttrTypes.roles.name)]
+                }
             }
         ];
     }
@@ -125,7 +159,10 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[mdm_sdk_1.EntityAttrTypes.tags.name] = [
             {
                 type: mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: tags.join(', ') }
+                newValue: {
+                    value: tags.join(', '),
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(mdm_sdk_1.EntityAttrTypes.tags.name)]
+                }
             }
         ];
     }
@@ -133,7 +170,10 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[mdm_sdk_1.EntityAttrTypes.startDate.name] = [
             {
                 type: mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: startDate }
+                newValue: {
+                    value: startDate,
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(mdm_sdk_1.EntityAttrTypes.startDate.name)]
+                }
             }
         ];
     }
@@ -141,10 +181,14 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[mdm_sdk_1.EntityAttrTypes.endDate.name] = [
             {
                 type: mdm_sdk_1.DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: endDate }
+                newValue: {
+                    value: endDate,
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(mdm_sdk_1.EntityAttrTypes.endDate.name)]
+                }
             }
         ];
     }
+    newObject['lineIds'] = lineIds;
     return newObject;
 };
 var mergeAttributesInChange = function (metadata, objectInfo, change, container) {

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

@@ -201,6 +201,7 @@ describe('mergeChanges tests', function () {
                 {
                     id: 'BpiR2Vqh',
                     type: mdm_sdk_1.DCRTypes.CREATE_RELATIONSHIP,
+                    lineIds: ['relations/1EvCRmwC/BpiR2Vqh'],
                     newValue: {
                         uri: 'relations/1EvCRmwC',
                         type: 'configuration/relationTypes/Assistant',
@@ -210,7 +211,8 @@ describe('mergeChanges tests', function () {
                         endObject: {
                             objectURI: 'entities/1C2v7IRp'
                         },
-                        startDate: 1643742000000
+                        startDate: 1643742000000,
+                        lineIds: ['relations/1EvCRmwC/BpiR2Vqh/newValue']
                     }
                 }
             ]
@@ -237,6 +239,7 @@ describe('mergeChanges tests', function () {
                     }
                 ], _a)),
                 label: metadata_test_data_1.metadata.relationTypes[1].label,
+                lineIds: ['relations/1EvCRmwC/BpiR2Vqh/newValue'],
                 level: 1
             },
             {
@@ -244,11 +247,62 @@ describe('mergeChanges tests', function () {
                 label: 'Start date',
                 level: 2,
                 newValue: {
-                    value: 1643742000000
+                    value: 1643742000000,
+                    lineIds: ["relations/1EvCRmwC/BpiR2Vqh/newValue/".concat(mdm_sdk_1.EntityAttrTypes.startDate.name)]
                 },
                 operation: mdm_sdk_1.DCROperationTypes.ADDED
             }
         ];
         expect((0, merge_1.mergeChanges)(metadata_test_data_1.metadata, changes, objectInfo, relationsInfo)).toMatchObject([[], mergedRelations]);
     });
+    it('should merge lineIds when multiple changes have the same attributePath', function () {
+        var _a;
+        var _b, _c;
+        var changes = (_a = {},
+            _a[entityUri] = [
+                {
+                    id: '0Kb5iws',
+                    type: mdm_sdk_1.DCRTypes.UPDATE_ATTRIBUTE,
+                    objectType: 'configuration/entityTypes/HCP',
+                    attributePath: 'CountryCode/2DEYF4Zg',
+                    oldValue: {
+                        value: 'American Samoa',
+                        lookupCode: 'ASM',
+                        lookupRawValue: 'ASM',
+                        lineIds: ['line-1']
+                    },
+                    newValue: {
+                        value: 'Algeria',
+                        lookupCode: 'DZA',
+                        lookupRawValue: 'DZA',
+                        lineIds: ['line-2']
+                    },
+                    newPinOrIgnoreValue: false,
+                    attributeType: 'configuration/entityTypes/HCP/attributes/CountryCode'
+                },
+                {
+                    id: '0Kb5nD8',
+                    type: mdm_sdk_1.DCRTypes.UPDATE_ATTRIBUTE,
+                    objectType: 'configuration/entityTypes/HCP',
+                    attributePath: 'CountryCode/2DEYF4Zg',
+                    oldValue: {
+                        value: 'American Samoa',
+                        lookupCode: 'ASM',
+                        lookupRawValue: 'ASM',
+                        lineIds: ['line-3']
+                    },
+                    newValue: {
+                        value: 'Algeria',
+                        lookupCode: 'DZA',
+                        lookupRawValue: 'DZA',
+                        lineIds: ['line-4']
+                    },
+                    newPinOrIgnoreValue: false,
+                    attributeType: 'configuration/entityTypes/HCP/attributes/CountryCode'
+                }
+            ],
+            _a);
+        var mergedChanges = (0, merge_1.mergeChanges)(metadata_test_data_1.metadata, changes, objectInfo, [])[0];
+        expect((_c = (_b = mergedChanges[0]) === null || _b === void 0 ? void 0 : _b.newValue) === null || _c === void 0 ? void 0 : _c.lineIds).toEqual(['line-2', 'line-4']);
+    });
 });

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

@@ -1,7 +1,7 @@
-import { DCRChanges, GroupedObjectsInfo } from '@reltio/mdm-sdk';
+import { EnrichedDCRChanges, GroupedObjectsInfo, DCRChanges } from '@reltio/mdm-sdk';
 import { Diff, Title } from '../types';
 type Props = {
-    changes: DCRChanges;
+    changes: EnrichedDCRChanges | DCRChanges;
     entityInfo: GroupedObjectsInfo['entity'];
     relationsInfo: GroupedObjectsInfo['relations'];
 };

package/cjs/features/workflow/types.d.ts

@@ -1,4 +1,4 @@
-import { AttributeType, ChangeValue, DCRAttributeValue, DCROperationTypes, DCRRelationInfo, TRelationType } from '@reltio/mdm-sdk';
+import { AttributeType, DCRAttributeValue, DCROperationTypes, DCRRelationInfo, EnrichedChangeValue, TRelationType, ChangeValue } from '@reltio/mdm-sdk';
 export type TaskAction = {
     text: string;
     onClick: (comment: string) => void;
@@ -10,10 +10,11 @@ export type Diff = {
     attributeType: AttributeType | null;
     relationType?: TRelationType;
     attributeValue?: DCRAttributeValue | RelationAttributeValue;
-    newValue?: ChangeValue;
-    oldValue?: ChangeValue;
+    newValue?: EnrichedChangeValue | ChangeValue;
+    oldValue?: EnrichedChangeValue | ChangeValue;
     operation?: DCROperationTypes;
     isReferenceSubAttribute?: boolean;
+    lineIds?: string[];
 };
 export type Title = {
     label: string;

package/features/activity-log/RecordUpdates/RecordUpdates.d.ts

@@ -4,6 +4,7 @@ type Props = {
     updates: ActivityDelta[];
     recordId: string;
     isSegment?: boolean;
+    isInteraction?: boolean;
 };
 export declare const RecordUpdates: ({ updates, recordId, isSegment }: Props) => React.JSX.Element;
 export {};

package/features/activity-log/RecordUpdates/RecordUpdates.js

@@ -12,9 +12,8 @@ export var RecordUpdates = function (_a) {
         itemsId: recordId,
         items: updates
     }), onExpand = _b.onExpand, collapsedItemsCount = _b.collapsedItemsCount, itemsToShow = _b.itemsToShow;
+    var DeltaFieldComponent = isSegment ? SegmentDeltaField : DeltaField;
     return (React.createElement(React.Fragment, null,
-        itemsToShow.map(function (update, index) {
-            return isSegment ? React.createElement(SegmentDeltaField, { key: index, delta: update }) : React.createElement(DeltaField, { key: index, delta: update });
-        }),
+        itemsToShow.map(function (update, index) { return (React.createElement(DeltaFieldComponent, { key: index, delta: update })); }),
         collapsedItemsCount ? (React.createElement(MoreItemsLink, { itemsCount: collapsedItemsCount, itemsLabel: collapsedItemsCount === 1 ? i18n.text('update') : i18n.text('updates'), onClick: onExpand, className: styles.moreLabel })) : null));
 };

package/features/activity-log/RecordUpdates/components/DeltaField/DeltaField.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ActivityDelta } from '../../../types';
+import { type ActivityDelta } from '../../../types';
 type Props = {
     delta: ActivityDelta;
 };

package/features/activity-log/RecordUpdates/components/DeltaField/DeltaField.js

@@ -1,32 +1,36 @@
 import React from 'react';
 import classnames from 'classnames';
-import { findAttributeTypeByUri } from '@reltio/mdm-sdk';
+import { findAttributeTypeByUri, findMemberTypeByUri } from '@reltio/mdm-sdk';
+import { EntityUriLink } from '../../../../../EntityUriLink';
 import Chip from '@mui/material/Chip';
 import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
-import { DeltaTypes } from '../../../types';
+import { DeltaTypes, MemberDeltaTypes } from '../../../types';
 import { stringifyDeltaValue } from '../../../utils/activities';
 import { useMdmMetadata, useMdmAttributesPresentation } from '../../../../../contexts/MdmModuleContext';
 import { Field } from '../../../Field';
-import { useStyles } from './styles';
+import styles from './DeltaField.module.css';
 export var DeltaField = function (_a) {
     var _b, _c;
     var delta = _a.delta;
-    var styles = useStyles();
     var metadata = useMdmMetadata();
     var attributesPresentation = useMdmAttributesPresentation();
-    var attribute = findAttributeTypeByUri(metadata, delta.attributeType);
+    var isMemberDelta = delta.type in MemberDeltaTypes;
+    var attributeType = !isMemberDelta ? findAttributeTypeByUri(metadata, delta.attributeType) : undefined;
+    var memberType = isMemberDelta ? findMemberTypeByUri(metadata, delta.attributeType) : undefined;
+    var fieldType = isMemberDelta ? memberType : attributeType;
+    var fieldName = (fieldType === null || fieldType === void 0 ? void 0 : fieldType.label) || (fieldType === null || fieldType === void 0 ? void 0 : fieldType.name);
     var newValue = (_b = delta.newValue) === null || _b === void 0 ? void 0 : _b.value;
     var oldValue = (_c = delta.oldValue) === null || _c === void 0 ? void 0 : _c.value;
     var value = oldValue || newValue;
-    var deltaLabel = DeltaTypes[delta.type];
-    var converter = function (value) {
-        return stringifyDeltaValue(value, delta.attributeType, metadata, attributesPresentation);
+    var deltaLabel = (isMemberDelta ? MemberDeltaTypes : DeltaTypes)[delta.type];
+    var converter = function (deltaValue) {
+        return isMemberDelta ? (React.createElement(EntityUriLink, { value: 'entities/' + deltaValue, className: styles.entityLink }, deltaValue)) : (stringifyDeltaValue(deltaValue, delta.attributeType, metadata, attributesPresentation));
     };
-    return (React.createElement(Field, { fieldName: (attribute === null || attribute === void 0 ? void 0 : attribute.label) || (attribute === null || attribute === void 0 ? void 0 : attribute.name), "data-reltio-id": "delta-field" },
+    return (React.createElement(Field, { fieldName: fieldName, "data-reltio-id": "delta-field" },
         React.createElement("span", null,
             value && converter(value),
             newValue && oldValue && (React.createElement(React.Fragment, null,
                 React.createElement(ArrowForwardIcon, { className: styles.arrow }),
                 converter(newValue)))),
-        deltaLabel && (React.createElement(Chip, { variant: "outlined", label: deltaLabel, className: classnames(styles.chip, deltaLabel) }))));
+        deltaLabel && (React.createElement(Chip, { variant: "outlined", label: deltaLabel, className: classnames(styles.chip, styles[deltaLabel]) }))));
 };

package/features/activity-log/RecordUpdates/components/DeltaField/DeltaField.module.css.js

@@ -0,0 +1,9 @@
+const styles = {"arrow":"DeltaField-arrow--5hkJ-","chip":"DeltaField-chip--OIM5S","edited":"DeltaField-edited--P1M7q","added":"DeltaField-added--HNmW4","deleted":"DeltaField-deleted--oKqex","entityLink":"DeltaField-entityLink--lGSiY"};
+if (typeof document !== 'undefined') {
+    const head = document.head || document.getElementsByTagName('head')[0]
+    const style = document.createElement('style');
+    style.type = 'text/css'
+    style.innerHTML = `.DeltaField-arrow--5hkJ-{color:var(--mui-palette-text-primary);font-size:12px;margin:0 8px}.DeltaField-chip--OIM5S{flex-shrink:0;font-size:10px;font-weight:500;height:20px;line-height:16px;margin-left:9px;text-transform:capitalize;width:53px}.DeltaField-chip--OIM5S.DeltaField-edited--P1M7q{border-color:#6973c2;color:#6973c2}.DeltaField-chip--OIM5S.DeltaField-added--HNmW4{border-color:#75c378;color:#75c378}.DeltaField-chip--OIM5S.DeltaField-deleted--oKqex{border-color:#f97061;color:#f97061}.DeltaField-chip--OIM5S span{padding:0}.DeltaField-entityLink--lGSiY{color:var(--mui-palette-primary-main);text-decoration:none}`;
+    head.appendChild(style);
+}
+export default styles;

package/features/activity-log/types.d.ts

@@ -61,6 +61,11 @@ export declare enum DeltaTypes {
     ATTRIBUTE_ADDED = "added",
     ATTRIBUTE_REMOVED = "deleted"
 }
+export declare enum MemberDeltaTypes {
+    MEMBER_CHANGED = "edited",
+    MEMBER_ADDED = "added",
+    MEMBER_REMOVED = "deleted"
+}
 export type ActivityDelta = {
     type: string;
     attributeType: string;

package/features/activity-log/types.js

@@ -42,3 +42,9 @@ export var DeltaTypes;
     DeltaTypes["ATTRIBUTE_ADDED"] = "added";
     DeltaTypes["ATTRIBUTE_REMOVED"] = "deleted";
 })(DeltaTypes || (DeltaTypes = {}));
+export var MemberDeltaTypes;
+(function (MemberDeltaTypes) {
+    MemberDeltaTypes["MEMBER_CHANGED"] = "edited";
+    MemberDeltaTypes["MEMBER_ADDED"] = "added";
+    MemberDeltaTypes["MEMBER_REMOVED"] = "deleted";
+})(MemberDeltaTypes || (MemberDeltaTypes = {}));

package/features/workflow/ChangeRequestEditor/ChangeRequestEditor.js

@@ -1,16 +1,26 @@
-import React from 'react';
+import React, { useMemo } from 'react';
+import { clone } from 'ramda';
 import i18n from 'ui-i18n';
 import Typography from '@mui/material/Typography';
+import { addLineIdToValue } from './helpers/helpers';
 import SvgSuggestedChanges from '../../../icons/SuggestedChanges';
 import { EntityChangesGroup, SkeletonEntityChangesGroupLoader } from './components/EntityChangesGroup';
 import styles from './ChangeRequestEditor.module.css';
 export var ChangeRequestEditor = function (_a) {
     var dcr = _a.dcr, task = _a.task, groupedObjects = _a.groupedObjects;
-    var dcrLoaded = !!dcr && groupedObjects.length > 0;
+    var enrichedDCR = useMemo(function () {
+        if (dcr === null || dcr === void 0 ? void 0 : dcr.changes) {
+            var cloned = clone(dcr);
+            cloned.changes = addLineIdToValue(cloned.changes);
+            return cloned;
+        }
+        return null;
+    }, [dcr]);
+    var dcrLoaded = !!enrichedDCR && groupedObjects.length > 0;
     return (React.createElement("div", { className: styles.container },
         React.createElement("div", { className: styles.header },
             React.createElement("div", { className: styles.suggestedChangesIcon },
                 React.createElement(SvgSuggestedChanges, null)),
             React.createElement(Typography, { variant: "h6", className: styles.suggestedChangesTitle }, i18n.text('Suggested changes'))),
-        dcrLoaded ? (groupedObjects.map(function (object, index) { return (React.createElement(EntityChangesGroup, { key: "entity-".concat(index), entityInfo: object.entity, relationsInfo: object.relations, task: task, dcr: dcr })); })) : (React.createElement(SkeletonEntityChangesGroupLoader, null))));
+        dcrLoaded ? (groupedObjects.map(function (object, index) { return (React.createElement(EntityChangesGroup, { key: "entity-".concat(index), entityInfo: object.entity, relationsInfo: object.relations, task: task, dcr: enrichedDCR })); })) : (React.createElement(SkeletonEntityChangesGroupLoader, null))));
 };

package/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/ChangeItemEditor.d.ts

@@ -1,10 +1,8 @@
 import React from 'react';
-import { DCRValue } from '@reltio/mdm-sdk';
 import { Diff } from '../../../types';
 type Props = {
     change: Diff;
-    onValueChange: (id: string, newValue: DCRValue) => void;
     editable?: boolean;
 };
-export declare const ChangeItemEditor: ({ change, onValueChange, editable }: Props) => React.JSX.Element;
+export declare const ChangeItemEditor: ({ change, editable }: Props) => React.JSX.Element;
 export {};

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

@@ -1,23 +1,32 @@
-import React, { useMemo } from 'react';
 import { isNil } from 'ramda';
+import React, { useCallback, useMemo } from 'react';
+import { useContextSelector } from '@fluentui/react-context-selector';
 import { DCROperationTypes, EntityAttrTypes, getAttributeValue } from '@reltio/mdm-sdk';
+import { useMdmMetadata } from '../../../../../contexts/MdmModuleContext';
+import { DataTypeValue } from '../../../../../DataTypeValue';
 import { getDataTypeDefinition, prepareRolesOrTagsValue } from '../../../helpers/common';
 import { OperationChip } from '../../../OperationChip';
-import { DataTypeValue } from '../../../../../DataTypeValue';
 import { RelationEntityLink } from '../../../RelationEntityLink';
+import { ChangeRequestEditorContext } from '../../context';
 import { ChangeItemLabel } from './ChangeItemLabel';
 import { DCRValueEditor } from './DCRValueEditor';
-import { useMdmMetadata } from '../../../../../contexts/MdmModuleContext';
+import { extractLineIds } from '../../../helpers/merge';
 import styles from './ChangeItemEditor.module.css';
 export var ChangeItemEditor = function (_a) {
     var _b, _c, _d;
-    var change = _a.change, onValueChange = _a.onValueChange, _e = _a.editable, editable = _e === void 0 ? true : _e;
+    var change = _a.change, _e = _a.editable, editable = _e === void 0 ? true : _e;
     var metadata = useMdmMetadata();
+    var lineIds = change.lineIds || extractLineIds(change === null || change === void 0 ? void 0 : change.newValue);
+    var lineData = useContextSelector(ChangeRequestEditorContext, function (context) { return lineIds && context.getLineData(lineIds[0]); });
+    var updateChange = useContextSelector(ChangeRequestEditorContext, function (context) { return context.updateChange; });
+    var onValueChange = useCallback(function (newValue) {
+        updateChange(lineIds, typeof newValue === 'object' && 'value' in newValue ? newValue : { value: newValue });
+    }, [lineIds, updateChange]);
     var isUpdateOperation = change.operation === DCROperationTypes.EDITED;
     var isAddOperation = change.operation === DCROperationTypes.ADDED;
     var hasAnyValue = Boolean(change.oldValue || change.newValue);
     var oldValue = getAttributeValue(change.oldValue);
-    var newValue = getAttributeValue(change.newValue);
+    var newValue = getAttributeValue(isNil(lineData === null || lineData === void 0 ? void 0 : lineData.value) ? change.newValue : lineData.value);
     var hasNewValue = !isNil(newValue);
     var dataTypeDefinition = useMemo(function () {
         return change.attributeType && getDataTypeDefinition(change.attributeType, newValue || oldValue);
@@ -35,7 +44,7 @@ export var ChangeItemEditor = function (_a) {
         React.createElement(ChangeItemLabel, { change: change, className: styles.labelColumn, showLabel: !isUpdateOperation }),
         React.createElement("div", { className: styles.valueColumn },
             React.createElement(RelationEntityLink, { attributeOrRelationType: change.attributeType || change.relationType, attributeValue: change.attributeValue, className: styles.relationEntityLink }),
-            shouldShowValueEditor ? (React.createElement(DCRValueEditor, { attributeType: change.attributeType, value: change.newValue, onChange: onValueChange })) : (hasNewValue && (React.createElement("div", { className: styles.value },
+            shouldShowValueEditor ? (React.createElement(DCRValueEditor, { attributeType: change.attributeType, value: isNil(lineData === null || lineData === void 0 ? void 0 : lineData.value) ? change.newValue : lineData.value, onChange: onValueChange })) : (hasNewValue && (React.createElement("div", { className: styles.value },
                 React.createElement(DataTypeValue, { value: preparedValue, dataTypeDefinition: dataTypeDefinition }))))),
         React.createElement("div", { className: styles.revertColumn }),
         React.createElement("div", { className: styles.operationColumn }, shouldShowOperationChip && (React.createElement(OperationChip, { operation: change.operation, size: "small", variant: "outlined" })))));

package/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/DCRValueEditor.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
-import { AttributeType, DCRValue, ChangeValue } from '@reltio/mdm-sdk';
+import { AttributeType, ChangeValue, PrimitiveValue, SimpleAttributeValue } from '@reltio/mdm-sdk';
+import { LineDataValue } from '../../context';
 type Props = {
     attributeType: AttributeType;
-    value: ChangeValue;
-    onChange: (id: string, newValue: DCRValue) => void;
+    value: LineDataValue | ChangeValue;
+    onChange: (value: SimpleAttributeValue | string[] | PrimitiveValue) => void;
 };
 export declare const DCRValueEditor: ({ attributeType, value, onChange }: Props) => React.JSX.Element;
 export {};

package/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/DCRValueEditor.js

@@ -1,14 +1,11 @@
-import React, { useCallback } from 'react';
+import React from 'react';
 import { DCRValueEditorFactory } from './DCRValueEditorFactory';
 import styles from './ChangeItemEditor.module.css';
 export var DCRValueEditor = function (_a) {
     var attributeType = _a.attributeType, value = _a.value, onChange = _a.onChange;
-    var handleChange = useCallback(function (updatedValue) {
-        onChange(attributeType.uri, updatedValue);
-    }, [attributeType.uri, onChange]);
     return (React.createElement("div", { className: styles.editor }, DCRValueEditorFactory.build({
         attributeType: attributeType,
         value: value,
-        onChange: handleChange
+        onChange: onChange
     })));
 };

package/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/DCRValueEditorFactory.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
-import { AttributeType, DCRValue, DataTypeDefinition, ChangeValue } from '@reltio/mdm-sdk';
+import { AttributeType, ChangeValue, DataTypeDefinition, PrimitiveValue, SimpleAttributeValue } from '@reltio/mdm-sdk';
+import { LineDataValue } from '../../context';
 type Props = {
     attributeType: AttributeType;
-    value: ChangeValue;
-    onChange: (value: DCRValue) => void;
+    value: LineDataValue | ChangeValue;
+    onChange: (value: SimpleAttributeValue | string[] | PrimitiveValue) => void;
     dataTypeDefinition?: DataTypeDefinition;
 };
 export declare class DCRValueEditorFactory {

package/features/workflow/ChangeRequestEditor/components/ChangeItemEditor/DCRValueEditorFactory.js

@@ -1,10 +1,11 @@
+import { prop } from 'ramda';
 import React from 'react';
-import { EntityAttrTypes, wrapInArrayIfNeeded, getAttributeValue } from '@reltio/mdm-sdk';
+import { EntityAttrTypes, getAttributeValue, wrapInArrayIfNeeded } from '@reltio/mdm-sdk';
 import { DataTypeValueEditor } from '../../../../../DataTypeValueEditor';
-import { attributeValueToEditorValue } from '../../../../../helpers/attributesView';
-import { getDataTypeDefinition } from '../../../helpers/common';
+import { attributeValueToEditorValue, editorValueToAttributeValue } from '../../../../../helpers/attributesView';
 import { RolesInput } from '../../../../../RolesInput/RolesInput';
 import { TagsInput } from '../../../../../TagsInput/TagsInput';
+import { getDataTypeDefinition } from '../../../helpers/common';
 var DCRValueEditorFactory = /** @class */ (function () {
     function DCRValueEditorFactory() {
     }
@@ -13,7 +14,10 @@ var DCRValueEditorFactory = /** @class */ (function () {
         var dcrValue = getAttributeValue(value);
         switch (attributeType.uri) {
             case EntityAttrTypes.roles.uri: {
-                return React.createElement(RolesInput, { value: wrapInArrayIfNeeded(dcrValue), onChange: onChange });
+                var handleChange = function (values) {
+                    onChange((values === null || values === void 0 ? void 0 : values.map(prop('value'))) || []);
+                };
+                return React.createElement(RolesInput, { value: wrapInArrayIfNeeded(dcrValue), onChange: handleChange });
             }
             case EntityAttrTypes.tags.uri: {
                 return React.createElement(TagsInput, { value: wrapInArrayIfNeeded(dcrValue), onChange: onChange });
@@ -23,7 +27,11 @@ var DCRValueEditorFactory = /** @class */ (function () {
                 var editorValue = value && dataTypeDefinition
                     ? attributeValueToEditorValue(value, dataTypeDefinition)
                     : null;
-                return (React.createElement(DataTypeValueEditor, { fieldName: attributeType.uri, value: editorValue, dataTypeDefinition: dataTypeDefinition, onChange: onChange, fullWidth: true }));
+                var handleChange = function (value) {
+                    var valueConvertedToAttributeValue = editorValueToAttributeValue(attributeType, value);
+                    onChange(valueConvertedToAttributeValue);
+                };
+                return (React.createElement(DataTypeValueEditor, { fieldName: attributeType.uri, value: editorValue, dataTypeDefinition: dataTypeDefinition, onChange: handleChange, fullWidth: true }));
             }
         }
     };

package/features/workflow/ChangeRequestEditor/components/ChangeItemRow/ChangeItemRow.d.ts

@@ -1,10 +1,9 @@
 import React from 'react';
-import { GroupedObjectsInfo, DCRValue } from '@reltio/mdm-sdk';
+import { GroupedObjectsInfo } from '@reltio/mdm-sdk';
 import { Diff, Title } from '../../../types';
 type Props = {
     item: Diff | Title;
-    onValueChange: (id: string, newValue: DCRValue) => void;
     entityInfo: GroupedObjectsInfo['entity'];
 };
-export declare const ChangeItemRow: ({ item, onValueChange, entityInfo }: Props) => React.JSX.Element;
+export declare const ChangeItemRow: ({ item, entityInfo }: Props) => React.JSX.Element;
 export {};

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

@@ -1,13 +1,13 @@
-import React from 'react';
-import { has } from 'ramda';
 import classnames from 'classnames';
+import { has } from 'ramda';
+import React from 'react';
 import { DCROperationTypes } from '@reltio/mdm-sdk';
-import { isEditableChange } from '../../helpers';
-import { ChangeItemOldValue, ChangeItemEditor } from '../ChangeItemEditor';
+import { isEditableChange } from '../../helpers/helpers';
+import { ChangeItemEditor, ChangeItemOldValue } from '../ChangeItemEditor';
 import styles from './ChangeItemRow.module.css';
 export var ChangeItemRow = function (_a) {
     var _b;
-    var item = _a.item, onValueChange = _a.onValueChange, entityInfo = _a.entityInfo;
+    var item = _a.item, entityInfo = _a.entityInfo;
     if (!has('level', item)) {
         return React.createElement("div", { className: styles.title }, item.label);
     }
@@ -16,5 +16,5 @@ export var ChangeItemRow = function (_a) {
     var editable = isEditableChange(change, entityInfo);
     return (React.createElement("div", { className: classnames(styles.changeItemRow, (_b = {}, _b[styles.editableRow] = editable, _b)) },
         isEditedOperation && React.createElement(ChangeItemOldValue, { change: change }),
-        React.createElement(ChangeItemEditor, { change: change, onValueChange: onValueChange, editable: editable })));
+        React.createElement(ChangeItemEditor, { change: change, editable: editable })));
 };