@reltio/components 1.4.913 → 1.4.917

package/cjs/components/history/utils/filters.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDateRangeValid = exports.buildHistoryFilterString = void 0;
+var moment_1 = __importDefault(require("moment"));
+var ramda_1 = require("ramda");
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
+var HistoryFilter_1 = require("../types/HistoryFilter");
+var ActivityTypes_1 = require("../../activityLog/types/ActivityTypes");
+var types_1 = require("../../../types");
+var wrapInBrackets = function (str) { return "(" + str + ")"; };
+var multiValueFilter = function (filterClauseFn) { return ramda_1.pipe(ramda_1.map(filterClauseFn), ramda_1.join(' or ')); };
+var durationToTimestamp = function (period) {
+    var amount = period[0], unit = period[1];
+    return moment_1.default().subtract(amount, unit).valueOf();
+};
+var convertHistoryTypes = ramda_1.chain(ramda_1.cond([
+    [
+        ramda_1.equals(HistoryFilter_1.HistoryActivityType.MERGE),
+        function () { return [
+            ActivityTypes_1.ActivityTypes.ENTITIES_MERGED,
+            ActivityTypes_1.ActivityTypes.ENTITIES_MERGED_MANUALLY,
+            ActivityTypes_1.ActivityTypes.ENTITIES_MERGED_ON_THE_FLY
+        ]; }
+    ],
+    [ramda_1.equals(HistoryFilter_1.HistoryActivityType.UNMERGE), function () { return [ActivityTypes_1.ActivityTypes.ENTITIES_SPLITTED]; }],
+    [ramda_1.equals(HistoryFilter_1.HistoryActivityType.UPDATE), function () { return [ActivityTypes_1.ActivityTypes.ENTITY_CHANGED]; }]
+]));
+var buildActivityFilterClause = ramda_1.pipe(ramda_1.defaultTo([]), convertHistoryTypes, ramda_1.concat([ActivityTypes_1.ActivityTypes.ENTITY_CREATED, ActivityTypes_1.ActivityTypes.ENTITY_REMOVED, ActivityTypes_1.ActivityTypes.ENTITY_LOST_MERGE]), multiValueFilter(function (value) { return "equals(type, '" + value + "')"; }));
+var buildUserFilterClause = function (user) { return "equals(user, '" + mdm_sdk_1.escapeQueryValue(user) + "')"; };
+var buildAttributeFilterClause = function (attribute) { return "changes(" + mdm_sdk_1.escapeQueryValue(attribute.value) + ")"; };
+var buildDateRangeFilterClause = function (_a) {
+    var type = _a.type, period = _a.period;
+    switch (type) {
+        case types_1.DateRangeTypes.WITHIN: {
+            return "gte(timestamp, " + durationToTimestamp(period) + ")";
+        }
+        case types_1.DateRangeTypes.AGO: {
+            return "lte(timestamp, " + durationToTimestamp(period) + ")";
+        }
+        case types_1.DateRangeTypes.BETWEEN: {
+            var start = period[0], end = period[1];
+            return "gte(timestamp, " + start.valueOf() + ") and lte(timestamp, " + moment_1.default(end).endOf('date').valueOf() + ")";
+        }
+        default: {
+            return '';
+        }
+    }
+};
+exports.buildHistoryFilterString = ramda_1.pipe(ramda_1.defaultTo({}), ramda_1.reject(mdm_sdk_1.isEmptyValue), ramda_1.evolve({
+    users: multiValueFilter(buildUserFilterClause),
+    attributes: multiValueFilter(buildAttributeFilterClause),
+    dateRange: buildDateRangeFilterClause
+}), ramda_1.over(ramda_1.lensProp('activities'), buildActivityFilterClause), ramda_1.values, ramda_1.reject(mdm_sdk_1.isEmptyValue), ramda_1.append("not equals(user, 'collaboration-service')"), ramda_1.map(wrapInBrackets), ramda_1.join(' and '));
+var isDateRangeValid = function (value) {
+    if (value.type === types_1.DateRangeTypes.AGO || value.type === types_1.DateRangeTypes.WITHIN) {
+        var _a = value.period, amount = _a[0], unit = _a[1];
+        return ramda_1.type(amount) === 'Number' && ramda_1.type(unit) === 'String' && amount > 0;
+    }
+    else if (value.type === types_1.DateRangeTypes.BETWEEN) {
+        var _b = value.period, startDate = _b[0], endDate = _b[1];
+        return startDate instanceof Date && endDate instanceof Date;
+    }
+};
+exports.isDateRangeValid = isDateRangeValid;

package/cjs/components/index.d.ts

@@ -17,6 +17,7 @@ export { default as EditableAttribute } from './attributes/editMode/AttributesFa
 export { default as ReadOnlyAttributeValuesBlock } from './attributes/readMode/AttributeValuesBlock/AttributeValuesBlock';
 export { default as ReadOnlyAttributesList } from './attributes/readMode/AttributesList';
 export { default as ImageAttributesLine } from './attributes/readMode/ImageAttributesLine';
+export { default as EditableImageAttributesLine } from './attributes/editMode/ImageAttributesLine';
 export { default as NestedAttribute } from './attributes/readMode/NestedAttribute';
 export { default as ReferenceAttribute } from './attributes/readMode/ReferenceAttribute';
 export { default as SimpleAttribute } from './attributes/readMode/SimpleAttribute';

package/cjs/components/index.js

