@reltio/components 1.4.818 → 1.4.819

package/components/CollaborationItem/CollaborationItem.d.ts

@@ -11,5 +11,5 @@ declare type Props = {
     messagesRef?: React.RefCallback<HTMLDivElement>;
     comment?: CommentType;
 };
-export declare const CollaborationItem: ({ uri, relatedObjectUris, objectType, classes, popperRef, messagesRef, comment }: Props) => JSX.Element;
+export declare const CollaborationItem: React.MemoExoticComponent<({ uri, relatedObjectUris, objectType, classes, popperRef, messagesRef, comment }: Props) => JSX.Element>;
 export {};

package/components/CollaborationItem/CollaborationItem.js

@@ -29,7 +29,7 @@ var Comment_1 = require("./Comment/Comment");
 var RepliedComment_1 = require("./RepliedComment/RepliedComment");
 var SendMessageArea_1 = require("./SendMessageArea/SendMessageArea");
 var styles_1 = require("./styles");
-var CollaborationItem = function (_a) {
+exports.CollaborationItem = react_1.memo(function (_a) {
     var uri = _a.uri, relatedObjectUris = _a.relatedObjectUris, objectType = _a.objectType, classes = _a.classes, popperRef = _a.popperRef, messagesRef = _a.messagesRef, comment = _a.comment;
     var inputRef = react_1.useRef();
     var styles = styles_1.useStyles({ classes: classes });
@@ -51,5 +51,4 @@ var CollaborationItem = function (_a) {
                 react_1.default.createElement(Box_1.default, { className: styles.replies }, comment.replies.map(function (reply) { return (react_1.default.createElement(RepliedComment_1.RepliedComment, { key: reply.replyId, className: styles.repliedComment, reply: reply })); }))),
             sendMessageArea)),
         !comment && sendMessageArea));
-};
-exports.CollaborationItem = CollaborationItem;
+});

package/contexts/CollaborationContext/index.d.ts

