@reltio/components 1.4.907 → 1.4.911

package/esm/components/attributes/AttributesView/index.d.ts

@@ -3,5 +3,5 @@ import { AttributesViewOwnProps } from '../types';
 import AttributesView from './AttributesView';
 declare type Props = Pick<AttributesViewOwnProps, 'entity' | 'mode'>;
 export { AttributesView };
-declare const _default: import("react-redux").ConnectedComponent<({ mode, attributesCount, ...restProps }: AttributesViewOwnProps) => JSX.Element, import("react-redux").Omit<AttributesViewOwnProps, "entity" | "mode"> & Props>;
+declare const _default: import("react-redux").ConnectedComponent<({ mode, attributesCount, pinnedAttributes, ...restProps }: AttributesViewOwnProps) => JSX.Element, import("react-redux").Omit<AttributesViewOwnProps, "entity" | "mode"> & Props>;
 export default _default;

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

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import React, { memo, useCallback, useMemo } from 'react';
+import React, { memo, useCallback, useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import i18n from 'ui-i18n';
 import { getCreatableAttributeTypes, getAttributesListForEditMode, ModeType } from '@reltio/mdm-sdk';
@@ -20,12 +20,14 @@ import MoreAttributesButton from '../MoreAttributesButton';
 import { ALWAYS_VISIBLE_TYPE_URIS } from '../../../../constants';
 import { splitPagersData } from '../../helpers/attributesView';
 import { getMoreAttrTypes } from './helpers';
+import { PinnedAttributesContext } from '../contexts/PinnedAttributesContext';
 var AttributesList = function (_a) {
     var attrTypes = _a.attrTypes, entity = _a.entity, parentUri = _a.parentUri, showEmptyEditors = _a.showEmptyEditors, mode = _a.mode, crosswalks = _a.crosswalks, drawLines = _a.drawLines, children = _a.children, className = _a.className, _b = _a.alwaysVisibleTypeUris, alwaysVisibleTypeUris = _b === void 0 ? ALWAYS_VISIBLE_TYPE_URIS : _b, onAddAttributes = _a.onAddAttributes, onChangeAttribute = _a.onChangeAttribute, onDeleteAttribute = _a.onDeleteAttribute, additionalControlsRenderer = _a.additionalControlsRenderer, showNonOv = _a.showNonOv;
     var _c = entity.attributes, attributes = _c === void 0 ? {} : _c;
     var creatableAttrTypes = useMemo(function () { return getCreatableAttributeTypes(mode, attrTypes); }, [attrTypes, mode]);
     var moreAttrTypes = getMoreAttrTypes(creatableAttrTypes, entity);
-    var pagersData = useMemo(function () { return getAttributesListForEditMode(attrTypes, mode, entity, showEmptyEditors, showNonOv); }, [attrTypes, mode, entity, showEmptyEditors, showNonOv]);
+    var pinnedAttributes = useContext(PinnedAttributesContext);
+    var pagersData = useMemo(function () { return getAttributesListForEditMode(attrTypes, mode, entity, showEmptyEditors, showNonOv, pinnedAttributes); }, [attrTypes, mode, entity, showEmptyEditors, showNonOv, pinnedAttributes]);
     var _d = useMemo(function () { return splitPagersData(alwaysVisibleTypeUris, pagersData); }, [pagersData, alwaysVisibleTypeUris]), alwaysVisiblePagersData = _d[0], regularPagersData = _d[1];
     var onAddMoreAttributes = useCallback(function (attributeTypes) {
         onAddAttributes(attributeTypes.map(function (attributeType) { return ({ attributeType: attributeType, parentUri: parentUri }); }));

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

@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useCallback, useRef, useState, useContext, useMemo } from 'react';
 import { createNewAttribute, getAttributeOwnError, isComplexAttribute, isEditableMode as checkIsEditableMode, isEmptyValue } from '@reltio/mdm-sdk';
 import { add, always, has, ifElse, min, pipe, prop, T } from 'ramda';
 import BranchDecorator from '../../BranchDecorator/BranchDecorator';
@@ -10,6 +10,7 @@ import Attribute from '../AttributesFactory/Attribute';
 import Cardinality from './CardinalityMessage';
 import { useStyles } from './styles';
 import { filterNewValues } from './utils';
+import { PinnedAttributesContext } from '../contexts/PinnedAttributesContext';
 var AttributeRenderer = function (_a) {
     var max = _a.max, values = _a.values, attributeType = _a.attributeType, parentUri = _a.parentUri, mode = _a.mode, drawLines = _a.drawLines, showEmptyEditors = _a.showEmptyEditors, errorMessage = _a.errorMessage, errors = _a.errors, paging = _a.paging, crosswalks = _a.crosswalks, showNonOv = _a.showNonOv, onAddAttributes = _a.onAddAttributes, onDeleteAttribute = _a.onDeleteAttribute, onChangeAttribute = _a.onChangeAttribute, onDeactivateError = _a.onDeactivateError, additionalControlsRenderer = _a.additionalControlsRenderer, requestNextPageOfAttributeValues = _a.requestNextPageOfAttributeValues;
     var styles = useStyles();
@@ -17,8 +18,10 @@ var AttributeRenderer = function (_a) {
     var _c = useState(false), hadDeletions = _c[0], setHadDeletions = _c[1];
     var label = attributeType.label, isRequired = attributeType.required, cardinality = attributeType.cardinality, name = attributeType.name, attributeTypeUri = attributeType.uri;
     var isEditableMode = checkIsEditableMode(mode);
+    var pinnedAttributes = useContext(PinnedAttributesContext);
+    var isPinned = useMemo(function () { return pinnedAttributes === null || pinnedAttributes === void 0 ? void 0 : pinnedAttributes.includes(attributeTypeUri); }, [attributeTypeUri, pinnedAttributes]);
     var isEmptyValues = isEmptyValue(values);
-    var showEmpty = ((!hadDeletions && showEmptyEditors) || isRequired) && isEmptyValues;
+    var showEmpty = ((!hadDeletions && showEmptyEditors) || isRequired || isPinned) && isEmptyValues;
     var emptyEditorValue = useRef(createNewAttribute({
         parentUri: parentUri,
         attributeType: attributeType

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import { AttributesViewProps } from '../../types';
 declare type Props = Omit<AttributesViewProps, 'attributesCount'>;
-declare const AttributesView: ({ className, entity, mode, metadata, caption, excludeUris, includeUris }: Props) => JSX.Element;
+declare const AttributesView: ({ className, entity, mode, metadata, caption, excludeUris, includeUris, pinnedAttributes }: Props) => JSX.Element;
 export default AttributesView;

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

@@ -14,7 +14,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import classnames from 'classnames';
 import { pipe } from 'ramda';
 import mdmModule, { profile } from '@reltio/mdm-module';
-import { isTempUri } from '@reltio/mdm-sdk';
+import { isTempUri, getPinnedAttributesForUser } from '@reltio/mdm-sdk';
 import Box from '@material-ui/core/Box';
 import BasicView from '../../../BasicView/BasicView';
 import FacetViewHeader from '../../../FacetViewHeader/FacetViewHeader';
@@ -22,12 +22,18 @@ import AttributesList from '../AttributesList';
 import { ViewIdContext } from '../../../../contexts';
 import { getFilteredAttrTypes } from '../../helpers/attributesView';
 import { useStyles } from './styles';
+import { PinnedAttributesContext } from '../contexts/PinnedAttributesContext';
 var AttributesView = function (_a) {
     var _b;
-    var className = _a.className, _c = _a.entity, entity = _c === void 0 ? {} : _c, mode = _a.mode, metadata = _a.metadata, _d = _a.caption, caption = _d === void 0 ? '' : _d, _e = _a.excludeUris, excludeUris = _e === void 0 ? [] : _e, _f = _a.includeUris, includeUris = _f === void 0 ? [] : _f;
+    var className = _a.className, _c = _a.entity, entity = _c === void 0 ? {} : _c, mode = _a.mode, metadata = _a.metadata, _d = _a.caption, caption = _d === void 0 ? '' : _d, _e = _a.excludeUris, excludeUris = _e === void 0 ? [] : _e, _f = _a.includeUris, includeUris = _f === void 0 ? [] : _f, pinnedAttributes = _a.pinnedAttributes;
     var styles = useStyles();
     var dispatch = useDispatch();
     var viewId = useContext(ViewIdContext);
+    var userRoles = useSelector(mdmModule.selectors.getUserRoles);
+    var pinnedAttributeUris = useMemo(function () { return getPinnedAttributesForUser(pinnedAttributes, userRoles); }, [
+        pinnedAttributes,
+        userRoles
+    ]);
     var modifiedEntity = useSelector(function (state) { return mdmModule.selectors.getModifiedEntity(state, entity.uri) || {}; });
     var filteredAttrTypes = useMemo(function () { return getFilteredAttrTypes(metadata, modifiedEntity.type, includeUris, excludeUris); }, [excludeUris, includeUris, metadata, modifiedEntity.type]);
     var onAddAttributes = useCallback(function (params) {
@@ -38,6 +44,7 @@ var AttributesView = function (_a) {
     return (React.createElement(BasicView, { className: className },
         caption && React.createElement(FacetViewHeader, { className: styles.header, title: caption }),
         React.createElement(Box, { className: classnames(styles.attributesContainer, (_b = {}, _b[styles.noCaption] = !caption, _b)) },
-            React.createElement(AttributesList, { entity: modifiedEntity, attrTypes: filteredAttrTypes, parentUri: modifiedEntity.uri, drawLines: false, mode: mode, showEmptyEditors: isTempUri(modifiedEntity.uri), crosswalks: modifiedEntity.crosswalks, onAddAttributes: onAddAttributes, onChangeAttribute: onChangeAttribute, onDeleteAttribute: onDeleteAttribute }))));
+            React.createElement(PinnedAttributesContext.Provider, { value: pinnedAttributeUris },
+                React.createElement(AttributesList, { entity: modifiedEntity, attrTypes: filteredAttrTypes, parentUri: modifiedEntity.uri, drawLines: false, mode: mode, showEmptyEditors: isTempUri(modifiedEntity.uri), crosswalks: modifiedEntity.crosswalks, onAddAttributes: onAddAttributes, onChangeAttribute: onChangeAttribute, onDeleteAttribute: onDeleteAttribute })))));
 };
 export default AttributesView;

package/esm/components/attributes/editMode/AttributesView/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import AttributesView from './AttributesView';
 export { AttributesView };
-declare const _default: import("react-redux").ConnectedComponent<({ className, entity, mode, metadata, caption, excludeUris, includeUris }: {
+declare const _default: import("react-redux").ConnectedComponent<({ className, entity, mode, metadata, caption, excludeUris, includeUris, pinnedAttributes }: {
     entity?: import("@reltio/mdm-sdk").Entity | Record<string, never>;
     metadata: import("@reltio/mdm-sdk").Metadata;
     mode?: import("@reltio/mdm-sdk").Mode;
@@ -9,6 +9,10 @@ declare const _default: import("react-redux").ConnectedComponent<({ className, e
     includeUris?: string[];
     excludeUris?: string[];
     className?: string;
+    pinnedAttributes?: {
+        attributes: string[];
+        roles?: string[];
+    }[];
 }) => JSX.Element, import("react-redux").Omit<{
     entity?: import("@reltio/mdm-sdk").Entity | Record<string, never>;
     metadata: import("@reltio/mdm-sdk").Metadata;
@@ -17,5 +21,9 @@ declare const _default: import("react-redux").ConnectedComponent<({ className, e
     includeUris?: string[];
     excludeUris?: string[];
     className?: string;
+    pinnedAttributes?: {
+        attributes: string[];
+        roles?: string[];
+    }[];
 }, "metadata">>;
 export default _default;

package/esm/components/attributes/editMode/contexts/PinnedAttributesContext.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const PinnedAttributesContext: React.Context<string[]>;

package/esm/components/attributes/editMode/contexts/PinnedAttributesContext.js

@@ -0,0 +1,2 @@
+import React from 'react';
+export var PinnedAttributesContext = React.createContext(null);

package/esm/components/attributes/readMode/AttributesView/index.d.ts

@@ -9,6 +9,10 @@ declare const _default: import("react-redux").ConnectedComponent<({ className, e
     excludeUris?: string[];
     className?: string;
     attributesCount?: number;
+    pinnedAttributes?: {
+        attributes: string[];
+        roles?: string[];
+    }[];
 }) => JSX.Element, import("react-redux").Omit<{
     entity?: import("@reltio/mdm-sdk").Entity | Record<string, never>;
     metadata: import("@reltio/mdm-sdk").Metadata;
@@ -17,5 +21,9 @@ declare const _default: import("react-redux").ConnectedComponent<({ className, e
     excludeUris?: string[];
     className?: string;
     attributesCount?: number;
+    pinnedAttributes?: {
+        attributes: string[];
+        roles?: string[];
+    }[];
 }, "metadata">>;
 export default _default;

package/esm/components/attributes/types/attributesView.d.ts

@@ -6,6 +6,10 @@ declare type OwnProps = {
     entity?: Entity | Record<string, never>;
     excludeUris?: string[];
     includeUris?: string[];
+    pinnedAttributes?: {
+        attributes: string[];
+        roles?: string[];
+    }[];
     mode?: Mode;
 };
 declare type StateProps = {

package/esm/components/history/HistoryMenuButton/HistoryMenuButton.js

@@ -1,9 +1,35 @@
 import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import i18n from 'ui-i18n';
 import MoreVertIcon from '@material-ui/icons/MoreVert';
+import mdmModule, { HistoryMode, profile } from '@reltio/mdm-module';
 import { SmallIconButton } from '../../SmallIconButton';
+import DropDownMenuButton from '../../DropDownMenuButton/DropDownMenuButton';
+import MenuItemRenderer from './MenuItemRenderer';
 import { useStyles } from './styles';
 var HistoryMenuButton = function () {
     var styles = useStyles();
-    return React.createElement(SmallIconButton, { icon: MoreVertIcon, size: "XS", onClick: function () { }, className: styles.icon });
+    var mode = useSelector(mdmModule.selectors.getHistoryMode);
+    var dispatch = useDispatch();
+    var handleModeChange = function (selectedMode) {
+        dispatch(profile.history.actions.setHistoryMode(selectedMode));
+    };
+    var menuItems = [
+        {
+            text: i18n.text('Compare to Current view'),
+            selected: mode === HistoryMode.Current,
+            onClick: function () { return handleModeChange(HistoryMode.Current); }
+        },
+        {
+            text: i18n.text('Compare to Previous view'),
+            selected: mode === HistoryMode.Previous,
+            onClick: function () { return handleModeChange(HistoryMode.Previous); }
+        }
+    ];
+    return (React.createElement(DropDownMenuButton, { MenuItemRenderer: MenuItemRenderer, buttonComponent: SmallIconButton, buttonProps: {
+            icon: MoreVertIcon,
+            size: 'L',
+            className: styles.icon
+        }, menuId: 'history-menu', menuItems: menuItems }));
 };
 export default HistoryMenuButton;

package/esm/components/history/HistoryMenuButton/MenuItemRenderer.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+declare type Item = {
+    text: string;
+    selected: boolean;
+    onClick: (e: any) => void;
+};
+declare type Props = {
+    item: Item;
+    onMenuClose?: () => void;
+};
+declare const MenuItemRenderer: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLLIElement>>;
+export default MenuItemRenderer;

package/esm/components/history/HistoryMenuButton/MenuItemRenderer.js

@@ -0,0 +1,20 @@
+import React, { forwardRef } from 'react';
+import MenuItem from '@material-ui/core/MenuItem';
+import Typography from '@material-ui/core/Typography';
+import CheckIcon from '@material-ui/icons/Check';
+import { noop } from '../../../core';
+import { useStyles } from './styles';
+var MenuItemRenderer = forwardRef(function (_a, ref) {
+    var item = _a.item, _b = _a.onMenuClose, onMenuClose = _b === void 0 ? noop : _b;
+    var styles = useStyles();
+    var text = item.text, selected = item.selected, onClick = item.onClick;
+    var handleClick = function (e) {
+        onMenuClose();
+        onClick(e);
+    };
+    return (React.createElement(MenuItem, { classes: { root: styles.menuItem }, onClick: handleClick, ref: ref },
+        selected && React.createElement(CheckIcon, { className: styles.checkIcon }),
+        React.createElement(Typography, { classes: { root: styles.menuText } }, text)));
+});
+MenuItemRenderer.displayName = 'MenuItemRenderer';
+export default MenuItemRenderer;

package/esm/components/history/HistoryMenuButton/styles.d.ts

@@ -1 +1 @@
-export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"icon">;
+export declare const useStyles: (props?: any) => import("@material-ui/core/styles/withStyles").ClassNameMap<"icon" | "menuItem" | "menuText" | "checkIcon">;

package/esm/components/history/HistoryMenuButton/styles.js

@@ -2,5 +2,18 @@ import { makeStyles } from '@material-ui/core/styles';
 export var useStyles = makeStyles({
     icon: {
         margin: 5
+    },
+    menuItem: {
+        minHeight: '32px'
+    },
+    menuText: {
+        fontSize: '13px',
+        lineHeight: '15px',
+        letterSpacing: 0,
+        marginLeft: '30px'
+    },
+    checkIcon: {
+        position: 'absolute',
+        color: 'rgba(0, 0, 0, 0.54)'
     }
 });

package/esm/components/index.d.ts

@@ -122,3 +122,6 @@ export { default as OvIcon } from './attributes/OvIcon';
 export { default as RelationEditor } from './RelationEditor';
 export * from './workflow';
 export { ProfileMatchCard } from './ProfileMatchCard/ProfileMatchCard';
+export { MergeButton } from './MergeButton/MergeButton';
+export { NotMatchButton } from './NotMatchButton/NotMatchButton';
+export { ActionButton, ActionButtonMode } from './ActionButton/ActionButton';

package/esm/components/index.js

@@ -121,3 +121,6 @@ export { default as OvIcon } from './attributes/OvIcon';
 export { default as RelationEditor } from './RelationEditor';
 export * from './workflow';
 export { ProfileMatchCard } from './ProfileMatchCard/ProfileMatchCard';
+export { MergeButton } from './MergeButton/MergeButton';
+export { NotMatchButton } from './NotMatchButton/NotMatchButton';
+export { ActionButton, ActionButtonMode } from './ActionButton/ActionButton';

package/esm/contexts/CollaborationContext/index.d.ts

@@ -6,6 +6,7 @@ export declare const CollaborationContext: React.Context<{
     comments: Comment[];
     currentComment: Comment;
     getComments: (uri: string, pageToken?: string) => void;
+    getCommentsCount: (objectIds: string[]) => void;
     getComment: (commentId: Comment['commentId']) => void;
     createComment: (params: Pick<Comment, 'content' | 'namedUsers' | 'objectType' | 'relatedObjectUris'> & {
         uri: string;

package/esm/contexts/CollaborationContext/index.js

@@ -6,6 +6,7 @@ export var CollaborationContext = React.createContext({
     currentComment: null,
     getComment: noop,
     getComments: function () { return new Promise(noop); },
+    getCommentsCount: noop,
     createComment: function () { return new Promise(noop); },
     editComment: function () { return new Promise(noop); },
     createReply: function () { return new Promise(noop); },

package/esm/hooks/index.d.ts

@@ -13,3 +13,5 @@ export { useWhyDidYouUpdate } from './useWhyDidYouUpdate';
 export { useConfigPermissions } from './useConfigPermissions';
 export { useMatchesLoader } from './useMatchesLoader';
 export { usePagingSimulator } from './usePagingSimulator';
+export { useMergeAllRequest } from './useMergeAllRequest';
+export { useMarkAsNotMatchRequest } from './useMarkAsNotMatchRequest';

package/esm/hooks/index.js

@@ -13,3 +13,5 @@ export { useWhyDidYouUpdate } from './useWhyDidYouUpdate';
 export { useConfigPermissions } from './useConfigPermissions';
 export { useMatchesLoader } from './useMatchesLoader';
 export { usePagingSimulator } from './usePagingSimulator';
+export { useMergeAllRequest } from './useMergeAllRequest';
+export { useMarkAsNotMatchRequest } from './useMarkAsNotMatchRequest';

package/esm/hooks/useCollaboration.d.ts

@@ -1,19 +1,20 @@
 import { CollaborationObjectTypes, Comment, CommentsMap } from '@reltio/mdm-sdk';
 export declare const useCollaboration: (objectIds?: string[], objectTypes?: CollaborationObjectTypes[]) => {
-    commentsMap: CommentsMap;
-    currentComment: Comment;
+    clearCurrentComment: () => void;
     comments: Comment[];
-    getComment: (commentId: string) => void;
+    commentsMap: CommentsMap;
+    createComment: ({ content, namedUsers, objectType, uri, relatedObjectUris }: any) => Promise<void>;
     createReply: ({ content, namedUsers, commentId, action, uri }: any) => Promise<void>;
-    editComment: ({ content, namedUsers, objectType, uri, relatedObjectUris, commentId, replies }: any) => Promise<void>;
+    currentComment: Comment;
     deleteComment: ({ uri, commentId }: any) => void;
-    createComment: ({ content, namedUsers, objectType, uri, relatedObjectUris }: any) => Promise<void>;
-    clearCurrentComment: () => void;
-    resolveThread: ({ commentId, uri }: any) => void;
-    reOpenThread: ({ commentId, uri }: any) => void;
-    sending: boolean;
+    editComment: ({ content, namedUsers, objectType, uri, relatedObjectUris, commentId, replies }: any) => Promise<void>;
+    getComment: (commentId: string) => void;
+    getComments: (relatedObjectUri: string, pageToken?: string) => void;
+    getCommentsCount: (objectIds: string[], shouldResetCommentsMap?: any) => void;
     loading: boolean;
     objectTypes: CollaborationObjectTypes[];
-    getComments: (relatedObjectUri: string, pageToken?: string) => void;
     pageToken: string;
+    reOpenThread: ({ commentId, uri }: any) => void;
+    resolveThread: ({ commentId, uri }: any) => void;
+    sending: boolean;
 };

package/esm/hooks/useCollaboration.js

@@ -17,7 +17,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import { useCallback, useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { andThen, fromPairs, map, otherwise, pipe, props, uniqBy, prop, propEq, when, always } from 'ramda';
-import { createComment as createCommentRequest, createReply as createReplyRequest, getComment as getCommentRequest, getCommentsCount, updateComment as updateCommentRequest, deleteComment as deleteCommentRequest, getComments as getCommentsRequest, isTempUri } from '@reltio/mdm-sdk';
+import { createComment as createCommentRequest, createReply as createReplyRequest, getComment as getCommentRequest, getCommentsCount as getCommentsCountRequest, updateComment as updateCommentRequest, deleteComment as deleteCommentRequest, getComments as getCommentsRequest, isTempUri } from '@reltio/mdm-sdk';
 import mdm from '@reltio/mdm-module';
 var defaultObjectIds = [];
 var catchErrorInRequest = function (e) { return console.error('Collaboration error', e); };
@@ -33,18 +33,26 @@ export var useCollaboration = function (objectIds, objectTypes) {
     var _d = useState(null), currentComment = _d[0], setCurrentComment = _d[1];
     var _e = useState(false), sending = _e[0], setSending = _e[1];
     var _f = useState(false), loading = _f[0], setLoading = _f[1];
-    useEffect(function () {
-        if (isCollaborationEnabled && entity && !isTempUri(entity.uri)) {
+    var addCommentsToCommentsMap = useCallback(function (commentsMap) {
+        setCommentsMap(function (currentCommentsMap) { return (__assign(__assign({}, currentCommentsMap), commentsMap)); });
+    }, []);
+    var entityUri = entity === null || entity === void 0 ? void 0 : entity.uri;
+    var getCommentsCount = useCallback(function (objectIds, shouldResetCommentsMap) {
+        if (shouldResetCommentsMap === void 0) { shouldResetCommentsMap = false; }
+        if (isCollaborationEnabled && entityUri && !isTempUri(entityUri)) {
             var onError = function (e) {
                 console.warn('Collaboration error', e);
                 setCommentsMap(null);
             };
-            pipe(getCommentsCount, andThen(map(props(['objectId', 'comments']))), andThen(fromPairs), andThen(setCommentsMap), otherwise(onError))({ uris: objectIds, tenant: tenant, collaborationPath: collaborationPath });
+            pipe(getCommentsCountRequest, andThen(map(props(['objectId', 'comments']))), andThen(fromPairs), andThen(shouldResetCommentsMap ? setCommentsMap : addCommentsToCommentsMap), otherwise(onError))({ uris: objectIds, tenant: tenant, collaborationPath: collaborationPath });
         }
         else {
             setCommentsMap(null);
         }
-    }, [entity, isCollaborationEnabled, tenant, collaborationPath, objectIds]);
+    }, [addCommentsToCommentsMap, collaborationPath, entityUri, isCollaborationEnabled, tenant]);
+    useEffect(function () {
+        getCommentsCount(objectIds, true);
+    }, [objectIds, getCommentsCount]);
     var getComments = useCallback(function (relatedObjectUri, pageToken) {
         getCommentsRequest({ collaborationPath: collaborationPath, tenant: tenant, relatedObjectUri: relatedObjectUri, pageToken: pageToken })
             .then(function (_a) {
@@ -198,21 +206,22 @@ export var useCollaboration = function (objectIds, objectTypes) {
         setCurrentComment(null);
     }, []);
     return {
-        commentsMap: commentsMap,
-        currentComment: currentComment,
+        clearCurrentComment: clearCurrentComment,
         comments: comments,
-        getComment: getComment,
+        commentsMap: commentsMap,
+        createComment: createComment,
         createReply: createReply,
-        editComment: editComment,
+        currentComment: currentComment,
         deleteComment: deleteComment,
-        createComment: createComment,
-        clearCurrentComment: clearCurrentComment,
-        resolveThread: resolveThread,
-        reOpenThread: reOpenThread,
-        sending: sending,
+        editComment: editComment,
+        getComment: getComment,
+        getComments: getComments,
+        getCommentsCount: getCommentsCount,
         loading: loading,
         objectTypes: objectTypes,
-        getComments: getComments,
-        pageToken: pageToken
+        pageToken: pageToken,
+        reOpenThread: reOpenThread,
+        resolveThread: resolveThread,
+        sending: sending
     };
 };

package/esm/hooks/useMarkAsNotMatchRequest.d.ts

@@ -0,0 +1,12 @@
+import { Entity } from '@reltio/mdm-sdk';
+declare type Props = {
+    entities: Entity[];
+    entity: Entity;
+    onFinishRequest?: () => void;
+    onStartRequest?: () => void;
+};
+export declare const useMarkAsNotMatchRequest: ({ entities, entity, onFinishRequest, onStartRequest }: Props) => {
+    isPending: boolean;
+    sendMarkAsNotMatchRequest: () => void;
+};
+export {};

package/esm/hooks/useMarkAsNotMatchRequest.js

@@ -0,0 +1,22 @@
+import { isDataTenantEntity, markDataTenantEntityAsNotMatch, markMixedEntitiesAsNotMatches } from '@reltio/mdm-sdk';
+import { useSelector } from 'react-redux';
+import mdmModule from '@reltio/mdm-module';
+import { useCallback, useState } from 'react';
+export var useMarkAsNotMatchRequest = function (_a) {
+    var entities = _a.entities, entity = _a.entity, onFinishRequest = _a.onFinishRequest, onStartRequest = _a.onStartRequest;
+    var tenant = useSelector(mdmModule.selectors.getTenant);
+    var dtssPath = useSelector(mdmModule.selectors.getDtssPath);
+    var _b = useState(false), isPending = _b[0], setIsPending = _b[1];
+    var sendMarkAsNotMatchRequest = useCallback(function () {
+        onStartRequest === null || onStartRequest === void 0 ? void 0 : onStartRequest();
+        setIsPending(true);
+        var params = { dtssPath: dtssPath, customerTenant: tenant, entity: entity, entities: entities };
+        (isDataTenantEntity(entity)
+            ? markDataTenantEntityAsNotMatch(params)
+            : markMixedEntitiesAsNotMatches(params)).finally(function () {
+            onFinishRequest === null || onFinishRequest === void 0 ? void 0 : onFinishRequest();
+            setIsPending(false);
+        });
+    }, [dtssPath, entities, entity, onFinishRequest, onStartRequest, tenant]);
+    return { isPending: isPending, sendMarkAsNotMatchRequest: sendMarkAsNotMatchRequest };
+};

package/esm/hooks/useMergeAllRequest.d.ts

@@ -0,0 +1,12 @@
+import { Entity } from '@reltio/mdm-sdk';
+declare type Props = {
+    entities: Entity[];
+    entity: Entity;
+    onFinishRequest?: () => void;
+    onStartRequest?: () => void;
+};
+export declare const useMergeAllRequest: ({ entities, entity, onFinishRequest, onStartRequest }: Props) => {
+    isPending: boolean;
+    sendMergeAllRequest: () => void;
+};
+export {};

package/esm/hooks/useMergeAllRequest.js

@@ -0,0 +1,22 @@
+import { useCallback, useState } from 'react';
+import { useSelector } from 'react-redux';
+import mdmModule from '@reltio/mdm-module';
+import { isDataTenantEntity, mergeCustomerTenantEntityWithMixedEntities, mergeDataTenantEntity } from '@reltio/mdm-sdk';
+export var useMergeAllRequest = function (_a) {
+    var entities = _a.entities, entity = _a.entity, onFinishRequest = _a.onFinishRequest, onStartRequest = _a.onStartRequest;
+    var tenant = useSelector(mdmModule.selectors.getTenant);
+    var dtssPath = useSelector(mdmModule.selectors.getDtssPath);
+    var _b = useState(false), isPending = _b[0], setIsPending = _b[1];
+    var sendMergeAllRequest = useCallback(function () {
+        onStartRequest === null || onStartRequest === void 0 ? void 0 : onStartRequest();
+        setIsPending(true);
+        var params = { dtssPath: dtssPath, customerTenant: tenant, entity: entity, entities: entities };
+        (isDataTenantEntity(entity)
+            ? mergeDataTenantEntity(params)
+            : mergeCustomerTenantEntityWithMixedEntities(params)).finally(function () {
+            onFinishRequest === null || onFinishRequest === void 0 ? void 0 : onFinishRequest();
+            setIsPending(false);
+        });
+    }, [dtssPath, entities, entity, onFinishRequest, onStartRequest, tenant]);
+    return { isPending: isPending, sendMergeAllRequest: sendMergeAllRequest };
+};

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.907",
+  "version": "1.4.911",
   "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.907",
-    "@reltio/mdm-sdk": "^1.4.907",
+    "@reltio/mdm-module": "^1.4.911",
+    "@reltio/mdm-sdk": "^1.4.911",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",