@reltio/components 1.4.921 → 1.4.925

package/cjs/components/DropDownSelector/DropDownSelector.js

@@ -83,7 +83,7 @@ var DropDownSelector = function (_a) {
             Menu: Menu_1.default }, showIndicatorSeparator), components), menuPlacement: "auto", TextFieldProps: __assign(__assign({}, TextFieldProps), { label: label, variant: 'filled', margin: 'dense', classes: __assign(__assign({}, ramda_1.prop('classes', TextFieldProps)), { root: classnames_1.default(styles.formControl, ramda_1.path(['classes', 'root'], TextFieldProps)) }), inputProps: __assign({}, ramda_1.prop('inputProps', TextFieldProps)), InputProps: __assign(__assign({}, ramda_1.prop('InputProps', TextFieldProps)), { classes: __assign(__assign({}, ramda_1.path(['InputProps', 'classes'], TextFieldProps)), { root: classnames_1.default(styles.filledInputRoot, ramda_1.path(['InputProps', 'classes', 'root'], TextFieldProps)), underline: classnames_1.default((_b = {}, _b[underlineStyle.filledInputUnderline] = mdm_sdk_1.isEmptyValue(value), _b), ramda_1.path(['InputProps', 'classes', 'underline'], TextFieldProps)), focused: classnames_1.default('focused', ramda_1.path(['InputProps', 'classes', 'focused'], TextFieldProps)) }) }), InputLabelProps: __assign(__assign({}, ramda_1.prop('InputLabelProps', TextFieldProps)), { classes: __assign(__assign({}, ramda_1.path(['InputLabelProps', 'classes'], TextFieldProps)), { root: classnames_1.default(styles.inputLabel, ramda_1.path(['InputLabelProps', 'classes', 'root'], TextFieldProps)), shrink: classnames_1.default('shrink', ramda_1.path(['InputLabelProps', 'classes', 'shrink'], TextFieldProps)) }), shrink: !mdm_sdk_1.isEmptyValue(value) ? true : undefined }), ref: textFieldInputRef || inputRef }), inputRef: textFieldInputRef || inputRef, menuIsOpen: open, onMenuOpen: function () { return setOpen(true); }, onMenuClose: function () { return setOpen(false); } })));
 };
 exports.DropDownSelectorType = {
-    value: prop_types_1.default.object,
+    value: prop_types_1.default.oneOfType([prop_types_1.default.object, prop_types_1.default.array]),
     label: prop_types_1.default.string.isRequired,
     getOptions: prop_types_1.default.func,
     options: prop_types_1.default.array,

package/cjs/components/MergeButton/MergeButton.js

@@ -47,7 +47,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MergeButton = void 0;
 var react_1 = __importStar(require("react"));
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
-var mergeIcon_svg_1 = __importDefault(require("./mergeIcon.svg"));
+var MergeDark_1 = __importDefault(require("../../icons/MergeDark"));
 var core_1 = require("../../core");
 var ActionButton_1 = require("../ActionButton/ActionButton");
 var hooks_1 = require("../../hooks");
@@ -60,6 +60,6 @@ exports.MergeButton = react_1.forwardRef(function (_a, ref) {
         onFinishRequest: onFinishRequest,
         onError: onError
     }).sendMergeAllRequest;
-    return (react_1.default.createElement(ActionButton_1.ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: ui_i18n_1.default.text('Merge'), icon: mergeIcon_svg_1.default, onClick: sendMergeAllRequest, onMenuClose: onMenuClose, ref: ref }, otherProps)));
+    return (react_1.default.createElement(ActionButton_1.ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: ui_i18n_1.default.text('Merge'), icon: MergeDark_1.default, onClick: sendMergeAllRequest, onMenuClose: onMenuClose, ref: ref }, otherProps)));
 });
 exports.MergeButton.displayName = 'mergeButton';

package/cjs/components/NotMatchButton/NotMatchButton.js

@@ -47,7 +47,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotMatchButton = void 0;
 var ActionButton_1 = require("../ActionButton/ActionButton");
 var react_1 = __importStar(require("react"));
-var notMatch_svg_1 = __importDefault(require("./notMatch.svg"));
+var NotMatchDark_1 = __importDefault(require("../../icons/NotMatchDark"));
 var core_1 = require("../../core");
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
 var useMarkAsNotMatchRequest_1 = require("../../hooks/useMarkAsNotMatchRequest");
@@ -59,6 +59,6 @@ exports.NotMatchButton = react_1.forwardRef(function (_a, ref) {
         onStartRequest: onStartRequest,
         onFinishRequest: onFinishRequest
     }).sendMarkAsNotMatchRequest;
-    return (react_1.default.createElement(ActionButton_1.ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: ui_i18n_1.default.text('Not a match'), icon: notMatch_svg_1.default, onClick: sendMarkAsNotMatchRequest, onMenuClose: onMenuClose, ref: ref }, otherProps)));
+    return (react_1.default.createElement(ActionButton_1.ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: ui_i18n_1.default.text('Not a match'), icon: NotMatchDark_1.default, onClick: sendMarkAsNotMatchRequest, onMenuClose: onMenuClose, ref: ref }, otherProps)));
 });
 exports.NotMatchButton.displayName = 'notMatchButton';

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

