Unverified Commit 10f887f8 authored by Karishma Chadha's avatar Karishma Chadha Committed by GitHub

Revert "Only request replies if reply_count > 0"

parent b3795c94
...@@ -69,10 +69,8 @@ const getTopLevelComments = (id, offset, ownerUsername, isAdmin, token) => (disp ...@@ -69,10 +69,8 @@ const getTopLevelComments = (id, offset, ownerUsername, isAdmin, token) => (disp
} }
dispatch(setFetchStatus('comments', Status.FETCHED)); dispatch(setFetchStatus('comments', Status.FETCHED));
dispatch(setComments(body)); dispatch(setComments(body));
const commentsWithReplies = body.filter(comment => comment.reply_count > 0); dispatch(getReplies(id, body.map(comment => comment.id), 0, ownerUsername, isAdmin, token));
if (commentsWithReplies.length > 0) {
dispatch(getReplies(id, commentsWithReplies.map(comment => comment.id), 0, ownerUsername, isAdmin, token));
}
// If we loaded a full page of comments, assume there are more to load. // If we loaded a full page of comments, assume there are more to load.
// This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require // This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require
// any more server query complexity, so seems worth it. In the case of a project with // any more server query complexity, so seems worth it. In the case of a project with
...@@ -107,9 +105,7 @@ const getCommentById = (projectId, commentId, ownerUsername, isAdmin, token) => ...@@ -107,9 +105,7 @@ const getCommentById = (projectId, commentId, ownerUsername, isAdmin, token) =>
// If the comment is not a reply, show it as top level and load replies // If the comment is not a reply, show it as top level and load replies
dispatch(setFetchStatus('comments', Status.FETCHED)); dispatch(setFetchStatus('comments', Status.FETCHED));
dispatch(setComments([body])); dispatch(setComments([body]));
if (body.reply_count > 0) { dispatch(getReplies(projectId, [body.id], 0, ownerUsername, isAdmin, token));
dispatch(getReplies(projectId, [body.id], 0, ownerUsername, isAdmin, token));
}
}); });
}); });
......
...@@ -90,10 +90,7 @@ const getTopLevelComments = () => ((dispatch, getState) => { ...@@ -90,10 +90,7 @@ const getTopLevelComments = () => ((dispatch, getState) => {
} }
dispatch(setFetchStatus('comments', Status.FETCHED)); dispatch(setFetchStatus('comments', Status.FETCHED));
dispatch(setComments(body)); dispatch(setComments(body));
const commentsWithReplies = body.filter(comment => comment.reply_count > 0); dispatch(getReplies(body.map(comment => comment.id), 0));
if (commentsWithReplies.length > 0) {
dispatch(getReplies(commentsWithReplies.map(comment => comment.id), 0));
}
// If we loaded a full page of comments, assume there are more to load. // If we loaded a full page of comments, assume there are more to load.
// This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require // This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require
...@@ -133,9 +130,7 @@ const getCommentById = commentId => ((dispatch, getState) => { ...@@ -133,9 +130,7 @@ const getCommentById = commentId => ((dispatch, getState) => {
// If the comment is not a reply, show it as top level and load replies // If the comment is not a reply, show it as top level and load replies
dispatch(setFetchStatus('comments', Status.FETCHED)); dispatch(setFetchStatus('comments', Status.FETCHED));
dispatch(setComments([body])); dispatch(setComments([body]));
if (body.reply_count > 0) { dispatch(getReplies(body.id, 0));
dispatch(getReplies(body.id, 0));
}
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment