From 8aab290d10cc7cdd864cebbd463044abfa2d2aea Mon Sep 17 00:00:00 2001
From: VeraLyu <lvroyce0210@gmail.com>
Date: Tue, 18 Apr 2017 23:47:27 +0800
Subject: PLT-6240: Remove own pinned post from RHS when removed from channel
 (#6098)

Dispatch REMOVE_POST event after successfully initiating delete post,
others get informed by websocket event and will mark the msg as deleted
but not delete from RHS.
---
 webapp/actions/post_actions.jsx |  8 ++------
 webapp/stores/search_store.jsx  | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'webapp')

diff --git a/webapp/actions/post_actions.jsx b/webapp/actions/post_actions.jsx
index 5319a00c6..266370f60 100644
--- a/webapp/actions/post_actions.jsx
+++ b/webapp/actions/post_actions.jsx
@@ -11,6 +11,7 @@ import {loadStatusesForChannel} from 'actions/status_actions.jsx';
 import {loadNewDMIfNeeded, loadNewGMIfNeeded} from 'actions/user_actions.jsx';
 import {trackEvent} from 'actions/diagnostics_actions.jsx';
 import {sendDesktopNotification} from 'actions/notification_actions.jsx';
+import * as GlobalActions from 'actions/global_actions.jsx';
 
 import Client from 'client/web_client.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
@@ -431,11 +432,6 @@ export function updatePost(post, success, isPost) {
         });
 }
 
-export function removePostFromStore(post) {
-    PostStore.removePost(post);
-    PostStore.emitChange();
-}
-
 export function emitEmojiPosted(emoji) {
     AppDispatcher.handleServerAction({
         type: ActionTypes.EMOJI_POSTED,
@@ -448,7 +444,7 @@ export function deletePost(channelId, post, success, error) {
         channelId,
         post.id,
         () => {
-            removePostFromStore(post);
+            GlobalActions.emitRemovePost(post);
             if (post.id === PostStore.getSelectedPostId()) {
                 AppDispatcher.handleServerAction({
                     type: ActionTypes.RECEIVED_POST_SELECTED,
diff --git a/webapp/stores/search_store.jsx b/webapp/stores/search_store.jsx
index 62cc5635b..2ccf02f94 100644
--- a/webapp/stores/search_store.jsx
+++ b/webapp/stores/search_store.jsx
@@ -133,6 +133,19 @@ class SearchStoreClass extends EventEmitter {
             });
         }
     }
+
+    removePost(post) {
+        const results = this.getSearchResults();
+        if (results == null) {
+            return;
+        }
+
+        const index = results.order.indexOf(post.id);
+        if (index > -1) {
+            delete results.posts[post.id];
+            results.order.splice(index, 1);
+        }
+    }
 }
 
 var SearchStore = new SearchStoreClass();
@@ -171,6 +184,10 @@ SearchStore.dispatchToken = AppDispatcher.register((payload) => {
         SearchStore.togglePinPost(action.reaction, false);
         SearchStore.emitSearchChange();
         break;
+    case ActionTypes.REMOVE_POST:
+        SearchStore.removePost(action.post);
+        SearchStore.emitSearchChange();
+        break;
     default:
     }
 });
-- 
cgit v1.2.3-1-g7c22