@@ -1,16 +1,16 @@
+import { Entity, HistoryWithTotal } from '@reltio/mdm-sdk';
 import { HistoryFilter } from '../types';
 declare type Props = {
-    entityUri: string;
+    entity: Entity;
     enabled: boolean;
 };
-export declare const useHistory: ({ entityUri, enabled }: Props) => {
+export declare const useHistory: ({ entity, enabled }: Props) => {
     isLoading: boolean;
     canLoadMore: boolean;
     onLoadMore: () => void;
     onApplyFilter: (filter: HistoryFilter) => void;
     historicUris: string[];
-    historyWithTotal: import("@reltio/mdm-sdk").HistoryWithTotal;
+    historyWithTotal: HistoryWithTotal;
     historyFilter: HistoryFilter;
-    reloadHistory: () => void;
 };
 export {};

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

@@ -1,32 +1,97 @@
 "use strict";
+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);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useHistory = void 0;
 var react_1 = require("react");
-var useHistoricUris_1 = require("./useHistoricUris");
-var useHistoryWithTotal_1 = require("./useHistoryWithTotal");
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var types_1 = require("../types");
 var filters_1 = require("../utils/filters");
+var hooks_1 = require("../../../hooks");
 var MAX_HISTORY_ROWS = 32;
 var useHistory = function (_a) {
-    var entityUri = _a.entityUri, enabled = _a.enabled;
+    var entity = _a.entity, enabled = _a.enabled;
     var _b = react_1.useState({
         activities: [types_1.HistoryActivityType.MERGE, types_1.HistoryActivityType.UNMERGE, types_1.HistoryActivityType.UPDATE]
     }), historyFilter = _b[0], setHistoryFilter = _b[1];
     var _c = react_1.useState(0), historyPage = _c[0], setHistoryPage = _c[1];
     var historyFilterString = react_1.useMemo(function () { return filters_1.buildHistoryFilterString(historyFilter); }, [historyFilter]);
-    var _d = useHistoricUris_1.useHistoricUris({
-        entityUri: entityUri,
-        enabled: enabled
-    }), isHistoricUrisLoading = _d.isLoading, historicUris = _d.historicUris;
-    var _e = useHistoryWithTotal_1.useHistoryWithTotal({
-        entityUri: entityUri,
-        enabled: enabled && !!historicUris,
-        filter: historyFilterString,
-        historicUris: historicUris,
-        max: MAX_HISTORY_ROWS,
-        offset: historyPage * MAX_HISTORY_ROWS,
-        order: 'desc'
-    }), isHistoryLoading = _e.isLoading, historyWithTotal = _e.historyWithTotal, loadMore = _e.loadMore, loadData = _e.loadData;
+    var _d = react_1.useState(null), historicUris = _d[0], setHistoricUris = _d[1];
+    var _e = react_1.useState(null), historyWithTotal = _e[0], setHistoryWithTotal = _e[1];
+    var _f = react_1.useState(false), isLoading = _f[0], setIsLoading = _f[1];
+    var safePromise = hooks_1.useSafePromise();
+    var entityUri = entity === null || entity === void 0 ? void 0 : entity.uri;
+    var options = { max: MAX_HISTORY_ROWS, order: 'desc' };
+    var showAll = mdm_sdk_1.isEmptyValue(historyFilter === null || historyFilter === void 0 ? void 0 : historyFilter.attributes) || undefined;
+    var loadHistoryWithTotal = function () {
+        setIsLoading(true);
+        return safePromise(mdm_sdk_1.getHistoryWithTotal(__assign({ entityUri: entityUri,
+            historicUris: historicUris, filter: historyFilterString, showAll: showAll }, options)))
+            .then(setHistoryWithTotal)
+            .catch(function (e) {
+            console.warn('Failed to load history data', e);
+            setHistoryWithTotal(null);
+        })
+            .finally(function () {
+            setIsLoading(false);
+        });
+    };
+    react_1.useEffect(function () {
+        if (entityUri && enabled) {
+            loadHistoryWithTotal();
+        }
+    }, [historyFilterString, showAll, historicUris]);
+    var loadHistoricUris = function () {
+        setIsLoading(true);
+        return safePromise(mdm_sdk_1.getHistoricUris({ entityUri: entityUri }))
+            .then(function (historicUris) {
+            setHistoricUris(historicUris);
+        })
+            .catch(function (e) {
+            console.warn('Failed to load history data', e);
+            setHistoricUris(null);
+        })
+            .finally(function () {
+            setIsLoading(false);
+        });
+    };
+    react_1.useEffect(function () {
+        if (entityUri && enabled) {
+            loadHistoricUris();
+            setHistoryPage(0);
+        }
+    }, [entityUri, entity === null || entity === void 0 ? void 0 : entity.updatedTime, enabled]);
+    var loadMore = react_1.useCallback(function (offset) {
+        if (entityUri && historicUris && enabled) {
+            setIsLoading(true);
+            safePromise(mdm_sdk_1.getHistoryWithTotal(__assign({ entityUri: entityUri,
+                historicUris: historicUris, filter: historyFilterString, showAll: showAll,
+                offset: offset }, options)))
+                .then(function (results) {
+                setHistoryWithTotal(function (prev) { return (__assign(__assign({}, prev), { changes: __spreadArray(__spreadArray([], prev === null || prev === void 0 ? void 0 : prev.changes), results.changes) })); });
+            })
+                .catch(function (e) {
+                console.warn('Failed to load history data', e);
+            })
+                .finally(function () {
+                setIsLoading(false);
+            });
+        }
+    }, [historicUris, historyFilterString, enabled]);
     var canLoadMore = react_1.useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS < (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
         historyWithTotal,
         historyPage
@@ -41,19 +106,14 @@ var useHistory = function (_a) {
         loadMore((historyPage + 1) * MAX_HISTORY_ROWS);
         setHistoryPage(historyPage + 1);
     }, [loadMore, historyPage, canLoadMore]);
-    var reloadHistory = react_1.useCallback(function () {
-        loadData();
-        setHistoryPage(0);
-    }, [loadData]);
     return {
-        isLoading: isHistoryLoading || isHistoricUrisLoading,
+        isLoading: isLoading,
         canLoadMore: canLoadMore,
         onLoadMore: onLoadMore,
         onApplyFilter: onApplyFilter,
         historicUris: historicUris,
         historyWithTotal: historyWithTotal,
-        historyFilter: historyFilter,
-        reloadHistory: reloadHistory
+        historyFilter: historyFilter
     };
 };
 exports.useHistory = useHistory;

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

