diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-02-23 14:34:06 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-02-23 14:34:06 -0500 |
commit | 0031c6fd1a4df621cbecfd2a2b3efe9a40cd49ce (patch) | |
tree | 2afcb0888267be4cf59df2d0e8f5085d6aacccb0 /web/react/stores | |
parent | 11093ddb51a70622287aac20108be6c6aa2eb76d (diff) | |
parent | 1f049af2b7ea41a5e1e79a8263e10fa58f186c8d (diff) | |
download | chat-0031c6fd1a4df621cbecfd2a2b3efe9a40cd49ce.tar.gz chat-0031c6fd1a4df621cbecfd2a2b3efe9a40cd49ce.tar.bz2 chat-0031c6fd1a4df621cbecfd2a2b3efe9a40cd49ce.zip |
Merge pull request #2229 from mattermost/plt-1770
PLT-1770 Refactor store listeners out of highly used components
Diffstat (limited to 'web/react/stores')
-rw-r--r-- | web/react/stores/post_store.jsx | 122 | ||||
-rw-r--r-- | web/react/stores/user_store.jsx | 52 |
2 files changed, 58 insertions, 116 deletions
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx index f5c342163..5100a4936 100644 --- a/web/react/stores/post_store.jsx +++ b/web/react/stores/post_store.jsx @@ -20,72 +20,7 @@ const SELECTED_POST_CHANGE_EVENT = 'selected_post_change'; class PostStoreClass extends EventEmitter { constructor() { super(); - - this.emitChange = this.emitChange.bind(this); - this.addChangeListener = this.addChangeListener.bind(this); - this.removeChangeListener = this.removeChangeListener.bind(this); - - this.emitEditPost = this.emitEditPost.bind(this); - this.addEditPostListener = this.addEditPostListener.bind(this); - this.removeEditPostListener = this.removeEditPostListner.bind(this); - - this.emitPostsViewJump = this.emitPostsViewJump.bind(this); - this.addPostsViewJumpListener = this.addPostsViewJumpListener.bind(this); - this.removePostsViewJumpListener = this.removePostsViewJumpListener.bind(this); - - this.emitPostFocused = this.emitPostFocused.bind(this); - this.addPostFocusedListener = this.addPostFocusedListener.bind(this); - this.removePostFocusedListener = this.removePostFocusedListener.bind(this); - - this.makePostsInfo = this.makePostsInfo.bind(this); - - this.getPost = this.getPost.bind(this); - this.getAllPosts = this.getAllPosts.bind(this); - this.getEarliestPost = this.getEarliestPost.bind(this); - this.getLatestPost = this.getLatestPost.bind(this); - this.getVisiblePosts = this.getVisiblePosts.bind(this); - this.getVisibilityAtTop = this.getVisibilityAtTop.bind(this); - this.getVisibilityAtBottom = this.getVisibilityAtBottom.bind(this); - this.requestVisibilityIncrease = this.requestVisibilityIncrease.bind(this); - this.getFocusedPostId = this.getFocusedPostId.bind(this); - - this.storePosts = this.storePosts.bind(this); - this.storePost = this.storePost.bind(this); - this.storeFocusedPost = this.storeFocusedPost.bind(this); - this.checkBounds = this.checkBounds.bind(this); - - this.clearFocusedPost = this.clearFocusedPost.bind(this); - this.clearChannelVisibility = this.clearChannelVisibility.bind(this); - - this.deletePost = this.deletePost.bind(this); - this.removePost = this.removePost.bind(this); - - this.getPendingPosts = this.getPendingPosts.bind(this); - this.storePendingPost = this.storePendingPost.bind(this); - this.removePendingPost = this.removePendingPost.bind(this); - this.clearPendingPosts = this.clearPendingPosts.bind(this); - this.updatePendingPost = this.updatePendingPost.bind(this); - - // These functions are bad and work should be done to remove this system when the RHS dies - this.storeSelectedPost = this.storeSelectedPost.bind(this); - this.getSelectedPost = this.getSelectedPost.bind(this); - this.emitSelectedPostChange = this.emitSelectedPostChange.bind(this); - this.addSelectedPostChangeListener = this.addSelectedPostChangeListener.bind(this); - this.removeSelectedPostChangeListener = this.removeSelectedPostChangeListener.bind(this); - this.selectedPost = null; - - this.getEmptyDraft = this.getEmptyDraft.bind(this); - this.storeCurrentDraft = this.storeCurrentDraft.bind(this); - this.getCurrentDraft = this.getCurrentDraft.bind(this); - this.storeDraft = this.storeDraft.bind(this); - this.getDraft = this.getDraft.bind(this); - this.storeCommentDraft = this.storeCommentDraft.bind(this); - this.getCommentDraft = this.getCommentDraft.bind(this); - this.clearDraftUploads = this.clearDraftUploads.bind(this); - this.clearCommentDraftUploads = this.clearCommentDraftUploads.bind(this); - this.getCurrentUsersLatestPost = this.getCurrentUsersLatestPost.bind(this); - this.getCommentCount = this.getCommentCount.bind(this); - + this.selectedPostId = null; this.postsInfo = {}; this.currentFocusedPostId = null; } @@ -421,12 +356,59 @@ class PostStoreClass extends EventEmitter { this.emitChange(); } - storeSelectedPost(postList) { - this.selectedPost = postList; + storeSelectedPostId(postId) { + this.selectedPostId = postId; + } + + getSelectedPostId() { + return this.selectedPostId; } getSelectedPost() { - return this.selectedPost; + if (this.selectedPostId == null) { + return null; + } + + for (const k in this.postsInfo) { + if (this.postsInfo[k].postList.posts.hasOwnProperty(this.selectedPostId)) { + return this.postsInfo[k].postList.posts[this.selectedPostId]; + } + } + + return null; + } + + getSelectedPostThread() { + if (this.selectedPostId == null) { + return null; + } + + let posts; + let pendingPosts; + for (const k in this.postsInfo) { + if (this.postsInfo[k].postList.posts.hasOwnProperty(this.selectedPostId)) { + posts = this.postsInfo[k].postList.posts; + if (this.postsInfo[k].pendingPosts != null) { + pendingPosts = this.postsInfo[k].pendingPosts.posts; + } + } + } + + const threadPosts = {}; + const rootId = this.selectedPostId; + for (const k in posts) { + if (posts[k].root_id === rootId) { + threadPosts[k] = JSON.parse(JSON.stringify(posts[k])); + } + } + + for (const k in pendingPosts) { + if (pendingPosts[k].root_id === rootId) { + threadPosts[k] = JSON.parse(JSON.stringify(pendingPosts[k])); + } + } + + return threadPosts; } emitSelectedPostChange(fromSearch) { @@ -565,7 +547,7 @@ PostStore.dispatchToken = AppDispatcher.register((payload) => { PostStore.emitChange(); break; case ActionTypes.RECEIVED_POST_SELECTED: - PostStore.storeSelectedPost(action.post_list); + PostStore.storeSelectedPostId(action.postId); PostStore.emitSelectedPostChange(action.from_search); break; default: diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index dd60e166f..75a87d424 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -17,50 +17,6 @@ const CHANGE_EVENT_STATUSES = 'change_statuses'; class UserStoreClass extends EventEmitter { constructor() { super(); - - this.emitChange = this.emitChange.bind(this); - this.addChangeListener = this.addChangeListener.bind(this); - this.removeChangeListener = this.removeChangeListener.bind(this); - this.emitSessionsChange = this.emitSessionsChange.bind(this); - this.addSessionsChangeListener = this.addSessionsChangeListener.bind(this); - this.removeSessionsChangeListener = this.removeSessionsChangeListener.bind(this); - this.emitAuditsChange = this.emitAuditsChange.bind(this); - this.addAuditsChangeListener = this.addAuditsChangeListener.bind(this); - this.removeAuditsChangeListener = this.removeAuditsChangeListener.bind(this); - this.emitTeamsChange = this.emitTeamsChange.bind(this); - this.addTeamsChangeListener = this.addTeamsChangeListener.bind(this); - this.removeTeamsChangeListener = this.removeTeamsChangeListener.bind(this); - this.emitStatusesChange = this.emitStatusesChange.bind(this); - this.addStatusesChangeListener = this.addStatusesChangeListener.bind(this); - this.removeStatusesChangeListener = this.removeStatusesChangeListener.bind(this); - this.getCurrentId = this.getCurrentId.bind(this); - this.getCurrentUser = this.getCurrentUser.bind(this); - this.setCurrentUser = this.setCurrentUser.bind(this); - this.getLastEmail = this.getLastEmail.bind(this); - this.setLastEmail = this.setLastEmail.bind(this); - this.getLastUsername = this.getLastUsername.bind(this); - this.setLastUsername = this.setLastUsername.bind(this); - this.hasProfile = this.hasProfile.bind(this); - this.getProfile = this.getProfile.bind(this); - this.getProfileByUsername = this.getProfileByUsername.bind(this); - this.getProfilesUsernameMap = this.getProfilesUsernameMap.bind(this); - this.getProfiles = this.getProfiles.bind(this); - this.getActiveOnlyProfiles = this.getActiveOnlyProfiles.bind(this); - this.getActiveOnlyProfileList = this.getActiveOnlyProfileList.bind(this); - this.saveProfile = this.saveProfile.bind(this); - this.setSessions = this.setSessions.bind(this); - this.getSessions = this.getSessions.bind(this); - this.setAudits = this.setAudits.bind(this); - this.getAudits = this.getAudits.bind(this); - this.setTeams = this.setTeams.bind(this); - this.getTeams = this.getTeams.bind(this); - this.getCurrentMentionKeys = this.getCurrentMentionKeys.bind(this); - this.setStatuses = this.setStatuses.bind(this); - this.pSetStatuses = this.pSetStatuses.bind(this); - this.setStatus = this.setStatus.bind(this); - this.getStatuses = this.getStatuses.bind(this); - this.getStatus = this.getStatus.bind(this); - this.profileCache = null; } @@ -277,7 +233,11 @@ class UserStoreClass extends EventEmitter { } getCurrentMentionKeys() { - var user = this.getCurrentUser(); + return this.getMentionKeys(this.getCurrentId()); + } + + getMentionKeys(id) { + var user = this.getProfile(id); var keys = []; @@ -330,7 +290,7 @@ class UserStoreClass extends EventEmitter { } var UserStore = new UserStoreClass(); -UserStore.setMaxListeners(0); +UserStore.setMaxListeners(15); UserStore.dispatchToken = AppDispatcher.register((payload) => { var action = payload.action; |