@reltio/components 1.4.2155 → 1.4.2156

package/ScreenProfileBand/ScreenProfileBand.test.js

@@ -51,7 +51,7 @@ import { getCommentsCount, getAllUsersForTenant, Mode } from '@reltio/mdm-sdk';
 import { ScreenProfileBand } from './ScreenProfileBand';
 import { MdmModuleProvider } from '../contexts/MdmModuleContext';
 import { ActionsHookProvider } from '../contexts/ActionsHookContext';
-jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getCommentsCount: jest.fn(), getTotalCommentsCount: jest.fn(function () { return Promise.resolve({ total: 1 }); }), getAllUsersForTenant: jest.fn() })); });
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getCommentsCount: jest.fn(), getAllUsersForTenant: jest.fn() })); });
 var defaultEntity = {
     uri: 'entities/uri1',
     type: 'configuration/entityTypes/HCO',

package/cjs/ScreenProfileBand/ScreenProfileBand.test.js

@@ -56,7 +56,7 @@ var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var ScreenProfileBand_1 = require("./ScreenProfileBand");
 var MdmModuleContext_1 = require("../contexts/MdmModuleContext");
 var ActionsHookContext_1 = require("../contexts/ActionsHookContext");
-jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getCommentsCount: jest.fn(), getTotalCommentsCount: jest.fn(function () { return Promise.resolve({ total: 1 }); }), getAllUsersForTenant: jest.fn() })); });
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getCommentsCount: jest.fn(), getAllUsersForTenant: jest.fn() })); });
 var defaultEntity = {
     uri: 'entities/uri1',
     type: 'configuration/entityTypes/HCO',

package/cjs/hooks/useCollaboration/useCollaboration.d.ts

@@ -3,8 +3,9 @@ type Props = {
     objectIds?: string[];
     objectTypes?: CollaborationObjectTypes[];
     enabled?: boolean;
+    needsTotalCount?: boolean;
 };
-export declare const useCollaboration: ({ objectIds, objectTypes, enabled }: Props) => {
+export declare const useCollaboration: ({ objectIds, objectTypes, enabled, needsTotalCount }: Props) => {
     clearCurrentComment: () => void;
     comments: Comment[];
     commentsMap: CommentsMap;

package/cjs/hooks/useCollaboration/useCollaboration.js

@@ -38,19 +38,19 @@ var getUpdatedReplies = function (comment, reply) {
 var defaultObjectIds = [];
 var catchErrorInRequest = function (e) { return console.warn('Collaboration error', e); };
 var useCollaboration = function (_a) {
-    var _b = _a.objectIds, objectIds = _b === void 0 ? defaultObjectIds : _b, objectTypes = _a.objectTypes, _c = _a.enabled, enabled = _c === void 0 ? true : _c;
+    var _b = _a.objectIds, objectIds = _b === void 0 ? defaultObjectIds : _b, objectTypes = _a.objectTypes, _c = _a.enabled, enabled = _c === void 0 ? true : _c, _d = _a.needsTotalCount, needsTotalCount = _d === void 0 ? false : _d;
     var entity = (0, MdmModuleContext_1.useMdmEntity)();
     var tenant = (0, MdmModuleContext_1.useMdmTenant)();
     var collaborationPath = (0, MdmModuleContext_1.useMdmCollaborationPath)();
     var isCollaborationEnabled = (0, MdmModuleContext_1.useMdmIsCollaborationEnabled)() && enabled;
-    var _d = (0, react_1.useState)(null), pageToken = _d[0], setPageToken = _d[1];
-    var _e = (0, react_1.useState)([]), comments = _e[0], setComments = _e[1];
-    var _f = (0, react_1.useState)(null), commentsMap = _f[0], setCommentsMap = _f[1];
-    var _g = (0, react_1.useState)(null), totalCommentsCount = _g[0], setTotalCommentsCount = _g[1];
-    var _h = (0, react_1.useState)(null), currentComment = _h[0], setCurrentComment = _h[1];
-    var _j = (0, react_1.useState)(false), sending = _j[0], setSending = _j[1];
-    var _k = (0, react_1.useState)(false), loading = _k[0], setLoading = _k[1];
-    var _l = (0, react_1.useState)({}), collaborationStateMap = _l[0], setCollaborationStateMap = _l[1];
+    var _e = (0, react_1.useState)(null), pageToken = _e[0], setPageToken = _e[1];
+    var _f = (0, react_1.useState)([]), comments = _f[0], setComments = _f[1];
+    var _g = (0, react_1.useState)(null), commentsMap = _g[0], setCommentsMap = _g[1];
+    var _h = (0, react_1.useState)(null), totalCommentsCount = _h[0], setTotalCommentsCount = _h[1];
+    var _j = (0, react_1.useState)(null), currentComment = _j[0], setCurrentComment = _j[1];
+    var _k = (0, react_1.useState)(false), sending = _k[0], setSending = _k[1];
+    var _l = (0, react_1.useState)(false), loading = _l[0], setLoading = _l[1];
+    var _m = (0, react_1.useState)({}), collaborationStateMap = _m[0], setCollaborationStateMap = _m[1];
     var addCommentsToCommentsMap = (0, react_1.useCallback)(function (commentsMap) {
         setCommentsMap(function (currentCommentsMap) { return (__assign(__assign({}, currentCommentsMap), commentsMap)); });
     }, []);
@@ -58,18 +58,16 @@ var useCollaboration = function (_a) {
     var isCollaborationEnabledForEntity = isCollaborationEnabled && entityUri && !(0, mdm_sdk_1.isTempUri)(entityUri);
     var getCommentsCount = (0, react_1.useCallback)(function (objectIds, shouldResetCommentsMap) {
         if (shouldResetCommentsMap === void 0) { shouldResetCommentsMap = false; }
-        if (!isCollaborationEnabledForEntity || totalCommentsCount == null) {
-            return setCommentsMap(null);
-        }
-        if (totalCommentsCount === 0) {
-            return shouldResetCommentsMap && setCommentsMap({});
+        if (!isCollaborationEnabledForEntity) {
+            setCommentsMap(null);
+            return;
         }
         var onError = function (e) {
             console.warn('Collaboration error', e);
             setCommentsMap(null);
         };
         (0, ramda_1.pipe)(mdm_sdk_1.getCommentsCount, (0, ramda_1.andThen)((0, ramda_1.map)((0, ramda_1.props)(['objectId', 'comments']))), (0, ramda_1.andThen)(ramda_1.fromPairs), (0, ramda_1.andThen)(shouldResetCommentsMap ? setCommentsMap : addCommentsToCommentsMap), (0, ramda_1.otherwise)(onError))({ uris: objectIds, tenant: tenant, collaborationPath: collaborationPath });
-    }, [addCommentsToCommentsMap, collaborationPath, isCollaborationEnabledForEntity, tenant, totalCommentsCount]);
+    }, [addCommentsToCommentsMap, collaborationPath, isCollaborationEnabledForEntity, tenant]);
     var getTotalCommentsCount = (0, react_1.useCallback)(function () {
         if (isCollaborationEnabledForEntity) {
             var onError = function (e) {
@@ -87,8 +85,10 @@ var useCollaboration = function (_a) {
         }
     }, [isCollaborationEnabledForEntity, collaborationPath, entityUri, tenant]);
     (0, react_1.useEffect)(function () {
-        getTotalCommentsCount();
-    }, [getTotalCommentsCount]);
+        if (needsTotalCount) {
+            getTotalCommentsCount();
+        }
+    }, [getTotalCommentsCount, needsTotalCount]);
     (0, react_1.useEffect)(function () {
         getCommentsCount(objectIds, true);
     }, [objectIds, getCommentsCount]);
@@ -127,16 +127,22 @@ var useCollaboration = function (_a) {
         setComments((0, ramda_1.map)((0, ramda_1.when)((0, ramda_1.propEq)('commentId', comment.commentId), (0, ramda_1.always)(comment))));
     };
     var deleteCommentFromState = function (commentId, uri) {
+        var repliesCountFromComments;
+        var repliesCountFromCommentsMap;
         setCurrentComment(null);
         setCommentsMap(function (prevCommentsMap) {
             var _a;
+            var _b, _c;
+            repliesCountFromCommentsMap = (_c = (_b = prevCommentsMap === null || prevCommentsMap === void 0 ? void 0 : prevCommentsMap[uri]) === null || _b === void 0 ? void 0 : _b.find(function (c) { return c.commentId === commentId; })) === null || _c === void 0 ? void 0 : _c.replies;
             var comments = prevCommentsMap[uri] || [];
             return __assign(__assign({}, prevCommentsMap), (_a = {}, _a[uri] = comments.filter(function (c) { return c.commentId !== commentId; }), _a));
         });
         setComments(function (prevComments) {
+            var _a;
+            repliesCountFromComments = (_a = prevComments.find(function (comment) { return comment.commentId === commentId; })) === null || _a === void 0 ? void 0 : _a.replies.length;
             return prevComments.filter(function (comment) { return comment.commentId !== commentId; });
         });
-        setTotalCommentsCount(function (prevCount) { return Math.max((prevCount || 0) - 1, 0); });
+        setTotalCommentsCount(function (prevCount) { var _a; return Math.max((prevCount || 0) - (1 + ((_a = repliesCountFromComments !== null && repliesCountFromComments !== void 0 ? repliesCountFromComments : repliesCountFromCommentsMap) !== null && _a !== void 0 ? _a : 0)), 0); });
     };
     var createComment = (0, react_1.useCallback)(function (_a) {
         var content = _a.content, namedUsers = _a.namedUsers, objectType = _a.objectType, uri = _a.uri, relatedObjectUris = _a.relatedObjectUris;

package/cjs/hooks/useCollaboration/useCollaboration.test.js

@@ -97,31 +97,6 @@ describe('useCollaboration behaviour', function () {
         expect(mdm_sdk_1.getCommentsCount).not.toHaveBeenCalled();
         expect(mdm_sdk_1.getTotalCommentsCount).not.toHaveBeenCalled();
     });
-    it('should not call getCommentsCount if totalCommentsCount is 0', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValue({ total: 0 });
-                    result = setUp().result;
-                    return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
-                    expect(mdm_sdk_1.getCommentsCount).not.toHaveBeenCalled();
-                    expect(result.current.commentsMap).toEqual({});
-                    return [2 /*return*/];
-            }
-        });
-    }); });
     it('should call getCommentsCount if collaboration is enabled and uris is undefined and update commentsMap value', function () { return __awaiter(void 0, void 0, void 0, function () {
         var result;
         return __generator(this, function (_a) {
@@ -152,7 +127,7 @@ describe('useCollaboration behaviour', function () {
             }
         });
     }); });
-    it('should call getCommentsCount if collaboration is enabled and totalCommentsCount is more then 0 and update commentsMap value', function () { return __awaiter(void 0, void 0, void 0, function () {
+    it('should call getCommentsCount if collaboration is enabled and update commentsMap value', function () { return __awaiter(void 0, void 0, void 0, function () {
         var comments, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -162,8 +137,12 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id2', status: 'open', replies: 2 }
                     ];
                     mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: comments }]);
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 2 });
                     result = setUp({ props: { objectIds: ['uri1'] } }).result;
+                    expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalledWith({
+                        uris: ['uri1'],
+                        tenant: 'alenat',
+                        collaborationPath: defaultMdmValues.collaborationPath
+                    });
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -176,24 +155,19 @@ describe('useCollaboration behaviour', function () {
                         }); })];
                 case 1:
                     _a.sent();
-                    expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalledWith({
-                        uris: ['uri1'],
-                        tenant: 'alenat',
-                        collaborationPath: defaultMdmValues.collaborationPath
-                    });
                     expect(result.current.commentsMap).toEqual({ uri1: comments });
                     return [2 /*return*/];
             }
         });
     }); });
