@reltio/components 1.4.2201 → 1.4.2203

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) {

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

@@ -199,6 +199,7 @@ describe('mergeChanges tests', function () {
                 {
                     id: 'BpiR2Vqh',
                     type: DCRTypes.CREATE_RELATIONSHIP,
+                    lineIds: ['relations/1EvCRmwC/BpiR2Vqh'],
                     newValue: {
                         uri: 'relations/1EvCRmwC',
                         type: 'configuration/relationTypes/Assistant',
@@ -208,7 +209,8 @@ describe('mergeChanges tests', function () {
                         endObject: {
                             objectURI: 'entities/1C2v7IRp'
                         },
-                        startDate: 1643742000000
+                        startDate: 1643742000000,
+                        lineIds: ['relations/1EvCRmwC/BpiR2Vqh/newValue']
                     }
                 }
             ]
@@ -235,6 +237,7 @@ describe('mergeChanges tests', function () {
                     }
                 ], _a)),
                 label: metadata.relationTypes[1].label,
+                lineIds: ['relations/1EvCRmwC/BpiR2Vqh/newValue'],
                 level: 1
             },
             {
@@ -242,11 +245,62 @@ describe('mergeChanges tests', function () {
                 label: 'Start date',
                 level: 2,
                 newValue: {
-                    value: 1643742000000
+                    value: 1643742000000,
+                    lineIds: ["relations/1EvCRmwC/BpiR2Vqh/newValue/".concat(EntityAttrTypes.startDate.name)]
                 },
                 operation: DCROperationTypes.ADDED
             }
         ];
         expect(mergeChanges(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: 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: 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 = mergeChanges(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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2201",
+  "version": "1.4.2203",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./index.js",
@@ -11,7 +11,7 @@
     "@fluentui/react-context-selector": "^9.1.26",
     "@googlemaps/markerclusterer": "^2.5.3",
     "@react-sigma/core": "3.4.0",
-    "@reltio/mdm-sdk": "^1.4.2004",
+    "@reltio/mdm-sdk": "^1.4.2006",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",

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

@@ -1 +0,0 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"arrow" | "chip">;

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

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useStyles = void 0;
-var styles_1 = require("@mui/styles");
-exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
-    arrow: {
-        margin: '0 8px',
-        fontSize: 12,
-        color: theme.palette.text.primary
-    },
-    chip: {
-        height: 20,
-        width: 53,
-        fontSize: 10,
-        fontWeight: 500,
-        lineHeight: '16px',
-        marginLeft: 9,
-        flexShrink: 0,
-        textTransform: 'capitalize',
-        '& span': {
-            padding: 0
-        },
-        '&.edited': {
-            color: '#6973C2',
-            borderColor: '#6973C2'
-        },
-        '&.added': {
-            color: '#75C378',
-            borderColor: '#75C378'
-        },
-        '&.deleted': {
-            color: '#F97061',
-            borderColor: '#F97061'
-        }
-    }
-}); });

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

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

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

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEditableChange = void 0;
-var ramda_1 = require("ramda");
-var mdm_sdk_1 = require("@reltio/mdm-sdk");
-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 === mdm_sdk_1.DCROperationTypes.ADDED &&
-        !(0, mdm_sdk_1.isRelationTypeUri)(currentAttributeTypeUri);
-    return !!currentAttributeTypeUri && !isExistingReferenceEntityChange && !(0, ramda_1.isNil)(change.newValue);
-};
-exports.isEditableChange = isEditableChange;

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

@@ -1 +0,0 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"arrow" | "chip">;

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

@@ -1,33 +0,0 @@
-import { makeStyles } from '@mui/styles';
-export var useStyles = makeStyles(function (theme) { return ({
-    arrow: {
-        margin: '0 8px',
-        fontSize: 12,
-        color: theme.palette.text.primary
-    },
-    chip: {
-        height: 20,
-        width: 53,
-        fontSize: 10,
-        fontWeight: 500,
-        lineHeight: '16px',
-        marginLeft: 9,
-        flexShrink: 0,
-        textTransform: 'capitalize',
-        '& span': {
-            padding: 0
-        },
-        '&.edited': {
-            color: '#6973C2',
-            borderColor: '#6973C2'
-        },
-        '&.added': {
-            color: '#75C378',
-            borderColor: '#75C378'
-        },
-        '&.deleted': {
-            color: '#F97061',
-            borderColor: '#F97061'
-        }
-    }
-}); });

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

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

package/features/workflow/ChangeRequestEditor/helpers.js

@@ -1,12 +0,0 @@
-import { isNil } from 'ramda';
-import { DCROperationTypes, 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);
-};