@reltio/components 1.4.2201 → 1.4.2202

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

@@ -0,0 +1,235 @@
+import { DCRTypes } from '@reltio/mdm-sdk';
+import { addLineIdToValue } from './helpers';
+describe('addLineIdToValue', function () {
+    it('should add lineIds for a simple attribute', function () {
+        var changes = {
+            'entities/0FaSodQ': [
+                {
+                    id: '4pomtm9',
+                    type: DCRTypes.INSERT_ATTRIBUTE,
+                    newValue: { value: '434' }
+                }
+            ]
+        };
+        var result = addLineIdToValue(changes);
+        expect(result).toEqual({
+            'entities/0FaSodQ': [
+                {
+                    id: '4pomtm9',
+                    type: DCRTypes.INSERT_ATTRIBUTE,
+                    newValue: {
+                        value: '434',
+                        lineIds: ['0FaSodQ/4pomtm9/newValue']
+                    },
+                    lineIds: ['0FaSodQ/4pomtm9']
+                }
+            ]
+        });
+    });
+    it('should add lineIds to the newValue of a UPDATE_TAGS change', function () {
+        var changes = {
+            'entities/0FaSodQ': [
+                {
+                    id: '0OSJEYr',
+                    type: DCRTypes.UPDATE_TAGS,
+                    newValue: ['www', 'qqq', 'sss'],
+                    oldValue: ['aaa', 'bbb', 'ccc']
+                }
+            ]
+        };
+        var result = addLineIdToValue(changes);
+        expect(result).toEqual({
+            'entities/0FaSodQ': [
+                {
+                    id: '0OSJEYr',
+                    type: DCRTypes.UPDATE_TAGS,
+                    newValue: {
+                        value: ['www', 'qqq', 'sss'],
+                        lineIds: ['0FaSodQ/0OSJEYr/newValue']
+                    },
+                    oldValue: {
+                        value: ['aaa', 'bbb', 'ccc'],
+                        lineIds: ['0FaSodQ/0OSJEYr/oldValue']
+                    },
+                    lineIds: ['0FaSodQ/0OSJEYr']
+                }
+            ]
+        });
+    });
+    it('should recursively add lineIds to nested attribute values', function () {
+        var changes = {
+            'entities/0FaSodQ': [
+                {
+                    id: '4ponaOj',
+                    type: DCRTypes.INSERT_ATTRIBUTE,
+                    newValue: {
+                        value: {
+                            TextField: [{ value: 'Test' }],
+                            Int: [{ value: '42' }]
+                        }
+                    }
+                }
+            ]
+        };
+        var result = addLineIdToValue(changes);
+        expect(result).toEqual({
+            'entities/0FaSodQ': [
+                {
+                    id: '4ponaOj',
+                    type: DCRTypes.INSERT_ATTRIBUTE,
+                    newValue: {
+                        value: {
+                            TextField: [
+                                {
+                                    value: 'Test',
+                                    lineIds: ['0FaSodQ/4ponaOj/newValue/value/TextField/0']
+                                }
+                            ],
+                            Int: [
+                                {
+                                    value: '42',
+                                    lineIds: ['0FaSodQ/4ponaOj/newValue/value/Int/0']
+                                }
+                            ]
+                        },
+                        lineIds: ['0FaSodQ/4ponaOj/newValue']
+                    },
+                    lineIds: ['0FaSodQ/4ponaOj']
+                }
+            ]
+        });
+    });
+    it('should add lineIds to all attributes of CREATE_ENTITY changes', function () {
+        var changes = {
+            'entities/1PMfzz2w': [
+                {
+                    id: '36a3GSVm',
+                    type: DCRTypes.CREATE_ENTITY,
+                    objectType: 'configuration/entityTypes/Location',
+                    newValue: {
+                        attributes: {
+                            AddressLine1: [{ value: 'www' }],
+                            CityTierName: [{ value: 'ALBY' }]
+                        },
+                        type: 'configuration/entityTypes/Location',
+                        uri: 'entities/0T5H79G'
+                    }
+                }
+            ]
+        };
+        var result = addLineIdToValue(changes);
+        expect(result).toEqual({
+            'entities/1PMfzz2w': [
+                {
+                    id: '36a3GSVm',
+                    type: DCRTypes.CREATE_ENTITY,
+                    objectType: 'configuration/entityTypes/Location',
+                    newValue: {
+                        attributes: {
+                            AddressLine1: [
+                                {
+                                    value: 'www',
+                                    lineIds: ['1PMfzz2w/36a3GSVm/newValue/attributes/AddressLine1/0']
+                                }
+                            ],
+                            CityTierName: [
+                                {
+                                    value: 'ALBY',
+                                    lineIds: ['1PMfzz2w/36a3GSVm/newValue/attributes/CityTierName/0']
+                                }
+                            ]
+                        },
+                        type: 'configuration/entityTypes/Location',
+                        uri: 'entities/0T5H79G',
+                        lineIds: ['1PMfzz2w/36a3GSVm/newValue']
+                    },
+                    lineIds: ['1PMfzz2w/36a3GSVm']
+                }
+            ]
+        });
+    });
+    it('should add lineIds to all attributes of CREATE_RELATIONSHIP changes', function () {
+        var changes = {
+            'relations/0lVSmtX': [
+                {
+                    id: '0G7u0JP',
+                    type: DCRTypes.CREATE_RELATIONSHIP,
+                    newValue: {
+                        attributes: {
+                            PrefOrActive: [{ value: 'yfhgvm' }],
+                            AffiliationStatus: [{ value: 'Status 1' }],
+                            PrimaryAffiliationIndicator: [{ value: 'true' }]
+                        },
+                        type: 'configuration/relationTypes/DirPharmacy',
+                        uri: 'relations/0Mj0zAI'
+                    }
+                }
+            ]
+        };
+        var result = addLineIdToValue(changes);
+        expect(result).toEqual({
+            'relations/0lVSmtX': [
+                {
+                    id: '0G7u0JP',
+                    type: DCRTypes.CREATE_RELATIONSHIP,
+                    newValue: {
+                        attributes: {
+                            PrefOrActive: [
+                                {
+                                    value: 'yfhgvm',
+                                    lineIds: ['0lVSmtX/0G7u0JP/newValue/attributes/PrefOrActive/0']
+                                }
+                            ],
+                            AffiliationStatus: [
+                                {
+                                    value: 'Status 1',
+                                    lineIds: ['0lVSmtX/0G7u0JP/newValue/attributes/AffiliationStatus/0']
+                                }
+                            ],
+                            PrimaryAffiliationIndicator: [
+                                {
+                                    value: 'true',
+                                    lineIds: ['0lVSmtX/0G7u0JP/newValue/attributes/PrimaryAffiliationIndicator/0']
+                                }
+                            ]
+                        },
+                        type: 'configuration/relationTypes/DirPharmacy',
+                        uri: 'relations/0Mj0zAI',
+                        lineIds: ['0lVSmtX/0G7u0JP/newValue']
+                    },
+                    lineIds: ['0lVSmtX/0G7u0JP']
+                }
+            ]
+        });
+    });
+    it('should add lineIds to both oldValue and newValue for UPDATE_ATTRIBUTE changes', function () {
+        var changes = {
+            'entities/0FaSodQ': [
+                {
+                    id: '4pomtm9',
+                    type: DCRTypes.UPDATE_ATTRIBUTE,
+                    oldValue: { value: 'old' },
+                    newValue: { value: 'new' }
+                }
+            ]
+        };
+        var result = addLineIdToValue(changes);
+        expect(result).toEqual({
+            'entities/0FaSodQ': [
+                {
+                    id: '4pomtm9',
+                    type: DCRTypes.UPDATE_ATTRIBUTE,
+                    oldValue: {
+                        value: 'old',
+                        lineIds: ['0FaSodQ/4pomtm9/oldValue']
+                    },
+                    newValue: {
+                        value: 'new',
+                        lineIds: ['0FaSodQ/4pomtm9/newValue']
+                    },
+                    lineIds: ['0FaSodQ/4pomtm9']
+                }
+            ]
+        });
+    });
+});

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

