[Comments] Batch fixes (#65)

ui/component/commentsList/index.js

@@ -1,5 +1,6 @@
 import { connect } from 'react-redux';
 import {
+  doResolveUris,
   makeSelectClaimForUri,
   makeSelectClaimIsMine,
   selectFetchingMyChannels,
@@ -24,11 +25,19 @@ import CommentsList from './view';
 
 const select = (state, props) => {
   const activeChannelClaim = selectActiveChannelClaim(state);
+  const topLevelComments = makeSelectTopLevelCommentsForUri(props.uri)(state);
+
+  const resolvedComments =
+    topLevelComments && topLevelComments.length > 0
+      ? topLevelComments.filter(({ channel_url }) => makeSelectClaimForUri(channel_url)(state) !== undefined)
+      : [];
+
   return {
+    topLevelComments,
+    resolvedComments,
     myChannels: selectMyChannelClaims(state),
     allCommentIds: makeSelectCommentIdsForUri(props.uri)(state),
     pinnedComments: makeSelectPinnedCommentsForUri(props.uri)(state),
-    topLevelComments: makeSelectTopLevelCommentsForUri(props.uri)(state),
     topLevelTotalPages: makeSelectTopLevelTotalPagesForUri(props.uri)(state),
     totalComments: makeSelectTotalCommentsCountForUri(props.uri)(state),
     claim: makeSelectClaimForUri(props.uri)(state),
@@ -49,6 +58,7 @@ const perform = (dispatch) => ({
   fetchComment: (commentId) => dispatch(doCommentById(commentId)),
   fetchReacts: (commentIds) => dispatch(doCommentReactList(commentIds)),
   resetComments: (claimId) => dispatch(doCommentReset(claimId)),
+  doResolveUris: (uris) => dispatch(doResolveUris(uris, true)),
 });
 
 export default connect(select, perform)(CommentsList);

ui/component/commentsList/view.jsx

@@ -32,6 +32,7 @@ type Props = {
   allCommentIds: any,
   pinnedComments: Array<Comment>,
   topLevelComments: Array<Comment>,
+  resolvedComments: Array<Comment>,
   topLevelTotalPages: number,
   uri: string,
   claim: ?Claim,
@@ -47,8 +48,9 @@ type Props = {
   othersReactsById: ?{ [string]: { [REACTION_TYPES.LIKE | REACTION_TYPES.DISLIKE]: number } },
   activeChannelId: ?string,
   settingsByChannelId: { [channelId: string]: PerChannelSettings },
-  fetchReacts: (Array<string>) => Promise<any>,
   commentsAreExpanded?: boolean,
+  fetchReacts: (Array<string>) => Promise<any>,
+  doResolveUris: (Array<string>) => void,
   fetchTopLevelComments: (string, number, number, number) => void,
   fetchComment: (string) => void,
   resetComments: (string) => void,
@@ -60,6 +62,7 @@ function CommentList(props: Props) {
     uri,
     pinnedComments,
     topLevelComments,
+    resolvedComments,
     topLevelTotalPages,
     claim,
     claimIsMine,
@@ -74,8 +77,9 @@ function CommentList(props: Props) {
     othersReactsById,
     activeChannelId,
     settingsByChannelId,
-    fetchReacts,
     commentsAreExpanded,
+    fetchReacts,
+    doResolveUris,
     fetchTopLevelComments,
     fetchComment,
     resetComments,
@@ -83,19 +87,24 @@ function CommentList(props: Props) {
 
   const isMobile = useIsMobile();
   const isMediumScreen = useIsMediumScreen();
+  const desktopView = !isMobile && !isMediumScreen;
   const spinnerRef = React.useRef();
   const DEFAULT_SORT = ENABLE_COMMENT_REACTIONS ? SORT_BY.POPULARITY : SORT_BY.NEWEST;
   const [sort, setSort] = usePersistedState('comment-sort-by', DEFAULT_SORT);
   const [page, setPage] = React.useState(0);
+  const [commentsToDisplay, setCommentsToDisplay] = React.useState(topLevelComments);
   const fetchedCommentsOnce = useFetched(isFetchingComments);
   const fetchedReactsOnce = useFetched(isFetchingReacts);
   const fetchedLinkedComment = useFetched(isFetchingCommentsById);
-  const hasDefaultExpansion = commentsAreExpanded || (!isMobile && !isMediumScreen);
+  const hasDefaultExpansion = commentsAreExpanded || desktopView;
   const [expandedComments, setExpandedComments] = React.useState(hasDefaultExpansion);
   const totalFetchedComments = allCommentIds ? allCommentIds.length : 0;
   const channelId = getChannelIdFromClaim(claim);
   const channelSettings = channelId ? settingsByChannelId[channelId] : undefined;
   const moreBelow = page < topLevelTotalPages;
+  const isResolvingComments = topLevelComments && resolvedComments.length !== topLevelComments.length;
+  const alreadyResolved = !isResolvingComments && resolvedComments.length !== 0;
+  const canDisplayComments = commentsToDisplay && commentsToDisplay.length === topLevelComments.length;
 
   // Display comments immediately if not fetching reactions
   // If not, wait to show comments until reactions are fetched
@@ -206,12 +215,12 @@ function CommentList(props: Props) {
     }
 
     const handleCommentScroll = debounce(() => {
-      if (hasDefaultExpansion && shouldFetchNextPage(page, topLevelTotalPages, window, document)) {
+      if (shouldFetchNextPage(page, topLevelTotalPages, window, document)) {
         setPage(page + 1);
       }
     }, DEBOUNCE_SCROLL_HANDLER_MS);
 
-    if (!isFetchingComments && readyToDisplayComments && moreBelow && spinnerRef && spinnerRef.current) {
+    if (hasDefaultExpansion && !isFetchingComments && canDisplayComments && readyToDisplayComments && moreBelow) {
       if (shouldFetchNextPage(page, topLevelTotalPages, window, document, 0)) {
         setPage(page + 1);
       } else {
@@ -219,10 +228,34 @@ function CommentList(props: Props) {
         return () => window.removeEventListener('scroll', handleCommentScroll);
       }
     }
-  }, [hasDefaultExpansion, isFetchingComments, moreBelow, page, readyToDisplayComments, topLevelTotalPages]);
+  }, [
+    canDisplayComments,
+    hasDefaultExpansion,
+    isFetchingComments,
+    moreBelow,
+    page,
+    readyToDisplayComments,
+    topLevelTotalPages,
+  ]);
 
-  const getCommentElems = (comments) => {
+  // Wait to only display topLevelComments after resolved or else
-    return comments.map((comment) => (
+  // other components will try to resolve again, like channelThumbnail
+  useEffect(() => {
+    if (!isResolvingComments) setCommentsToDisplay(topLevelComments);
+  }, [isResolvingComments, topLevelComments]);
+
+  // Batch resolve comment channel urls
+  useEffect(() => {
+    if (!topLevelComments || alreadyResolved) return;
+
+    const urisToResolve = [];
+    topLevelComments.map(({ channel_url }) => channel_url !== undefined && urisToResolve.push(channel_url));
+
+    if (urisToResolve.length > 0) doResolveUris(urisToResolve);
+  }, [alreadyResolved, doResolveUris, topLevelComments]);
+
+  const getCommentElems = (comments) =>
+    comments.map((comment) => (
       <CommentView
         isTopLevel
         threadDepth={3}
@@ -247,22 +280,19 @@ function CommentList(props: Props) {
         isFiat={comment.is_fiat}
       />
     ));
-  };
 
-  const sortButton = (label, icon, sortOption) => {
+  const sortButton = (label, icon, sortOption) => (
-    return (
+    <Button
-      <Button
+      button="alt"
-        button="alt"
+      label={label}
-        label={label}
+      icon={icon}
-        icon={icon}
+      iconSize={18}
-        iconSize={18}
+      onClick={() => changeSort(sortOption)}
-        onClick={() => changeSort(sortOption)}
+      className={classnames(`button-toggle`, {
-        className={classnames(`button-toggle`, {
+        'button-toggle--active': sort === sortOption,
-          'button-toggle--active': sort === sortOption,
+      })}
-        })}
+    />
-      />
+  );
-    );
-  };
 
   return (
     <Card
@@ -294,12 +324,12 @@ function CommentList(props: Props) {
 
           <ul
             className={classnames({
-              comments: expandedComments,
+              comments: desktopView || expandedComments,
-              'comments--contracted': !expandedComments,
+              'comments--contracted': !desktopView && !expandedComments,
             })}
           >
             {readyToDisplayComments && pinnedComments && getCommentElems(pinnedComments)}
-            {readyToDisplayComments && topLevelComments && getCommentElems(topLevelComments)}
+            {readyToDisplayComments && commentsToDisplay && getCommentElems(commentsToDisplay)}
           </ul>
 
           {!hasDefaultExpansion && (
@@ -323,7 +353,7 @@ function CommentList(props: Props) {
             </div>
           )}
 
-          {(isFetchingComments || (hasDefaultExpansion && moreBelow)) && (
+          {(isFetchingComments || (hasDefaultExpansion && moreBelow) || !canDisplayComments) && (
             <div className="main--empty" ref={spinnerRef}>
               <Spinner type="small" />
             </div>

ui/component/commentsReplies/index.js

@@ -1,15 +1,26 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimIsMine, selectMyChannelClaims } from 'lbry-redux';
+import { makeSelectClaimIsMine, selectMyChannelClaims, makeSelectClaimForUri, doResolveUris } from 'lbry-redux';
 import { selectIsFetchingCommentsByParentId, makeSelectRepliesForParentId } from 'redux/selectors/comments';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import CommentsReplies from './view';
 
-const select = (state, props) => ({
+const select = (state, props) => {
-  fetchedReplies: makeSelectRepliesForParentId(props.parentId)(state),
+  const fetchedReplies = makeSelectRepliesForParentId(props.parentId)(state);
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
+  const resolvedReplies =
-  commentingEnabled: IS_WEB ? Boolean(selectUserVerifiedEmail(state)) : true,
+    fetchedReplies && fetchedReplies.length > 0
-  myChannels: selectMyChannelClaims(state),
+      ? fetchedReplies.filter(({ channel_url }) => makeSelectClaimForUri(channel_url)(state) !== undefined)
-  isFetchingByParentId: selectIsFetchingCommentsByParentId(state),
+      : [];
-});
 
-export default connect(select)(CommentsReplies);
+  return {
+    fetchedReplies,
+    resolvedReplies,
+    claimIsMine: makeSelectClaimIsMine(props.uri)(state),
+    userCanComment: IS_WEB ? Boolean(selectUserVerifiedEmail(state)) : true,
+    myChannels: selectMyChannelClaims(state),
+    isFetchingByParentId: selectIsFetchingCommentsByParentId(state),
+  };
+};
+
+const perform = (dispatch) => ({ doResolveUris: (uris) => dispatch(doResolveUris(uris, true)) });
+
+export default connect(select, perform)(CommentsReplies);

ui/component/commentsReplies/view.jsx

@@ -1,24 +1,26 @@
 // @flow
 import * as ICONS from 'constants/icons';
-import React from 'react';
-import Comment from 'component/comment';
 import Button from 'component/button';
+import Comment from 'component/comment';
+import React from 'react';
 import Spinner from 'component/spinner';
 
 type Props = {
-  fetchedReplies: Array<any>,
+  fetchedReplies: Array<Comment>,
+  resolvedReplies: Array<Comment>,
   uri: string,
   parentId: string,
   claimIsMine: boolean,
   myChannels: ?Array<ChannelClaim>,
   linkedCommentId?: string,
-  commentingEnabled: boolean,
+  userCanComment: boolean,
   threadDepth: number,
   numDirectReplies: number, // Total replies for parentId as reported by 'comment[replies]'. Includes blocked items.
   isFetchingByParentId: { [string]: boolean },
-  onShowMore?: () => void,
   hasMore: boolean,
   supportDisabled: boolean,
+  doResolveUris: (Array<string>) => void,
+  onShowMore?: () => void,
 };
 
 function CommentsReplies(props: Props) {
@@ -26,102 +28,108 @@ function CommentsReplies(props: Props) {
     uri,
     parentId,
     fetchedReplies,
+    resolvedReplies,
     claimIsMine,
     myChannels,
     linkedCommentId,
-    commentingEnabled,
+    userCanComment,
     threadDepth,
     numDirectReplies,
     isFetchingByParentId,
-    onShowMore,
     hasMore,
     supportDisabled,
+    doResolveUris,
+    onShowMore,
   } = props;
 
   const [isExpanded, setExpanded] = React.useState(true);
+  const [commentsToDisplay, setCommentsToDisplay] = React.useState(fetchedReplies);
+  const isResolvingReplies = fetchedReplies && resolvedReplies.length !== fetchedReplies.length;
+  const alreadyResolved = !isResolvingReplies && resolvedReplies.length !== 0;
+  const canDisplayComments = commentsToDisplay && commentsToDisplay.length === fetchedReplies.length;
 
-  function showMore() {
+  // Batch resolve comment channel urls
-    if (onShowMore) {
+  React.useEffect(() => {
-      onShowMore();
+    if (!fetchedReplies || alreadyResolved) return;
-    }
-  }
 
-  // todo: implement comment_list --mine in SDK so redux can grab with selectCommentIsMine
+    const urisToResolve = [];
-  function isMyComment(channelId: string) {
+    fetchedReplies.map(({ channel_url }) => channel_url !== undefined && urisToResolve.push(channel_url));
-    if (myChannels != null && channelId != null) {
-      for (let i = 0; i < myChannels.length; i++) {
-        if (myChannels[i].claim_id === channelId) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
 
-  const displayedComments = fetchedReplies;
+    if (urisToResolve.length > 0) doResolveUris(urisToResolve);
+  }, [alreadyResolved, doResolveUris, fetchedReplies]);
 
-  return (
+  // Wait to only display topLevelComments after resolved or else
-    Boolean(numDirectReplies) && (
+  // other components will try to resolve again, like channelThumbnail
-      <div className="comment__replies-container">
+  React.useEffect(() => {
-        {Boolean(numDirectReplies) && !isExpanded && (
+    if (!isResolvingReplies) setCommentsToDisplay(fetchedReplies);
+  }, [isResolvingReplies, fetchedReplies]);
+
+  return !numDirectReplies ? null : (
+    <div className="comment__replies-container">
+      {!isExpanded ? (
+        <div className="comment__actions--nested">
+          <Button
+            className="comment__action"
+            label={__('Show Replies')}
+            onClick={() => setExpanded(!isExpanded)}
+            icon={isExpanded ? ICONS.UP : ICONS.DOWN}
+          />
+        </div>
+      ) : (
+        <div className="comment__replies">
+          <Button className="comment__threadline" aria-label="Hide Replies" onClick={() => setExpanded(false)} />
+
+          <ul className="comments--replies">
+            {!isResolvingReplies &&
+              commentsToDisplay &&
+              commentsToDisplay.length > 0 &&
+              commentsToDisplay.map((comment) => (
+                <Comment
+                  threadDepth={threadDepth}
+                  uri={uri}
+                  authorUri={comment.channel_url}
+                  author={comment.channel_name}
+                  claimId={comment.claim_id}
+                  commentId={comment.comment_id}
+                  key={comment.comment_id}
+                  message={comment.comment}
+                  timePosted={comment.timestamp * 1000}
+                  claimIsMine={claimIsMine}
+                  commentIsMine={
+                    comment.channel_id &&
+                    myChannels &&
+                    myChannels.some(({ claim_id }) => claim_id === comment.channel_id)
+                  }
+                  linkedCommentId={linkedCommentId}
+                  commentingEnabled={userCanComment}
+                  supportAmount={comment.support_amount}
+                  numDirectReplies={comment.replies}
+                  isModerator={comment.is_moderator}
+                  isGlobalMod={comment.is_global_mod}
+                  supportDisabled={supportDisabled}
+                />
+              ))}
+          </ul>
+        </div>
+      )}
+      {isExpanded && fetchedReplies && hasMore && (
+        <div className="comment__actions--nested">
+          <Button
+            button="link"
+            label={__('Show more')}
+            onClick={() => onShowMore && onShowMore()}
+            className="button--uri-indicator"
+          />
+        </div>
+      )}
+      {(isFetchingByParentId[parentId] || isResolvingReplies || !canDisplayComments) && (
+        <div className="comment__replies-container">
           <div className="comment__actions--nested">
-            <Button
+            <Spinner type="small" />
-              className="comment__action"
-              label={__('Show Replies')}
-              onClick={() => setExpanded(!isExpanded)}
-              icon={isExpanded ? ICONS.UP : ICONS.DOWN}
-            />
           </div>
-        )}
+        </div>
-        {isExpanded && (
+      )}
-          <div>
+    </div>
-            <div className="comment__replies">
-              <Button className="comment__threadline" aria-label="Hide Replies" onClick={() => setExpanded(false)} />
-
-              <ul className="comments--replies">
-                {displayedComments &&
-                  displayedComments.map((comment) => {
-                    return (
-                      <Comment
-                        threadDepth={threadDepth}
-                        uri={uri}
-                        authorUri={comment.channel_url}
-                        author={comment.channel_name}
-                        claimId={comment.claim_id}
-                        commentId={comment.comment_id}
-                        key={comment.comment_id}
-                        message={comment.comment}
-                        timePosted={comment.timestamp * 1000}
-                        claimIsMine={claimIsMine}
-                        commentIsMine={comment.channel_id && isMyComment(comment.channel_id)}
-                        linkedCommentId={linkedCommentId}
-                        commentingEnabled={commentingEnabled}
-                        supportAmount={comment.support_amount}
-                        numDirectReplies={comment.replies}
-                        isModerator={comment.is_moderator}
-                        isGlobalMod={comment.is_global_mod}
-                        supportDisabled={supportDisabled}
-                      />
-                    );
-                  })}
-              </ul>
-            </div>
-          </div>
-        )}
-        {isExpanded && fetchedReplies && hasMore && (
-          <div className="comment__actions--nested">
-            <Button button="link" label={__('Show more')} onClick={showMore} className="button--uri-indicator" />
-          </div>
-        )}
-        {isFetchingByParentId[parentId] && (
-          <div className="comment__replies-container">
-            <div className="comment__actions--nested">
-              <Spinner type="small" />
-            </div>
-          </div>
-        )}
-      </div>
-    )
   );
 }