@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityTypeIcon = exports.EntityTypeBadge = exports.EntityAvatar = exports.EMPTY_STATE_VARIANTS = exports.EMPTY_STATE_ICONS = exports.EmptyState = exports.NoResults = exports.NoData = exports.DropDownSelector = exports.DropDownMenuButton = exports.Drawer = exports.DataTypeValue = exports.ConnectionRelationTypeSelector = exports.ConfigureColumnsPopup = exports.MenuWithPopper = exports.DropdownIndicatorWithIconButton = exports.DropdownIndicator = exports.CommentsContainer = exports.ColorBar = exports.CollapseButton = exports.CollaborationItem = exports.ClickAwayProvider = exports.BasicViewHeader = exports.BasicViewContent = exports.BasicView = exports.ProfileBandNavigation = exports.AvatarWithFallback = exports.AutoSizeList = exports.ReadOnlyAttributesPager = exports.SimpleAttribute = exports.ReferenceAttribute = exports.NestedAttribute = exports.ImageAttributesLine = exports.ReadOnlyAttributesList = exports.ReadOnlyAttributeValuesBlock = exports.EditableAttribute = exports.ReadOnlyAttribute = exports.CardinalityMessage = exports.AttributesPager = exports.SimpleAttributeEditor = exports.RelationTypeSelector = exports.ReferenceAttributeEditor = exports.NestedAttributeEditor = exports.MoreAttributesButton = exports.EntitySelector = exports.EntityCreator = exports.AttributesList = exports.BranchDecorator = exports.AttributesView = exports.AttributeListItem = void 0;
-exports.SimpleDropDownSelector = exports.SidePanelContentHeader = exports.SidePanel = exports.SideButtonsPanel = exports.SelectorWithOnlyOptionAutoSelect = exports.SelectionPopupPopper = exports.SelectionPopup = exports.useKeyboardNavigation = exports.WhiteSearchInput = exports.SearchInput = exports.ScoreLabel = exports.Score = exports.ResizablePanes = exports.ReltioGridLayout = exports.ReactSortableTreeUtils = exports.ReactSortableTreeHandlers = exports.ReactSortableTree = exports.ReactSelectOptionFilters = exports.MultiSelect = exports.QueryBuilderRowsGroup = exports.QueryBuilderRow = exports.ProfileCard = exports.ProfileBand = exports.PotentialMatchReviewCard = exports.PopupWithArrow = exports.Popper = exports.MultipleInput = exports.ModeSwitcherSelect = exports.ModeSwitcher = exports.TransitiveMatchBlock = exports.SimpleMatchRulesBuilder = exports.SimpleMatchRulesBlock = exports.MatchRulesBlock = exports.LoadingSpinner = exports.Link = exports.LinearLoadIndicator = exports.ImportModes = exports.ImportButton = exports.ImageGalleryDialog = exports.Highlighter = exports.HierarchicalAttributeTooltip = exports.HideOnShrink = exports.FlipCard = exports.FacetViewHeader = exports.ExpandedValueTooltip = exports.ErrorWrapper = exports.ErrorPopup = exports.ErrorBoundary = exports.EntityUriLink = exports.EntityTypesSelector = void 0;
-exports.ActionButtonMode = exports.ActionButton = exports.NotMatchButton = exports.MergeButton = exports.ProfileMatchCard = exports.RelationEditor = exports.OvIcon = exports.ErrorMessage = exports.ReltioMap = exports.ConfirmDeleteDialog = exports.ConfirmationDialog = exports.Marginator = exports.LightArrowTooltip = exports.ArrowExpandButton = exports.ScrollableTabs = exports.ExpandableSearchInput = exports.VirtualGroupedList = exports.ViewMoreToggle = exports.VerticalHeadingsTable = exports.VerticalDivider = exports.AttributeTitle = exports.Spacer = exports.SourceIcon = exports.SmallIconButtonWithTooltip = exports.SmallIconButton = void 0;
+exports.EntityTypeBadge = exports.EntityAvatar = exports.EMPTY_STATE_VARIANTS = exports.EMPTY_STATE_ICONS = exports.EmptyState = exports.NoResults = exports.NoData = exports.DropDownSelector = exports.DropDownMenuButton = exports.Drawer = exports.DataTypeValue = exports.ConnectionRelationTypeSelector = exports.ConfigureColumnsPopup = exports.MenuWithPopper = exports.DropdownIndicatorWithIconButton = exports.DropdownIndicator = exports.CommentsContainer = exports.ColorBar = exports.CollapseButton = exports.CollaborationItem = exports.ClickAwayProvider = exports.BasicViewHeader = exports.BasicViewContent = exports.BasicView = exports.ProfileBandNavigation = exports.AvatarWithFallback = exports.AutoSizeList = exports.ReadOnlyAttributesPager = exports.SimpleAttribute = exports.ReferenceAttribute = exports.NestedAttribute = exports.EditableImageAttributesLine = exports.ImageAttributesLine = exports.ReadOnlyAttributesList = exports.ReadOnlyAttributeValuesBlock = exports.EditableAttribute = exports.ReadOnlyAttribute = exports.CardinalityMessage = exports.AttributesPager = exports.SimpleAttributeEditor = exports.RelationTypeSelector = exports.ReferenceAttributeEditor = exports.NestedAttributeEditor = exports.MoreAttributesButton = exports.EntitySelector = exports.EntityCreator = exports.AttributesList = exports.BranchDecorator = exports.AttributesView = exports.AttributeListItem = void 0;
+exports.SidePanelContentHeader = exports.SidePanel = exports.SideButtonsPanel = exports.SelectorWithOnlyOptionAutoSelect = exports.SelectionPopupPopper = exports.SelectionPopup = exports.useKeyboardNavigation = exports.WhiteSearchInput = exports.SearchInput = exports.ScoreLabel = exports.Score = exports.ResizablePanes = exports.ReltioGridLayout = exports.ReactSortableTreeUtils = exports.ReactSortableTreeHandlers = exports.ReactSortableTree = exports.ReactSelectOptionFilters = exports.MultiSelect = exports.QueryBuilderRowsGroup = exports.QueryBuilderRow = exports.ProfileCard = exports.ProfileBand = exports.PotentialMatchReviewCard = exports.PopupWithArrow = exports.Popper = exports.MultipleInput = exports.ModeSwitcherSelect = exports.ModeSwitcher = exports.TransitiveMatchBlock = exports.SimpleMatchRulesBuilder = exports.SimpleMatchRulesBlock = exports.MatchRulesBlock = exports.LoadingSpinner = exports.Link = exports.LinearLoadIndicator = exports.ImportModes = exports.ImportButton = exports.ImageGalleryDialog = exports.Highlighter = exports.HierarchicalAttributeTooltip = exports.HideOnShrink = exports.FlipCard = exports.FacetViewHeader = exports.ExpandedValueTooltip = exports.ErrorWrapper = exports.ErrorPopup = exports.ErrorBoundary = exports.EntityUriLink = exports.EntityTypesSelector = exports.EntityTypeIcon = void 0;
+exports.ActionButtonMode = exports.ActionButton = exports.NotMatchButton = exports.MergeButton = exports.ProfileMatchCard = exports.RelationEditor = exports.OvIcon = exports.ErrorMessage = exports.ReltioMap = exports.ConfirmDeleteDialog = exports.ConfirmationDialog = exports.Marginator = exports.LightArrowTooltip = exports.ArrowExpandButton = exports.ScrollableTabs = exports.ExpandableSearchInput = exports.VirtualGroupedList = exports.ViewMoreToggle = exports.VerticalHeadingsTable = exports.VerticalDivider = exports.AttributeTitle = exports.Spacer = exports.SourceIcon = exports.SmallIconButtonWithTooltip = exports.SmallIconButton = exports.SimpleDropDownSelector = void 0;
 __exportStar(require("./activityLog"), exports);
 var AttributeListItem_1 = require("./AttributeListItem/AttributeListItem");
 Object.defineProperty(exports, "AttributeListItem", { enumerable: true, get: function () { return __importDefault(AttributeListItem_1).default; } });