@@ -0,0 +1,4 @@
+import { DCRChanges, GroupedObjectsInfo, EnrichedDCRChanges } from '@reltio/mdm-sdk';
+import { Diff } from '../../types';
+export declare const isEditableChange: (change: Diff, entityInfo: GroupedObjectsInfo["entity"]) => boolean;
+export declare const addLineIdToValue: (data: DCRChanges) => EnrichedDCRChanges;

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

@@ -0,0 +1,100 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { clone, isNil } from 'ramda';
+import { DCROperationTypes, DCRTypes, isRelationTypeUri } from '@reltio/mdm-sdk';
+export var isEditableChange = function (change, entityInfo) {
+    var _a;
+    var currentAttributeTypeUri = (_a = change.attributeType) === null || _a === void 0 ? void 0 : _a.uri;
+    var isExistingReferenceEntityChange = entityInfo.isExist &&
+        currentAttributeTypeUri &&
+        change.isReferenceSubAttribute &&
+        change.operation === DCROperationTypes.ADDED &&
+        !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;
+    if (Array.isArray(value)) {
+        return value.map(function (entry, index) {
+            if (entry && typeof entry === 'object') {
+                var entryPath = "".concat(basePath, "/").concat(index);
+                var newEntry = clone(entry);
+                newEntry.lineIds = [entryPath];
+                var v = newEntry.value;
+                if (typeof v === 'object' && v !== null) {
+                    newEntry.value = addLineIdRecursively(v, "".concat(entryPath, "/value"));
+                }
+                return newEntry;
+            }
+            return entry;
+        });
+    }
+    if (typeof value === 'object') {
+        var result = {};
+        for (var _i = 0, _a = Object.entries(value); _i < _a.length; _i++) {
+            var _b = _a[_i], key = _b[0], val = _b[1];
+            var childPath = "".concat(basePath, "/").concat(key);
+            result[key] = addLineIdRecursively(val, childPath);
+        }
+        return result;
+    }
+    return value;
+};
+var addLineIdToChangeValue = function (container, basePath, type) {
+    if (container == null)
+        return container;
+    if ([DCRTypes.CREATE_ENTITY, DCRTypes.CREATE_RELATIONSHIP].includes(type)) {
+        var attributes = void 0;
+        if ('attributes' in container && typeof container.attributes === 'object') {
+            attributes = addLineIdRecursively(container.attributes, "".concat(basePath, "/attributes"));
+        }
+        return __assign(__assign({}, container), { attributes: attributes, lineIds: [basePath] });
+    }
+    if (Array.isArray(container)) {
+        return { value: container, lineIds: [basePath] };
+    }
+    if (typeof container === 'object' && 'value' in container) {
+        var containerValue = container.value;
+        return __assign(__assign({}, container), { lineIds: [basePath], value: isPrimitiveValue(containerValue)
+                ? containerValue
+                : addLineIdRecursively(containerValue, "".concat(basePath, "/value")) });
+    }
+    return container;
+};
+export var addLineIdToValue = function (data) {
+    var enrichedData = clone(data);
+    for (var entityOrRelationKey in enrichedData) {
+        var entityOrRelationId = entityOrRelationKey.split('/')[1];
+        var changeList = enrichedData[entityOrRelationKey];
+        if (!Array.isArray(changeList))
+            continue;
+        for (var _i = 0, changeList_1 = changeList; _i < changeList_1.length; _i++) {
+            var change = changeList_1[_i];
+            var changeId = change.id;
+            var type = change.type;
+            if (change.newValue != null) {
+                var root = "".concat(entityOrRelationId, "/").concat(changeId, "/newValue");
+                change.newValue = addLineIdToChangeValue(change.newValue, root, type);
+            }
+            if (change.oldValue != null) {
+                var root = "".concat(entityOrRelationId, "/").concat(changeId, "/oldValue");
+                change.oldValue = addLineIdToChangeValue(change.oldValue, root, type);
+            }
+            change.lineIds = ["".concat(entityOrRelationId, "/").concat(changeId)];
+        }
+    }
+    return enrichedData;
+};

