From 19a282ad412f42e8e2d5793708d2a0476fc8b714 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Fri, 8 May 2020 17:19:03 +0200
Subject: [PATCH] Ensure receivedPosts runs first (#4285)

Co-authored-by: Miguel Alatzar <this.migbot@gmail.com>
---
 app/actions/views/post.js      |  5 ++++-
 app/actions/views/post.test.js | 18 ++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/actions/views/post.js b/app/actions/views/post.js
index cd83cae62..d97054434 100644
--- a/app/actions/views/post.js
+++ b/app/actions/views/post.js
@@ -465,7 +465,10 @@ export function loadUnreadChannelPosts(channels, channelMembers) {
 
         console.log(`Fetched ${posts.length} posts from ${promises.length} unread channels`); //eslint-disable-line no-console
         if (posts.length) {
-            actions.push(receivedPosts({posts}));
+            // receivedPosts should be the first action dispatched as
+            // receivedPostsSince and receivedPostsInChannel reducers are
+            // dependent on it.
+            actions.unshift(receivedPosts({posts}));
             const additional = await dispatch(getPostsAdditionalDataBatch(posts));
             if (additional.data.length) {
                 actions.push(...additional.data);
diff --git a/app/actions/views/post.test.js b/app/actions/views/post.test.js
index f2c41c1c0..82d1326ac 100644
--- a/app/actions/views/post.test.js
+++ b/app/actions/views/post.test.js
@@ -83,18 +83,16 @@ describe('Actions.Views.Post', () => {
         const actionTypes = store.getActions()[0].payload.map((action) => action.type);
 
         // Actions dispatched:
+        // RECEIVED_POSTS once and first, with all channel posts combined.
         // RECEIVED_POSTS_IN_CHANNEL and RECEIVED_POSTS_FOR_CHANNEL_AT_TIME for each channel.
-        // RECEIVED_POSTS once, with all channel posts combined.
         expect(actionTypes.length).toBe((2 * channels.length) + 1);
+        expect(actionTypes[0]).toEqual(PostTypes.RECEIVED_POSTS);
 
         const receivedPostsInChannelActions = actionTypes.filter((type) => type === PostTypes.RECEIVED_POSTS_IN_CHANNEL);
         expect(receivedPostsInChannelActions.length).toBe(channels.length);
 
         const receivedPostsForChannelAtTimeActions = actionTypes.filter((type) => type === ViewTypes.RECEIVED_POSTS_FOR_CHANNEL_AT_TIME);
         expect(receivedPostsForChannelAtTimeActions.length).toBe(channels.length);
-
-        const receivedPosts = actionTypes.filter((type) => type === 'RECEIVED_POSTS');
-        expect(receivedPosts.length).toBe(1);
     });
 
     test('loadUnreadChannelPosts dispatches actions for unread channels with postIds in channel', async () => {
@@ -122,18 +120,16 @@ describe('Actions.Views.Post', () => {
         const actionTypes = store.getActions()[0].payload.map((action) => action.type);
 
         // Actions dispatched:
+        // RECEIVED_POSTS once and first, with all channel posts combined.
         // RECEIVED_POSTS_SINCE and RECEIVED_POSTS_FOR_CHANNEL_AT_TIME for each channel.
-        // RECEIVED_POSTS once, with all channel posts combined.
         expect(actionTypes.length).toBe((2 * channels.length) + 1);
+        expect(actionTypes[0]).toEqual(PostTypes.RECEIVED_POSTS);
 
         const receivedPostsInChannelActions = actionTypes.filter((type) => type === PostTypes.RECEIVED_POSTS_SINCE);
         expect(receivedPostsInChannelActions.length).toBe(channels.length);
 
         const receivedPostsForChannelAtTimeActions = actionTypes.filter((type) => type === ViewTypes.RECEIVED_POSTS_FOR_CHANNEL_AT_TIME);
         expect(receivedPostsForChannelAtTimeActions.length).toBe(channels.length);
-
-        const receivedPosts = actionTypes.filter((type) => type === PostTypes.RECEIVED_POSTS);
-        expect(receivedPosts.length).toBe(1);
     });
 
     test('loadUnreadChannelPosts dispatches additional actions for unread channels', async () => {
@@ -168,11 +164,12 @@ describe('Actions.Views.Post', () => {
         const actionTypes = store.getActions()[0].payload.map((action) => action.type);
 
         // Actions dispatched:
+        // RECEIVED_POSTS once and first, with all channel posts combined.
         // RECEIVED_POSTS_SINCE and RECEIVED_POSTS_FOR_CHANNEL_AT_TIME for each channel.
-        // RECEIVED_POSTS once, with all channel posts combined.
         // RECEIVED_PROFILES_LIST twice, once for getProfilesByIds and once for getProfilesByUsernames
         // RECEIVED_STATUSES for getStatusesByIds
         expect(actionTypes.length).toBe((2 * channels.length) + 4);
+        expect(actionTypes[0]).toEqual(PostTypes.RECEIVED_POSTS);
 
         const receivedPostsInChannelActions = actionTypes.filter((type) => type === PostTypes.RECEIVED_POSTS_SINCE);
         expect(receivedPostsInChannelActions.length).toBe(channels.length);
@@ -180,9 +177,6 @@ describe('Actions.Views.Post', () => {
         const receivedPostsForChannelAtTimeActions = actionTypes.filter((type) => type === ViewTypes.RECEIVED_POSTS_FOR_CHANNEL_AT_TIME);
         expect(receivedPostsForChannelAtTimeActions.length).toBe(channels.length);
 
-        const receivedPosts = actionTypes.filter((type) => type === PostTypes.RECEIVED_POSTS);
-        expect(receivedPosts.length).toBe(1);
-
         const receivedProfiles = actionTypes.filter((type) => type === UserTypes.RECEIVED_PROFILES_LIST);
         expect(receivedProfiles.length).toBe(2);