@@ -52,6 +52,8 @@ var AttributesList_2 = require("./attributes/readMode/AttributesList");
 Object.defineProperty(exports, "ReadOnlyAttributesList", { enumerable: true, get: function () { return __importDefault(AttributesList_2).default; } });
 var ImageAttributesLine_1 = require("./attributes/readMode/ImageAttributesLine");
 Object.defineProperty(exports, "ImageAttributesLine", { enumerable: true, get: function () { return __importDefault(ImageAttributesLine_1).default; } });
+var ImageAttributesLine_2 = require("./attributes/editMode/ImageAttributesLine");
+Object.defineProperty(exports, "EditableImageAttributesLine", { enumerable: true, get: function () { return __importDefault(ImageAttributesLine_2).default; } });
 var NestedAttribute_2 = require("./attributes/readMode/NestedAttribute");
 Object.defineProperty(exports, "NestedAttribute", { enumerable: true, get: function () { return __importDefault(NestedAttribute_2).default; } });
 var ReferenceAttribute_2 = require("./attributes/readMode/ReferenceAttribute");

package/cjs/contexts/HistoryAppearanceContext/index.js

@@ -7,6 +7,8 @@ exports.HistoryDiffContext = void 0;
 var react_1 = __importDefault(require("react"));
 exports.HistoryDiffContext = react_1.default.createContext({
     appearance: undefined,
-    attributes: undefined
+    attributes: undefined,
+    roles: undefined,
+    tags: undefined
 });
 exports.HistoryDiffContext.displayName = 'HistoryDiffContext';

package/cjs/hooks/useMergeAllRequest.d.ts

@@ -4,8 +4,9 @@ declare type Props = {
     entity: Entity;
     onFinishRequest?: () => void;
     onStartRequest?: () => void;
+    onError?: () => void;
 };
