@reltio/components 1.4.1725 → 1.4.1726

package/cjs/components/history/ContributorsPanel/ContributorItem.js

@@ -12,7 +12,7 @@ var ContributorItem = function (_a) {
     var value = _a.value, _c = _a.isSelected, isSelected = _c === void 0 ? true : _c, onClick = _a.onClick;
     var color = (0, mdm_sdk_1.getContributorColor)(value);
     var styles = (0, styles_1.useContributorStyles)({ color: color });
-    return (react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.icon, (_b = {},
+    return (react_1.default.createElement("div", { "data-reltio-id": "reltio-contributor-item", "data-reltio-contributor": value, className: (0, classnames_1.default)(styles.icon, (_b = {},
             _b[styles.inactive] = !isSelected,
             _b[styles.active] = isSelected,
             _b[styles.clickable] = !!onClick,

package/cjs/components/history/ContributorsPanel/ContributorsPanel.js

@@ -28,9 +28,8 @@ var ContributorsPanel = function (_a) {
             onSelectValues(__spreadArray(__spreadArray([], (selectedValues || []), true), [value], false));
         }
     };
-    return (react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.root, className) },
-        react_1.default.createElement(ContributorItem_1.default, { value: entityUri }),
-        (values === null || values === void 0 ? void 0 : values.length) > 0 &&
-            values.map(function (value) { return (react_1.default.createElement(ContributorItem_1.default, { key: value, value: value, isSelected: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.includes(value), onClick: function () { return handleClick(value); } })); })));
+    return (react_1.default.createElement("div", { "data-reltio-id": "reltio-contributors-panel", className: (0, classnames_1.default)(styles.root, className) },
+        react_1.default.createElement(ContributorItem_1.default, { key: entityUri, value: entityUri }), values === null || values === void 0 ? void 0 :
+        values.map(function (value) { return (react_1.default.createElement(ContributorItem_1.default, { key: value, value: value, isSelected: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.includes(value), onClick: function () { return handleClick(value); } })); })));
 };
 exports.default = ContributorsPanel;

package/cjs/components/history/HistoryGraph/HistoryGraph.js

@@ -45,13 +45,15 @@ var HistoryGraph = function (_a) {
     var rowPositions = [ROW_MARGIN];
     var _b = rows.reduce(function (acc, _a, i) {
         var uri = _a.uri, height = _a.height, uris = _a.uris, type = _a.type, fakeType = _a.fakeType, index = _a.index, timestamp = _a.timestamp, label = _a.label;
-        var x = historyLanes[uri].index * COL_WIDTH + COL_MARGIN;
+        var historyLane = historyLanes[uri];
+        var x = historyLane.index * COL_WIDTH + COL_MARGIN;
         var y = rowPositions[i];
         rowPositions.push(y + height);
         var hasFakeType = (0, helpers_1.isFakeHistoryType)(fakeType);
         var circleUri = hasFakeType ? uris[0] : uri;
         var isCollapsed = !(uris === null || uris === void 0 ? void 0 : uris.some(function (uri) { return historyLanes[uri]; }));
-        acc.circles.push(react_1.default.createElement(exports.HistoryCircleWithTooltip, { tooltipTitle: label, tooltipPlacement: "top", onMouseOver: onHistoryCircleMouseOver ? function () { return onHistoryCircleMouseOver(uri, timestamp, index); } : undefined, key: "circle-".concat(circleUri, "-").concat(i), x: x, y: y, color: (0, mdm_sdk_1.getContributorColor)(circleUri), isDashed: hasFakeType, isCollapsed: isCollapsed, showCollapseIcon: !!uris, showLine: fakeType === types_1.HistoryChangeTypes.FAKE_NAVIGATE_PROFILE }));
+        var shouldShowLine = fakeType === types_1.HistoryChangeTypes.FAKE_NAVIGATE_PROFILE && historyLane.index !== 0;
+        acc.circles.push(react_1.default.createElement(exports.HistoryCircleWithTooltip, { tooltipTitle: label, tooltipPlacement: "top", onMouseOver: onHistoryCircleMouseOver ? function () { return onHistoryCircleMouseOver(uri, timestamp, index); } : undefined, key: "circle-".concat(circleUri, "-").concat(i), x: x, y: y, color: (0, mdm_sdk_1.getContributorColor)(circleUri), isDashed: hasFakeType, isCollapsed: isCollapsed, showCollapseIcon: !!uris, showLine: shouldShowLine }));
         acc.rowLines.push(react_1.default.createElement("rect", { key: "".concat(circleUri, "-").concat(index), x: x, y: y - ROW_HEIGHT / 2, width: '100%', height: ROW_HEIGHT, fill: (0, mdm_sdk_1.getContributorColor)(circleUri), opacity: 0.06 }));
         var isUpRight = type === types_1.HistoryChangeTypes.ENTITIES_SPLITTED;
         uris === null || uris === void 0 ? void 0 : uris.forEach(function (contributorUri) {
@@ -62,7 +64,7 @@ var HistoryGraph = function (_a) {
             var toX = contributorLane.index * COL_WIDTH + COL_MARGIN;
             var toY = isUpRight ? y - rowHeight : y + rowHeight;
             if (x !== toX)
-                acc.links.push(react_1.default.createElement(HistoryLink_1.default, { key: "link-".concat(contributorUri, "-").concat(index), x: x, y: y, toX: toX, toY: toY, isDashed: (0, helpers_1.isFakeHistoryType)(fakeType), color: (0, mdm_sdk_1.getContributorColor)(contributorUri) }));
+                acc.links.push(react_1.default.createElement(HistoryLink_1.default, { key: "link-".concat(contributorUri, "-").concat(index), x: x, y: y, toX: toX, toY: toY, isDashed: hasFakeType, color: (0, mdm_sdk_1.getContributorColor)(contributorUri) }));
         });
         return acc;
     }, { links: [], circles: [], rowLines: [] }), links = _b.links, rowLines = _b.rowLines, circles = _b.circles;
@@ -74,25 +76,26 @@ var HistoryGraph = function (_a) {
         contributorLane.lifeTime.forEach(function (_a, i) {
             var _b;
             var start = _a.start, end = _a.end;
-            if (((_b = rows[end === null || end === void 0 ? void 0 : end.index]) === null || _b === void 0 ? void 0 : _b.type) === types_1.HistoryChangeTypes.ENTITIES_SPLITTED)
+            if (((_b = rows[end === null || end === void 0 ? void 0 : end.index]) === null || _b === void 0 ? void 0 : _b.type) === types_1.HistoryChangeTypes.ENTITIES_SPLITTED) {
+                if ((end === null || end === void 0 ? void 0 : end.index) && contributorLane.index === 0) {
+                    links.unshift(react_1.default.createElement("path", { key: "line-".concat(contributorUri, "-").concat(i), d: "M".concat(x, " ").concat(rowPositions[0], " L").concat(x, " ").concat(rowPositions[end.index - 1]), stroke: (0, mdm_sdk_1.getContributorColor)(contributorUri), strokeWidth: 2 }));
+                }
                 return;
+            }
             var startIndex = (start === null || start === void 0 ? void 0 : start.type) === types_1.HistoryChangeTypes.ENTITIES_SPLITTED ? (start === null || start === void 0 ? void 0 : start.index) - 1 : start === null || start === void 0 ? void 0 : start.index;
-            var endIndex = (end === null || end === void 0 ? void 0 : end.type) === types_1.HistoryChangeTypes.ENTITIES_MERGED_MANUALLY ||
-                (end === null || end === void 0 ? void 0 : end.type) === types_1.HistoryChangeTypes.ENTITIES_MERGED
-                ? (end === null || end === void 0 ? void 0 : end.index) + 1
-                : end === null || end === void 0 ? void 0 : end.index;
+            var endIndex = (0, helpers_1.findEndIndex)(end);
             var startY = rowPositions[startIndex] || rowPositions[rowPositions.length - 2];
             var endY = rowPositions[endIndex] || ROW_MARGIN;
             if (startY <= endY)
                 return;
             var color = (0, mdm_sdk_1.getContributorColor)(contributorUri);
-            if (!end && contributorLane.index > 0) {
+            if (!end && endIndex === undefined && contributorLane.index > 0) {
                 circles.push(react_1.default.createElement(HistoryCircle_1.default, { key: "initCircle-".concat(contributorUri, "-").concat(i), x: x, y: endY, color: color, showLine: true }));
             }
             links.unshift(react_1.default.createElement("path", { key: "line-".concat(contributorUri, "-").concat(i), d: "M".concat(x, " ").concat(startY, " L").concat(x, " ").concat(endY), stroke: color, strokeWidth: 2 }));
         });
     });
-    return (react_1.default.createElement("svg", { className: "chart", width: width, height: height },
+    return (react_1.default.createElement("svg", { "data-reltio-id": "reltio-history-graph", className: "chart", width: width, height: height },
         react_1.default.createElement("g", { id: "rowLines" }, rowLines),
         react_1.default.createElement("g", { id: "links" }, links),
         react_1.default.createElement("g", { id: "circles" }, circles)));

package/cjs/components/history/HistoryGraph/helpers.d.ts

@@ -1,2 +1,4 @@
+import { HistoryRowData } from '../types';
 export declare const getHistoryLinkCurve: (x: number, y: number, toX: number, toY: number) => string;
 export declare const isFakeHistoryType: (type: string) => boolean;
+export declare const findEndIndex: (end: HistoryRowData) => number;

package/cjs/components/history/HistoryGraph/helpers.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFakeHistoryType = exports.getHistoryLinkCurve = void 0;
-var HistoryChangeTypes_1 = require("../types/HistoryChangeTypes");
+exports.findEndIndex = exports.isFakeHistoryType = exports.getHistoryLinkCurve = void 0;
+var types_1 = require("../types");
 var getHistoryLinkCurve = function (x, y, toX, toY) {
     var isUp = y > toY;
     var isLeft = x < toX;
@@ -13,6 +13,15 @@ var getHistoryLinkCurve = function (x, y, toX, toY) {
 };
 exports.getHistoryLinkCurve = getHistoryLinkCurve;
 var isFakeHistoryType = function (type) {
-    return type === HistoryChangeTypes_1.HistoryChangeTypes.FAKE_FILTERED_INCOMING || type === HistoryChangeTypes_1.HistoryChangeTypes.FAKE_FILTERED_OUTGOING;
+    return type === types_1.HistoryChangeTypes.FAKE_FILTERED_INCOMING || type === types_1.HistoryChangeTypes.FAKE_FILTERED_OUTGOING;
 };
 exports.isFakeHistoryType = isFakeHistoryType;
+var findEndIndex = function (end) {
+    var _a = end || {}, endIndex = _a.index, endType = _a.type;
+    if (endIndex === undefined)
+        return;
+    return endType === types_1.HistoryChangeTypes.ENTITIES_MERGED_MANUALLY || endType === types_1.HistoryChangeTypes.ENTITIES_MERGED
+        ? endIndex + 1
+        : endIndex;
+};
+exports.findEndIndex = findEndIndex;

package/cjs/components/history/HistoryRow/HistoryRow.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import { HistoryChange } from '@reltio/mdm-sdk';
+import { HistoryRowData } from '../types';
 type Props = {
-    change: HistoryChange;
+    change: HistoryRowData;
     isCurrent?: boolean;
     isSelected: boolean;
     onClick: () => void;

package/cjs/components/history/HistoryRow/HistoryRow.js

@@ -13,8 +13,9 @@ var styles_1 = require("./styles");
 var HistoryRow = function (_a) {
     var _b;
     var change = _a.change, isCurrent = _a.isCurrent, isSelected = _a.isSelected, onClick = _a.onClick;
-    var uri = change.uri, type = change.type, matchGroups = change.matchGroups, user = change.user, timestamp = change.timestamp;
-    var color = (0, mdm_sdk_1.getContributorColor)(uri);
+    var uri = change.uri, type = change.type, matchGroups = change.matchGroups, user = change.user, timestamp = change.timestamp, fakeType = change.fakeType, uris = change.uris;
+    var colorUri = fakeType && uris ? uris[0] : uri;
+    var color = (0, mdm_sdk_1.getContributorColor)(colorUri);
     var styles = (0, styles_1.useStyles)({ color: color });
     return (react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.historyRow, (_b = {}, _b[styles.selected] = isSelected, _b)), onClick: onClick },
         react_1.default.createElement("div", { className: styles.rowHeader },

package/cjs/components/history/hooks/historyHelpers.d.ts

@@ -0,0 +1,6 @@
+import { HistoryChange } from '@reltio/mdm-sdk';
+import { HistoryLife } from '../types';
+export declare const checkChange: any;
+export declare const startNewLife: (lifeTime: HistoryLife[], change: HistoryChange) => void;
+export declare const updateLife: (lifeTime: HistoryLife[], change: HistoryChange) => void;
+export declare const endLife: (lifeTime: HistoryLife[], change: HistoryChange) => void;

package/cjs/components/history/hooks/historyHelpers.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.endLife = exports.updateLife = exports.startNewLife = exports.checkChange = void 0;
+var ramda_1 = require("ramda");
+var types_1 = require("../types");
+exports.checkChange = (0, ramda_1.curry)(function (involvedUris, checkInUris, change) {
+    var uri = change.uri, type = change.type, uris = change.uris;
+    if (involvedUris) {
+        if (Array.isArray(involvedUris)) {
+            if (type !== types_1.HistoryChangeTypes.ENTITY_LOST_MERGE)
+                return null;
+            if (involvedUris.includes(uri)) {
+                return change;
+            }
+            else if (checkInUris && uris) {
+                return involvedUris.some(function (involvedUri) { return uris.includes(involvedUri); }) ? change : null;
+            }
+        }
+        else {
+            if (uri === involvedUris || (checkInUris && (uris === null || uris === void 0 ? void 0 : uris.includes(involvedUris))))
+                return change;
+        }
+    }
+    return null;
+});
+var startNewLife = function (lifeTime, change) {
+    var currentLife = lifeTime[lifeTime.length - 1];
+    if (currentLife &&
+        (!currentLife.start ||
+            (currentLife.start.type === types_1.HistoryChangeTypes.ENTITY_CREATED &&
+                change.type === types_1.HistoryChangeTypes.ENTITIES_SPLITTED))) {
+        currentLife.start = change;
+        return;
+    }
+    lifeTime.push({ start: change, end: null });
+};
+exports.startNewLife = startNewLife;
+var updateLife = function (lifeTime, change) {
+    var shouldAddNewLife = true;
+    if (lifeTime.length) {
+        var currentLife = lifeTime[lifeTime.length - 1];
+        shouldAddNewLife = !((!currentLife.start || currentLife.start.timestamp < change.timestamp) &&
+            (!currentLife.end || currentLife.end.timestamp > change.timestamp));
+    }
+    if (shouldAddNewLife) {
+        lifeTime.push({ start: null, end: null });
+    }
+};
+exports.updateLife = updateLife;
+var endLife = function (lifeTime, change) {
+    if (lifeTime.length) {
+        var currentLife = lifeTime[lifeTime.length - 1];
+        if (!currentLife.start)
+            currentLife.start = change;
+    }
+    lifeTime.push({ start: null, end: change });
+};
+exports.endLife = endLife;

package/cjs/components/history/hooks/useHistory.js

@@ -82,6 +82,7 @@ var useHistory = function (_a) {
         if (entityUri && enabled) {
             loadHistoricUris();
             setHistoryPage(0);
+            setHistoryWithTotal(null);
         }
     }, [entityUri, entity === null || entity === void 0 ? void 0 : entity.updatedTime, enabled]);
     var loadMore = (0, react_1.useCallback)(function (offset) {

package/cjs/components/history/hooks/useHistoryTree.d.ts

@@ -1,5 +1,5 @@
 import { HistoryChange } from '@reltio/mdm-sdk';
-import { HistoryRowData } from './../types';
+import { HistoryRowData } from '../types';
 type Props = {
     entityUri: string;
     historyChanges: HistoryChange[];

package/cjs/components/history/hooks/useHistoryTree.js

@@ -10,43 +10,33 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useHistoryTree = void 0;
 var react_1 = require("react");
 var ramda_1 = require("ramda");
-var types_1 = require("./../types");
+var types_1 = require("../types");
+var historyHelpers_1 = require("./historyHelpers");
 var useHistoryTree = function (_a) {
     var entityUri = _a.entityUri, historyChanges = _a.historyChanges, selectedUris = _a.selectedUris;
     return (0, react_1.useMemo)(function () {
         var _a;
         var historyLanes = (_a = {}, _a[entityUri] = { index: 0, lifeTime: [] }, _a);
         var rows = [{ user: '', timestamp: 0, uri: entityUri }];
-        var checkChange = (0, ramda_1.curry)(function (involvedUris, checkInUris, change) {
-            var _a;
-            var uri = change.uri || entityUri;
-            if (involvedUris) {
-                if (Array.isArray(involvedUris)) {
-                    if (change.type !== types_1.HistoryChangeTypes.ENTITY_LOST_MERGE)
-                        return null;
-                    if (involvedUris.includes(uri)) {
-                        return change;
-                    }
-                    else if (checkInUris && change.uris) {
-                        return involvedUris.some(function (involvedUri) { return change.uris.includes(involvedUri); }) ? change : null;
-                    }
-                }
-                else {
-                    if (uri === involvedUris || (checkInUris && ((_a = change.uris) === null || _a === void 0 ? void 0 : _a.includes(involvedUris))))
-                        return change;
-                }
-            }
-            return null;
-        });
+        var normalizedHistoryChanges = historyChanges === null || historyChanges === void 0 ? void 0 : historyChanges.map(function (change) { return (__assign(__assign({}, change), { uri: change.uri || entityUri })); });
         var findNextChange = function (index, involvedUris, checkInUris) {
-            return (0, ramda_1.pipe)((0, ramda_1.drop)(index + 1), (0, ramda_1.find)(checkChange(involvedUris, checkInUris)))(historyChanges);
+            return (0, ramda_1.pipe)((0, ramda_1.drop)(index + 1), (0, ramda_1.find)((0, historyHelpers_1.checkChange)(involvedUris, checkInUris)))(normalizedHistoryChanges);
         };
         var findPreviousChange = function (index, uri) {
-            return (0, ramda_1.pipe)((0, ramda_1.slice)(index + 1, Infinity), (0, ramda_1.find)(checkChange(uri, false)))(rows);
+            return (0, ramda_1.pipe)((0, ramda_1.slice)(index + 1, Infinity), (0, ramda_1.find)((0, historyHelpers_1.checkChange)(uri, false)))(rows);
         };
         var checkLaneUri = function (uri) {
             if (!historyLanes[uri] && (!selectedUris || selectedUris.includes(uri))) {
@@ -57,60 +47,30 @@ var useHistoryTree = function (_a) {
             }
             return historyLanes[uri];
         };
-        var startNewLife = function (lifeTime, change) {
-            var currentLife = lifeTime[lifeTime.length - 1];
-            if (currentLife &&
-                (!currentLife.start ||
-                    (currentLife.start.type === types_1.HistoryChangeTypes.ENTITY_CREATED &&
-                        change.type === types_1.HistoryChangeTypes.ENTITIES_SPLITTED))) {
-                currentLife.start = change;
-                return;
-            }
-            lifeTime.push({ start: change, end: null });
-        };
-        var updateLife = function (lifeTime, change) {
-            var shouldAddNewLife = true;
-            if (lifeTime.length) {
-                var currentLife = lifeTime[lifeTime.length - 1];
-                shouldAddNewLife = !((!currentLife.start || currentLife.start.timestamp < change.timestamp) &&
-                    (!currentLife.end || currentLife.end.timestamp > change.timestamp));
-            }
-            if (shouldAddNewLife) {
-                lifeTime.push({ start: null, end: null });
-            }
-        };
-        var endLife = function (lifeTime, change) {
-            if (lifeTime.length) {
-                var currentLife = lifeTime[lifeTime.length - 1];
-                if (!currentLife.start)
-                    currentLife.start = change;
-            }
-            lifeTime.push({ start: null, end: change });
-        };
         var checkLifeTime = function (lifeTime, change) {
             var _a, _b;
             switch (change.type) {
                 case types_1.HistoryChangeTypes.ENTITY_CREATED:
-                    startNewLife(lifeTime, change);
+                    (0, historyHelpers_1.startNewLife)(lifeTime, change);
                     break;
                 case types_1.HistoryChangeTypes.ENTITIES_MERGED_ON_THE_FLY:
                 case types_1.HistoryChangeTypes.ENTITY_CHANGED:
-                    updateLife(lifeTime, change);
+                    (0, historyHelpers_1.updateLife)(lifeTime, change);
                     break;
                 case types_1.HistoryChangeTypes.ENTITY_LOST_MERGE:
                 case types_1.HistoryChangeTypes.ENTITY_REMOVED:
-                    endLife(lifeTime, change);
+                    (0, historyHelpers_1.endLife)(lifeTime, change);
                     break;
                 case types_1.HistoryChangeTypes.ENTITIES_SPLITTED:
-                    updateLife(lifeTime, change);
+                    (0, historyHelpers_1.updateLife)(lifeTime, change);
                     (_a = change.uris) === null || _a === void 0 ? void 0 : _a.forEach(function (uri) {
                         var relatedLane = historyLanes[uri];
                         if (!relatedLane)
                             return;
                         var lifeTimeLength = relatedLane.lifeTime.length;
                         lifeTimeLength
-                            ? startNewLife(relatedLane.lifeTime, change)
-                            : endLife(relatedLane.lifeTime, change);
+                            ? (0, historyHelpers_1.startNewLife)(relatedLane.lifeTime, change)
+                            : (0, historyHelpers_1.endLife)(relatedLane.lifeTime, change);
                         rows.push({
                             uri: uri,
                             user: change.user,
@@ -124,28 +84,32 @@ var useHistoryTree = function (_a) {
                     break;
                 case types_1.HistoryChangeTypes.ENTITIES_MERGED:
                 case types_1.HistoryChangeTypes.ENTITIES_MERGED_MANUALLY:
-                    updateLife(lifeTime, change);
+                    (0, historyHelpers_1.updateLife)(lifeTime, change);
                     (_b = change.uris) === null || _b === void 0 ? void 0 : _b.forEach(function (uri) {
                         var relatedLane = historyLanes[uri];
                         if (relatedLane)
-                            endLife(relatedLane.lifeTime, change);
+                            (0, historyHelpers_1.endLife)(relatedLane.lifeTime, change);
                     });
                     break;
             }
         };
         var postProcessChanges = [];
-        historyChanges === null || historyChanges === void 0 ? void 0 : historyChanges.forEach(function (change, index) {
-            var _a;
+        normalizedHistoryChanges === null || normalizedHistoryChanges === void 0 ? void 0 : normalizedHistoryChanges.forEach(function (change, index) {
+            var uri = change.uri, uris = change.uris, timestamp = change.timestamp;
             switch (change.type) {
                 case types_1.HistoryChangeTypes.ENTITIES_SPLITTED:
-                    if (!findNextChange(index, change.uri || entityUri, false)) {
+                    if (!findNextChange(index, uri, false)) {
                         return;
                     }
                     else {
-                        var uri = change.uri;
-                        var involvedUris = change.uris ? [change.uris, uri] : [uri];
+                        var involvedUris = uris ? __spreadArray(__spreadArray([], uris, true), [uri], false) : [uri];
                         var lostMergeChange = findNextChange(index, involvedUris, true);
-                        if (lostMergeChange && (!uri || uri === lostMergeChange.uri))
+                        var isLostMerge = !uri || uri === (lostMergeChange === null || lostMergeChange === void 0 ? void 0 : lostMergeChange.uri);
+                        var lastChange = rows[rows.length - 1];
+                        var isAlreadyUnmerged = lastChange.type === types_1.HistoryChangeTypes.ENTITIES_SPLITTED &&
+                            (uris === null || uris === void 0 ? void 0 : uris.includes(lastChange.uri)) &&
+                            lastChange.timestamp === timestamp;
+                        if (isLostMerge || isAlreadyUnmerged)
                             return;
                     }
                     break;
@@ -155,71 +119,50 @@ var useHistoryTree = function (_a) {
                 case types_1.HistoryChangeTypes.RELATIONSHIP_CHANGED:
                     return;
             }
-            var addPostProcess = false;
-            (_a = change.uris) === null || _a === void 0 ? void 0 : _a.forEach(function (uri) {
-                if (!checkLaneUri(uri))
-                    addPostProcess = true;
-            });
-            var contributorLane = checkLaneUri(change.uri || entityUri);
-            if (!contributorLane)
-                return;
+            var contributorLane = checkLaneUri(uri);
+            uris === null || uris === void 0 ? void 0 : uris.forEach(function (uri) { return checkLaneUri(uri); });
             var rowChange = __assign({}, change);
-            checkLifeTime(contributorLane.lifeTime, rowChange);
-            if (addPostProcess)
-                postProcessChanges.push(rowChange);
-            rows.push(rowChange);
+            if (contributorLane) {
+                checkLifeTime(contributorLane.lifeTime, rowChange);
+                rows.push(rowChange);
+            }
+            else {
+                if (uris)
+                    postProcessChanges.push(rowChange);
+            }
         });
         postProcessChanges.forEach(function (postChange) {
             postChange.uris.forEach(function (postUri) {
-                if (historyLanes[postUri])
+                if (!historyLanes[postUri])
                     return;
-                historyChanges.forEach(function (_a) {
-                    var uri = _a.uri, uris = _a.uris, timestamp = _a.timestamp, user = _a.user, type = _a.type;
-                    if (uri !== postUri)
+                normalizedHistoryChanges.forEach(function (change) {
+                    var uri = change.uri, uris = change.uris, type = change.type, timestamp = change.timestamp;
+                    if (timestamp !== postChange.timestamp || type !== postChange.type)
                         return;
-                    uris === null || uris === void 0 ? void 0 : uris.forEach(function (contributorUri) {
-                        var contributorLane = historyLanes[contributorUri];
-                        if (!contributorLane)
-                            return;
-                        var fakeType = null;
-                        switch (type) {
-                            case types_1.HistoryChangeTypes.ENTITIES_MERGED:
-                            case types_1.HistoryChangeTypes.ENTITIES_MERGED_MANUALLY:
-                                fakeType = types_1.HistoryChangeTypes.FAKE_FILTERED_INCOMING;
-                                break;
-                            case types_1.HistoryChangeTypes.ENTITIES_SPLITTED:
-                                fakeType = types_1.HistoryChangeTypes.FAKE_FILTERED_OUTGOING;
-                                break;
-                            default:
+                    var fakeChange;
+                    switch (type) {
+                        case types_1.HistoryChangeTypes.ENTITIES_MERGED:
+                        case types_1.HistoryChangeTypes.ENTITIES_MERGED_MANUALLY:
+                            if (!(uris === null || uris === void 0 ? void 0 : uris.includes(postUri)))
                                 return;
-                        }
-                        var fakeChange = {
-                            fakeType: fakeType,
-                            uri: postChange.uri,
-                            uris: [contributorUri],
-                            type: type,
-                            user: user,
-                            timestamp: timestamp
-                        };
-                        var extendLife = findClosestLife(contributorLane.lifeTime, postChange.timestamp);
-                        if (fakeType === types_1.HistoryChangeTypes.FAKE_FILTERED_INCOMING) {
-                            if (!(0, ramda_1.isNil)(extendLife.endIndex)) {
-                                contributorLane.lifeTime[extendLife.endIndex].end = fakeChange;
-                            }
-                        }
-                        else {
-                            if (!(0, ramda_1.isNil)(extendLife.startIndex)) {
-                                contributorLane.lifeTime[extendLife.startIndex].start = fakeChange;
-                            }
-                        }
-                        rows.splice(rows.indexOf(postChange), 0, fakeChange);
-                    });
+                            fakeChange = { fakeType: types_1.HistoryChangeTypes.FAKE_FILTERED_INCOMING, uri: postUri };
+                            break;
+                        case types_1.HistoryChangeTypes.ENTITIES_SPLITTED:
+                            if (uri !== postUri || !uris)
+                                return;
+                            fakeChange = { fakeType: types_1.HistoryChangeTypes.FAKE_FILTERED_OUTGOING, uri: uri };
+                            break;
+                        default:
+                            return;
+                    }
+                    var fakeRowIndex = rows.findIndex(function (row, i) { return i !== 0 && row.timestamp < timestamp; });
+                    var fakeRow = __assign(__assign(__assign({}, postChange), fakeChange), { uris: [postChange.uri] });
+                    rows.splice(fakeRowIndex, 0, fakeRow);
                 });
             });
         });
         rows.forEach(function (row, i) {
             row.index = i;
-            row.uri = row.uri || entityUri;
         });
         return {
             historyData: { historyLanes: historyLanes, rows: rows },
@@ -228,23 +171,3 @@ var useHistoryTree = function (_a) {
     }, [entityUri, historyChanges, selectedUris]);
 };
 exports.useHistoryTree = useHistoryTree;
-var findClosestLife = function (lifeTime, timestamp) {
-    return lifeTime.reduce(function (acc, _a, i) {
-        var start = _a.start, end = _a.end;
-        if (start) {
-            var d = timestamp - start.timestamp;
-            if ((0, ramda_1.isNil)(acc.startDistance) || (Math.abs(acc.startDistance) > Math.abs(d) && d > 0)) {
-                acc.startIndex = i;
-                acc.startDistance = d;
-            }
-        }
-        if (end) {
-            var d = timestamp - end.timestamp;
-            if ((0, ramda_1.isNil)(acc.endDistance) || (Math.abs(acc.endDistance) > Math.abs(d) && d < 0)) {
-                acc.endIndex = i;
-                acc.endDistance = d;
-            }
-        }
-        return acc;
-    }, { startIndex: null, endIndex: null, startDistance: null, endDistance: null });
-};

package/esm/components/history/ContributorsPanel/ContributorItem.js

@@ -7,7 +7,7 @@ var ContributorItem = function (_a) {
     var value = _a.value, _c = _a.isSelected, isSelected = _c === void 0 ? true : _c, onClick = _a.onClick;
     var color = getContributorColor(value);
     var styles = useContributorStyles({ color: color });
-    return (React.createElement("div", { className: classnames(styles.icon, (_b = {},
+    return (React.createElement("div", { "data-reltio-id": "reltio-contributor-item", "data-reltio-contributor": value, className: classnames(styles.icon, (_b = {},
             _b[styles.inactive] = !isSelected,
             _b[styles.active] = isSelected,
             _b[styles.clickable] = !!onClick,

package/esm/components/history/ContributorsPanel/ContributorsPanel.js

@@ -23,9 +23,8 @@ var ContributorsPanel = function (_a) {
             onSelectValues(__spreadArray(__spreadArray([], (selectedValues || []), true), [value], false));
         }
     };
-    return (React.createElement("div", { className: classnames(styles.root, className) },
-        React.createElement(ContributorItem, { value: entityUri }),
-        (values === null || values === void 0 ? void 0 : values.length) > 0 &&
-            values.map(function (value) { return (React.createElement(ContributorItem, { key: value, value: value, isSelected: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.includes(value), onClick: function () { return handleClick(value); } })); })));
+    return (React.createElement("div", { "data-reltio-id": "reltio-contributors-panel", className: classnames(styles.root, className) },
+        React.createElement(ContributorItem, { key: entityUri, value: entityUri }), values === null || values === void 0 ? void 0 :
+        values.map(function (value) { return (React.createElement(ContributorItem, { key: value, value: value, isSelected: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.includes(value), onClick: function () { return handleClick(value); } })); })));
 };
 export default ContributorsPanel;

package/esm/components/history/HistoryGraph/HistoryGraph.js

@@ -3,7 +3,7 @@ import { getContributorColor } from '@reltio/mdm-sdk';
 import HistoryLink from './HistoryLink';
 import HistoryCircle from './HistoryCircle';
 import { HistoryChangeTypes } from '../types';
-import { isFakeHistoryType } from './helpers';
+import { isFakeHistoryType, findEndIndex } from './helpers';
 import { withTooltip } from '../../../HOCs';
 var COL_WIDTH = 16;
 var COL_MARGIN = 24;
@@ -16,13 +16,15 @@ var HistoryGraph = function (_a) {
     var rowPositions = [ROW_MARGIN];
     var _b = rows.reduce(function (acc, _a, i) {
         var uri = _a.uri, height = _a.height, uris = _a.uris, type = _a.type, fakeType = _a.fakeType, index = _a.index, timestamp = _a.timestamp, label = _a.label;
-        var x = historyLanes[uri].index * COL_WIDTH + COL_MARGIN;
+        var historyLane = historyLanes[uri];
+        var x = historyLane.index * COL_WIDTH + COL_MARGIN;
         var y = rowPositions[i];
         rowPositions.push(y + height);
         var hasFakeType = isFakeHistoryType(fakeType);
         var circleUri = hasFakeType ? uris[0] : uri;
         var isCollapsed = !(uris === null || uris === void 0 ? void 0 : uris.some(function (uri) { return historyLanes[uri]; }));
-        acc.circles.push(React.createElement(HistoryCircleWithTooltip, { tooltipTitle: label, tooltipPlacement: "top", onMouseOver: onHistoryCircleMouseOver ? function () { return onHistoryCircleMouseOver(uri, timestamp, index); } : undefined, key: "circle-".concat(circleUri, "-").concat(i), x: x, y: y, color: getContributorColor(circleUri), isDashed: hasFakeType, isCollapsed: isCollapsed, showCollapseIcon: !!uris, showLine: fakeType === HistoryChangeTypes.FAKE_NAVIGATE_PROFILE }));
+        var shouldShowLine = fakeType === HistoryChangeTypes.FAKE_NAVIGATE_PROFILE && historyLane.index !== 0;
+        acc.circles.push(React.createElement(HistoryCircleWithTooltip, { tooltipTitle: label, tooltipPlacement: "top", onMouseOver: onHistoryCircleMouseOver ? function () { return onHistoryCircleMouseOver(uri, timestamp, index); } : undefined, key: "circle-".concat(circleUri, "-").concat(i), x: x, y: y, color: getContributorColor(circleUri), isDashed: hasFakeType, isCollapsed: isCollapsed, showCollapseIcon: !!uris, showLine: shouldShowLine }));
         acc.rowLines.push(React.createElement("rect", { key: "".concat(circleUri, "-").concat(index), x: x, y: y - ROW_HEIGHT / 2, width: '100%', height: ROW_HEIGHT, fill: getContributorColor(circleUri), opacity: 0.06 }));
         var isUpRight = type === HistoryChangeTypes.ENTITIES_SPLITTED;
         uris === null || uris === void 0 ? void 0 : uris.forEach(function (contributorUri) {
@@ -33,7 +35,7 @@ var HistoryGraph = function (_a) {
             var toX = contributorLane.index * COL_WIDTH + COL_MARGIN;
             var toY = isUpRight ? y - rowHeight : y + rowHeight;
             if (x !== toX)
-                acc.links.push(React.createElement(HistoryLink, { key: "link-".concat(contributorUri, "-").concat(index), x: x, y: y, toX: toX, toY: toY, isDashed: isFakeHistoryType(fakeType), color: getContributorColor(contributorUri) }));
+                acc.links.push(React.createElement(HistoryLink, { key: "link-".concat(contributorUri, "-").concat(index), x: x, y: y, toX: toX, toY: toY, isDashed: hasFakeType, color: getContributorColor(contributorUri) }));
         });
         return acc;
     }, { links: [], circles: [], rowLines: [] }), links = _b.links, rowLines = _b.rowLines, circles = _b.circles;
@@ -45,25 +47,26 @@ var HistoryGraph = function (_a) {
         contributorLane.lifeTime.forEach(function (_a, i) {
             var _b;
             var start = _a.start, end = _a.end;
-            if (((_b = rows[end === null || end === void 0 ? void 0 : end.index]) === null || _b === void 0 ? void 0 : _b.type) === HistoryChangeTypes.ENTITIES_SPLITTED)
+            if (((_b = rows[end === null || end === void 0 ? void 0 : end.index]) === null || _b === void 0 ? void 0 : _b.type) === HistoryChangeTypes.ENTITIES_SPLITTED) {
+                if ((end === null || end === void 0 ? void 0 : end.index) && contributorLane.index === 0) {
+                    links.unshift(React.createElement("path", { key: "line-".concat(contributorUri, "-").concat(i), d: "M".concat(x, " ").concat(rowPositions[0], " L").concat(x, " ").concat(rowPositions[end.index - 1]), stroke: getContributorColor(contributorUri), strokeWidth: 2 }));
+                }
                 return;
+            }
             var startIndex = (start === null || start === void 0 ? void 0 : start.type) === HistoryChangeTypes.ENTITIES_SPLITTED ? (start === null || start === void 0 ? void 0 : start.index) - 1 : start === null || start === void 0 ? void 0 : start.index;
-            var endIndex = (end === null || end === void 0 ? void 0 : end.type) === HistoryChangeTypes.ENTITIES_MERGED_MANUALLY ||
-                (end === null || end === void 0 ? void 0 : end.type) === HistoryChangeTypes.ENTITIES_MERGED
-                ? (end === null || end === void 0 ? void 0 : end.index) + 1
-                : end === null || end === void 0 ? void 0 : end.index;
+            var endIndex = findEndIndex(end);
             var startY = rowPositions[startIndex] || rowPositions[rowPositions.length - 2];
             var endY = rowPositions[endIndex] || ROW_MARGIN;
             if (startY <= endY)
                 return;
             var color = getContributorColor(contributorUri);
-            if (!end && contributorLane.index > 0) {
+            if (!end && endIndex === undefined && contributorLane.index > 0) {
                 circles.push(React.createElement(HistoryCircle, { key: "initCircle-".concat(contributorUri, "-").concat(i), x: x, y: endY, color: color, showLine: true }));
             }
             links.unshift(React.createElement("path", { key: "line-".concat(contributorUri, "-").concat(i), d: "M".concat(x, " ").concat(startY, " L").concat(x, " ").concat(endY), stroke: color, strokeWidth: 2 }));
         });
     });
-    return (React.createElement("svg", { className: "chart", width: width, height: height },
+    return (React.createElement("svg", { "data-reltio-id": "reltio-history-graph", className: "chart", width: width, height: height },
         React.createElement("g", { id: "rowLines" }, rowLines),
         React.createElement("g", { id: "links" }, links),
         React.createElement("g", { id: "circles" }, circles)));

package/esm/components/history/HistoryGraph/helpers.d.ts

@@ -1,2 +1,4 @@
+import { HistoryRowData } from '../types';
 export declare const getHistoryLinkCurve: (x: number, y: number, toX: number, toY: number) => string;
 export declare const isFakeHistoryType: (type: string) => boolean;
+export declare const findEndIndex: (end: HistoryRowData) => number;

package/esm/components/history/HistoryGraph/helpers.js

@@ -1,4 +1,4 @@
-import { HistoryChangeTypes } from '../types/HistoryChangeTypes';
+import { HistoryChangeTypes } from '../types';
 export var getHistoryLinkCurve = function (x, y, toX, toY) {
     var isUp = y > toY;
     var isLeft = x < toX;
@@ -11,3 +11,11 @@ export var getHistoryLinkCurve = function (x, y, toX, toY) {
 export var isFakeHistoryType = function (type) {
     return type === HistoryChangeTypes.FAKE_FILTERED_INCOMING || type === HistoryChangeTypes.FAKE_FILTERED_OUTGOING;
 };
+export var findEndIndex = function (end) {
+    var _a = end || {}, endIndex = _a.index, endType = _a.type;
+    if (endIndex === undefined)
+        return;
+    return endType === HistoryChangeTypes.ENTITIES_MERGED_MANUALLY || endType === HistoryChangeTypes.ENTITIES_MERGED
+        ? endIndex + 1
+        : endIndex;
+};

package/esm/components/history/HistoryRow/HistoryRow.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import { HistoryChange } from '@reltio/mdm-sdk';
+import { HistoryRowData } from '../types';
 type Props = {
-    change: HistoryChange;
+    change: HistoryRowData;
     isCurrent?: boolean;
     isSelected: boolean;
     onClick: () => void;

package/esm/components/history/HistoryRow/HistoryRow.js

@@ -8,8 +8,9 @@ import { useStyles } from './styles';
 var HistoryRow = function (_a) {
     var _b;
     var change = _a.change, isCurrent = _a.isCurrent, isSelected = _a.isSelected, onClick = _a.onClick;
-    var uri = change.uri, type = change.type, matchGroups = change.matchGroups, user = change.user, timestamp = change.timestamp;
-    var color = getContributorColor(uri);
+    var uri = change.uri, type = change.type, matchGroups = change.matchGroups, user = change.user, timestamp = change.timestamp, fakeType = change.fakeType, uris = change.uris;
+    var colorUri = fakeType && uris ? uris[0] : uri;
+    var color = getContributorColor(colorUri);
     var styles = useStyles({ color: color });
     return (React.createElement("div", { className: classnames(styles.historyRow, (_b = {}, _b[styles.selected] = isSelected, _b)), onClick: onClick },
         React.createElement("div", { className: styles.rowHeader },

package/esm/components/history/hooks/historyHelpers.d.ts

@@ -0,0 +1,6 @@
+import { HistoryChange } from '@reltio/mdm-sdk';
+import { HistoryLife } from '../types';
+export declare const checkChange: any;
+export declare const startNewLife: (lifeTime: HistoryLife[], change: HistoryChange) => void;
+export declare const updateLife: (lifeTime: HistoryLife[], change: HistoryChange) => void;
+export declare const endLife: (lifeTime: HistoryLife[], change: HistoryChange) => void;

package/esm/components/history/hooks/historyHelpers.js

@@ -0,0 +1,52 @@
+import { curry } from 'ramda';
+import { HistoryChangeTypes } from '../types';
+export var checkChange = curry(function (involvedUris, checkInUris, change) {
+    var uri = change.uri, type = change.type, uris = change.uris;
+    if (involvedUris) {
+        if (Array.isArray(involvedUris)) {
+            if (type !== HistoryChangeTypes.ENTITY_LOST_MERGE)
+                return null;
+            if (involvedUris.includes(uri)) {
+                return change;
+            }
+            else if (checkInUris && uris) {
+                return involvedUris.some(function (involvedUri) { return uris.includes(involvedUri); }) ? change : null;
+            }
+        }
+        else {
+            if (uri === involvedUris || (checkInUris && (uris === null || uris === void 0 ? void 0 : uris.includes(involvedUris))))
+                return change;
+        }
+    }
+    return null;
+});
+export var startNewLife = function (lifeTime, change) {
+    var currentLife = lifeTime[lifeTime.length - 1];
+    if (currentLife &&
+        (!currentLife.start ||
+            (currentLife.start.type === HistoryChangeTypes.ENTITY_CREATED &&
+                change.type === HistoryChangeTypes.ENTITIES_SPLITTED))) {
+        currentLife.start = change;
+        return;
+    }
+    lifeTime.push({ start: change, end: null });
+};
+export var updateLife = function (lifeTime, change) {
+    var shouldAddNewLife = true;
+    if (lifeTime.length) {
+        var currentLife = lifeTime[lifeTime.length - 1];
+        shouldAddNewLife = !((!currentLife.start || currentLife.start.timestamp < change.timestamp) &&
+            (!currentLife.end || currentLife.end.timestamp > change.timestamp));
+    }
+    if (shouldAddNewLife) {
+        lifeTime.push({ start: null, end: null });
+    }
+};
+export var endLife = function (lifeTime, change) {
+    if (lifeTime.length) {
+        var currentLife = lifeTime[lifeTime.length - 1];
+        if (!currentLife.start)
+            currentLife.start = change;
+    }
+    lifeTime.push({ start: null, end: change });
+};

package/esm/components/history/hooks/useHistory.js

@@ -78,6 +78,7 @@ export var useHistory = function (_a) {
         if (entityUri && enabled) {
             loadHistoricUris();
             setHistoryPage(0);
+            setHistoryWithTotal(null);
         }
     }, [entityUri, entity === null || entity === void 0 ? void 0 : entity.updatedTime, enabled]);
     var loadMore = useCallback(function (offset) {

package/esm/components/history/hooks/useHistoryTree.d.ts

@@ -1,5 +1,5 @@
 import { HistoryChange } from '@reltio/mdm-sdk';
-import { HistoryRowData } from './../types';
+import { HistoryRowData } from '../types';
 type Props = {
     entityUri: string;
     historyChanges: HistoryChange[];

package/esm/components/history/hooks/useHistoryTree.js

@@ -9,38 +9,28 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { useMemo } from 'react';
-import { isNil, pipe, slice, find, curry, drop } from 'ramda';
-import { HistoryChangeTypes } from './../types';
+import { pipe, slice, find, drop } from 'ramda';
+import { HistoryChangeTypes } from '../types';
+import { checkChange, startNewLife, updateLife, endLife } from './historyHelpers';
 export var useHistoryTree = function (_a) {
     var entityUri = _a.entityUri, historyChanges = _a.historyChanges, selectedUris = _a.selectedUris;
     return useMemo(function () {
         var _a;
         var historyLanes = (_a = {}, _a[entityUri] = { index: 0, lifeTime: [] }, _a);
         var rows = [{ user: '', timestamp: 0, uri: entityUri }];
-        var checkChange = curry(function (involvedUris, checkInUris, change) {
-            var _a;
-            var uri = change.uri || entityUri;
-            if (involvedUris) {
-                if (Array.isArray(involvedUris)) {
-                    if (change.type !== HistoryChangeTypes.ENTITY_LOST_MERGE)
-                        return null;
-                    if (involvedUris.includes(uri)) {
-                        return change;
-                    }
-                    else if (checkInUris && change.uris) {
-                        return involvedUris.some(function (involvedUri) { return change.uris.includes(involvedUri); }) ? change : null;
-                    }
-                }
-                else {
-                    if (uri === involvedUris || (checkInUris && ((_a = change.uris) === null || _a === void 0 ? void 0 : _a.includes(involvedUris))))
-                        return change;
-                }
-            }
-            return null;
-        });
+        var normalizedHistoryChanges = historyChanges === null || historyChanges === void 0 ? void 0 : historyChanges.map(function (change) { return (__assign(__assign({}, change), { uri: change.uri || entityUri })); });
         var findNextChange = function (index, involvedUris, checkInUris) {
-            return pipe(drop(index + 1), find(checkChange(involvedUris, checkInUris)))(historyChanges);
+            return pipe(drop(index + 1), find(checkChange(involvedUris, checkInUris)))(normalizedHistoryChanges);
         };
         var findPreviousChange = function (index, uri) {
             return pipe(slice(index + 1, Infinity), find(checkChange(uri, false)))(rows);
@@ -54,36 +44,6 @@ export var useHistoryTree = function (_a) {
             }
             return historyLanes[uri];
         };
-        var startNewLife = function (lifeTime, change) {
-            var currentLife = lifeTime[lifeTime.length - 1];
-            if (currentLife &&
-                (!currentLife.start ||
-                    (currentLife.start.type === HistoryChangeTypes.ENTITY_CREATED &&
-                        change.type === HistoryChangeTypes.ENTITIES_SPLITTED))) {
-                currentLife.start = change;
-                return;
-            }
-            lifeTime.push({ start: change, end: null });
-        };
-        var updateLife = function (lifeTime, change) {
-            var shouldAddNewLife = true;
-            if (lifeTime.length) {
-                var currentLife = lifeTime[lifeTime.length - 1];
-                shouldAddNewLife = !((!currentLife.start || currentLife.start.timestamp < change.timestamp) &&
-                    (!currentLife.end || currentLife.end.timestamp > change.timestamp));
-            }
-            if (shouldAddNewLife) {
-                lifeTime.push({ start: null, end: null });
-            }
-        };
-        var endLife = function (lifeTime, change) {
-            if (lifeTime.length) {
-                var currentLife = lifeTime[lifeTime.length - 1];
-                if (!currentLife.start)
-                    currentLife.start = change;
-            }
-            lifeTime.push({ start: null, end: change });
-        };
         var checkLifeTime = function (lifeTime, change) {
             var _a, _b;
             switch (change.type) {
@@ -131,18 +91,22 @@ export var useHistoryTree = function (_a) {
             }
         };
         var postProcessChanges = [];
-        historyChanges === null || historyChanges === void 0 ? void 0 : historyChanges.forEach(function (change, index) {
-            var _a;
+        normalizedHistoryChanges === null || normalizedHistoryChanges === void 0 ? void 0 : normalizedHistoryChanges.forEach(function (change, index) {
+            var uri = change.uri, uris = change.uris, timestamp = change.timestamp;
             switch (change.type) {
                 case HistoryChangeTypes.ENTITIES_SPLITTED:
-                    if (!findNextChange(index, change.uri || entityUri, false)) {
+                    if (!findNextChange(index, uri, false)) {
                         return;
                     }
                     else {
-                        var uri = change.uri;
-                        var involvedUris = change.uris ? [change.uris, uri] : [uri];
+                        var involvedUris = uris ? __spreadArray(__spreadArray([], uris, true), [uri], false) : [uri];
                         var lostMergeChange = findNextChange(index, involvedUris, true);
-                        if (lostMergeChange && (!uri || uri === lostMergeChange.uri))
+                        var isLostMerge = !uri || uri === (lostMergeChange === null || lostMergeChange === void 0 ? void 0 : lostMergeChange.uri);
+                        var lastChange = rows[rows.length - 1];
+                        var isAlreadyUnmerged = lastChange.type === HistoryChangeTypes.ENTITIES_SPLITTED &&
+                            (uris === null || uris === void 0 ? void 0 : uris.includes(lastChange.uri)) &&
+                            lastChange.timestamp === timestamp;
+                        if (isLostMerge || isAlreadyUnmerged)
                             return;
                     }
                     break;
@@ -152,71 +116,50 @@ export var useHistoryTree = function (_a) {
                 case HistoryChangeTypes.RELATIONSHIP_CHANGED:
                     return;
             }
-            var addPostProcess = false;
-            (_a = change.uris) === null || _a === void 0 ? void 0 : _a.forEach(function (uri) {
-                if (!checkLaneUri(uri))
-                    addPostProcess = true;
-            });
-            var contributorLane = checkLaneUri(change.uri || entityUri);
-            if (!contributorLane)
-                return;
+            var contributorLane = checkLaneUri(uri);
+            uris === null || uris === void 0 ? void 0 : uris.forEach(function (uri) { return checkLaneUri(uri); });
             var rowChange = __assign({}, change);
-            checkLifeTime(contributorLane.lifeTime, rowChange);
-            if (addPostProcess)
-                postProcessChanges.push(rowChange);
-            rows.push(rowChange);
+            if (contributorLane) {
+                checkLifeTime(contributorLane.lifeTime, rowChange);
+                rows.push(rowChange);
+            }
+            else {
+                if (uris)
+                    postProcessChanges.push(rowChange);
+            }
         });
         postProcessChanges.forEach(function (postChange) {
             postChange.uris.forEach(function (postUri) {
-                if (historyLanes[postUri])
+                if (!historyLanes[postUri])
                     return;
-                historyChanges.forEach(function (_a) {
-                    var uri = _a.uri, uris = _a.uris, timestamp = _a.timestamp, user = _a.user, type = _a.type;
-                    if (uri !== postUri)
+                normalizedHistoryChanges.forEach(function (change) {
+                    var uri = change.uri, uris = change.uris, type = change.type, timestamp = change.timestamp;
+                    if (timestamp !== postChange.timestamp || type !== postChange.type)
                         return;
-                    uris === null || uris === void 0 ? void 0 : uris.forEach(function (contributorUri) {
-                        var contributorLane = historyLanes[contributorUri];
-                        if (!contributorLane)
-                            return;
-                        var fakeType = null;
-                        switch (type) {
-                            case HistoryChangeTypes.ENTITIES_MERGED:
-                            case HistoryChangeTypes.ENTITIES_MERGED_MANUALLY:
-                                fakeType = HistoryChangeTypes.FAKE_FILTERED_INCOMING;
-                                break;
-                            case HistoryChangeTypes.ENTITIES_SPLITTED:
-                                fakeType = HistoryChangeTypes.FAKE_FILTERED_OUTGOING;
-                                break;
-                            default:
+                    var fakeChange;
+                    switch (type) {
+                        case HistoryChangeTypes.ENTITIES_MERGED:
+                        case HistoryChangeTypes.ENTITIES_MERGED_MANUALLY:
+                            if (!(uris === null || uris === void 0 ? void 0 : uris.includes(postUri)))
                                 return;
-                        }
-                        var fakeChange = {
-                            fakeType: fakeType,
-                            uri: postChange.uri,
-                            uris: [contributorUri],
-                            type: type,
-                            user: user,
-                            timestamp: timestamp
-                        };
-                        var extendLife = findClosestLife(contributorLane.lifeTime, postChange.timestamp);
-                        if (fakeType === HistoryChangeTypes.FAKE_FILTERED_INCOMING) {
-                            if (!isNil(extendLife.endIndex)) {
-                                contributorLane.lifeTime[extendLife.endIndex].end = fakeChange;
-                            }
-                        }
-                        else {
-                            if (!isNil(extendLife.startIndex)) {
-                                contributorLane.lifeTime[extendLife.startIndex].start = fakeChange;
-                            }
-                        }
-                        rows.splice(rows.indexOf(postChange), 0, fakeChange);
-                    });
+                            fakeChange = { fakeType: HistoryChangeTypes.FAKE_FILTERED_INCOMING, uri: postUri };
+                            break;
+                        case HistoryChangeTypes.ENTITIES_SPLITTED:
+                            if (uri !== postUri || !uris)
+                                return;
+                            fakeChange = { fakeType: HistoryChangeTypes.FAKE_FILTERED_OUTGOING, uri: uri };
+                            break;
+                        default:
+                            return;
+                    }
+                    var fakeRowIndex = rows.findIndex(function (row, i) { return i !== 0 && row.timestamp < timestamp; });
+                    var fakeRow = __assign(__assign(__assign({}, postChange), fakeChange), { uris: [postChange.uri] });
+                    rows.splice(fakeRowIndex, 0, fakeRow);
                 });
             });
         });
         rows.forEach(function (row, i) {
             row.index = i;
-            row.uri = row.uri || entityUri;
         });
         return {
             historyData: { historyLanes: historyLanes, rows: rows },
@@ -224,23 +167,3 @@ export var useHistoryTree = function (_a) {
         };
     }, [entityUri, historyChanges, selectedUris]);
 };
-var findClosestLife = function (lifeTime, timestamp) {
-    return lifeTime.reduce(function (acc, _a, i) {
-        var start = _a.start, end = _a.end;
-        if (start) {
-            var d = timestamp - start.timestamp;
-            if (isNil(acc.startDistance) || (Math.abs(acc.startDistance) > Math.abs(d) && d > 0)) {
-                acc.startIndex = i;
-                acc.startDistance = d;
-            }
-        }
-        if (end) {
-            var d = timestamp - end.timestamp;
-            if (isNil(acc.endDistance) || (Math.abs(acc.endDistance) > Math.abs(d) && d < 0)) {
-                acc.endIndex = i;
-                acc.endDistance = d;
-            }
-        }
-        return acc;
-    }, { startIndex: null, endIndex: null, startDistance: null, endDistance: null });
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1725",
+  "version": "1.4.1726",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",