-    it('should set commentsMap value as null in case of unsuccessful getCommentsCount request', function () { return __awaiter(void 0, void 0, void 0, function () {
+    it('should set commentsMap value as null in case of unsuccessful request', function () { return __awaiter(void 0, void 0, void 0, function () {
         var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 1 });
-                    mdm_sdk_1.getCommentsCount.mockRejectedValueOnce(new Error('Fail'));
+                    mdm_sdk_1.getCommentsCount.mockRejectedValueOnce(null);
                     result = setUp().result;
+                    expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalled();
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -206,7 +180,6 @@ describe('useCollaboration behaviour', function () {
                         }); })];
                 case 1:
                     _a.sent();
-                    expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalled();
                     expect(result.current.commentsMap).toBe(null);
                     return [2 /*return*/];
             }
@@ -228,20 +201,7 @@ describe('useCollaboration behaviour', function () {
                             return Promise.resolve([{ objectId: 'uri2', comments: secondComments }]);
                         }
                     });
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 3 });
                     result = setUp({ props: { objectIds: ['uri1'] } }).result;
-                    return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
                     expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri1'],
                         tenant: 'alenat',
@@ -253,7 +213,7 @@ describe('useCollaboration behaviour', function () {
                                 return [2 /*return*/];
                             });
                         }); })];
