@reltio/components 1.4.2203 → 1.4.2205

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

@@ -155,6 +155,85 @@ describe('mergeChanges tests', function () {
         ];
         expect(mergeChanges(metadata, changes, objectInfo, [])).toMatchObject([mergedChanges, []]);
     });
+    it('should not merge changes with the same paths, but different types', function () {
+        var _a;
+        var changes = (_a = {},
+            _a[entityUri] = [
+                {
+                    attributePath: 'Identifiers/2BNyTheu/Type/2BNyU2yC',
+                    attributeType: 'configuration/entityTypes/HCA/attributes/Identifiers/attributes/Type',
+                    id: '58dpOzAR',
+                    newPinOrIgnoreValue: false,
+                    oldValue: {
+                        value: 'ValueOld'
+                    },
+                    newValue: {
+                        value: 'ValueNew'
+                    },
+                    type: DCRTypes.UPDATE_ATTRIBUTE
+                },
+                {
+                    attributePath: 'Identifiers/2BNyTheu/Type/2BNyU2yC',
+                    attributeType: 'configuration/entityTypes/HCA/attributes/Identifiers/attributes/Type',
+                    id: '58dpP3Qh',
+                    newPinOrIgnoreValue: true,
+                    oldValue: {
+                        value: 'ValueOld'
+                    },
+                    newValue: {
+                        value: 'ValueOld'
+                    },
+                    type: DCRTypes.IGNORE_ATTRIBUTE
+                }
+            ],
+            _a);
+        var mergedChanges = [
+            {
+                level: 0,
+                label: 'Customer Identity',
+                attributeType: metadata.entityTypes[0].attributes[3],
+                attributeValue: {
+                    id: '2BNyTheu',
+                    value: {
+                        Type: [
+                            {
+                                id: '2BNyU2yC',
+                                value: changes[entityUri][0]
+                            },
+                            {
+                                id: '2BNyU2yC',
+                                value: changes[entityUri][1]
+                            }
+                        ]
+                    }
+                }
+            },
+            {
+                attributeType: metadata.entityTypes[0].attributes[3].attributes[0],
+                newValue: {
+                    value: 'ValueNew'
+                },
+                oldValue: {
+                    value: 'ValueOld'
+                },
+                operation: 'edited',
+                label: 'Identity Type',
+                level: 1,
+                isReferenceSubAttribute: false
+            },
+            {
+                attributeType: metadata.entityTypes[0].attributes[3].attributes[0],
+                newValue: {
+                    value: 'ValueOld'
+                },
+                operation: 'ignored',
+                label: 'Identity Type',
+                level: 1,
+                isReferenceSubAttribute: false
+            }
+        ];
+        expect(mergeChanges(metadata, changes, objectInfo, [])).toMatchObject([mergedChanges, []]);
+    });
     it('should merge special attributes', function () {
         var _a;
         var changes = (_a = {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2203",
+  "version": "1.4.2205",
   "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.2006",
+    "@reltio/mdm-sdk": "^1.4.2007",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",