package/features/workflow/ReviewDCRDialog/ReviewDCRDialog.js

@@ -9,6 +9,7 @@ import i18n from 'ui-i18n';
 import { useWorkflowCheckPermission } from '../hooks/useWorkflowCheckPermission';
 import { useWorkflowActions } from '../hooks/useWorkflowActions';
 import { useMdmEntity } from '../../../contexts/MdmModuleContext';
+import { ChangeRequestEditorProvider } from '../ChangeRequestEditor/context';
 import { ProfileBand } from '../../../ProfileBand';
 import { DueDateField } from '../DueDateField';
 import { PrioritySelector } from '../PrioritySelector';
@@ -48,7 +49,8 @@ export var ReviewDCRDialog = function (_a) {
                         React.createElement("div", { className: styles.editableItem },
                             React.createElement(AssigneeSelector, { taskId: task.taskId, assignee: task.assignee, isTaskOpen: task.isOpen })))),
                 React.createElement("div", { className: styles.changesSection },
-                    React.createElement(ChangeRequestEditor, { dcr: dcr, task: task, groupedObjects: groupedObjects }))),
+                    React.createElement(ChangeRequestEditorProvider, null,
+                        React.createElement(ChangeRequestEditor, { dcr: dcr, task: task, groupedObjects: groupedObjects })))),
             canViewComments && (React.createElement(WorkflowComments, { workflowActions: workflowActions, actionRequestIsInProgress: actionRequestIsInProgress, preferredAction: task.preferredAction, taskId: task.taskId, processInstanceComments: task.processInstanceComments, isTaskOpen: task.isOpen, showActionButtons: false, alwaysExpanded: true, classes: {
                     container: styles.commentsRootContainer,
                     commentsContainer: styles.commentsContainer

package/features/workflow/helpers/attributes.js

@@ -61,19 +61,30 @@ var dcrAttributesFactory = function (metadata, attributeType, attributeValue, le
         }
     }
 };
+var extractLineIds = function (attributeValue) {
+    var _a, _b;
+    return typeof attributeValue.value === 'object' &&
+        'newValue' in attributeValue.value &&
+        'lineIds' in attributeValue.value.newValue &&
+        Array.isArray(attributeValue.value.newValue.lineIds)
+        ? (_b = (_a = attributeValue === null || attributeValue === void 0 ? void 0 : attributeValue.value) === null || _a === void 0 ? void 0 : _a.newValue) === null || _b === void 0 ? void 0 : _b.lineIds
+        : attributeValue.lineIds;
+};
 var getNestedAttributeChange = function (metadata, attributeType, attributeValue, level) {
     var attributeTypeList = getAttributeTypeSubAttributes({}, attributeType);
     var label = getLabel((attributeType === null || attributeType === void 0 ? void 0 : attributeType.label) || (attributeType === null || attributeType === void 0 ? void 0 : attributeType.name));
+    var lineIds = extractLineIds(attributeValue);
     return [
-        { level: level, label: label, attributeType: attributeType, attributeValue: attributeValue },
+        { level: level, label: label, attributeType: attributeType, attributeValue: attributeValue, lineIds: lineIds },
         getAttributesList(metadata, attributeTypeList, attributeValue.value, level + 1)
     ];
 };
 var getReferenceAttributeChange = function (metadata, attributeType, attributeValue, level) {
     var attributeTypeList = getAttributeTypeSubAttributes(metadata, attributeType);
     var label = (attributeType === null || attributeType === void 0 ? void 0 : attributeType.label) || (attributeType === null || attributeType === void 0 ? void 0 : attributeType.name);
+    var lineIds = extractLineIds(attributeValue);
     return [
-        { level: level, label: label, attributeType: attributeType, attributeValue: attributeValue },
+        { level: level, label: label, attributeType: attributeType, attributeValue: attributeValue, lineIds: lineIds },
         getAttributesList(metadata, attributeTypeList, attributeValue.value, level + 1, true)
     ];
 };
@@ -111,7 +122,7 @@ export var getRelationChanges = curry(function (metadata, relationInfo, changes,
     var relationType = getRelationType(metadata, relationInfo.type);
     var attrTypes = getRelationAttributesList(metadata, relationInfo.type);
     return flatten([
-        __assign({ level: 1, label: propOr('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes) }, addRelationOperationIfNeeded(changes, changeType)),
+        __assign({ level: 1, label: propOr('', 'label', relationType), attributeType: null, relationType: relationType, attributeValue: __assign(__assign({}, relationInfo), changes), lineIds: changes === null || changes === void 0 ? void 0 : changes.lineIds }, addRelationOperationIfNeeded(changes, changeType)),
         getAttributesList(metadata, attrTypes, changes, 2)
     ]);
 });

package/features/workflow/helpers/attributes.test.js

@@ -30,8 +30,20 @@ describe('attributes helpers tests', function () {
                         attributeType: 'configuration/entityTypes/HCA/attributes/CountryCode',
                         id: '41cb3gGy',
                         newPinOrIgnoreValue: true,
-                        newValue: { value: 'Chile', lookupCode: 'CL', lookupRawValue: 'Chile', pin: true },
-                        oldValue: { value: 'Chile', lookupCode: 'CL', lookupRawValue: 'Chile', pin: true },
+                        newValue: {
+                            value: 'Chile',
+                            lookupCode: 'CL',
+                            lookupRawValue: 'Chile',
+                            pin: true,
+                            lineIds: ['3AqlrpfGa/value/newValue']
+                        },
+                        oldValue: {
+                            value: 'Chile',
+                            lookupCode: 'CL',
+                            lookupRawValue: 'Chile',
+                            pin: true,
+                            lineIds: ['3AqlrpfGa/value/oldValue']
+                        },
                         type: DCRTypes.IGNORE_ATTRIBUTE
                     }
                 },
@@ -42,7 +54,12 @@ describe('attributes helpers tests', function () {
                         attributeType: 'configuration/entityTypes/HCA/attributes/CountryCode',
                         id: '41cb3c0i',
                         newPinOrIgnoreValue: false,
-                        newValue: { value: 'Bahamas', lookupCode: 'BS', lookupRawValue: 'BS' },
+                        newValue: {
+                            value: 'Bahamas',
+                            lookupCode: 'BS',
+                            lookupRawValue: 'BS',
+                            lineIds: ['uri$$1643545710682']
+                        },
                         type: DCRTypes.INSERT_ATTRIBUTE
                     }
                 }
@@ -74,7 +91,7 @@ describe('attributes helpers tests', function () {
                 attributeType: metadata.entityTypes[0].attributes[1],
                 label: 'Country Code',
                 level: 0,
-                newValue: changes.CountryCode[0].value.newValue,
+                newValue: __assign(__assign({}, changes.CountryCode[0].value.newValue), { lineIds: ['3AqlrpfGa/value/oldValue'] }),
                 operation: 'ignored',
                 isReferenceSubAttribute: false
             },
@@ -114,7 +131,12 @@ describe('attributes helpers tests', function () {
         };
         var changes = {
             TestAttribute: [{ value: { newValue: '123', type: DCRTypes.INSERT_ATTRIBUTE } }],
-            'activeness.startDate': [{ newValue: { value: 1644001200000 }, type: DCRTypes.INSERT_ATTRIBUTE }]
+            'activeness.startDate': [
+                {
+                    newValue: { value: 1644001200000, lineIds: ['relations/t58vHMD/activeness/startDate/newValue'] },
+                    type: DCRTypes.INSERT_ATTRIBUTE
+                }
+            ]
         };
         it('should not show operation for relation title', function () {
             expect(getRelationChanges(metadata, relationInfo, changes, DCRTypes.INSERT_ATTRIBUTE)).toEqual([
@@ -129,7 +151,7 @@ describe('attributes helpers tests', function () {
                     attributeType: EntityAttrTypes.startDate,
                     label: EntityAttrTypes.startDate.label,
                     level: 2,
-                    newValue: { value: 1644001200000 },
+                    newValue: { value: 1644001200000, lineIds: ['relations/t58vHMD/activeness/startDate/newValue'] },
                     operation: DCROperationTypes.ADDED,
                     isReferenceSubAttribute: false
                 },
@@ -157,7 +179,7 @@ describe('attributes helpers tests', function () {
                     attributeType: EntityAttrTypes.startDate,
                     label: EntityAttrTypes.startDate.label,
                     level: 2,
-                    newValue: { value: 1644001200000 },
+                    newValue: { value: 1644001200000, lineIds: ['relations/t58vHMD/activeness/startDate/newValue'] },
                     operation: DCROperationTypes.ADDED,
                     isReferenceSubAttribute: false
                 },

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

@@ -1,3 +1,4 @@
-import { DCRChanges, GroupedObjectsInfo, Metadata } from '@reltio/mdm-sdk';
+import { GroupedObjectsInfo, Metadata, EnrichedDCRChanges, EnrichedChangeValue, ChangeValue, DCRChanges } from '@reltio/mdm-sdk';
 import { Diff } from '../types';
-export declare const mergeChanges: (metadata: Metadata, changes: DCRChanges, entityInfo: GroupedObjectsInfo["entity"], relationsInfo: GroupedObjectsInfo["relations"]) => [Diff[], Diff[]];
+export declare const extractLineIds: (value: ChangeValue | EnrichedChangeValue) => string[] | undefined;
+export declare const mergeChanges: (metadata: Metadata, changes: EnrichedDCRChanges | DCRChanges, entityInfo: GroupedObjectsInfo["entity"], relationsInfo: GroupedObjectsInfo["relations"]) => [Diff[], Diff[]];

package/features/workflow/helpers/merge.js

@@ -20,18 +20,29 @@ var SPECIAL_ATTRIBUTES_NAMES = [
     EntityAttrTypes.startDate.name,
     EntityAttrTypes.endDate.name
 ];
+export var extractLineIds = function (value) {
+    return typeof value === 'object' && 'lineIds' in value ? value.lineIds : undefined;
+};
 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) || isEmptyValue(value) ? value : parseInt(value)); };
     var isExistedValue = function (value) { return (value === null || value === void 0 ? void 0 : value.length) && !isEmptyValue(value) && !isEmptyValue(value[0]); };
-    var isExistNewValue = isExistedValue(newValue);
-    var isExistOldValue = isExistedValue(oldValue);
+    var isExistNewValue = isExistedValue(actualNewValue);
+    var isExistOldValue = isExistedValue(actualOldValue);
     if (isExistNewValue && isExistOldValue) {
         return [
             {
                 type: DCRTypes.UPDATE_ATTRIBUTE,
-                oldValue: { value: parseValue(oldValue[0]) },
-                newValue: { value: parseValue(newValue[0]) }
+                oldValue: {
+                    value: parseValue(actualOldValue[0]),
+                    lineIds: extractLineIds(oldValue)
+                },
+                newValue: {
+                    value: parseValue(actualNewValue[0]),
+                    lineIds: extractLineIds(newValue)
+                }
             }
         ];
     }
@@ -39,7 +50,10 @@ var prepareStartOrEndDate = function (_a) {
         return [
             {
                 type: DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: parseValue(newValue[0]) }
+                newValue: {
+                    value: parseValue(actualNewValue[0]),
+                    lineIds: extractLineIds(newValue)
+                }
             }
         ];
     }
@@ -47,26 +61,31 @@ var prepareStartOrEndDate = function (_a) {
         return [
             {
                 type: DCRTypes.DELETE_ATTRIBUTE,
-                oldValue: { value: parseValue(oldValue[0]) }
+                oldValue: {
+                    value: parseValue(actualOldValue[0]),
+                    lineIds: 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 = difference(newValue, oldValue);
-    var diffOldValue = difference(oldValue, newValue);
+    var preparedNewValue = 'value' in newValue ? newValue.value : newValue;
+    var preparedOldValue = 'value' in oldValue ? oldValue.value : oldValue;
+    var diffNewValue = difference(preparedNewValue, preparedOldValue);
+    var diffOldValue = difference(preparedOldValue, preparedNewValue);
     var items = [];
     if (diffNewValue.length) {
         items.push({
             type: DCRTypes.INSERT_ATTRIBUTE,
-            newValue: { value: diffNewValue }
+            newValue: { value: diffNewValue, lineIds: extractLineIds(newValue) }
         });
     }
     if (diffOldValue.length) {
         items.push({
             type: DCRTypes.DELETE_ATTRIBUTE,
-            oldValue: { value: diffOldValue }
+            oldValue: { value: diffOldValue, lineIds: extractLineIds(oldValue) }
         });
     }
     return items;
@@ -82,7 +101,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;
@@ -90,9 +109,20 @@ var prepareAttribute = function (container, change) {
         var key = pathArray[i];
         var id = pathArray[i + 1];
         var currentValue = (holder[key] || []).find(propEq('id', id));
+        if (!isNil(currentValue)) {
+            var newLineIds = extractLineIds(change.newValue);
+            var oldLineIds = 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;
         }
@@ -104,7 +134,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) {
@@ -114,7 +144,10 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[EntityAttrTypes.roles.name] = [
             {
                 type: DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: roles.map(getRoleLabel(metadata)).join(', ') }
+                newValue: {
+                    value: roles.map(getRoleLabel(metadata)).join(', '),
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(EntityAttrTypes.roles.name)]
+                }
             }
         ];
     }
@@ -122,7 +155,10 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[EntityAttrTypes.tags.name] = [
             {
                 type: DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: tags.join(', ') }
+                newValue: {
+                    value: tags.join(', '),
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(EntityAttrTypes.tags.name)]
+                }
             }
         ];
     }
@@ -130,7 +166,10 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[EntityAttrTypes.startDate.name] = [
             {
                 type: DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: startDate }
+                newValue: {
+                    value: startDate,
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(EntityAttrTypes.startDate.name)]
+                }
             }
         ];
     }
@@ -138,10 +177,14 @@ var createEntityOrRelation = function (metadata, value) {
         newObject[EntityAttrTypes.endDate.name] = [
             {
                 type: DCRTypes.INSERT_ATTRIBUTE,
-                newValue: { value: endDate }
+                newValue: {
+                    value: endDate,
+                    lineIds: lineIds && ["".concat(lineIds[0], "/").concat(EntityAttrTypes.endDate.name)]
+                }
             }
         ];
     }
+    newObject['lineIds'] = lineIds;
     return newObject;
 };
 var mergeAttributesInChange = function (metadata, objectInfo, change, container) {