-                case 2:
+                case 1:
                     _a.sent();
                     expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri2'],
@@ -281,20 +241,7 @@ describe('useCollaboration behaviour', function () {
                             return Promise.resolve([{ objectId: 'uri2', comments: secondComments }]);
                         }
                     });
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValue({ total: 3 });
                     _a = setUp({ props: { objectIds: ['uri1'] } }), result = _a.result, rerender = _a.rerender;
-                    return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _b.sent();
                     expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri1'],
                         tenant: 'alenat',
@@ -312,7 +259,7 @@ describe('useCollaboration behaviour', function () {
                                 }
                             });
                         }); })];
-                case 2:
+                case 1:
                     _b.sent();
                     expect(mdm_sdk_1.getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri2'],
@@ -449,12 +396,7 @@ describe('useCollaboration behaviour', function () {
                             replies: 2
                         }
                     ];
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 3 });
-                    mdm_sdk_1.getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: comments }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: __spreadArray(__spreadArray([], comments, true), [{ commentId: 'commentId', replies: 0, status: 'open' }], false) }
-                    ]);
+                    mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: comments }]);
                     mdm_sdk_1.createComment.mockResolvedValueOnce([{ commentId: 'commentId' }]);
                     result = setUp().result;
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -472,16 +414,33 @@ describe('useCollaboration behaviour', function () {
                     expect(result.current.commentsMap).toEqual({ uri1: comments });
                     expect(result.current.currentComment).toBe(null);
                     expect(result.current.sending).toBe(false);
+                    (0, react_hooks_1.act)(function () {
+                        result.current.createComment({
+                            content: 'content',
+                            namedUsers: [],
+                            objectType: 'entity',
+                            relatedObjectUris: ['uri1'],
+                            uri: 'uri1'
+                        });
+                    });
+                    expect(result.current.sending).toBe(true);
+                    expect(mdm_sdk_1.createComment).toHaveBeenCalledWith({
+                        collaborationPath: '123',
+                        tenant: 'alenat',
+                        data: {
+                            objectId: 'uri1',
+                            content: 'content',
+                            relatedObjectUris: ['uri1'],
+                            objectType: 'entity',
+                            visibility: 'public',
+                            namedUsers: [],
+                            permanentLink: 'https://tst-01.reltio.com/nui/alenat/profile?entityUri=entities%2F2jWtLtNc&commentId=%7BcommentId%7D'
+                        }
+                    });
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, result.current.createComment({
-                                            content: 'content',
-                                            namedUsers: [],
-                                            objectType: 'entity',
-                                            relatedObjectUris: ['uri1'],
-                                            uri: 'uri1'
-                                        })];
+                                    case 0: return [4 /*yield*/, Promise.resolve()];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -498,23 +457,15 @@ describe('useCollaboration behaviour', function () {
                         uri1: __spreadArray(__spreadArray([], comments, true), [{ commentId: 'commentId', replies: 0, status: 'open' }], false)
                     });
                     mdm_sdk_1.createComment.mockResolvedValueOnce([{ commentId: 'commentId2' }]);
-                    mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: __spreadArray(__spreadArray([], comments, true), [{ commentId: 'commentId', replies: 0, status: 'open' }], false) },
-                        { objectId: 'uri2', comments: [{ commentId: 'commentId2', replies: 0, status: 'open' }] }
-                    ]);
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, result.current.createComment({
-                                            content: 'content',
-                                            namedUsers: [],
-                                            objectType: 'entity',
-                                            uri: 'uri2'
-                                        })];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
+                                result.current.createComment({
+                                    content: 'content',
+                                    namedUsers: [],
+                                    objectType: 'entity',
+                                    uri: 'uri2'
+                                });
+                                return [2 /*return*/];
                             });
                         }); })];
                 case 3:
@@ -543,14 +494,7 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', content: 'first comment', status: 'open', replies: [] },
                         { commentId: 'id2', content: 'second comment', status: 'open', replies: [] }
                     ];
-                    mdm_sdk_1.getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'open', replies: 3 }] }
-                    ])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'resolved', replies: 4 }] }
-                    ]);
+                    mdm_sdk_1.getCommentsCount.mockResolvedValue([{ objectId: 'uri1', comments: commentsCount }]);
                     mdm_sdk_1.getComments.mockResolvedValue({ items: comments });
                     mdm_sdk_1.getComment.mockResolvedValueOnce({
                         commentId: 'id2',
@@ -683,11 +627,7 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', status: 'open', content: 'first comment', replies: [] },
                         { commentId: 'id2', status: 'open', content: 'second comment', replies: [] }
                     ];
-                    mdm_sdk_1.getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'resolved', replies: 3 }] }
-                    ]);
+                    mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     mdm_sdk_1.getComment.mockResolvedValueOnce({ commentId: 'id2', replies: [] });
                     mdm_sdk_1.getComments.mockResolvedValue({ items: comments });
                     mdm_sdk_1.createReply.mockResolvedValueOnce([{ content: '', action: 'resolve' }]);
@@ -760,11 +700,7 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', status: 'open', content: 'first comment', replies: [] },
                         { commentId: 'id2', status: 'open', content: 'second comment', replies: [] }
                     ];
-                    mdm_sdk_1.getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'open', replies: 3 }] }
-                    ]);
+                    mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     mdm_sdk_1.getComment.mockResolvedValueOnce({ commentId: 'id2', replies: [] });
                     mdm_sdk_1.getComments.mockResolvedValue({
                         items: comments
@@ -937,12 +873,9 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', content: 'text 1', status: 'open', replies: [] },
                         { commentId: 'id2', content: 'text2', status: 'open', replies: [] }
                     ];
-                    expectedCommentsCount = [{ commentId: 'id2', status: 'open', replies: 0 }];
-                    expectedComments = [{ commentId: 'id2', content: 'text2', status: 'open', replies: [] }];
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 2 });
-                    mdm_sdk_1.getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: expectedCommentsCount }]);
+                    expectedCommentsCount = commentsCount.slice(1);
+                    expectedComments = comments.slice(1);
+                    mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     mdm_sdk_1.getComments.mockResolvedValueOnce({ items: comments });
                     mdm_sdk_1.deleteComment.mockResolvedValueOnce('');
                     result = setUp().result;