@@ -3,7 +3,9 @@ import { CollaborationObjectTypes, Comment, CommentsMap, Reply } from '@reltio/m
 export declare const CollaborationContext: React.Context<{
     objectTypes?: CollaborationObjectTypes[];
     commentsMap: CommentsMap;
+    comments: Comment[];
     currentComment: Comment;
+    getComments: (uri: string, pageToken?: string) => void;
     getComment: (commentId: Comment['commentId']) => void;
     createComment: (params: Pick<Comment, 'content' | 'namedUsers' | 'objectType' | 'relatedObjectUris'> & {
         uri: string;
@@ -29,4 +31,5 @@ export declare const CollaborationContext: React.Context<{
     clearCurrentComment: () => void;
     sending: boolean;
     loading: boolean;
+    pageToken: string;
 }>;

package/contexts/CollaborationContext/index.js

@@ -7,9 +7,11 @@ exports.CollaborationContext = void 0;
 var react_1 = __importDefault(require("react"));
 var noop = function () { };
 exports.CollaborationContext = react_1.default.createContext({
+    comments: [],
     commentsMap: null,
     currentComment: null,
     getComment: noop,
+    getComments: function () { return new Promise(noop); },
     createComment: function () { return new Promise(noop); },
     editComment: function () { return new Promise(noop); },
     createReply: function () { return new Promise(noop); },
@@ -18,6 +20,7 @@ exports.CollaborationContext = react_1.default.createContext({
     clearCurrentComment: noop,
     deleteComment: noop,
     sending: false,
-    loading: false
+    loading: false,
+    pageToken: null
 });
 exports.CollaborationContext.displayName = 'CollaborationContext';

package/hooks/useCollaboration.d.ts

@@ -2,6 +2,7 @@ import { CollaborationObjectTypes, Comment, CommentsMap } from '@reltio/mdm-sdk'
 export declare const useCollaboration: (objectIds?: string[], objectTypes?: CollaborationObjectTypes[]) => {
     commentsMap: CommentsMap;
     currentComment: Comment;
+    comments: Comment[];
     getComment: (commentId: string) => void;
     createReply: ({ content, namedUsers, commentId, action, uri }: any) => Promise<void>;
     editComment: ({ content, namedUsers, objectType, uri, relatedObjectUris, commentId, replies }: any) => Promise<void>;
@@ -13,4 +14,6 @@ export declare const useCollaboration: (objectIds?: string[], objectTypes?: Coll
     sending: boolean;
     loading: boolean;
     objectTypes: CollaborationObjectTypes[];
+    getComments: (relatedObjectUri: string, pageToken?: string) => void;
+    pageToken: string;
 };

package/hooks/useCollaboration.js

@@ -33,10 +33,12 @@ var useCollaboration = function (objectIds, objectTypes) {
     var tenant = react_redux_1.useSelector(mdm_module_1.default.selectors.getTenant);
     var collaborationPath = react_redux_1.useSelector(mdm_module_1.default.selectors.getCollaborationPath);
     var isCollaborationEnabled = react_redux_1.useSelector(mdm_module_1.default.selectors.isCollaborationEnabled);
-    var _a = react_1.useState(null), commentsMap = _a[0], setCommentsMap = _a[1];
-    var _b = react_1.useState(null), currentComment = _b[0], setCurrentComment = _b[1];
-    var _c = react_1.useState(false), sending = _c[0], setSending = _c[1];
-    var _d = react_1.useState(false), loading = _d[0], setLoading = _d[1];
+    var _a = react_1.useState(null), pageToken = _a[0], setPageToken = _a[1];
+    var _b = react_1.useState([]), comments = _b[0], setComments = _b[1];
+    var _c = react_1.useState(null), commentsMap = _c[0], setCommentsMap = _c[1];
+    var _d = react_1.useState(null), currentComment = _d[0], setCurrentComment = _d[1];
+    var _e = react_1.useState(false), sending = _e[0], setSending = _e[1];
+    var _f = react_1.useState(false), loading = _f[0], setLoading = _f[1];
     react_1.useEffect(function () {
         if (isCollaborationEnabled && entity) {
             var onError = function (e) {
@@ -49,6 +51,20 @@ var useCollaboration = function (objectIds, objectTypes) {
             setCommentsMap(null);
         }
     }, [entity, isCollaborationEnabled, tenant, collaborationPath, objectIds]);
+    var getComments = react_1.useCallback(function (relatedObjectUri, pageToken) {
+        mdm_sdk_1.getComments({ collaborationPath: collaborationPath, tenant: tenant, relatedObjectUri: relatedObjectUri, pageToken: pageToken })
+            .then(function (_a) {
+            var items = _a.items, nextPageToken = _a.nextPageToken;
+            setComments(function (prevComments) {
+                if (!pageToken) {
+                    return items;
+                }
+                return ramda_1.uniqBy(ramda_1.prop('commentId'), __spreadArray(__spreadArray([], prevComments), items));
+            });
+            setPageToken(nextPageToken);
+        })
+            .catch(catchErrorInRequest);
+    }, [collaborationPath, tenant]);
     var getComment = react_1.useCallback(function (commentId) {
         setLoading(true);
         mdm_sdk_1.getComment({ collaborationPath: collaborationPath, tenant: tenant, commentId: commentId })
@@ -62,17 +78,11 @@ var useCollaboration = function (objectIds, objectTypes) {
             var _a;
             return __assign(__assign({}, prevCommentsMap), (_a = {}, _a[uri] = __spreadArray(__spreadArray([], (prevCommentsMap[uri] || [])), [{ commentId: comment.commentId, replies: 0, status: 'open' }]), _a));
         });
+        setComments(function (prevComments) { return __spreadArray([comment], prevComments); });
     };
-    var updateCommentInState = function (comment, uri) {
+    var updateCommentInState = function (comment) {
         setCurrentComment(comment);
-        setCommentsMap(function (prevCommentsMap) {
-            var _a;
-            var comments = (prevCommentsMap[uri] || []).map(function (c) {
-                return c.commentId === comment.commentId
-                    ? __assign(__assign({}, comment), { replies: (typeof comment.replies === 'number' ? comment.replies : comment.replies.length) || 0 }) : c;
-            });
-            return __assign(__assign({}, prevCommentsMap), (_a = {}, _a[uri] = comments, _a));
-        });
+        setComments(ramda_1.map(ramda_1.when(ramda_1.propEq('commentId', comment.commentId), ramda_1.always(comment))));
     };
     var deleteCommentFromState = function (commentId, uri) {
         setCurrentComment(null);
@@ -81,6 +91,9 @@ var useCollaboration = function (objectIds, objectTypes) {
             var comments = prevCommentsMap[uri] || [];
             return __assign(__assign({}, prevCommentsMap), (_a = {}, _a[uri] = comments.filter(function (c) { return c.commentId !== commentId; }), _a));
         });
+        setComments(function (prevComments) {
+            return prevComments.filter(function (comment) { return comment.commentId !== commentId; });
+        });
     };
     var createComment = react_1.useCallback(function (_a) {
         var content = _a.content, namedUsers = _a.namedUsers, objectType = _a.objectType, uri = _a.uri, relatedObjectUris = _a.relatedObjectUris;
@@ -117,7 +130,7 @@ var useCollaboration = function (objectIds, objectTypes) {
             replies: replies
         };
         return mdm_sdk_1.updateComment({ collaborationPath: collaborationPath, tenant: tenant, data: data })
-            .then(function (comment) { return updateCommentInState(__assign(__assign({}, comment), { replies: replies }), uri); })
+            .then(function (comment) { return updateCommentInState(__assign(__assign({}, comment), { replies: replies })); })
             .catch(catchErrorInRequest)
             .finally(function () { return setSending(false); });
     }, [collaborationPath, tenant]);
@@ -129,7 +142,7 @@ var useCollaboration = function (objectIds, objectTypes) {
             .catch(catchErrorInRequest)
             .finally(function () { return setSending(false); });
     }, [collaborationPath, tenant]);
-    var updateReply = react_1.useCallback(function (reply, uri, commentId) {
+    var updateReplyInState = react_1.useCallback(function (reply, uri, commentId) {
         var newStatus = reply.action === 'resolve' ? 'resolved' : 'open';
         if (newStatus === 'resolved') {
             setCurrentComment(function (prevCurrentComment) {
@@ -154,6 +167,14 @@ var useCollaboration = function (objectIds, objectTypes) {
                 return comment;
             }), _a)));
         });
+        setComments(function (prevComments) {
+            return prevComments.map(function (comment) {
+                if (comment.commentId === commentId) {
+                    return __assign(__assign({}, comment), { status: newStatus, replies: __spreadArray(__spreadArray([], comment.replies), [reply]) });
+                }
+                return comment;
+            });
+        });
     }, []);
     var createReply = react_1.useCallback(function (_a) {
         var content = _a.content, namedUsers = _a.namedUsers, commentId = _a.commentId, action = _a.action, uri = _a.uri;
@@ -166,11 +187,11 @@ var useCollaboration = function (objectIds, objectTypes) {
         return mdm_sdk_1.createReply({ collaborationPath: collaborationPath, tenant: tenant, commentId: commentId, data: data })
             .then(function (_a) {
             var reply = _a[0];
-            return updateReply(reply, uri, commentId);
+            return updateReplyInState(reply, uri, commentId);
         })
             .catch(catchErrorInRequest)
             .finally(function () { return setSending(false); });
-    }, [collaborationPath, tenant, updateReply]);
+    }, [collaborationPath, tenant, updateReplyInState]);
     var resolveThread = react_1.useCallback(function (_a) {
         var commentId = _a.commentId, uri = _a.uri;
         createReply({ content: '', namedUsers: [], commentId: commentId, action: 'resolve', uri: uri });
@@ -185,6 +206,7 @@ var useCollaboration = function (objectIds, objectTypes) {
     return {
         commentsMap: commentsMap,
         currentComment: currentComment,
+        comments: comments,
         getComment: getComment,
         createReply: createReply,
         editComment: editComment,
@@ -195,7 +217,9 @@ var useCollaboration = function (objectIds, objectTypes) {
         reOpenThread: reOpenThread,
         sending: sending,
         loading: loading,
-        objectTypes: objectTypes
+        objectTypes: objectTypes,
+        getComments: getComments,
+        pageToken: pageToken
     };
 };
 exports.useCollaboration = useCollaboration;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.818",
+  "version": "1.4.819",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "index.js",
   "dependencies": {
     "@date-io/moment": "^1.3.5",
     "@react-google-maps/api": "^2.7.0",
-    "@reltio/mdm-module": "^1.4.818",
-    "@reltio/mdm-sdk": "^1.4.818",
+    "@reltio/mdm-module": "^1.4.819",
+    "@reltio/mdm-sdk": "^1.4.819",
     "classnames": "^2.2.5",
     "frontend-collective-react-dnd-scrollzone": "^1.0.2",
     "nanoid": "^2.0.0",