-export declare const useMergeAllRequest: ({ entities, entity, onFinishRequest, onStartRequest }: Props) => {
+export declare const useMergeAllRequest: ({ entities, entity, onFinishRequest, onStartRequest, onError }: Props) => {
     isPending: boolean;
     sendMergeAllRequest: () => void;
 };

package/cjs/hooks/useMergeAllRequest.js

@@ -8,18 +8,21 @@ var react_1 = require("react");
 var react_redux_1 = require("react-redux");
 var mdm_module_1 = __importDefault(require("@reltio/mdm-module"));
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
+var core_1 = require("../core");
 var useMergeAllRequest = function (_a) {
-    var entities = _a.entities, entity = _a.entity, onFinishRequest = _a.onFinishRequest, onStartRequest = _a.onStartRequest;
+    var entities = _a.entities, entity = _a.entity, onFinishRequest = _a.onFinishRequest, onStartRequest = _a.onStartRequest, _b = _a.onError, onError = _b === void 0 ? core_1.noop : _b;
     var tenant = react_redux_1.useSelector(mdm_module_1.default.selectors.getTenant);
     var dtssPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getDtssPath);
-    var _b = react_1.useState(false), isPending = _b[0], setIsPending = _b[1];
+    var _c = react_1.useState(false), isPending = _c[0], setIsPending = _c[1];
     var sendMergeAllRequest = react_1.useCallback(function () {
         onStartRequest === null || onStartRequest === void 0 ? void 0 : onStartRequest();
         setIsPending(true);
         var params = { dtssPath: dtssPath, customerTenant: tenant, entity: entity, entities: entities };
         (mdm_sdk_1.isDataTenantEntity(entity)
             ? mdm_sdk_1.mergeDataTenantEntity(params)
-            : mdm_sdk_1.mergeCustomerTenantEntityWithMixedEntities(params)).finally(function () {
+            : mdm_sdk_1.mergeCustomerTenantEntityWithMixedEntities(params))
+            .catch(onError)
+            .finally(function () {
             onFinishRequest === null || onFinishRequest === void 0 ? void 0 : onFinishRequest();
             setIsPending(false);
         });

package/esm/components/MergeButton/MergeButton.d.ts

@@ -10,6 +10,7 @@ declare type Props = {
     disabled?: boolean;
     onStartRequest?: () => void;
     onFinishRequest?: () => void;
+    onError?: () => void;
 };
 export declare const MergeButton: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLLIElement>>;
 export {};

package/esm/components/MergeButton/MergeButton.js

@@ -27,12 +27,13 @@ import { noop } from '../../core';
 import { ActionButton, ActionButtonMode } from '../ActionButton/ActionButton';
 import { useMergeAllRequest } from '../../hooks';
 export var MergeButton = forwardRef(function (_a, ref) {
-    var className = _a.className, _b = _a.mode, mode = _b === void 0 ? ActionButtonMode.iconButton : _b, _c = _a.onMenuClose, onMenuClose = _c === void 0 ? noop : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, entity = _a.entity, entities = _a.entities, onStartRequest = _a.onStartRequest, onFinishRequest = _a.onFinishRequest, otherProps = __rest(_a, ["className", "mode", "onMenuClose", "disabled", "entity", "entities", "onStartRequest", "onFinishRequest"]);
+    var className = _a.className, _b = _a.mode, mode = _b === void 0 ? ActionButtonMode.iconButton : _b, _c = _a.onMenuClose, onMenuClose = _c === void 0 ? noop : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, entity = _a.entity, entities = _a.entities, onStartRequest = _a.onStartRequest, onFinishRequest = _a.onFinishRequest, onError = _a.onError, otherProps = __rest(_a, ["className", "mode", "onMenuClose", "disabled", "entity", "entities", "onStartRequest", "onFinishRequest", "onError"]);
     var sendMergeAllRequest = useMergeAllRequest({
         entity: entity,
         entities: entities,
         onStartRequest: onStartRequest,
-        onFinishRequest: onFinishRequest
+        onFinishRequest: onFinishRequest,
+        onError: onError
     }).sendMergeAllRequest;
     return (React.createElement(ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: i18n.text('Merge'), icon: MergeIcon, onClick: sendMergeAllRequest, onMenuClose: onMenuClose, ref: ref }, otherProps)));
 });

package/esm/components/SideIconPanel/SideButtonsPanel.d.ts

@@ -3,11 +3,11 @@ declare type Props = {
     buttonsProps: {
         icon: ElementType;
         tooltipTitle: string;
-        id: string;
+        id: number;
     }[];
-    activeIndex: number;
+    activeIndexId: number;
     className?: string;
-    onButtonClick: (index: number) => void;
+    onButtonClick: (id: number) => void;
 };
 export declare const SideButtonsPanel: VFC<Props>;
 export {};

package/esm/components/SideIconPanel/SideButtonsPanel.js

@@ -25,11 +25,11 @@ import classnames from 'classnames';
 import { SmallIconButtonWithTooltip } from '../SmallIconButton';
 import { useStyles } from './styles';
 export var SideButtonsPanel = function (_a) {
-    var buttonsProps = _a.buttonsProps, activeIndex = _a.activeIndex, className = _a.className, onButtonClick = _a.onButtonClick;
+    var buttonsProps = _a.buttonsProps, activeIndexId = _a.activeIndexId, className = _a.className, onButtonClick = _a.onButtonClick;
     var styles = useStyles();
-    return (React.createElement("div", { className: classnames(styles.container, className) }, buttonsProps.map(function (_a, index) {
+    return (React.createElement("div", { className: classnames(styles.container, className) }, buttonsProps.map(function (_a) {
         var _b;
         var id = _a.id, buttonProps = __rest(_a, ["id"]);
-        return (React.createElement(SmallIconButtonWithTooltip, __assign({}, buttonProps, { size: "S", key: id, className: classnames((_b = {}, _b[styles.active] = activeIndex === index, _b), styles.buttonWrapper), onClick: function () { return onButtonClick(index); }, "data-reltio-id": "reltio-profile-right-side-button-" + id })));
+        return (React.createElement(SmallIconButtonWithTooltip, __assign({}, buttonProps, { size: "S", key: id, className: classnames((_b = {}, _b[styles.active] = activeIndexId === id, _b), styles.buttonWrapper), onClick: function () { return onButtonClick(id); }, "data-reltio-id": "reltio-profile-right-side-button-" + id })));
     })));
 };

package/esm/components/SidePanel/SidePanelContentHeader/SidePanelContentHeader.d.ts

@@ -1,7 +1,8 @@
 import { ReactNode, VFC } from 'react';
 declare type HeaderProps = {
-    mainTitle: string;
-    secondTitle: string;
+    mainTitle?: string;
+    secondTitle?: string;
+    content?: ReactNode;
     rightContent?: ReactNode;
 };
 declare type Props = HeaderProps & {

package/esm/components/SidePanel/SidePanelContentHeader/SidePanelContentHeader.js

@@ -6,12 +6,13 @@ import Divider from '@material-ui/core/Divider';
 import i18n from 'ui-i18n';
 import { SmallIconButtonWithTooltip } from '../../SmallIconButton';
 export var SidePanelContentHeader = function (_a) {
-    var onClose = _a.onClose, mainTitle = _a.mainTitle, secondTitle = _a.secondTitle, rightContent = _a.rightContent;
+    var onClose = _a.onClose, mainTitle = _a.mainTitle, secondTitle = _a.secondTitle, content = _a.content, rightContent = _a.rightContent;
     var styles = useStyles();
     return (React.createElement("div", { className: styles.container },
         React.createElement(SmallIconButtonWithTooltip, { size: "S", icon: CloseIcon, onClick: onClose, className: styles.icon, tooltipTitle: i18n.text('Close') }),
-        React.createElement(Typography, { variant: "h6" }, mainTitle),
-        React.createElement(Divider, { orientation: "vertical", flexItem: true, className: styles.divider }),
-        React.createElement(Typography, { variant: "body1", color: "textSecondary", className: styles.secondTitle }, secondTitle),
-        rightContent));
+        content || (React.createElement(React.Fragment, null,
+            React.createElement(Typography, { variant: "h6" }, mainTitle),
+            React.createElement(Divider, { orientation: "vertical", flexItem: true, className: styles.divider }),
+            React.createElement(Typography, { variant: "body1", color: "textSecondary", className: styles.secondTitle }, secondTitle),
+            rightContent))));
 };

package/esm/components/attributes/AttributesView/index.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import mdm from '@reltio/mdm-module';
 import AttributesView from './AttributesView';
 var mapStateToProps = function (state, ownProps) { return ({
-    entity: ownProps.entity || mdm.selectors.getEntity(state),
+    entity: ownProps.entity || mdm.selectors.getEntityWithDiff(state),
     mode: ownProps.mode || mdm.selectors.getMode(state)
 }); };
 export { AttributesView };

package/esm/components/attributes/ImageAttributesLine/ImageAttributesLine.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import { AttributeType, ImageAttributeValue } from '@reltio/mdm-sdk';
+import { RequestNextPageOfAttributeValuesPayload } from '@reltio/mdm-module';
+import { AttributeType, ImageAttributeValue, Paging } from '@reltio/mdm-sdk';
 import { AttributeItem } from '../editMode/AttributesPager';
 import { SIZES_TYPE } from './styles';
 export declare type ImageRenderProps = {
@@ -19,6 +20,10 @@ declare type Props = {
     onUpload?: () => void;
     onDeleteAttribute?: (param: AttributeItem) => void;
     imageSize?: SIZES_TYPE;
+    paging?: Paging;
+    requestNextPageOfAttributeValues?: (payload: RequestNextPageOfAttributeValuesPayload) => void;
+    parentUri?: string;
+    showNonOv?: boolean;
 };
-declare const ImageAttributesLine: ({ attributeType, attributeValues, renderImage, overlay, countFixedItems, children, onUpload, onDeleteAttribute, imageSize }: Props) => JSX.Element;
+declare const ImageAttributesLine: ({ attributeType, attributeValues, renderImage, overlay, countFixedItems, children, onUpload, onDeleteAttribute, imageSize, paging, parentUri, showNonOv, requestNextPageOfAttributeValues }: Props) => JSX.Element;
 export default ImageAttributesLine;

package/esm/components/attributes/ImageAttributesLine/ImageAttributesLine.js

@@ -21,11 +21,25 @@ import { downloadImagesByURLs } from '../helpers/imageAttributes';
 import { DEFAULT_IMAGE_SIZE, IMAGE_MIN_VISIBLE_WIDTH } from './constants';
 import { useStyles } from './styles';
 var ImageAttributesLine = function (_a) {
-    var attributeType = _a.attributeType, _b = _a.attributeValues, attributeValues = _b === void 0 ? [] : _b, renderImage = _a.renderImage, _c = _a.overlay, overlay = _c === void 0 ? false : _c, _d = _a.countFixedItems, countFixedItems = _d === void 0 ? 0 : _d, children = _a.children, onUpload = _a.onUpload, onDeleteAttribute = _a.onDeleteAttribute, _e = _a.imageSize, imageSize = _e === void 0 ? DEFAULT_IMAGE_SIZE : _e;
+    var attributeType = _a.attributeType, _b = _a.attributeValues, attributeValues = _b === void 0 ? [] : _b, renderImage = _a.renderImage, _c = _a.overlay, overlay = _c === void 0 ? false : _c, _d = _a.countFixedItems, countFixedItems = _d === void 0 ? 0 : _d, children = _a.children, onUpload = _a.onUpload, onDeleteAttribute = _a.onDeleteAttribute, _e = _a.imageSize, imageSize = _e === void 0 ? DEFAULT_IMAGE_SIZE : _e, paging = _a.paging, parentUri = _a.parentUri, showNonOv = _a.showNonOv, requestNextPageOfAttributeValues = _a.requestNextPageOfAttributeValues;
     var entity = useSelector(mdm.selectors.getEntity) || {};
     var isViewMode = useSelector(mdm.selectors.getIsViewMode);
     var dispatch = useDispatch();
     var styles = useStyles(imageSize);
+    useEffect(function () {
+        if (paging && requestNextPageOfAttributeValues) {
+            var totalVisibleValues = showNonOv ? paging.totalOvValues : paging.totalValues;
+            if (totalVisibleValues > attributeValues.length) {
+                requestNextPageOfAttributeValues({
+                    parentUri: parentUri,
+                    attributeTypeUri: attributeType.uri,
+                    attributeTypeName: attributeType.name,
+                    values: [],
+                    defaultMaxValues: totalVisibleValues
+                });
+            }
+        }
+    }, [paging, requestNextPageOfAttributeValues, attributeType, parentUri, attributeValues.length, showNonOv]);
     var lastWidth = useRef();
     var _f = useState(0), maxItems = _f[0], setMaxItems = _f[1];
     var _g = useState(0), hiddenItemsLength = _g[0], setHiddenItemsLength = _g[1];

package/esm/components/attributes/editMode/AttributesPager/AttributesPager.js

@@ -56,7 +56,7 @@ var AttributesPager = function (_a) {
                 return (React.createElement(BranchDecorator, { enabled: drawLines },
                     React.createElement("div", { className: styles.wrapper },
                         React.createElement(Title, { label: attributeType === null || attributeType === void 0 ? void 0 : attributeType.label, attributeType: attributeType }),
-                        React.createElement(ImageAttributesLine, { attributeValues: visibleValues, attributeType: attributeType, onDeleteAttribute: onDeleteAttribute, parentUri: parentUri, onChangeAttribute: onChangeAttribute }))));
+                        React.createElement(ImageAttributesLine, { attributeValues: visibleValues, attributeType: attributeType, paging: paging, onDeleteAttribute: onDeleteAttribute, parentUri: parentUri, onChangeAttribute: onChangeAttribute, requestNextPageOfAttributeValues: requestNextPageOfAttributeValues, showNonOv: showNonOv }))));
             default:
                 return (React.createElement(AttributeRenderer, __assign({ values: visibleValues, attributeType: attributeType, max: max, paging: paging, crosswalks: crosswalks, showEmptyEditors: showEmptyEditors, drawLines: drawLines, requestNextPageOfAttributeValues: requestNextPageOfAttributeValues, showNonOv: showNonOv }, commonProps)));
         }

package/esm/components/attributes/editMode/ImageAttributesLine/ImageAttributesLine.d.ts

@@ -1,12 +1,18 @@
 /// <reference types="react" />
-import { AttributeType, ImageAttributeValue } from '@reltio/mdm-sdk';
+import { RequestNextPageOfAttributeValuesPayload } from '@reltio/mdm-module';
+import { AttributeType, ImageAttributeValue, Paging } from '@reltio/mdm-sdk';
 import { AttributeItem } from '../AttributesPager';
+import { SIZES_TYPE } from '../../ImageAttributesLine/styles';
 declare type Props = {
     attributeType: AttributeType;
     attributeValues: ImageAttributeValue[];
     onDeleteAttribute: (param: AttributeItem) => void;
     onChangeAttribute: (param: AttributeItem) => void;
     parentUri: string;
+    imageSize?: SIZES_TYPE;
+    paging?: Paging;
+    requestNextPageOfAttributeValues?: (payload: RequestNextPageOfAttributeValuesPayload) => void;
+    showNonOv?: boolean;
 };
-declare const ImageAttributesLine: ({ attributeType, attributeValues, onDeleteAttribute, onChangeAttribute, parentUri }: Props) => JSX.Element;
+declare const ImageAttributesLine: ({ attributeType, attributeValues, onDeleteAttribute, onChangeAttribute, requestNextPageOfAttributeValues, parentUri, paging, showNonOv, imageSize }: Props) => JSX.Element;
 export default ImageAttributesLine;

package/esm/components/attributes/editMode/ImageAttributesLine/ImageAttributesLine.js

@@ -8,17 +8,17 @@ import ImageActionsOverlay from '../../../Image/ImageActionsOverlay/ImageActions
 import { SmallIconButton } from '../../../SmallIconButton';
 import { UploadImageDialog } from '../../../UploadImageDialog/UploadImageDialog';
 import ImageAttributesLineCommon from '../../ImageAttributesLine';
-import { IMAGE_HEIGHT, IMAGE_MARGIN, IMAGE_WIDTH } from '../../ImageAttributesLine/constants';
+import { DEFAULT_IMAGE_SIZE } from '../../ImageAttributesLine/constants';
 import { useStyles } from './styles';
 var ImageAttributesLine = function (_a) {
-    var _b = _a.attributeType, attributeType = _b === void 0 ? {} : _b, _c = _a.attributeValues, attributeValues = _c === void 0 ? [] : _c, onDeleteAttribute = _a.onDeleteAttribute, onChangeAttribute = _a.onChangeAttribute, parentUri = _a.parentUri;
-    var styles = useStyles({ imageMargin: IMAGE_MARGIN, imageWidth: IMAGE_WIDTH, imageHeight: IMAGE_HEIGHT });
+    var _b = _a.attributeType, attributeType = _b === void 0 ? {} : _b, _c = _a.attributeValues, attributeValues = _c === void 0 ? [] : _c, onDeleteAttribute = _a.onDeleteAttribute, onChangeAttribute = _a.onChangeAttribute, requestNextPageOfAttributeValues = _a.requestNextPageOfAttributeValues, parentUri = _a.parentUri, paging = _a.paging, showNonOv = _a.showNonOv, _d = _a.imageSize, imageSize = _d === void 0 ? DEFAULT_IMAGE_SIZE : _d;
+    var styles = useStyles(imageSize);
     var entity = useSelector(mdmModule.selectors.getEntity) || {};
     var defaultProfilePic = useSelector(function (state) {
         return mdmModule.selectors.getModifiedEntityDefaultProfilePic(state, entity.uri);
     });
     var dispatch = useDispatch();
-    var _d = useState(false), isVisibleUploadDialog = _d[0], setIsVisibleUploadDialog = _d[1];
+    var _e = useState(false), isVisibleUploadDialog = _e[0], setIsVisibleUploadDialog = _e[1];
     var toggleVisibilityUploadDialog = useCallback(function () {
         setIsVisibleUploadDialog(function (visible) { return !visible; });
     }, []);
@@ -70,12 +70,12 @@ var ImageAttributesLine = function (_a) {
             var uri = attribute.uri;
             var onOpenImageGalleryDialog = methods.onOpenImageGalleryDialog;
             return (React.createElement("div", { className: styles.image, key: uri },
-                React.createElement(Image, { src: src, overlay: renderImageActionsOverlay(methods, attribute), onClick: function () { return onOpenImageGalleryDialog(uri); } })));
+                React.createElement(Image, { src: src, overlay: renderImageActionsOverlay(methods, attribute), onClick: function () { return onOpenImageGalleryDialog(uri); }, size: { imageWidth: imageSize.imageWidth, imageHeight: imageSize.imageHeight } })));
         };
         return renderImage;
     };
     return (React.createElement("div", { className: styles.root },
-        React.createElement(ImageAttributesLineCommon, { attributeValues: attributeValues, attributeType: attributeType, renderImage: renderImage, overlay: true, countFixedItems: 1, onUpload: toggleVisibilityUploadDialog, onDeleteAttribute: handleDeleteAttribute },
+        React.createElement(ImageAttributesLineCommon, { attributeValues: attributeValues, attributeType: attributeType, renderImage: renderImage, overlay: true, countFixedItems: 1, onUpload: toggleVisibilityUploadDialog, onDeleteAttribute: handleDeleteAttribute, imageSize: imageSize, requestNextPageOfAttributeValues: requestNextPageOfAttributeValues, paging: paging, parentUri: parentUri, showNonOv: showNonOv },
             React.createElement("div", { className: styles.uploadContainer, onClick: toggleVisibilityUploadDialog },
                 React.createElement(SmallIconButton, { className: styles.uploadButton, iconClassName: styles.uploadIcon, icon: CloudUploadIcon }))),
         React.createElement(UploadImageDialog, { open: isVisibleUploadDialog, onUpload: handleAddAttributes, onClose: toggleVisibilityUploadDialog })));

package/esm/components/attributes/editMode/SimpleAttributeEditor/selectors/helpers/parents.js

@@ -24,11 +24,13 @@ export var getParents = function (state, valueUri, node) {
     });
     var modifiedEntities = mdmModule.selectors.getModifiedEntities(state);
     var entityUri = mdmModule.selectors.getEntityUri(state);
+    var connections = mdmModule.selectors.getAllRelationsToAddAndEdit(state);
     var ownParentNodesValues = filterRelatedParentValuesForDependentLookupValueUri({
         parentValues: parentNodesValues,
         valueUri: valueUri,
         entityUri: entityUri,
-        modifiedEntities: modifiedEntities
+        modifiedEntities: modifiedEntities,
+        connections: connections
     });
     var neededParentsAttributeTypes = node.parents.map(function (type) {
         var parentNode = mdmModule.selectors.getDependentLookupsStructureNode(state, type);

package/esm/components/attributes/readMode/AttributesPager/AttributesPager.js

@@ -47,7 +47,7 @@ var AttributesPager = function (_a) {
             case RENDERER_TYPES.imageLine:
                 return (React.createElement(React.Fragment, null,
                     showTitle && React.createElement(Title, { label: attributeType === null || attributeType === void 0 ? void 0 : attributeType.label, attributeType: attributeType }),
-                    React.createElement(ImageAttributesLine, { attributeValues: visibleValues, attributeType: attributeType })));
+                    React.createElement(ImageAttributesLine, { attributeValues: visibleValues, attributeType: attributeType, paging: paging, parentUri: parentUri, requestNextPageOfAttributeValues: requestNextPageOfAttributeValues, showNonOv: showNonOv })));
             case RENDERER_TYPES.special:
                 return React.createElement(SpecialRenderer, { values: visibleValues, attributeType: attributeType, showTitle: showTitle });
         }

package/esm/components/attributes/readMode/ImageAttributesLine/ImageAttributesLine.d.ts

@@ -1,10 +1,15 @@
 /// <reference types="react" />
-import { AttributeType, ImageAttributeValue } from '@reltio/mdm-sdk';
+import { AttributeType, ImageAttributeValue, Paging } from '@reltio/mdm-sdk';
+import { RequestNextPageOfAttributeValuesPayload } from '@reltio/mdm-module';
 import { SIZES_TYPE } from '../../ImageAttributesLine/styles';
 declare type Props = {
     attributeValues: ImageAttributeValue[];
     attributeType: AttributeType;
     imageSize?: SIZES_TYPE;
+    paging?: Paging;
+    parentUri?: string;
+    showNonOv?: boolean;
+    requestNextPageOfAttributeValues?: (payload: RequestNextPageOfAttributeValuesPayload) => void;
 };
-declare const ImageAttributesLine: ({ attributeType, attributeValues, imageSize }: Props) => JSX.Element;
+declare const ImageAttributesLine: ({ attributeType, attributeValues, paging, parentUri, requestNextPageOfAttributeValues, showNonOv, imageSize }: Props) => JSX.Element;
 export default ImageAttributesLine;

package/esm/components/attributes/readMode/ImageAttributesLine/ImageAttributesLine.js

@@ -8,7 +8,7 @@ import { DEFAULT_IMAGE_SIZE } from '../../ImageAttributesLine/constants';
 import { getHistoryAppearanceByUri, getHistoryAttributeClassName } from '../helpers/historyAppearance';
 import { useStyles } from './styles';
 var ImageAttributesLine = function (_a) {
-    var attributeType = _a.attributeType, _b = _a.attributeValues, attributeValues = _b === void 0 ? [] : _b, _c = _a.imageSize, imageSize = _c === void 0 ? DEFAULT_IMAGE_SIZE : _c;
+    var attributeType = _a.attributeType, _b = _a.attributeValues, attributeValues = _b === void 0 ? [] : _b, paging = _a.paging, parentUri = _a.parentUri, requestNextPageOfAttributeValues = _a.requestNextPageOfAttributeValues, showNonOv = _a.showNonOv, _c = _a.imageSize, imageSize = _c === void 0 ? DEFAULT_IMAGE_SIZE : _c;
     var styles = useStyles(imageSize);
     var appearance = useContext(HistoryDiffContext).appearance;
     var renderImage = function (_a) {
@@ -26,6 +26,6 @@ var ImageAttributesLine = function (_a) {
         };
         return renderImage;
     };
-    return (React.createElement(ImageAttributesLineCommon, { attributeValues: attributeValues, attributeType: attributeType, renderImage: renderImage, imageSize: imageSize }));
+    return (React.createElement(ImageAttributesLineCommon, { attributeValues: attributeValues, attributeType: attributeType, renderImage: renderImage, imageSize: imageSize, requestNextPageOfAttributeValues: requestNextPageOfAttributeValues, paging: paging, parentUri: parentUri, showNonOv: showNonOv }));
 };
 export default ImageAttributesLine;

package/esm/components/history/HistoryFilterButton/HistoryFilterButton.js

@@ -11,12 +11,13 @@ var __assign = (this && this.__assign) || function () {
 };
 import React, { useState } from 'react';
 import i18n from 'ui-i18n';
-import { curry } from 'ramda';
+import { curry, dissoc } from 'ramda';
 import FilterListIcon from '@material-ui/icons/FilterList';
 import Button from '@material-ui/core/Button';
 import Popover from '@material-ui/core/Popover';
 import Typography from '@material-ui/core/Typography';
 import { SmallIconButton } from '../../SmallIconButton';
+import { isDateRangeValid } from '../utils/filters';
 import UserSelector from '../../UserSelector/UserSelector';
 import AttributeSelector from '../../AttributeSelector/AttributeSelector';
 import DateRangeSelector from '../DateRangeSelector/DateRangeSelector';
@@ -56,7 +57,12 @@ var HistoryFilterButton = function (_a) {
                 React.createElement(Button, { onClick: clearCurrentValue, className: styles.clearButton }, i18n.text('Clear all')),
                 React.createElement(Button, { onClick: closePopup }, i18n.text('Cancel')),
                 React.createElement(Button, { color: "primary", onClick: function () {
-                        onApplyFilter(currentValue);
+                        if (dateRange && isDateRangeValid(dateRange)) {
+                            onApplyFilter(currentValue);
+                        }
+                        else {
+                            onApplyFilter(dissoc('dateRange', currentValue));
+                        }
                         closePopup();
                     } }, i18n.text('Apply'))))));
 };

