@reltio/components 1.4.2153 → 1.4.2155

package/CollaborationItem/IntegrationCollaborationItem.test.js

@@ -118,6 +118,7 @@ var setUp = function (_a) {
         return (React.createElement(MdmModuleProvider, { values: mdmValues },
             React.createElement(CollaborationContext.Provider, { value: {
                     commentsMap: {},
+                    totalCommentsCount: null,
                     currentComment: currentComment,
                     createComment: function () { return Promise.resolve(); },
                     editComment: function () { return Promise.resolve(); },

package/CollaborationItem/components/Comment/Comment.test.js

@@ -126,6 +126,7 @@ describe('Comment tests', function () {
     };
     var defaultCollaborationContextValue = {
         commentsMap: defaultCommentsMap,
+        totalCommentsCount: null,
         currentComment: defaultCurrentComment,
         createComment: function () { return Promise.resolve(); },
         editComment: function () { return Promise.resolve(); },

package/CollaborationItem/components/SendMessageArea/SendMessageArea.test.js

@@ -65,7 +65,7 @@ describe('SendMessageArea tests', function () {
     };
     var createCollaborationContext = function (props) {
         if (props === void 0) { props = {}; }
-        return __assign({ comments: [], commentsMap: null, currentComment: null, getComment: identity, getComments: function () { return new Promise(identity); }, getCommentsCount: identity, resolveThread: identity, reOpenThread: identity, clearCurrentComment: identity, deleteComment: identity, sending: false, loading: false, pageToken: null, deleteReply: identity, createReply: function () { return new Promise(function (res) { return res(); }); }, createComment: function () { return new Promise(function (res) { return res(); }); }, editComment: function () { return new Promise(function (res) { return res(); }); }, editReply: function () { return new Promise(function (res) { return res(); }); }, getCommentState: function () { return ({}); }, clearCommentState: function () { }, updateCommentState: function () { } }, props);
+        return __assign({ comments: [], commentsMap: null, totalCommentsCount: null, currentComment: null, getComment: identity, getComments: function () { return new Promise(identity); }, getCommentsCount: identity, resolveThread: identity, reOpenThread: identity, clearCurrentComment: identity, deleteComment: identity, sending: false, loading: false, pageToken: null, deleteReply: identity, createReply: function () { return new Promise(function (res) { return res(); }); }, createComment: function () { return new Promise(function (res) { return res(); }); }, editComment: function () { return new Promise(function (res) { return res(); }); }, editReply: function () { return new Promise(function (res) { return res(); }); }, getCommentState: function () { return ({}); }, clearCommentState: function () { }, updateCommentState: function () { } }, props);
     };
     var createProps = function (comment, extraProps) {
         if (extraProps === void 0) { extraProps = {}; }

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(), getAllUsersForTenant: jest.fn() })); });
+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() })); });
 var defaultEntity = {
     uri: 'entities/uri1',
     type: 'configuration/entityTypes/HCO',

package/cjs/CollaborationItem/IntegrationCollaborationItem.test.js

@@ -123,6 +123,7 @@ var setUp = function (_a) {
         return (react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: mdmValues },
             react_1.default.createElement(CollaborationContext_1.CollaborationContext.Provider, { value: {
                     commentsMap: {},
+                    totalCommentsCount: null,
                     currentComment: currentComment,
                     createComment: function () { return Promise.resolve(); },
                     editComment: function () { return Promise.resolve(); },

package/cjs/CollaborationItem/components/Comment/Comment.test.js

@@ -131,6 +131,7 @@ describe('Comment tests', function () {
     };
     var defaultCollaborationContextValue = {
         commentsMap: defaultCommentsMap,
+        totalCommentsCount: null,
         currentComment: defaultCurrentComment,
         createComment: function () { return Promise.resolve(); },
         editComment: function () { return Promise.resolve(); },

package/cjs/CollaborationItem/components/SendMessageArea/SendMessageArea.test.js

@@ -70,7 +70,7 @@ describe('SendMessageArea tests', function () {
     };
     var createCollaborationContext = function (props) {
         if (props === void 0) { props = {}; }
-        return __assign({ comments: [], commentsMap: null, currentComment: null, getComment: ramda_1.identity, getComments: function () { return new Promise(ramda_1.identity); }, getCommentsCount: ramda_1.identity, resolveThread: ramda_1.identity, reOpenThread: ramda_1.identity, clearCurrentComment: ramda_1.identity, deleteComment: ramda_1.identity, sending: false, loading: false, pageToken: null, deleteReply: ramda_1.identity, createReply: function () { return new Promise(function (res) { return res(); }); }, createComment: function () { return new Promise(function (res) { return res(); }); }, editComment: function () { return new Promise(function (res) { return res(); }); }, editReply: function () { return new Promise(function (res) { return res(); }); }, getCommentState: function () { return ({}); }, clearCommentState: function () { }, updateCommentState: function () { } }, props);
+        return __assign({ comments: [], commentsMap: null, totalCommentsCount: null, currentComment: null, getComment: ramda_1.identity, getComments: function () { return new Promise(ramda_1.identity); }, getCommentsCount: ramda_1.identity, resolveThread: ramda_1.identity, reOpenThread: ramda_1.identity, clearCurrentComment: ramda_1.identity, deleteComment: ramda_1.identity, sending: false, loading: false, pageToken: null, deleteReply: ramda_1.identity, createReply: function () { return new Promise(function (res) { return res(); }); }, createComment: function () { return new Promise(function (res) { return res(); }); }, editComment: function () { return new Promise(function (res) { return res(); }); }, editReply: function () { return new Promise(function (res) { return res(); }); }, getCommentState: function () { return ({}); }, clearCommentState: function () { }, updateCommentState: function () { } }, props);
     };
     var createProps = function (comment, extraProps) {
         if (extraProps === void 0) { extraProps = {}; }

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(), getAllUsersForTenant: jest.fn() })); });
+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() })); });
 var defaultEntity = {
     uri: 'entities/uri1',
     type: 'configuration/entityTypes/HCO',

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

@@ -22,6 +22,7 @@ export declare const InitialCollaborationContextValue: {
     pageToken: any;
     deleteReply: any;
     editReply: () => Promise<void>;
+    totalCommentsCount: any;
 };
 export declare const CollaborationContext: React.Context<{
     objectTypes?: CollaborationObjectTypes[];
@@ -67,6 +68,7 @@ export declare const CollaborationContext: React.Context<{
     sending: boolean;
     loading: boolean;
     pageToken: string;
+    totalCommentsCount: number | null;
 }>;
 export declare const CollaborationContextProvider: ({ collaboration, children }: {
     collaboration: any;

package/cjs/contexts/CollaborationContext/index.js

@@ -29,7 +29,8 @@ exports.InitialCollaborationContextValue = {
     loading: false,
     pageToken: null,
     deleteReply: ramda_1.identity,
-    editReply: function () { return new Promise(ramda_1.identity); }
+    editReply: function () { return new Promise(ramda_1.identity); },
+    totalCommentsCount: null
 };
 exports.CollaborationContext = react_1.default.createContext(exports.InitialCollaborationContextValue);
 exports.CollaborationContext.displayName = 'CollaborationContext';

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

@@ -27,5 +27,6 @@ export declare const useCollaboration: ({ objectIds, objectTypes, enabled }: Pro
     sending: boolean;
     deleteReply: ({ uri, commentId, reply }: any) => void;
     editReply: ({ content, namedUsers, commentId, replyId }: any) => Promise<void>;
+    totalCommentsCount: number;
 };
 export {};

package/cjs/hooks/useCollaboration/useCollaboration.js

@@ -46,27 +46,49 @@ var useCollaboration = function (_a) {
     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), currentComment = _g[0], setCurrentComment = _g[1];
-    var _h = (0, react_1.useState)(false), sending = _h[0], setSending = _h[1];
-    var _j = (0, react_1.useState)(false), loading = _j[0], setLoading = _j[1];
-    var _k = (0, react_1.useState)({}), collaborationStateMap = _k[0], setCollaborationStateMap = _k[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 addCommentsToCommentsMap = (0, react_1.useCallback)(function (commentsMap) {
         setCommentsMap(function (currentCommentsMap) { return (__assign(__assign({}, currentCommentsMap), commentsMap)); });
     }, []);
     var entityUri = entity === null || entity === void 0 ? void 0 : entity.uri;
+    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 (isCollaborationEnabled && entityUri && !(0, mdm_sdk_1.isTempUri)(entityUri)) {
+        if (!isCollaborationEnabledForEntity || totalCommentsCount == null) {
+            return setCommentsMap(null);
+        }
+        if (totalCommentsCount === 0) {
+            return shouldResetCommentsMap && setCommentsMap({});
+        }
+        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]);
+    var getTotalCommentsCount = (0, react_1.useCallback)(function () {
+        if (isCollaborationEnabledForEntity) {
             var onError = function (e) {
                 console.warn('Collaboration error', e);
-                setCommentsMap(null);
+                setTotalCommentsCount(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 });
+            (0, ramda_1.pipe)(mdm_sdk_1.getTotalCommentsCount, (0, ramda_1.andThen)((0, ramda_1.prop)('total')), (0, ramda_1.andThen)(setTotalCommentsCount), (0, ramda_1.otherwise)(onError))({
+                relatedObjectUri: entityUri,
+                collaborationPath: collaborationPath,
+                tenant: tenant
+            });
         }
         else {
-            setCommentsMap(null);
+            setTotalCommentsCount(null);
         }
-    }, [addCommentsToCommentsMap, collaborationPath, entityUri, isCollaborationEnabled, tenant]);
+    }, [isCollaborationEnabledForEntity, collaborationPath, entityUri, tenant]);
+    (0, react_1.useEffect)(function () {
+        getTotalCommentsCount();
+    }, [getTotalCommentsCount]);
     (0, react_1.useEffect)(function () {
         getCommentsCount(objectIds, true);
     }, [objectIds, getCommentsCount]);
@@ -98,6 +120,7 @@ var useCollaboration = function (_a) {
             return __assign(__assign({}, prevCommentsMap), (_a = {}, _a[uri] = __spreadArray(__spreadArray([], (prevCommentsMap[uri] || []), true), [{ commentId: comment.commentId, replies: 0, status: 'open' }], false), _a));
         });
         setComments(function (prevComments) { return __spreadArray([comment], prevComments, true); });
+        setTotalCommentsCount(function (prevCount) { return (prevCount || 0) + 1; });
     };
     var updateCommentInState = function (comment) {
         setCurrentComment(comment);
@@ -113,6 +136,7 @@ var useCollaboration = function (_a) {
         setComments(function (prevComments) {
             return prevComments.filter(function (comment) { return comment.commentId !== commentId; });
         });
+        setTotalCommentsCount(function (prevCount) { return Math.max((prevCount || 0) - 1, 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;
@@ -198,6 +222,12 @@ var useCollaboration = function (_a) {
                 return comment;
             });
         });
+        if (isDeleteReply) {
+            setTotalCommentsCount(function (prevCount) { return Math.max((prevCount || 0) - 1, 0); });
+        }
+        else {
+            setTotalCommentsCount(function (prevCount) { return (prevCount || 0) + 1; });
+        }
     }, []);
     var deleteReply = (0, react_1.useCallback)(function (_a) {
         var uri = _a.uri, commentId = _a.commentId, reply = _a.reply;
@@ -292,7 +322,8 @@ var useCollaboration = function (_a) {
         resolveThread: resolveThread,
         sending: sending,
         deleteReply: deleteReply,
-        editReply: editReply
+        editReply: editReply,
+        totalCommentsCount: totalCommentsCount
     }); }, [
         clearCurrentComment,
         comments,
@@ -315,7 +346,8 @@ var useCollaboration = function (_a) {
         resolveThread,
         sending,
         deleteReply,
-        editReply
+        editReply,
+        totalCommentsCount
     ]);
 };
 exports.useCollaboration = useCollaboration;