@reltio/components 1.4.2201 → 1.4.2202

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.2202",
   "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.2005",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",

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/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);
-};