@@ -957,20 +890,28 @@ describe('useCollaboration behaviour', function () {
                     expect(result.current.comments).toEqual(comments);
                     expect(result.current.commentsMap).toEqual({ uri1: commentsCount });
                     expect(result.current.sending).toBe(false);
+                    (0, react_hooks_1.act)(function () {
+                        result.current.deleteComment({ commentId: 'id1', uri: 'uri1' });
+                    });
+                    expect(result.current.sending).toBe(true);
+                    expect(mdm_sdk_1.deleteComment).toHaveBeenCalledWith({
+                        collaborationPath: '123',
+                        tenant: 'alenat',
+                        commentId: 'id1'
+                    });
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                result.current.deleteComment({ commentId: 'id1', uri: 'uri1' });
-                                return [2 /*return*/];
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, Promise.resolve()];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
                             });
                         }); })];
                 case 2:
                     _a.sent();
                     expect(result.current.sending).toBe(false);
-                    expect(mdm_sdk_1.deleteComment).toHaveBeenCalledWith({
-                        collaborationPath: '123',
-                        tenant: 'alenat',
-                        commentId: 'id1'
-                    });
                     expect(result.current.commentsMap).toEqual({
                         uri1: expectedCommentsCount
                     });
@@ -988,23 +929,13 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', status: 'open', replies: 1 },
                         { commentId: 'id2', status: 'open', replies: 2 }
                     ];
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: commentsCount.length });
-                    mdm_sdk_1.getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'open', replies: 2 }] },
-                        { objectId: 'uri2', comments: [] }
-                    ]);
+                    mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     mdm_sdk_1.createReply.mockResolvedValueOnce([{ content: 'reply message' }]);
                     result = setUp().result;
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
+                                Promise.resolve();
+                                return [2 /*return*/];
                             });
                         }); })];
                 case 1:
@@ -1021,9 +952,6 @@ describe('useCollaboration behaviour', function () {
                                             uri: 'uri2'
                                         })];
                                     case 1:
-                                        _a.sent();
-                                        return [4 /*yield*/, Promise.resolve()];
-                                    case 2:
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
@@ -1050,23 +978,14 @@ describe('useCollaboration behaviour', function () {
                     ];
                     expectedCommentsCount = [{ commentId: 'id1', status: 'open', replies: 0 }];
                     expectedComments = [{ commentId: 'id1', content: 'text 1', status: 'open', replies: [] }];
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 2 }).mockResolvedValueOnce({ total: 1 });
-                    mdm_sdk_1.getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: expectedCommentsCount }]);
+                    mdm_sdk_1.getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     mdm_sdk_1.getComments.mockResolvedValue({ items: comments });
                     mdm_sdk_1.deleteReply.mockResolvedValueOnce('');
                     result = setUp().result;
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        result.current.getComments('uri');
-                                        return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
+                                result.current.getComments('uri');
+                                return [2 /*return*/];
                             });
                         }); })];
                 case 1:
