From ab67f6e257f6e8f08145a02a7b93550f99641be4 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Sun, 18 Jun 2017 14:42:32 -0400 Subject: PLT-6215 Major post list refactor (#6501) * Major post list refactor * Fix post and thread deletion * Fix preferences not selecting correctly * Fix military time displaying * Fix UP key for editing posts * Fix ESLint error * Various fixes and updates per feedback * Fix for permalink view * Revert to old scrolling method and various fixes * Add floating timestamp, new message indicator, scroll arrows * Update post loading for focus mode and add visibility limit * Fix pinning posts and a react warning * Add loading UI updates from Asaad * Fix refreshing loop * Temporarily bump post visibility limit * Update infinite scrolling * Remove infinite scrolling --- webapp/stores/channel_store.jsx | 3 +- webapp/stores/emoji_store.jsx | 2 +- webapp/stores/file_store.jsx | 73 ----- webapp/stores/post_store.jsx | 654 ++++----------------------------------- webapp/stores/reaction_store.jsx | 92 ------ 5 files changed, 59 insertions(+), 765 deletions(-) delete mode 100644 webapp/stores/file_store.jsx delete mode 100644 webapp/stores/reaction_store.jsx (limited to 'webapp/stores') diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx index 07513aade..58ea19419 100644 --- a/webapp/stores/channel_store.jsx +++ b/webapp/stores/channel_store.jsx @@ -159,7 +159,8 @@ class ChannelStoreClass extends EventEmitter { setCurrentId(id) { store.dispatch({ type: ChannelTypes.SELECT_CHANNEL, - data: id + data: id, + member: this.getMyMember(id) }); } diff --git a/webapp/stores/emoji_store.jsx b/webapp/stores/emoji_store.jsx index 8a4165dd4..812688995 100644 --- a/webapp/stores/emoji_store.jsx +++ b/webapp/stores/emoji_store.jsx @@ -15,7 +15,7 @@ const MAXIMUM_RECENT_EMOJI = 27; // Wrap the contents of the store so that we don't need to construct an ES6 map where most of the content // (the system emojis) will never change. It provides the get/has functions of a map and an iterator so // that it can be used in for..of loops -class EmojiMap { +export class EmojiMap { constructor(customEmojis) { this.customEmojis = customEmojis; diff --git a/webapp/stores/file_store.jsx b/webapp/stores/file_store.jsx deleted file mode 100644 index 34378c062..000000000 --- a/webapp/stores/file_store.jsx +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; -import Constants from 'utils/constants.jsx'; -import EventEmitter from 'events'; - -const ActionTypes = Constants.ActionTypes; - -const CHANGE_EVENT = 'changed'; - -class FileStore extends EventEmitter { - constructor() { - super(); - - this.handleEventPayload = this.handleEventPayload.bind(this); - this.dispatchToken = AppDispatcher.register(this.handleEventPayload); - - this.setMaxListeners(600); - - this.fileInfosByPost = new Map(); - } - - addChangeListener(callback) { - this.on(CHANGE_EVENT, callback); - } - - removeChangeListener(callback) { - this.removeListener(CHANGE_EVENT, callback); - } - - emitChange() { - this.emit(CHANGE_EVENT); - } - - hasInfosForPost(postId) { - return this.fileInfosByPost.has(postId); - } - - getInfosForPost(postId) { - return this.fileInfosByPost.get(postId); - } - - saveInfos(postId, infos) { - this.fileInfosByPost.set(postId, infos); - } - - getFileUrl(fileId) { - return `/api/v3/files/${fileId}/get`; - } - - getFileThumbnailUrl(fileId) { - return `/api/v3/files/${fileId}/get_thumbnail`; - } - - getFilePreviewUrl(fileId) { - return `/api/v3/files/${fileId}/get_preview`; - } - - handleEventPayload(payload) { - const action = payload.action; - - switch (action.type) { - case ActionTypes.RECEIVED_FILE_INFOS: - // This assumes that all received file infos are for a single post - this.saveInfos(action.postId, action.infos); - this.emitChange(action.postId); - break; - } - } -} - -export default new FileStore(); diff --git a/webapp/stores/post_store.jsx b/webapp/stores/post_store.jsx index a402490af..66e7108ca 100644 --- a/webapp/stores/post_store.jsx +++ b/webapp/stores/post_store.jsx @@ -4,40 +4,29 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import EventEmitter from 'events'; +import ChannelStore from 'stores/channel_store.jsx'; import BrowserStore from 'stores/browser_store.jsx'; import UserStore from 'stores/user_store.jsx'; -import {Constants, PostTypes} from 'utils/constants.jsx'; +import {Constants} from 'utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; -const CHANGE_EVENT = 'change'; const FOCUSED_POST_CHANGE = 'focused_post_change'; const EDIT_POST_EVENT = 'edit_post'; -const POSTS_VIEW_JUMP_EVENT = 'post_list_jump'; -const SELECTED_POST_CHANGE_EVENT = 'selected_post_change'; const POST_PINNED_CHANGE_EVENT = 'post_pinned_change'; -const POST_DRAFT_CHANGE_EVENT = 'post_draft_change'; + +import store from 'stores/redux_store.jsx'; +const dispatch = store.dispatch; +const getState = store.getState; + +import * as Selectors from 'mattermost-redux/selectors/entities/posts'; class PostStoreClass extends EventEmitter { constructor() { super(); this.selectedPostId = null; - this.postsInfo = {}; - this.latestPageTime = {}; - this.earliestPostFromPage = {}; this.currentFocusedPostId = null; } - emitChange() { - this.emit(CHANGE_EVENT); - } - - addChangeListener(callback) { - this.on(CHANGE_EVENT, callback); - } - - removeChangeListener(callback) { - this.removeListener(CHANGE_EVENT, callback); - } emitPostFocused() { this.emit(FOCUSED_POST_CHANGE); @@ -63,512 +52,64 @@ class PostStoreClass extends EventEmitter { this.removeListener(EDIT_POST_EVENT, callback); } - emitPostsViewJump(type, post) { - this.emit(POSTS_VIEW_JUMP_EVENT, type, post); - } - - addPostsViewJumpListener(callback) { - this.on(POSTS_VIEW_JUMP_EVENT, callback); - } - - removePostsViewJumpListener(callback) { - this.removeListener(POSTS_VIEW_JUMP_EVENT, callback); - } - - emitPostDraftChange(channelId) { - this.emit(POST_DRAFT_CHANGE_EVENT + channelId, this.getPostDraft(channelId)); - } - - addPostDraftChangeListener(channelId, callback) { - this.on(POST_DRAFT_CHANGE_EVENT + channelId, callback); - } - - removePostDraftChangeListener(channelId, callback) { - this.removeListener(POST_DRAFT_CHANGE_EVENT + channelId, callback); - } - - jumpPostsViewToBottom() { - this.emitPostsViewJump(Constants.PostsViewJumpTypes.BOTTOM, null); - } - - jumpPostsViewToPost(post) { - this.emitPostsViewJump(Constants.PostsViewJumpTypes.POST, post); - } - - jumpPostsViewSidebarOpen() { - this.emitPostsViewJump(Constants.PostsViewJumpTypes.SIDEBAR_OPEN, null); - } - - // All this does is makes sure the postsInfo is not null for the specified channel - makePostsInfo(id) { - if (!this.postsInfo.hasOwnProperty(id)) { - this.postsInfo[id] = {}; - } - } - - getPost(channelId, postId) { - const postInfo = this.postsInfo[channelId]; - if (postInfo == null) { - return null; - } - - const postList = postInfo.postList; - let post = null; - - if (postList && postList.posts && postList.posts.hasOwnProperty(postId)) { - post = postList.posts[postId]; - } - - return post; - } - - getAllPosts(id) { - if (this.postsInfo.hasOwnProperty(id)) { - return this.postsInfo[id].postList; - } - - return null; - } - - getEarliestPostFromPage(id) { - return this.earliestPostFromPage[id]; + emitPostPinnedChange() { + this.emit(POST_PINNED_CHANGE_EVENT); } - getLatestPost(id) { - if (this.postsInfo.hasOwnProperty(id)) { - const postList = this.postsInfo[id].postList; - - for (const postId of postList.order) { - if (postList.posts[postId].state !== Constants.POST_DELETED) { - return postList.posts[postId]; - } - } - } - - return null; + addPostPinnedChangeListener(callback) { + this.on(POST_PINNED_CHANGE_EVENT, callback); } - getLatestNonEphemeralPost(id) { - if (this.postsInfo.hasOwnProperty(id)) { - const postList = this.postsInfo[id].postList; - - for (const postId of postList.order) { - if (postList.posts[postId].state !== Constants.POST_DELETED && postList.posts[postId].type !== Constants.PostTypes.EPHEMERAL) { - return postList.posts[postId]; - } - } - } - - return null; + removePostPinnedChangeListener(callback) { + this.removeListener(POST_PINNED_CHANGE_EVENT, callback); } - getLatestPostFromPageTime(id) { - if (this.latestPageTime.hasOwnProperty(id)) { - return this.latestPageTime[id]; - } - - return 0; + getLatestPostId(channelId) { + const postsInChannel = getState().entities.posts.postsInChannel[channelId] || []; + return postsInChannel[0]; } - getVisiblePosts(id) { - if (this.postsInfo.hasOwnProperty(id) && this.postsInfo[id].hasOwnProperty('postList')) { - const postList = JSON.parse(JSON.stringify(this.postsInfo[id].postList)); + getLatestNonEphemeralPost(channelId) { + const postIds = getState().entities.posts.postsInChannel[channelId]; + const posts = getState().entities.posts.posts; - // Only limit visibility if we are not focused on a post - if (this.currentFocusedPostId === null) { - postList.order = postList.order.slice(0, this.postsInfo[id].endVisible); + for (const postId of postIds) { + const post = posts[postId] || {}; + if (post.state !== Constants.POST_DELETED && post.type !== Constants.PostTypes.EPHEMERAL) { + return post; } - - // Add pending posts - if (this.postsInfo[id].hasOwnProperty('pendingPosts')) { - Object.assign(postList.posts, this.postsInfo[id].pendingPosts.posts); - postList.order = this.postsInfo[id].pendingPosts.order.concat(postList.order); - } - - return postList; } return null; } - getVisibilityAtTop(id) { - if (this.postsInfo.hasOwnProperty(id)) { - return this.postsInfo[id].atTop && this.postsInfo[id].endVisible >= this.postsInfo[id].postList.order.length; - } - - return false; - } - - getVisibilityAtBottom(id) { - if (this.postsInfo.hasOwnProperty(id)) { - return this.postsInfo[id].atBottom; - } - - return false; - } - - // Returns true if posts need to be fetched - requestVisibilityIncrease(id, amount) { - const endVisible = this.postsInfo[id].endVisible; - const postList = this.postsInfo[id].postList; - if (this.getVisibilityAtTop(id)) { - return false; - } - this.postsInfo[id].endVisible += amount; - this.emitChange(); - return endVisible + amount > postList.order.length; + getVisiblePosts() { + const posts = Selectors.getPostsInCurrentChannel(getState()); + const currentChannelId = getState().entities.channels.currentChannelId; + return posts.slice(0, getState().views.channel.postVisibility[currentChannelId]); } getFocusedPostId() { return this.currentFocusedPostId; } - storePosts(id, newPosts, checkLatest, checkEarliest) { - if (isPostListNull(newPosts)) { - return; - } - - if (checkLatest) { - const currentLatest = this.latestPageTime[id] || 0; - if (newPosts.order.length >= 1) { - const newLatest = newPosts.posts[newPosts.order[0]].create_at || 0; - if (newLatest > currentLatest) { - this.latestPageTime[id] = newLatest; - } - } else if (currentLatest === 0) { - // Mark that an empty page was received - this.latestPageTime[id] = 1; - } - } - - if (checkEarliest) { - const currentEarliest = this.earliestPostFromPage[id] || {create_at: Number.MAX_SAFE_INTEGER}; - const orderLength = newPosts.order.length; - if (orderLength >= 1) { - const newEarliestPost = newPosts.posts[newPosts.order[orderLength - 1]]; - if (newEarliestPost.create_at < currentEarliest.create_at) { - this.earliestPostFromPage[id] = newEarliestPost; - } - } - } - - const combinedPosts = makePostListNonNull(this.getAllPosts(id)); - - for (const pid in newPosts.posts) { - if (newPosts.posts.hasOwnProperty(pid)) { - const np = newPosts.posts[pid]; - if (np.delete_at === 0) { - combinedPosts.posts[pid] = np; - if (combinedPosts.order.indexOf(pid) === -1 && newPosts.order.indexOf(pid) !== -1) { - combinedPosts.order.push(pid); - } - } else if (combinedPosts.posts.hasOwnProperty(pid)) { - combinedPosts.posts[pid] = Object.assign({}, np, { - state: Constants.POST_DELETED, - fileIds: [] - }); - } - } - } - - combinedPosts.order.sort((a, b) => { - if (combinedPosts.posts[a].create_at > combinedPosts.posts[b].create_at) { - return -1; - } - if (combinedPosts.posts[a].create_at < combinedPosts.posts[b].create_at) { - return 1; - } - - return 0; - }); - - this.makePostsInfo(id); - this.postsInfo[id].postList = combinedPosts; - } - - focusedPostListHasPost(id) { - const focusedPostId = this.getFocusedPostId(); - if (focusedPostId == null) { - return false; - } - - const focusedPostList = makePostListNonNull(this.getAllPosts(focusedPostId)); - return focusedPostList.posts.hasOwnProperty(id); - } - - storePost(post, isNewPost = false) { - const ids = [ - post.channel_id - ]; - - // update the post in the permalink view if it's there - if (!isNewPost && this.focusedPostListHasPost(post.id)) { - ids.push(this.getFocusedPostId()); - } - - ids.forEach((id) => { - const postList = makePostListNonNull(this.getAllPosts(id)); - if (post.pending_post_id !== '') { - this.removePendingPost(post.channel_id, post.pending_post_id); - } - - post.pending_post_id = ''; - - postList.posts[post.id] = post; - if (isNewPost && postList.order.indexOf(post.id) === -1) { - postList.order.unshift(post.id); - } - - this.makePostsInfo(post.channel_id); - this.postsInfo[id].postList = postList; - }); - } - - storeFocusedPost(postId, channelId, postList) { - const focusedPost = postList.posts[postId]; - if (!focusedPost) { - return; - } + storeFocusedPostId(postId) { this.currentFocusedPostId = postId; - this.storePosts(postId, postList); - this.storePosts(channelId, postList); - } - - checkBounds(id, numRequested, postList, before) { - if (numRequested > postList.order.length) { - if (before) { - this.postsInfo[id].atTop = true; - } else { - this.postsInfo[id].atBottom = true; - } - } } clearFocusedPost() { - if (this.currentFocusedPostId != null) { - Reflect.deleteProperty(this.postsInfo, this.currentFocusedPostId); - this.currentFocusedPostId = null; - } - } - - clearChannelVisibility(id, atBottom) { - this.makePostsInfo(id); - this.postsInfo[id].endVisible = Constants.POST_CHUNK_SIZE; - if (this.postsInfo[id].postList) { - this.postsInfo[id].atTop = this.postsInfo[id].atTop && Constants.POST_CHUNK_SIZE >= this.postsInfo[id].postList.order.length; - } else { - this.postsInfo[id].atTop = false; - } - this.postsInfo[id].atBottom = atBottom; - } - - deletePost(post) { - let postInfo = null; - if (this.currentFocusedPostId == null) { - postInfo = this.postsInfo[post.channel_id]; - } else { - postInfo = this.postsInfo[this.currentFocusedPostId]; - } - if (!postInfo) { - // the post that has been deleted is in a channel that we haven't seen so just ignore it - return; - } - - const postList = postInfo.postList; - - if (isPostListNull(postList)) { - return; - } - - if (post.id in postList.posts) { - // make sure to copy the post so that component state changes work properly - postList.posts[post.id] = Object.assign({}, post, { - state: Constants.POST_DELETED, - file_ids: [], - has_reactions: false - }); - } - } - - removePost(post) { - const channelId = post.channel_id; - this.makePostsInfo(channelId); - const postList = this.postsInfo[channelId].postList; - if (isPostListNull(postList)) { - return; - } - - if (post.id in postList.posts) { - Reflect.deleteProperty(postList.posts, post.id); - } - - const index = postList.order.indexOf(post.id); - if (index !== -1) { - postList.order.splice(index, 1); - } - - for (const pid in postList.posts) { - if (!postList.posts.hasOwnProperty(pid)) { - continue; - } - - if (postList.posts[pid].root_id === post.id) { - Reflect.deleteProperty(postList.posts, pid); - const commentIndex = postList.order.indexOf(pid); - if (commentIndex !== -1) { - postList.order.splice(commentIndex, 1); - } - } - } - - this.postsInfo[channelId].postList = postList; - } - - getPendingPosts(channelId) { - if (this.postsInfo.hasOwnProperty(channelId)) { - return this.postsInfo[channelId].pendingPosts; - } - - return null; - } - - storePendingPost(post) { - const copyPost = JSON.parse(JSON.stringify(post)); - copyPost.state = Constants.POST_LOADING; - - const postList = makePostListNonNull(this.getPendingPosts(copyPost.channel_id)); - - postList.posts[copyPost.pending_post_id] = copyPost; - postList.order.unshift(copyPost.pending_post_id); - - this.makePostsInfo(copyPost.channel_id); - this.postsInfo[copyPost.channel_id].pendingPosts = postList; - this.emitChange(); - } - - removePendingPost(channelId, pendingPostId) { - const postList = makePostListNonNull(this.getPendingPosts(channelId)); - - Reflect.deleteProperty(postList.posts, pendingPostId); - const index = postList.order.indexOf(pendingPostId); - if (index === -1) { - return; - } - - postList.order.splice(index, 1); - - this.postsInfo[channelId].pendingPosts = postList; - this.emitChange(); - } - - clearPendingPosts(channelId) { - if (this.postsInfo.hasOwnProperty(channelId)) { - Reflect.deleteProperty(this.postsInfo[channelId], 'pendingPosts'); - } - } - - updatePendingPost(post) { - const copyPost = JSON.parse(JSON.stringify(post)); - const postList = makePostListNonNull(this.getPendingPosts(copyPost.channel_id)); - - if (postList.order.indexOf(copyPost.pending_post_id) === -1) { - return; - } - - postList.posts[copyPost.pending_post_id] = copyPost; - this.postsInfo[copyPost.channel_id].pendingPosts = postList; - this.emitChange(); - } - - storeSelectedPostId(postId) { - this.selectedPostId = postId; - } - - getSelectedPostId() { - return this.selectedPostId; - } - - getSelectedPost() { - 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; - } - - const posts = {}; - let pendingPosts; - for (const k in this.postsInfo) { - if (this.postsInfo[k].postList && this.postsInfo[k].postList.posts.hasOwnProperty(this.selectedPostId)) { - Object.assign(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, fromFlaggedPosts, fromPinnedPosts) { - this.emit(SELECTED_POST_CHANGE_EVENT, fromSearch, fromFlaggedPosts, fromPinnedPosts); - } - - addSelectedPostChangeListener(callback) { - this.on(SELECTED_POST_CHANGE_EVENT, callback); - } - - removeSelectedPostChangeListener(callback) { - this.removeListener(SELECTED_POST_CHANGE_EVENT, callback); - } - - emitPostPinnedChange() { - this.emit(POST_PINNED_CHANGE_EVENT); - } - - addPostPinnedChangeListener(callback) { - this.on(POST_PINNED_CHANGE_EVENT, callback); - } - - removePostPinnedChangeListener(callback) { - this.removeListener(POST_PINNED_CHANGE_EVENT, callback); + this.currentFocusedPostId = null; } getCurrentUsersLatestPost(channelId, rootId) { const userId = UserStore.getCurrentId(); - const postList = makePostListNonNull(this.getAllPosts(channelId)); - const len = postList.order.length; + const postIds = getState().entities.posts.postsInChannel[channelId] || []; let lastPost = null; - for (let i = 0; i < len; i++) { - const post = postList.posts[postList.order[i]]; + for (const id of postIds) { + const post = Selectors.getPost(getState(), id) || {}; // don't edit webhook posts, deleted posts, or system messages if (post.user_id !== userId || @@ -611,11 +152,21 @@ class PostStoreClass extends EventEmitter { return draft; } - storePostDraft(channelId, draft) { + storeCurrentDraft(draft) { + var channelId = ChannelStore.getCurrentId(); + BrowserStore.setGlobalItem('draft_' + channelId, draft); + } + + getCurrentDraft() { + var channelId = ChannelStore.getCurrentId(); + return this.getDraft(channelId); + } + + storeDraft(channelId, draft) { BrowserStore.setGlobalItem('draft_' + channelId, draft); } - getPostDraft(channelId) { + getDraft(channelId) { return this.normalizeDraft(BrowserStore.getGlobalItem('draft_' + channelId)); } @@ -645,40 +196,19 @@ class PostStoreClass extends EventEmitter { }); } - getCommentCount(post) { - const posts = this.getAllPosts(post.channel_id).posts; + getCommentCount(rootPost) { + const postIds = getState().entities.posts.postsInChannel[rootPost.channel_id] || []; let commentCount = 0; - for (const id in posts) { - if (posts.hasOwnProperty(id)) { - if (posts[id].root_id === post.id) { - commentCount += 1; - } + for (const postId of postIds) { + const post = Selectors.getPost(getState(), postId) || {}; + if (post.root_id === rootPost.id) { + commentCount += 1; } } return commentCount; } - - filterPosts(channelId, joinLeave) { - const postsList = JSON.parse(JSON.stringify(this.getVisiblePosts(channelId))); - - if (!joinLeave && postsList) { - postsList.order = postsList.order.filter((id) => { - const post = postsList.posts[id]; - - if (post.type === PostTypes.JOIN_LEAVE || post.type === PostTypes.JOIN_CHANNEL || post.type === PostTypes.LEAVE_CHANNEL) { - Reflect.deleteProperty(postsList.posts, id); - - return false; - } - - return true; - }); - } - - return postsList; - } } var PostStore = new PostStoreClass(); @@ -687,97 +217,25 @@ PostStore.dispatchToken = AppDispatcher.register((payload) => { var action = payload.action; switch (action.type) { - case ActionTypes.RECEIVED_POSTS: { - if (PostStore.currentFocusedPostId !== null && action.isPost) { - PostStore.storePosts(PostStore.currentFocusedPostId, makePostListNonNull(action.post_list), action.checkLatest, action.checkEarliest); - PostStore.checkBounds(PostStore.currentFocusedPostId, action.numRequested, makePostListNonNull(action.post_list), action.before); - } - PostStore.storePosts(action.id, makePostListNonNull(action.post_list), action.checkLatest, action.checkEarliest); - PostStore.checkBounds(action.id, action.numRequested, makePostListNonNull(action.post_list), action.before); - PostStore.emitChange(); - break; - } case ActionTypes.RECEIVED_FOCUSED_POST: - PostStore.clearChannelVisibility(action.postId, false); - PostStore.storeFocusedPost(action.postId, action.channelId, makePostListNonNull(action.post_list)); - PostStore.emitChange(); - break; - case ActionTypes.RECEIVED_POST: - PostStore.storePost(action.post, true); - PostStore.emitChange(); - break; - case ActionTypes.RECEIVED_EDIT_POST: - PostStore.emitEditPost(action); - PostStore.emitChange(); + PostStore.storeFocusedPostId(action.postId); + PostStore.emitPostFocused(); break; case ActionTypes.CLICK_CHANNEL: PostStore.clearFocusedPost(); - PostStore.clearChannelVisibility(action.id, true); - break; - case ActionTypes.CREATE_POST: - PostStore.storePendingPost(action.post); - PostStore.storePostDraft(action.post.channel_id, null); - PostStore.jumpPostsViewToBottom(); - break; - case ActionTypes.CREATE_COMMENT: - PostStore.storePendingPost(action.post); - PostStore.storeCommentDraft(action.post.root_id, null); - break; - case ActionTypes.POST_DELETED: - PostStore.deletePost(action.post); - PostStore.emitChange(); break; - case ActionTypes.REMOVE_POST: - PostStore.removePost(action.post); - PostStore.emitChange(); + case ActionTypes.RECEIVED_EDIT_POST: + PostStore.emitEditPost(action); break; case ActionTypes.RECEIVED_POST_SELECTED: - PostStore.storeSelectedPostId(action.postId); - PostStore.emitSelectedPostChange(action.from_search, action.from_flagged_posts, action.from_pinned_posts); + dispatch({...action, type: ActionTypes.SELECT_POST}); break; case ActionTypes.RECEIVED_POST_PINNED: case ActionTypes.RECEIVED_POST_UNPINNED: PostStore.emitPostPinnedChange(); break; - case ActionTypes.POST_DRAFT_CHANGED: - PostStore.storePostDraft(action.channelId, action.draft); - PostStore.emitPostDraftChange(action.channelId); - break; default: } }); export default PostStore; - -function makePostListNonNull(pl) { - var postList = pl; - if (postList == null) { - postList = {order: [], posts: {}}; - } - - if (postList.order == null) { - postList.order = []; - } - - if (postList.posts == null) { - postList.posts = {}; - } - - return postList; -} - -function isPostListNull(pl) { - if (pl == null) { - return true; - } - - if (pl.posts == null) { - return true; - } - - if (pl.order == null) { - return true; - } - - return false; -} diff --git a/webapp/stores/reaction_store.jsx b/webapp/stores/reaction_store.jsx deleted file mode 100644 index ebebd4374..000000000 --- a/webapp/stores/reaction_store.jsx +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; -import Constants from 'utils/constants.jsx'; -import EventEmitter from 'events'; - -const ActionTypes = Constants.ActionTypes; - -const CHANGE_EVENT = 'changed'; - -class ReactionStore extends EventEmitter { - constructor() { - super(); - - this.dispatchToken = AppDispatcher.register(this.handleEventPayload.bind(this)); - - this.reactions = new Map(); - - this.setMaxListeners(600); - } - - addChangeListener(postId, callback) { - this.on(CHANGE_EVENT + postId, callback); - } - - removeChangeListener(postId, callback) { - this.removeListener(CHANGE_EVENT + postId, callback); - } - - emitChange(postId) { - this.emit(CHANGE_EVENT + postId, postId); - } - - setReactions(postId, reactions) { - this.reactions.set(postId, reactions); - } - - addReaction(postId, reaction) { - let reactions = this.getReactions(postId) || []; - - // Make sure not to add duplicates - const existingIndex = reactions.findIndex((existing) => { - return existing.user_id === reaction.user_id && existing.post_id === reaction.post_id && existing.emoji_name === reaction.emoji_name; - }); - - if (existingIndex === -1) { - reactions = [...reactions, reaction]; - } - - this.setReactions(postId, reactions); - } - - removeReaction(postId, reaction) { - let reactions = this.getReactions(postId) || []; - - const existingIndex = reactions.findIndex((existing) => { - return existing.user_id === reaction.user_id && existing.post_id === reaction.post_id && existing.emoji_name === reaction.emoji_name; - }); - - if (existingIndex !== -1) { - reactions = reactions.slice(0, existingIndex).concat(reactions.slice(existingIndex + 1)); - } - - this.setReactions(postId, reactions); - } - - getReactions(postId) { - return this.reactions.get(postId); - } - - handleEventPayload(payload) { - const action = payload.action; - - switch (action.type) { - case ActionTypes.RECEIVED_REACTIONS: - this.setReactions(action.postId, action.reactions); - this.emitChange(action.postId); - break; - case ActionTypes.ADDED_REACTION: - this.addReaction(action.postId, action.reaction); - this.emitChange(action.postId); - break; - case ActionTypes.REMOVED_REACTION: - this.removeReaction(action.postId, action.reaction); - this.emitChange(action.postId); - break; - } - } -} - -export default new ReactionStore(); -- cgit v1.2.3-1-g7c22