@@ -1,2 +1,3 @@
 import { HistoryDiff } from '@reltio/mdm-sdk';
+export declare const defaultHistoryDiff: HistoryDiff;
 export declare const useHistoryDiff: () => HistoryDiff;

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

@@ -19,13 +19,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useHistoryDiff = void 0;
+exports.useHistoryDiff = exports.defaultHistoryDiff = void 0;
 var react_1 = require("react");
 var react_redux_1 = require("react-redux");
 var ramda_1 = require("ramda");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var mdm_module_1 = __importStar(require("@reltio/mdm-module"));
-var defaultHistoryDiff = {
+exports.defaultHistoryDiff = {
     appearance: {},
     attributes: {},
     roles: [],
@@ -57,6 +57,6 @@ var useHistoryDiff = function () {
             dispatch(mdm_module_1.profile.history.actions.setHistoryDiff(historyDiff_1));
         }
     }, [historySlice, historyMode, dispatch, entity]);
-    return historyDiff || defaultHistoryDiff;
+    return historyDiff || exports.defaultHistoryDiff;
 };
 exports.useHistoryDiff = useHistoryDiff;

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

@@ -1,5 +1,3 @@
-export { useHistoricUris } from './hooks/useHistoricUris';
-export { useHistoryWithTotal } from './hooks/useHistoryWithTotal';
 export { useHistorySlice } from './hooks/useHistorySlice';
 export { useHistory } from './hooks/useHistory';
 export { useHistoryDiff } from './hooks/useHistoryDiff';

package/cjs/components/history/index.js

@@ -13,11 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProfileBandHistory = exports.HistoryHeader = exports.HistoryView = exports.useHistoryDiff = exports.useHistory = exports.useHistorySlice = exports.useHistoryWithTotal = exports.useHistoricUris = void 0;
-var useHistoricUris_1 = require("./hooks/useHistoricUris");
-Object.defineProperty(exports, "useHistoricUris", { enumerable: true, get: function () { return useHistoricUris_1.useHistoricUris; } });
-var useHistoryWithTotal_1 = require("./hooks/useHistoryWithTotal");
-Object.defineProperty(exports, "useHistoryWithTotal", { enumerable: true, get: function () { return useHistoryWithTotal_1.useHistoryWithTotal; } });
+exports.ProfileBandHistory = exports.HistoryHeader = exports.HistoryView = exports.useHistoryDiff = exports.useHistory = exports.useHistorySlice = void 0;
 var useHistorySlice_1 = require("./hooks/useHistorySlice");
 Object.defineProperty(exports, "useHistorySlice", { enumerable: true, get: function () { return useHistorySlice_1.useHistorySlice; } });
 var useHistory_1 = require("./hooks/useHistory");

package/cjs/icons/MergeDark.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const SvgMergeDark: React.FC<React.SVGProps<SVGSVGElement>>;
+export default SvgMergeDark;

package/cjs/icons/MergeDark.js