@@ -1074,16 +993,24 @@ describe('useCollaboration behaviour', function () {
                     expect(result.current.comments).toEqual(comments);
                     expect(result.current.commentsMap).toEqual({ uri1: commentsCount });
                     expect(result.current.sending).toBe(false);
+                    (0, react_hooks_1.act)(function () {
+                        result.current.deleteReply({
+                            commentId: 'id1',
+                            uri: 'uri1',
+                            reply: comments[0].replies[0]
+                        });
+                    });
+                    expect(result.current.sending).toBe(true);
+                    expect(mdm_sdk_1.deleteReply).toHaveBeenCalledWith({
+                        collaborationPath: '123',
+                        tenant: 'alenat',
+                        commentId: 'id1',
+                        replyId: 'replyId1'
+                    });
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0:
-                                        result.current.deleteReply({
-                                            commentId: 'id1',
-                                            uri: 'uri1',
-                                            reply: comments[0].replies[0]
-                                        });
-                                        return [4 /*yield*/, Promise.resolve()];
+                                    case 0: return [4 /*yield*/, Promise.resolve()];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -1093,12 +1020,6 @@ describe('useCollaboration behaviour', function () {
                 case 2:
                     _a.sent();
                     expect(result.current.sending).toBe(false);
-                    expect(mdm_sdk_1.deleteReply).toHaveBeenCalledWith({
-                        collaborationPath: '123',
-                        tenant: 'alenat',
-                        commentId: 'id1',
-                        replyId: 'replyId1'
-                    });
                     expect(result.current.commentsMap).toEqual({
                         uri1: expectedCommentsCount
                     });
@@ -1130,7 +1051,6 @@ describe('useCollaboration behaviour', function () {
                     mdm_sdk_1.updateReply.mockResolvedValueOnce(editedReply);
                     mdm_sdk_1.getComment.mockResolvedValueOnce(initialComment);
                     mdm_sdk_1.getComments.mockResolvedValueOnce({ items: initialComments });
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValue({ total: 2 });
                     result = setUp().result;
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -1187,7 +1107,6 @@ describe('useCollaboration behaviour', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValue({ total: 1 });
                     result = setUp().result;
                     expect(result.current.getCommentState('attrUri', 'commentUri')).toEqual({});
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -1230,7 +1149,6 @@ describe('useCollaboration behaviour', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValue({ total: 1 });
                     result = setUp().result;
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -1267,7 +1185,6 @@ describe('useCollaboration behaviour', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    mdm_sdk_1.getTotalCommentsCount.mockResolvedValue({ total: 1 });
                     result = setUp().result;
                     return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -1331,13 +1248,37 @@ describe('useCollaboration behaviour', function () {
             expect(result.current.totalCommentsCount).toBe(null);
             expect(mdm_sdk_1.getTotalCommentsCount).not.toHaveBeenCalled();
         });
-        it('should call getTotalCommentsCount if collaboration is enabled and update totalCommentsCount value', function () { return __awaiter(void 0, void 0, void 0, function () {
+        it('should not call getTotalCommentsCount and update totalCommentsCount value if collaboration is enabled but needsTotalCount is false', function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 15 });
+                        setUp();
+                        expect(mdm_sdk_1.getTotalCommentsCount).not.toHaveBeenCalled();
+                        return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, Promise.resolve()];
+                                        case 1:
+                                            _a.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
+                    case 1:
+                        _a.sent();
+                        expect(mdm_sdk_1.getTotalCommentsCount).not.toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should call getTotalCommentsCount and update totalCommentsCount value if collaboration is enabled and needsTotalCount is true', function () { return __awaiter(void 0, void 0, void 0, function () {
             var result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         mdm_sdk_1.getTotalCommentsCount.mockResolvedValueOnce({ total: 15 });
-                        result = setUp().result;
+                        result = setUp({ props: { needsTotalCount: true } }).result;
                         expect(mdm_sdk_1.getTotalCommentsCount).toHaveBeenCalledWith({
                             relatedObjectUri: '1',
                             collaborationPath: '123',
@@ -1366,7 +1307,7 @@ describe('useCollaboration behaviour', function () {
                 switch (_a.label) {
                     case 0:
                         mdm_sdk_1.getTotalCommentsCount.mockRejectedValueOnce(new Error('Network error'));
-                        result = setUp().result;
+                        result = setUp({ props: { needsTotalCount: true } }).result;
                         expect(mdm_sdk_1.getTotalCommentsCount).toHaveBeenCalled();
                         return [4 /*yield*/, (0, react_hooks_1.act)(function () { return __awaiter(void 0, void 0, void 0, function () {
                                 return __generator(this, function (_a) {

package/hooks/useCollaboration/useCollaboration.d.ts

@@ -3,8 +3,9 @@ type Props = {
     objectIds?: string[];
     objectTypes?: CollaborationObjectTypes[];
     enabled?: boolean;
+    needsTotalCount?: boolean;
 };
-export declare const useCollaboration: ({ objectIds, objectTypes, enabled }: Props) => {
+export declare const useCollaboration: ({ objectIds, objectTypes, enabled, needsTotalCount }: Props) => {
     clearCurrentComment: () => void;
     comments: Comment[];
     commentsMap: CommentsMap;

package/hooks/useCollaboration/useCollaboration.js

@@ -35,19 +35,19 @@ var getUpdatedReplies = function (comment, reply) {
 var defaultObjectIds = [];
 var catchErrorInRequest = function (e) { return console.warn('Collaboration error', e); };
 export var useCollaboration = function (_a) {
-    var _b = _a.objectIds, objectIds = _b === void 0 ? defaultObjectIds : _b, objectTypes = _a.objectTypes, _c = _a.enabled, enabled = _c === void 0 ? true : _c;
+    var _b = _a.objectIds, objectIds = _b === void 0 ? defaultObjectIds : _b, objectTypes = _a.objectTypes, _c = _a.enabled, enabled = _c === void 0 ? true : _c, _d = _a.needsTotalCount, needsTotalCount = _d === void 0 ? false : _d;
     var entity = useMdmEntity();
     var tenant = useMdmTenant();
     var collaborationPath = useMdmCollaborationPath();
     var isCollaborationEnabled = useMdmIsCollaborationEnabled() && enabled;
-    var _d = useState(null), pageToken = _d[0], setPageToken = _d[1];
-    var _e = useState([]), comments = _e[0], setComments = _e[1];
-    var _f = useState(null), commentsMap = _f[0], setCommentsMap = _f[1];
-    var _g = useState(null), totalCommentsCount = _g[0], setTotalCommentsCount = _g[1];
-    var _h = useState(null), currentComment = _h[0], setCurrentComment = _h[1];
-    var _j = useState(false), sending = _j[0], setSending = _j[1];
-    var _k = useState(false), loading = _k[0], setLoading = _k[1];
-    var _l = useState({}), collaborationStateMap = _l[0], setCollaborationStateMap = _l[1];
+    var _e = useState(null), pageToken = _e[0], setPageToken = _e[1];
+    var _f = useState([]), comments = _f[0], setComments = _f[1];
+    var _g = useState(null), commentsMap = _g[0], setCommentsMap = _g[1];
+    var _h = useState(null), totalCommentsCount = _h[0], setTotalCommentsCount = _h[1];
+    var _j = useState(null), currentComment = _j[0], setCurrentComment = _j[1];
+    var _k = useState(false), sending = _k[0], setSending = _k[1];
+    var _l = useState(false), loading = _l[0], setLoading = _l[1];
+    var _m = useState({}), collaborationStateMap = _m[0], setCollaborationStateMap = _m[1];
     var addCommentsToCommentsMap = useCallback(function (commentsMap) {
         setCommentsMap(function (currentCommentsMap) { return (__assign(__assign({}, currentCommentsMap), commentsMap)); });
     }, []);
@@ -55,18 +55,16 @@ export var useCollaboration = function (_a) {
     var isCollaborationEnabledForEntity = isCollaborationEnabled && entityUri && !isTempUri(entityUri);
     var getCommentsCount = useCallback(function (objectIds, shouldResetCommentsMap) {
         if (shouldResetCommentsMap === void 0) { shouldResetCommentsMap = false; }
-        if (!isCollaborationEnabledForEntity || totalCommentsCount == null) {
-            return setCommentsMap(null);
-        }
-        if (totalCommentsCount === 0) {
-            return shouldResetCommentsMap && setCommentsMap({});
+        if (!isCollaborationEnabledForEntity) {
+            setCommentsMap(null);
+            return;
         }
         var onError = function (e) {
             console.warn('Collaboration error', e);
             setCommentsMap(null);
         };
         pipe(getCommentsCountRequest, andThen(map(props(['objectId', 'comments']))), andThen(fromPairs), andThen(shouldResetCommentsMap ? setCommentsMap : addCommentsToCommentsMap), otherwise(onError))({ uris: objectIds, tenant: tenant, collaborationPath: collaborationPath });
-    }, [addCommentsToCommentsMap, collaborationPath, isCollaborationEnabledForEntity, tenant, totalCommentsCount]);
+    }, [addCommentsToCommentsMap, collaborationPath, isCollaborationEnabledForEntity, tenant]);
     var getTotalCommentsCount = useCallback(function () {
         if (isCollaborationEnabledForEntity) {
             var onError = function (e) {
@@ -84,8 +82,10 @@ export var useCollaboration = function (_a) {
         }
     }, [isCollaborationEnabledForEntity, collaborationPath, entityUri, tenant]);
     useEffect(function () {
-        getTotalCommentsCount();
-    }, [getTotalCommentsCount]);
+        if (needsTotalCount) {
+            getTotalCommentsCount();
+        }
+    }, [getTotalCommentsCount, needsTotalCount]);
     useEffect(function () {
         getCommentsCount(objectIds, true);
     }, [objectIds, getCommentsCount]);
@@ -124,16 +124,22 @@ export var useCollaboration = function (_a) {
         setComments(map(when(propEq('commentId', comment.commentId), always(comment))));
     };
     var deleteCommentFromState = function (commentId, uri) {
+        var repliesCountFromComments;
+        var repliesCountFromCommentsMap;
         setCurrentComment(null);
         setCommentsMap(function (prevCommentsMap) {
             var _a;
+            var _b, _c;
+            repliesCountFromCommentsMap = (_c = (_b = prevCommentsMap === null || prevCommentsMap === void 0 ? void 0 : prevCommentsMap[uri]) === null || _b === void 0 ? void 0 : _b.find(function (c) { return c.commentId === commentId; })) === null || _c === void 0 ? void 0 : _c.replies;
             var comments = prevCommentsMap[uri] || [];
             return __assign(__assign({}, prevCommentsMap), (_a = {}, _a[uri] = comments.filter(function (c) { return c.commentId !== commentId; }), _a));
         });
         setComments(function (prevComments) {
+            var _a;
+            repliesCountFromComments = (_a = prevComments.find(function (comment) { return comment.commentId === commentId; })) === null || _a === void 0 ? void 0 : _a.replies.length;
             return prevComments.filter(function (comment) { return comment.commentId !== commentId; });
         });
-        setTotalCommentsCount(function (prevCount) { return Math.max((prevCount || 0) - 1, 0); });
+        setTotalCommentsCount(function (prevCount) { var _a; return Math.max((prevCount || 0) - (1 + ((_a = repliesCountFromComments !== null && repliesCountFromComments !== void 0 ? repliesCountFromComments : repliesCountFromCommentsMap) !== null && _a !== void 0 ? _a : 0)), 0); });
     };
     var createComment = useCallback(function (_a) {
         var content = _a.content, namedUsers = _a.namedUsers, objectType = _a.objectType, uri = _a.uri, relatedObjectUris = _a.relatedObjectUris;

package/hooks/useCollaboration/useCollaboration.test.js

@@ -92,31 +92,6 @@ describe('useCollaboration behaviour', function () {
         expect(getCommentsCount).not.toHaveBeenCalled();
         expect(getTotalCommentsCount).not.toHaveBeenCalled();
     });
-    it('should not call getCommentsCount if totalCommentsCount is 0', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    getTotalCommentsCount.mockResolvedValue({ total: 0 });
-                    result = setUp().result;
-                    return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
-                    expect(getCommentsCount).not.toHaveBeenCalled();
-                    expect(result.current.commentsMap).toEqual({});
-                    return [2 /*return*/];
-            }
-        });
-    }); });
     it('should call getCommentsCount if collaboration is enabled and uris is undefined and update commentsMap value', function () { return __awaiter(void 0, void 0, void 0, function () {
         var result;
         return __generator(this, function (_a) {
@@ -147,7 +122,7 @@ describe('useCollaboration behaviour', function () {
             }
         });
     }); });
-    it('should call getCommentsCount if collaboration is enabled and totalCommentsCount is more then 0 and update commentsMap value', function () { return __awaiter(void 0, void 0, void 0, function () {
+    it('should call getCommentsCount if collaboration is enabled and update commentsMap value', function () { return __awaiter(void 0, void 0, void 0, function () {
         var comments, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -157,8 +132,12 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id2', status: 'open', replies: 2 }
                     ];
                     getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: comments }]);
-                    getTotalCommentsCount.mockResolvedValueOnce({ total: 2 });
                     result = setUp({ props: { objectIds: ['uri1'] } }).result;
+                    expect(getCommentsCount).toHaveBeenCalledWith({
+                        uris: ['uri1'],
+                        tenant: 'alenat',
+                        collaborationPath: defaultMdmValues.collaborationPath
+                    });
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -171,24 +150,19 @@ describe('useCollaboration behaviour', function () {
                         }); })];
                 case 1:
                     _a.sent();
-                    expect(getCommentsCount).toHaveBeenCalledWith({
-                        uris: ['uri1'],
-                        tenant: 'alenat',
-                        collaborationPath: defaultMdmValues.collaborationPath
-                    });
                     expect(result.current.commentsMap).toEqual({ uri1: comments });
                     return [2 /*return*/];
             }
         });
     }); });
-    it('should set commentsMap value as null in case of unsuccessful getCommentsCount request', function () { return __awaiter(void 0, void 0, void 0, function () {
+    it('should set commentsMap value as null in case of unsuccessful request', function () { return __awaiter(void 0, void 0, void 0, function () {
         var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    getTotalCommentsCount.mockResolvedValueOnce({ total: 1 });
-                    getCommentsCount.mockRejectedValueOnce(new Error('Fail'));
+                    getCommentsCount.mockRejectedValueOnce(null);
                     result = setUp().result;
+                    expect(getCommentsCount).toHaveBeenCalled();
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -201,7 +175,6 @@ describe('useCollaboration behaviour', function () {
                         }); })];
                 case 1:
                     _a.sent();
-                    expect(getCommentsCount).toHaveBeenCalled();
                     expect(result.current.commentsMap).toBe(null);
                     return [2 /*return*/];
             }
@@ -223,20 +196,7 @@ describe('useCollaboration behaviour', function () {
                             return Promise.resolve([{ objectId: 'uri2', comments: secondComments }]);
                         }
                     });
-                    getTotalCommentsCount.mockResolvedValueOnce({ total: 3 });
                     result = setUp({ props: { objectIds: ['uri1'] } }).result;
-                    return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
                     expect(getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri1'],
                         tenant: 'alenat',
@@ -248,7 +208,7 @@ describe('useCollaboration behaviour', function () {
                                 return [2 /*return*/];
                             });
                         }); })];
-                case 2:
+                case 1:
                     _a.sent();
                     expect(getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri2'],
@@ -276,20 +236,7 @@ describe('useCollaboration behaviour', function () {
                             return Promise.resolve([{ objectId: 'uri2', comments: secondComments }]);
                         }
                     });
-                    getTotalCommentsCount.mockResolvedValue({ total: 3 });
                     _a = setUp({ props: { objectIds: ['uri1'] } }), result = _a.result, rerender = _a.rerender;
-                    return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _b.sent();
                     expect(getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri1'],
                         tenant: 'alenat',
@@ -307,7 +254,7 @@ describe('useCollaboration behaviour', function () {
                                 }
                             });
                         }); })];
-                case 2:
+                case 1:
                     _b.sent();
                     expect(getCommentsCount).toHaveBeenCalledWith({
                         uris: ['uri2'],
@@ -444,12 +391,7 @@ describe('useCollaboration behaviour', function () {
                             replies: 2
                         }
                     ];
-                    getTotalCommentsCount.mockResolvedValueOnce({ total: 3 });
-                    getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: comments }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: __spreadArray(__spreadArray([], comments, true), [{ commentId: 'commentId', replies: 0, status: 'open' }], false) }
-                    ]);
+                    getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: comments }]);
                     createComment.mockResolvedValueOnce([{ commentId: 'commentId' }]);
                     result = setUp().result;
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -467,16 +409,33 @@ describe('useCollaboration behaviour', function () {
                     expect(result.current.commentsMap).toEqual({ uri1: comments });
                     expect(result.current.currentComment).toBe(null);
                     expect(result.current.sending).toBe(false);
+                    act(function () {
+                        result.current.createComment({
+                            content: 'content',
+                            namedUsers: [],
+                            objectType: 'entity',
+                            relatedObjectUris: ['uri1'],
+                            uri: 'uri1'
+                        });
+                    });
+                    expect(result.current.sending).toBe(true);
+                    expect(createComment).toHaveBeenCalledWith({
+                        collaborationPath: '123',
+                        tenant: 'alenat',
+                        data: {
+                            objectId: 'uri1',
+                            content: 'content',
+                            relatedObjectUris: ['uri1'],
+                            objectType: 'entity',
+                            visibility: 'public',
+                            namedUsers: [],
+                            permanentLink: 'https://tst-01.reltio.com/nui/alenat/profile?entityUri=entities%2F2jWtLtNc&commentId=%7BcommentId%7D'
+                        }
+                    });
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, result.current.createComment({
-                                            content: 'content',
-                                            namedUsers: [],
-                                            objectType: 'entity',
-                                            relatedObjectUris: ['uri1'],
-                                            uri: 'uri1'
-                                        })];
+                                    case 0: return [4 /*yield*/, Promise.resolve()];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -493,23 +452,15 @@ describe('useCollaboration behaviour', function () {
                         uri1: __spreadArray(__spreadArray([], comments, true), [{ commentId: 'commentId', replies: 0, status: 'open' }], false)
                     });
                     createComment.mockResolvedValueOnce([{ commentId: 'commentId2' }]);
-                    getCommentsCount.mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: __spreadArray(__spreadArray([], comments, true), [{ commentId: 'commentId', replies: 0, status: 'open' }], false) },
-                        { objectId: 'uri2', comments: [{ commentId: 'commentId2', replies: 0, status: 'open' }] }
-                    ]);
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, result.current.createComment({
-                                            content: 'content',
-                                            namedUsers: [],
-                                            objectType: 'entity',
-                                            uri: 'uri2'
-                                        })];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
+                                result.current.createComment({
+                                    content: 'content',
+                                    namedUsers: [],
+                                    objectType: 'entity',
+                                    uri: 'uri2'
+                                });
+                                return [2 /*return*/];
                             });
                         }); })];
                 case 3:
@@ -538,14 +489,7 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', content: 'first comment', status: 'open', replies: [] },
                         { commentId: 'id2', content: 'second comment', status: 'open', replies: [] }
                     ];
-                    getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'open', replies: 3 }] }
-                    ])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'resolved', replies: 4 }] }
-                    ]);
+                    getCommentsCount.mockResolvedValue([{ objectId: 'uri1', comments: commentsCount }]);
                     getComments.mockResolvedValue({ items: comments });
                     getComment.mockResolvedValueOnce({
                         commentId: 'id2',
@@ -678,11 +622,7 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', status: 'open', content: 'first comment', replies: [] },
                         { commentId: 'id2', status: 'open', content: 'second comment', replies: [] }
                     ];
-                    getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'resolved', replies: 3 }] }
-                    ]);
+                    getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     getComment.mockResolvedValueOnce({ commentId: 'id2', replies: [] });
                     getComments.mockResolvedValue({ items: comments });
                     createReply.mockResolvedValueOnce([{ content: '', action: 'resolve' }]);
@@ -755,11 +695,7 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', status: 'open', content: 'first comment', replies: [] },
                         { commentId: 'id2', status: 'open', content: 'second comment', replies: [] }
                     ];
-                    getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'open', replies: 3 }] }
-                    ]);
+                    getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     getComment.mockResolvedValueOnce({ commentId: 'id2', replies: [] });
                     getComments.mockResolvedValue({
                         items: comments
@@ -932,12 +868,9 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', content: 'text 1', status: 'open', replies: [] },
                         { commentId: 'id2', content: 'text2', status: 'open', replies: [] }
                     ];
-                    expectedCommentsCount = [{ commentId: 'id2', status: 'open', replies: 0 }];
-                    expectedComments = [{ commentId: 'id2', content: 'text2', status: 'open', replies: [] }];
-                    getTotalCommentsCount.mockResolvedValueOnce({ total: 2 });
-                    getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: expectedCommentsCount }]);
+                    expectedCommentsCount = commentsCount.slice(1);
+                    expectedComments = comments.slice(1);
+                    getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     getComments.mockResolvedValueOnce({ items: comments });
                     deleteComment.mockResolvedValueOnce('');
                     result = setUp().result;
