Skip to content

Reader: improve performance of conversations #21468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samouri merged 4 commits into from
Jan 23, 2018
Merged

Reader: improve performance of conversations #21468

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8541041
Reader: comments selectors use tree-select
samouri Jan 15, 2018
e3182e4
protect empty case
samouri Jan 15, 2018
451b14c
protect all the empty cases
samouri Jan 16, 2018
ecac717
update based on new changes to treeSelect
samouri Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update based on new changes to treeSelect
  • Loading branch information
@samouri
samouri committed Jan 19, 2018
commit ecac7170e04b26c70a84943e478824844f261e94
22 changes: 9 additions & 13 deletions client/state/comments/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ import treeSelect from 'lib/tree-select';
import { fetchStatusInitialState } from './reducer';
import { getStateKey, deconstructStateKey, getErrorKey } from './utils';

const emptyObject = {};
const emptyArray = [];

/***
* Gets comment items for post
* @param {Object} state redux state
Expand All @@ -39,7 +36,7 @@ export const getPostCommentItems = ( state, siteId, postId ) =>
get( state.comments.items, `${ siteId }-${ postId }` );

export const getDateSortedPostComments = treeSelect(
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) || emptyArray ],
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) ],
( [ comments ] ) => {
return sortBy( comments, comment => new Date( comment.date ) );
}
Expand Down Expand Up @@ -80,7 +77,7 @@ export const getPostTotalCommentsCount = ( state, siteId, postId ) =>
* @return {Date} most recent comment date
*/
export const getPostNewestCommentDate = treeSelect(
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) || emptyArray ],
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) ],
( [ comments ] ) => {
const firstContiguousComment = find( comments, 'contiguous' );
return firstContiguousComment ? new Date( get( firstContiguousComment, 'date' ) ) : undefined;
Expand All @@ -95,7 +92,7 @@ export const getPostNewestCommentDate = treeSelect(
* @return {Date} earliest comment date
*/
export const getPostOldestCommentDate = treeSelect(
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) || emptyArray ],
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) ],
( [ comments ] ) => {
const lastContiguousComment = findLast( comments, 'contiguous' );
return lastContiguousComment ? new Date( get( lastContiguousComment, 'date' ) ) : undefined;
Expand All @@ -112,7 +109,7 @@ export const getPostOldestCommentDate = treeSelect(
* @return {Object} comments tree, and in addition a children array
*/
export const getPostCommentsTree = treeSelect(
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) || emptyArray ],
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) ],
( [ allItems ], siteId, postId, status = 'approved', authorId ) => {
const items = filter( allItems, item => {
//only return pending comments that match the comment author
Expand Down Expand Up @@ -153,12 +150,12 @@ export const getPostCommentsTree = treeSelect(
);

export const getExpansionsForPost = ( state, siteId, postId ) =>
state.comments.expansions[ getStateKey( siteId, postId ) ] || emptyObject;
state.comments.expansions[ getStateKey( siteId, postId ) ];

export const getHiddenCommentsForPost = treeSelect(
( state, siteId, postId ) => [
getPostCommentItems( state, siteId, postId ) || emptyArray,
getExpansionsForPost( state, siteId, postId ) || emptyObject,
getPostCommentItems( state, siteId, postId ),
getExpansionsForPost( state, siteId, postId ),
],
( [ comments, expanded ] ) => {
const commentsById = keyBy( comments, 'ID' );
Expand Down Expand Up @@ -192,7 +189,7 @@ export const commentsFetchingStatus = ( state, siteId, postId, commentTotal = 0
* @return {Object} that has i_like and like_count props
*/
export const getCommentLike = treeSelect(
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) || emptyArray ],
( state, siteId, postId ) => [ getPostCommentItems( state, siteId, postId ) ],
( [ comments ], siteId, postId, commentId ) => {
const comment = find( comments, { ID: commentId } );

Expand All @@ -201,6 +198,5 @@ export const getCommentLike = treeSelect(
}
const { i_like, like_count } = comment;
return { i_like, like_count };
},
state => state.comments.items
}
);