@@ -0,0 +1,27 @@
+"use strict";
+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);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var SvgMergeDark = function (props) {
+    return (react_1.default.createElement("svg", __assign({ width: 24, height: 24, viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink" }, props),
+        react_1.default.createElement("defs", null,
+            react_1.default.createElement("path", { d: "M17.045 20.455l1.41-1.41-3.41-3.41-1.41 1.41 3.41 3.41zm-9.5-12.41h3.5v5.59l-5.41 5.41 1.41 1.41 6-6v-6.41h3.5l-4.5-4.5-4.5 4.5z", id: "MergeDark_svg__a" })),
+        react_1.default.createElement("g", { stroke: "none", strokeWidth: 1, fill: "none", fillRule: "evenodd" },
+            react_1.default.createElement("mask", { id: "MergeDark_svg__b", fill: "#fff" },
+                react_1.default.createElement("use", { xlinkHref: "#MergeDark_svg__a", transform: "rotate(90 12.045 12)" })),
+            react_1.default.createElement("path", { fillOpacity: 0.54, fill: "#000", mask: "url(#MergeDark_svg__b)", d: "M0 0h24v24H0z" }))));
+};
+exports.default = SvgMergeDark;

package/cjs/icons/NotMatchDark.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const SvgNotMatchDark: React.FC<React.SVGProps<SVGSVGElement>>;
+export default SvgNotMatchDark;

package/cjs/icons/NotMatchDark.js

@@ -0,0 +1,27 @@
+"use strict";
+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);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var SvgNotMatchDark = function (props) {
+    return (react_1.default.createElement("svg", __assign({ width: 24, height: 24, viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink" }, props),
+        react_1.default.createElement("defs", null,
+            react_1.default.createElement("path", { d: "M17 13.138l4.5 4.5-4.5 4.5V18.5h-1.247l-3.488-3.479 1.413-1.414 2.901 2.893H17v-3.362zM17 1.5L21.5 6 17 10.5V7.138h-.421l-11.03 11H2v-2h2.723l11.03-11H17V1.5zm-11.45 4l3.294 3.286-1.414 1.413L4.723 7.5H2v-2h3.55z", id: "NotMatchDark_svg__a" })),
+        react_1.default.createElement("g", { stroke: "none", strokeWidth: 1, fill: "none", fillRule: "evenodd" },
+            react_1.default.createElement("mask", { id: "NotMatchDark_svg__b", fill: "#fff" },
+                react_1.default.createElement("use", { xlinkHref: "#NotMatchDark_svg__a" })),
+            react_1.default.createElement("path", { fillOpacity: 0.54, fill: "#000", mask: "url(#NotMatchDark_svg__b)", d: "M0 0h24v24H0z" }))));
+};
+exports.default = SvgNotMatchDark;

package/esm/components/DropDownSelector/DropDownSelector.js

@@ -58,7 +58,7 @@ var DropDownSelector = function (_a) {
             Menu: Menu }, showIndicatorSeparator), components), menuPlacement: "auto", TextFieldProps: __assign(__assign({}, TextFieldProps), { label: label, variant: 'filled', margin: 'dense', classes: __assign(__assign({}, prop('classes', TextFieldProps)), { root: classnames(styles.formControl, path(['classes', 'root'], TextFieldProps)) }), inputProps: __assign({}, prop('inputProps', TextFieldProps)), InputProps: __assign(__assign({}, prop('InputProps', TextFieldProps)), { classes: __assign(__assign({}, path(['InputProps', 'classes'], TextFieldProps)), { root: classnames(styles.filledInputRoot, path(['InputProps', 'classes', 'root'], TextFieldProps)), underline: classnames((_b = {}, _b[underlineStyle.filledInputUnderline] = isEmptyValue(value), _b), path(['InputProps', 'classes', 'underline'], TextFieldProps)), focused: classnames('focused', path(['InputProps', 'classes', 'focused'], TextFieldProps)) }) }), InputLabelProps: __assign(__assign({}, prop('InputLabelProps', TextFieldProps)), { classes: __assign(__assign({}, path(['InputLabelProps', 'classes'], TextFieldProps)), { root: classnames(styles.inputLabel, path(['InputLabelProps', 'classes', 'root'], TextFieldProps)), shrink: classnames('shrink', path(['InputLabelProps', 'classes', 'shrink'], TextFieldProps)) }), shrink: !isEmptyValue(value) ? true : undefined }), ref: textFieldInputRef || inputRef }), inputRef: textFieldInputRef || inputRef, menuIsOpen: open, onMenuOpen: function () { return setOpen(true); }, onMenuClose: function () { return setOpen(false); } })));
 };
 export var DropDownSelectorType = {
-    value: PropTypes.object,
+    value: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
     label: PropTypes.string.isRequired,
     getOptions: PropTypes.func,
     options: PropTypes.array,

package/esm/components/MergeButton/MergeButton.js

@@ -22,7 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import React, { forwardRef } from 'react';
 import i18n from 'ui-i18n';
-import MergeIcon from './mergeIcon.svg';
+import MergeIcon from '../../icons/MergeDark';
 import { noop } from '../../core';
 import { ActionButton, ActionButtonMode } from '../ActionButton/ActionButton';
 import { useMergeAllRequest } from '../../hooks';

package/esm/components/NotMatchButton/NotMatchButton.js

@@ -22,7 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { ActionButton, ActionButtonMode } from '../ActionButton/ActionButton';
 import React, { forwardRef } from 'react';
-import NotMatchIcon from './notMatch.svg';
+import NotMatchIcon from '../../icons/NotMatchDark';
 import { noop } from '../../core';
 import i18n from 'ui-i18n';
 import { useMarkAsNotMatchRequest } from '../../hooks/useMarkAsNotMatchRequest';

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

@@ -1,16 +1,16 @@
+import { Entity, HistoryWithTotal } from '@reltio/mdm-sdk';
 import { HistoryFilter } from '../types';
 declare type Props = {
-    entityUri: string;
+    entity: Entity;
     enabled: boolean;
 };
-export declare const useHistory: ({ entityUri, enabled }: Props) => {
+export declare const useHistory: ({ entity, enabled }: Props) => {
     isLoading: boolean;
     canLoadMore: boolean;
     onLoadMore: () => void;
     onApplyFilter: (filter: HistoryFilter) => void;
     historicUris: string[];
-    historyWithTotal: import("@reltio/mdm-sdk").HistoryWithTotal;
+    historyWithTotal: HistoryWithTotal;
     historyFilter: HistoryFilter;
-    reloadHistory: () => void;
 };
 export {};

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

@@ -1,29 +1,94 @@
-import { useState, useMemo, useCallback } from 'react';
-import { useHistoricUris } from './useHistoricUris';
-import { useHistoryWithTotal } from './useHistoryWithTotal';
+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);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
+import { useState, useMemo, useCallback, useEffect } from 'react';
+import { getHistoricUris, getHistoryWithTotal, isEmptyValue } from '@reltio/mdm-sdk';
 import { HistoryActivityType } from '../types';
 import { buildHistoryFilterString } from '../utils/filters';
+import { useSafePromise } from '../../../hooks';
 var MAX_HISTORY_ROWS = 32;
 export var useHistory = function (_a) {
-    var entityUri = _a.entityUri, enabled = _a.enabled;
+    var entity = _a.entity, enabled = _a.enabled;
     var _b = useState({
         activities: [HistoryActivityType.MERGE, HistoryActivityType.UNMERGE, HistoryActivityType.UPDATE]
     }), historyFilter = _b[0], setHistoryFilter = _b[1];
     var _c = useState(0), historyPage = _c[0], setHistoryPage = _c[1];
     var historyFilterString = useMemo(function () { return buildHistoryFilterString(historyFilter); }, [historyFilter]);
-    var _d = useHistoricUris({
-        entityUri: entityUri,
-        enabled: enabled
-    }), isHistoricUrisLoading = _d.isLoading, historicUris = _d.historicUris;
-    var _e = useHistoryWithTotal({
-        entityUri: entityUri,
-        enabled: enabled && !!historicUris,
-        filter: historyFilterString,
-        historicUris: historicUris,
-        max: MAX_HISTORY_ROWS,
-        offset: historyPage * MAX_HISTORY_ROWS,
-        order: 'desc'
-    }), isHistoryLoading = _e.isLoading, historyWithTotal = _e.historyWithTotal, loadMore = _e.loadMore, loadData = _e.loadData;
+    var _d = useState(null), historicUris = _d[0], setHistoricUris = _d[1];
+    var _e = useState(null), historyWithTotal = _e[0], setHistoryWithTotal = _e[1];
+    var _f = useState(false), isLoading = _f[0], setIsLoading = _f[1];
+    var safePromise = useSafePromise();
+    var entityUri = entity === null || entity === void 0 ? void 0 : entity.uri;
+    var options = { max: MAX_HISTORY_ROWS, order: 'desc' };
+    var showAll = isEmptyValue(historyFilter === null || historyFilter === void 0 ? void 0 : historyFilter.attributes) || undefined;
+    var loadHistoryWithTotal = function () {
+        setIsLoading(true);
+        return safePromise(getHistoryWithTotal(__assign({ entityUri: entityUri,
+            historicUris: historicUris, filter: historyFilterString, showAll: showAll }, options)))
+            .then(setHistoryWithTotal)
+            .catch(function (e) {
+            console.warn('Failed to load history data', e);
+            setHistoryWithTotal(null);
+        })
+            .finally(function () {
+            setIsLoading(false);
+        });
+    };
+    useEffect(function () {
+        if (entityUri && enabled) {
+            loadHistoryWithTotal();
+        }
+    }, [historyFilterString, showAll, historicUris]);
+    var loadHistoricUris = function () {
+        setIsLoading(true);
+        return safePromise(getHistoricUris({ entityUri: entityUri }))
+            .then(function (historicUris) {
+            setHistoricUris(historicUris);
+        })
+            .catch(function (e) {
+            console.warn('Failed to load history data', e);
+            setHistoricUris(null);
+        })
+            .finally(function () {
+            setIsLoading(false);
+        });
+    };
+    useEffect(function () {
+        if (entityUri && enabled) {
+            loadHistoricUris();
+            setHistoryPage(0);
+        }
+    }, [entityUri, entity === null || entity === void 0 ? void 0 : entity.updatedTime, enabled]);
+    var loadMore = useCallback(function (offset) {
+        if (entityUri && historicUris && enabled) {
+            setIsLoading(true);
+            safePromise(getHistoryWithTotal(__assign({ entityUri: entityUri,
+                historicUris: historicUris, filter: historyFilterString, showAll: showAll,
+                offset: offset }, options)))
+                .then(function (results) {
+                setHistoryWithTotal(function (prev) { return (__assign(__assign({}, prev), { changes: __spreadArray(__spreadArray([], prev === null || prev === void 0 ? void 0 : prev.changes), results.changes) })); });
+            })
+                .catch(function (e) {
+                console.warn('Failed to load history data', e);
+            })
+                .finally(function () {
+                setIsLoading(false);
+            });
+        }
+    }, [historicUris, historyFilterString, enabled]);
     var canLoadMore = useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS < (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
         historyWithTotal,
         historyPage
@@ -38,18 +103,13 @@ export var useHistory = function (_a) {
         loadMore((historyPage + 1) * MAX_HISTORY_ROWS);
         setHistoryPage(historyPage + 1);
     }, [loadMore, historyPage, canLoadMore]);
-    var reloadHistory = useCallback(function () {
-        loadData();
-        setHistoryPage(0);
-    }, [loadData]);
     return {
-        isLoading: isHistoryLoading || isHistoricUrisLoading,
+        isLoading: isLoading,
         canLoadMore: canLoadMore,
         onLoadMore: onLoadMore,
         onApplyFilter: onApplyFilter,
         historicUris: historicUris,
         historyWithTotal: historyWithTotal,
-        historyFilter: historyFilter,
-        reloadHistory: reloadHistory
+        historyFilter: historyFilter
     };
 };

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

@@ -1,2 +1,3 @@
 import { HistoryDiff } from '@reltio/mdm-sdk';
+export declare const defaultHistoryDiff: HistoryDiff;
 export declare const useHistoryDiff: () => HistoryDiff;

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

@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { evolve, map } from 'ramda';
 import { entity as History, wrapInArrayIfNeeded } from '@reltio/mdm-sdk';
 import mdmModule, { HistoryMode, profile } from '@reltio/mdm-module';
-var defaultHistoryDiff = {
+export var defaultHistoryDiff = {
     appearance: {},
     attributes: {},
     roles: [],

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

@@ -1,5 +1,3 @@
-export { useHistoricUris } from './hooks/useHistoricUris';
-export { useHistoryWithTotal } from './hooks/useHistoryWithTotal';
 export { useHistorySlice } from './hooks/useHistorySlice';
 export { useHistory } from './hooks/useHistory';
 export { useHistoryDiff } from './hooks/useHistoryDiff';

package/esm/components/history/index.js

@@ -1,5 +1,3 @@
-export { useHistoricUris } from './hooks/useHistoricUris';
-export { useHistoryWithTotal } from './hooks/useHistoryWithTotal';
 export { useHistorySlice } from './hooks/useHistorySlice';
 export { useHistory } from './hooks/useHistory';
 export { useHistoryDiff } from './hooks/useHistoryDiff';

package/esm/icons/MergeDark.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const SvgMergeDark: React.FC<React.SVGProps<SVGSVGElement>>;
+export default SvgMergeDark;

package/esm/icons/MergeDark.js

@@ -0,0 +1,22 @@
+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 React from 'react';
+var SvgMergeDark = function (props) {
+    return (React.createElement("svg", __assign({ width: 24, height: 24, viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink" }, props),
+        React.createElement("defs", null,
+            React.createElement("path", { d: "M17.045 20.455l1.41-1.41-3.41-3.41-1.41 1.41 3.41 3.41zm-9.5-12.41h3.5v5.59l-5.41 5.41 1.41 1.41 6-6v-6.41h3.5l-4.5-4.5-4.5 4.5z", id: "MergeDark_svg__a" })),
+        React.createElement("g", { stroke: "none", strokeWidth: 1, fill: "none", fillRule: "evenodd" },
+            React.createElement("mask", { id: "MergeDark_svg__b", fill: "#fff" },
+                React.createElement("use", { xlinkHref: "#MergeDark_svg__a", transform: "rotate(90 12.045 12)" })),
+            React.createElement("path", { fillOpacity: 0.54, fill: "#000", mask: "url(#MergeDark_svg__b)", d: "M0 0h24v24H0z" }))));
+};
+export default SvgMergeDark;

package/esm/icons/NotMatchDark.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const SvgNotMatchDark: React.FC<React.SVGProps<SVGSVGElement>>;
+export default SvgNotMatchDark;

package/esm/icons/NotMatchDark.js

@@ -0,0 +1,22 @@
+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 React from 'react';
+var SvgNotMatchDark = function (props) {
+    return (React.createElement("svg", __assign({ width: 24, height: 24, viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink" }, props),
+        React.createElement("defs", null,
+            React.createElement("path", { d: "M17 13.138l4.5 4.5-4.5 4.5V18.5h-1.247l-3.488-3.479 1.413-1.414 2.901 2.893H17v-3.362zM17 1.5L21.5 6 17 10.5V7.138h-.421l-11.03 11H2v-2h2.723l11.03-11H17V1.5zm-11.45 4l3.294 3.286-1.414 1.413L4.723 7.5H2v-2h3.55z", id: "NotMatchDark_svg__a" })),
+        React.createElement("g", { stroke: "none", strokeWidth: 1, fill: "none", fillRule: "evenodd" },
+            React.createElement("mask", { id: "NotMatchDark_svg__b", fill: "#fff" },
+                React.createElement("use", { xlinkHref: "#NotMatchDark_svg__a" })),
+            React.createElement("path", { fillOpacity: 0.54, fill: "#000", mask: "url(#NotMatchDark_svg__b)", d: "M0 0h24v24H0z" }))));
+};
+export default SvgNotMatchDark;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.921",
+  "version": "1.4.925",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "dependencies": {
     "@date-io/moment": "^1.3.5",
     "@react-google-maps/api": "^2.7.0",
-    "@reltio/mdm-module": "^1.4.921",
-    "@reltio/mdm-sdk": "^1.4.921",
+    "@reltio/mdm-module": "^1.4.925",
+    "@reltio/mdm-sdk": "^1.4.925",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",

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

@@ -1,9 +0,0 @@
-declare type Props = {
-    entityUri: string;
-    enabled?: boolean;
-};
-export declare const useHistoricUris: ({ entityUri, enabled }: Props) => {
-    isLoading: boolean;
-    historicUris: string[];
-};
-export {};

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

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useHistoricUris = void 0;
-var react_1 = require("react");
-var mdm_sdk_1 = require("@reltio/mdm-sdk");
-var hooks_1 = require("../../../hooks");
-var useHistoricUris = function (_a) {
-    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b;
-    var _c = react_1.useState(null), historicUris = _c[0], setHistoricUris = _c[1];
-    var _d = react_1.useState(false), isLoading = _d[0], setIsLoading = _d[1];
-    var safePromise = hooks_1.useSafePromise();
-    var onError = function (e) {
-        console.warn('Failed to load historic URIs', e);
-        setHistoricUris(null);
-    };
-    var loadData = react_1.useCallback(function () {
-        if (entityUri) {
-            setIsLoading(true);
-            safePromise(mdm_sdk_1.getHistoricUris({ entityUri: entityUri }))
-                .then(function (results) {
-                setHistoricUris(results);
-            })
-                .catch(onError)
-                .finally(function () {
-                setIsLoading(false);
-            });
-        }
-        else {
-            setHistoricUris(null);
-        }
-    }, [entityUri]);
-    react_1.useEffect(function () {
-        if (enabled) {
-            loadData();
-        }
-    }, [loadData, enabled]);
-    return { isLoading: isLoading, historicUris: historicUris };
-};
-exports.useHistoricUris = useHistoricUris;

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

@@ -1,18 +0,0 @@
-import { HistoryWithTotal } from '@reltio/mdm-sdk';
-declare type Props = {
-    entityUri: string;
-    enabled?: boolean;
-    historicUris: string[];
-    showAll?: boolean;
-    max?: number;
-    offset?: number;
-    order?: string;
-    filter?: string;
-};
-export declare const useHistoryWithTotal: ({ entityUri, enabled, historicUris, filter, ...options }: Props) => {
-    isLoading: boolean;
-    historyWithTotal: HistoryWithTotal;
-    loadMore: (offset: number) => void;
-    loadData: () => void;
-};
-export {};

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

@@ -1,79 +0,0 @@
-"use strict";
-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);
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useHistoryWithTotal = void 0;
-var react_1 = require("react");
-var mdm_sdk_1 = require("@reltio/mdm-sdk");
-var hooks_1 = require("../../../hooks");
-var useHistoryWithTotal = function (_a) {
-    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b, historicUris = _a.historicUris, filter = _a.filter, options = __rest(_a, ["entityUri", "enabled", "historicUris", "filter"]);
-    var _c = react_1.useState(null), historyWithTotal = _c[0], setHistoryWithTotal = _c[1];
-    var _d = react_1.useState(false), isLoading = _d[0], setIsLoading = _d[1];
-    var safePromise = hooks_1.useSafePromise();
-    var onError = function (e) {
-        console.warn('Failed to load history', e);
-        setHistoryWithTotal(null);
-    };
-    var loadData = react_1.useCallback(function () {
-        if (entityUri && historicUris) {
-            setIsLoading(true);
-            safePromise(mdm_sdk_1.getHistoryWithTotal(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options)))
-                .then(function (results) {
-                setHistoryWithTotal(results);
-            })
-                .catch(onError)
-                .finally(function () {
-                setIsLoading(false);
-            });
-        }
-        else {
-            setHistoryWithTotal(null);
-        }
-    }, [entityUri, historicUris, filter]);
-    var loadMore = react_1.useCallback(function (offset) {
-        if (entityUri && historicUris) {
-            setIsLoading(true);
-            safePromise(mdm_sdk_1.getHistoryWithTotal(__assign(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options), { offset: offset })))
-                .then(function (results) {
-                setHistoryWithTotal(function (prev) { return (__assign(__assign({}, prev), { changes: __spreadArray(__spreadArray([], prev === null || prev === void 0 ? void 0 : prev.changes), results.changes) })); });
-            })
-                .catch(onError)
-                .finally(function () {
-                setIsLoading(false);
-            });
-        }
-    }, [entityUri, historicUris, filter]);
-    react_1.useEffect(function () {
-        if (enabled) {
-            loadData();
-        }
-    }, [loadData, enabled]);
-    return { isLoading: isLoading, historyWithTotal: historyWithTotal, loadMore: loadMore, loadData: loadData };
-};
-exports.useHistoryWithTotal = useHistoryWithTotal;

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

@@ -1,9 +0,0 @@
-declare type Props = {
-    entityUri: string;
-    enabled?: boolean;
-};
-export declare const useHistoricUris: ({ entityUri, enabled }: Props) => {
-    isLoading: boolean;
-    historicUris: string[];
-};
-export {};

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

@@ -1,35 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { getHistoricUris } from '@reltio/mdm-sdk';
-import { useSafePromise } from '../../../hooks';
-export var useHistoricUris = function (_a) {
-    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b;
-    var _c = useState(null), historicUris = _c[0], setHistoricUris = _c[1];
-    var _d = useState(false), isLoading = _d[0], setIsLoading = _d[1];
-    var safePromise = useSafePromise();
-    var onError = function (e) {
-        console.warn('Failed to load historic URIs', e);
-        setHistoricUris(null);
-    };
-    var loadData = useCallback(function () {
-        if (entityUri) {
-            setIsLoading(true);
-            safePromise(getHistoricUris({ entityUri: entityUri }))
-                .then(function (results) {
-                setHistoricUris(results);
-            })
-                .catch(onError)
-                .finally(function () {
-                setIsLoading(false);
-            });
-        }
-        else {
-            setHistoricUris(null);
-        }
-    }, [entityUri]);
-    useEffect(function () {
-        if (enabled) {
-            loadData();
-        }
-    }, [loadData, enabled]);
-    return { isLoading: isLoading, historicUris: historicUris };
-};

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

@@ -1,18 +0,0 @@
-import { HistoryWithTotal } from '@reltio/mdm-sdk';
-declare type Props = {
-    entityUri: string;
-    enabled?: boolean;
-    historicUris: string[];
-    showAll?: boolean;
-    max?: number;
-    offset?: number;
-    order?: string;
-    filter?: string;
-};
-export declare const useHistoryWithTotal: ({ entityUri, enabled, historicUris, filter, ...options }: Props) => {
-    isLoading: boolean;
-    historyWithTotal: HistoryWithTotal;
-    loadMore: (offset: number) => void;
-    loadData: () => void;
-};
-export {};

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

@@ -1,75 +0,0 @@
-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);
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
-};
-import { useCallback, useEffect, useState } from 'react';
-import { getHistoryWithTotal } from '@reltio/mdm-sdk';
-import { useSafePromise } from '../../../hooks';
-export var useHistoryWithTotal = function (_a) {
-    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b, historicUris = _a.historicUris, filter = _a.filter, options = __rest(_a, ["entityUri", "enabled", "historicUris", "filter"]);
-    var _c = useState(null), historyWithTotal = _c[0], setHistoryWithTotal = _c[1];
-    var _d = useState(false), isLoading = _d[0], setIsLoading = _d[1];
-    var safePromise = useSafePromise();
-    var onError = function (e) {
-        console.warn('Failed to load history', e);
-        setHistoryWithTotal(null);
-    };
-    var loadData = useCallback(function () {
-        if (entityUri && historicUris) {
-            setIsLoading(true);
-            safePromise(getHistoryWithTotal(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options)))
-                .then(function (results) {
-                setHistoryWithTotal(results);
-            })
-                .catch(onError)
-                .finally(function () {
-                setIsLoading(false);
-            });
-        }
-        else {
-            setHistoryWithTotal(null);
-        }
-    }, [entityUri, historicUris, filter]);
-    var loadMore = useCallback(function (offset) {
-        if (entityUri && historicUris) {
-            setIsLoading(true);
-            safePromise(getHistoryWithTotal(__assign(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options), { offset: offset })))
-                .then(function (results) {
-                setHistoryWithTotal(function (prev) { return (__assign(__assign({}, prev), { changes: __spreadArray(__spreadArray([], prev === null || prev === void 0 ? void 0 : prev.changes), results.changes) })); });
-            })
-                .catch(onError)
-                .finally(function () {
-                setIsLoading(false);
-            });
-        }
-    }, [entityUri, historicUris, filter]);
-    useEffect(function () {
-        if (enabled) {
-            loadData();
-        }
-    }, [loadData, enabled]);
-    return { isLoading: isLoading, historyWithTotal: historyWithTotal, loadMore: loadMore, loadData: loadData };
-};