@@ -952,20 +885,28 @@ describe('useCollaboration behaviour', function () {
                     expect(result.current.comments).toEqual(comments);
                     expect(result.current.commentsMap).toEqual({ uri1: commentsCount });
                     expect(result.current.sending).toBe(false);
+                    act(function () {
+                        result.current.deleteComment({ commentId: 'id1', uri: 'uri1' });
+                    });
+                    expect(result.current.sending).toBe(true);
+                    expect(deleteComment).toHaveBeenCalledWith({
+                        collaborationPath: '123',
+                        tenant: 'alenat',
+                        commentId: 'id1'
+                    });
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                result.current.deleteComment({ commentId: 'id1', uri: 'uri1' });
-                                return [2 /*return*/];
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, Promise.resolve()];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
                             });
                         }); })];
                 case 2:
                     _a.sent();
                     expect(result.current.sending).toBe(false);
-                    expect(deleteComment).toHaveBeenCalledWith({
-                        collaborationPath: '123',
-                        tenant: 'alenat',
-                        commentId: 'id1'
-                    });
                     expect(result.current.commentsMap).toEqual({
                         uri1: expectedCommentsCount
                     });
@@ -983,23 +924,13 @@ describe('useCollaboration behaviour', function () {
                         { commentId: 'id1', status: 'open', replies: 1 },
                         { commentId: 'id2', status: 'open', replies: 2 }
                     ];
-                    getTotalCommentsCount.mockResolvedValueOnce({ total: commentsCount.length });
-                    getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([
-                        { objectId: 'uri1', comments: [commentsCount[0], { commentId: 'id2', status: 'open', replies: 2 }] },
-                        { objectId: 'uri2', comments: [] }
-                    ]);
+                    getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     createReply.mockResolvedValueOnce([{ content: 'reply message' }]);
                     result = setUp().result;
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
+                                Promise.resolve();
+                                return [2 /*return*/];
                             });
                         }); })];
                 case 1:
@@ -1016,9 +947,6 @@ describe('useCollaboration behaviour', function () {
                                             uri: 'uri2'
                                         })];
                                     case 1:
-                                        _a.sent();
-                                        return [4 /*yield*/, Promise.resolve()];
-                                    case 2:
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
@@ -1045,23 +973,14 @@ describe('useCollaboration behaviour', function () {
                     ];
                     expectedCommentsCount = [{ commentId: 'id1', status: 'open', replies: 0 }];
                     expectedComments = [{ commentId: 'id1', content: 'text 1', status: 'open', replies: [] }];
-                    getTotalCommentsCount.mockResolvedValueOnce({ total: 2 }).mockResolvedValueOnce({ total: 1 });
-                    getCommentsCount
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }])
-                        .mockResolvedValueOnce([{ objectId: 'uri1', comments: expectedCommentsCount }]);
+                    getCommentsCount.mockResolvedValueOnce([{ objectId: 'uri1', comments: commentsCount }]);
                     getComments.mockResolvedValue({ items: comments });
                     deleteReply.mockResolvedValueOnce('');
                     result = setUp().result;
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        result.current.getComments('uri');
-                                        return [4 /*yield*/, Promise.resolve()];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
+                                result.current.getComments('uri');
+                                return [2 /*return*/];
                             });
                         }); })];
                 case 1:
@@ -1069,16 +988,24 @@ describe('useCollaboration behaviour', function () {
                     expect(result.current.comments).toEqual(comments);
                     expect(result.current.commentsMap).toEqual({ uri1: commentsCount });
                     expect(result.current.sending).toBe(false);
+                    act(function () {
+                        result.current.deleteReply({
+                            commentId: 'id1',
+                            uri: 'uri1',
+                            reply: comments[0].replies[0]
+                        });
+                    });
+                    expect(result.current.sending).toBe(true);
+                    expect(deleteReply).toHaveBeenCalledWith({
+                        collaborationPath: '123',
+                        tenant: 'alenat',
+                        commentId: 'id1',
+                        replyId: 'replyId1'
+                    });
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0:
-                                        result.current.deleteReply({
-                                            commentId: 'id1',
-                                            uri: 'uri1',
-                                            reply: comments[0].replies[0]
-                                        });
-                                        return [4 /*yield*/, Promise.resolve()];
+                                    case 0: return [4 /*yield*/, Promise.resolve()];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -1088,12 +1015,6 @@ describe('useCollaboration behaviour', function () {
                 case 2:
                     _a.sent();
                     expect(result.current.sending).toBe(false);
-                    expect(deleteReply).toHaveBeenCalledWith({
-                        collaborationPath: '123',
-                        tenant: 'alenat',
-                        commentId: 'id1',
-                        replyId: 'replyId1'
-                    });
                     expect(result.current.commentsMap).toEqual({
                         uri1: expectedCommentsCount
                     });
@@ -1125,7 +1046,6 @@ describe('useCollaboration behaviour', function () {
                     updateReply.mockResolvedValueOnce(editedReply);
                     getComment.mockResolvedValueOnce(initialComment);
                     getComments.mockResolvedValueOnce({ items: initialComments });
-                    getTotalCommentsCount.mockResolvedValue({ total: 2 });
                     result = setUp().result;
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -1182,7 +1102,6 @@ describe('useCollaboration behaviour', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    getTotalCommentsCount.mockResolvedValue({ total: 1 });
                     result = setUp().result;
                     expect(result.current.getCommentState('attrUri', 'commentUri')).toEqual({});
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -1225,7 +1144,6 @@ describe('useCollaboration behaviour', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    getTotalCommentsCount.mockResolvedValue({ total: 1 });
                     result = setUp().result;
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -1262,7 +1180,6 @@ describe('useCollaboration behaviour', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    getTotalCommentsCount.mockResolvedValue({ total: 1 });
                     result = setUp().result;
                     return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
@@ -1326,13 +1243,37 @@ describe('useCollaboration behaviour', function () {
             expect(result.current.totalCommentsCount).toBe(null);
             expect(getTotalCommentsCount).not.toHaveBeenCalled();
         });
-        it('should call getTotalCommentsCount if collaboration is enabled and update totalCommentsCount value', function () { return __awaiter(void 0, void 0, void 0, function () {
+        it('should not call getTotalCommentsCount and update totalCommentsCount value if collaboration is enabled but needsTotalCount is false', function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        getTotalCommentsCount.mockResolvedValueOnce({ total: 15 });
+                        setUp();
+                        expect(getTotalCommentsCount).not.toHaveBeenCalled();
+                        return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, Promise.resolve()];
+                                        case 1:
+                                            _a.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
+                    case 1:
+                        _a.sent();
+                        expect(getTotalCommentsCount).not.toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should call getTotalCommentsCount and update totalCommentsCount value if collaboration is enabled and needsTotalCount is true', function () { return __awaiter(void 0, void 0, void 0, function () {
             var result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         getTotalCommentsCount.mockResolvedValueOnce({ total: 15 });
-                        result = setUp().result;
+                        result = setUp({ props: { needsTotalCount: true } }).result;
                         expect(getTotalCommentsCount).toHaveBeenCalledWith({
                             relatedObjectUri: '1',
                             collaborationPath: '123',
@@ -1361,7 +1302,7 @@ describe('useCollaboration behaviour', function () {
                 switch (_a.label) {
                     case 0:
                         getTotalCommentsCount.mockRejectedValueOnce(new Error('Network error'));
-                        result = setUp().result;
+                        result = setUp({ props: { needsTotalCount: true } }).result;
                         expect(getTotalCommentsCount).toHaveBeenCalled();
                         return [4 /*yield*/, act(function () { return __awaiter(void 0, void 0, void 0, function () {
                                 return __generator(this, function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2155",
+  "version": "1.4.2156",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./index.js",
@@ -11,7 +11,7 @@
     "@fluentui/react-context-selector": "^9.1.26",
     "@googlemaps/markerclusterer": "^2.5.3",
     "@react-sigma/core": "3.4.0",
-    "@reltio/mdm-sdk": "^1.4.1976",
+    "@reltio/mdm-sdk": "^1.4.1977",
     "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",