package/esm/components/history/HistoryTree/HistoryTree.js

@@ -10,12 +10,13 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import ReactResizeDetector from 'react-resize-detector';
 import i18n from 'ui-i18n';
 import { isNil } from 'ramda';
 import classnames from 'classnames';
-import { profile } from '@reltio/mdm-module';
+import { Mode } from '@reltio/mdm-sdk';
+import mdm, { profile } from '@reltio/mdm-module';
 import Button from '@material-ui/core/Button';
 import HistoryRow from '../HistoryRow/HistoryRow';
 import HistoryGraph from '../HistoryGraph/HistoryGraph';
@@ -26,6 +27,7 @@ var HistoryTree = function (_a) {
     var historyData = _a.historyData, isLoading = _a.isLoading, canLoadMore = _a.canLoadMore, onLoadMore = _a.onLoadMore, entityUri = _a.entityUri, historyEvent = _a.historyEvent, findPreviousChange = _a.findPreviousChange;
     var styles = useStyles();
     var dispatch = useDispatch();
+    var isEditableMode = useSelector(mdm.selectors.getIsEditableMode);
     var _c = useState({ historyLanes: {}, rows: [] }), graphData = _c[0], setGraphData = _c[1];
     var _d = useState(false), isScrollable = _d[0], setIsScrollable = _d[1];
     var _e = useState(-1), selectedIndex = _e[0], setSelectedIndex = _e[1];
@@ -54,6 +56,14 @@ var HistoryTree = function (_a) {
         setIsScrollable(scrollLeft < scrollWidth - clientWidth);
     };
     var handleHistoryRowClick = function (index, change, isSelected, isCurrent) {
+        if (isEditableMode) {
+            if (window.confirm(i18n.text('Are you sure you want to go in history mode? All your changes will be lost.'))) {
+                dispatch(profile.mode.actions.modeUpdated(Mode.Viewing));
+            }
+            else {
+                return;
+            }
+        }
         if ((isCurrent && !isSelected) || (!isCurrent && isSelected)) {
             dispatch(profile.history.actions.clearHistoryEvent());
             setSelectedIndex(0);

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { HistoryFilter } from '../types';
 declare type Props = {
     entityUri: string;
@@ -8,9 +7,10 @@ export declare const useHistory: ({ entityUri, enabled }: Props) => {
     isLoading: boolean;
     canLoadMore: boolean;
     onLoadMore: () => void;
+    onApplyFilter: (filter: HistoryFilter) => void;
     historicUris: string[];
     historyWithTotal: import("@reltio/mdm-sdk").HistoryWithTotal;
     historyFilter: HistoryFilter;
-    setHistoryFilter: import("react").Dispatch<import("react").SetStateAction<HistoryFilter>>;
+    reloadHistory: () => void;
 };
 export {};

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

@@ -1,11 +1,16 @@
 import { useState, useMemo, useCallback } from 'react';
 import { useHistoricUris } from './useHistoricUris';
 import { useHistoryWithTotal } from './useHistoryWithTotal';
+import { HistoryActivityType } from '../types';
+import { buildHistoryFilterString } from '../utils/filters';
 var MAX_HISTORY_ROWS = 32;
 export var useHistory = function (_a) {
     var entityUri = _a.entityUri, enabled = _a.enabled;
-    var _b = useState(null), historyFilter = _b[0], setHistoryFilter = _b[1];
+    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
@@ -13,29 +18,38 @@ export var useHistory = function (_a) {
     var _e = useHistoryWithTotal({
         entityUri: entityUri,
         enabled: enabled && !!historicUris,
+        filter: historyFilterString,
         historicUris: historicUris,
         max: MAX_HISTORY_ROWS,
         offset: historyPage * MAX_HISTORY_ROWS,
-        order: 'desc',
-        showAll: true
-    }), isHistoryLoading = _e.isLoading, historyWithTotal = _e.historyWithTotal, loadMore = _e.loadMore;
-    var canLoadMore = useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS <= (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
+        order: 'desc'
+    }), isHistoryLoading = _e.isLoading, historyWithTotal = _e.historyWithTotal, loadMore = _e.loadMore, loadData = _e.loadData;
+    var canLoadMore = useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS < (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
         historyWithTotal,
         historyPage
     ]);
+    var onApplyFilter = useCallback(function (filter) {
+        setHistoryPage(0);
+        setHistoryFilter(filter);
+    }, []);
     var onLoadMore = useCallback(function () {
         if (!canLoadMore)
             return;
         loadMore((historyPage + 1) * MAX_HISTORY_ROWS);
         setHistoryPage(historyPage + 1);
     }, [loadMore, historyPage, canLoadMore]);
+    var reloadHistory = useCallback(function () {
+        loadData();
+        setHistoryPage(0);
+    }, [loadData]);
     return {
         isLoading: isHistoryLoading || isHistoricUrisLoading,
         canLoadMore: canLoadMore,
         onLoadMore: onLoadMore,
+        onApplyFilter: onApplyFilter,
         historicUris: historicUris,
         historyWithTotal: historyWithTotal,
         historyFilter: historyFilter,
-        setHistoryFilter: setHistoryFilter
+        reloadHistory: reloadHistory
     };
 };

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

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