Merge branch 'rm/321019' into 'master'

Fix: group channels members not loaded when category is collapsed

See merge request kchat/webapp!693

webapp/channels/src/actions/user_actions.ts

@@ -27,7 +27,7 @@ import {calculateUnreadCount} from 'mattermost-redux/utils/channel_utils';
 
 import {loadCustomEmojisForCustomStatusesByUserIds} from 'actions/emoji_actions';
 import {loadStatusesForProfilesList, loadStatusesForProfilesMap} from 'actions/status_actions';
-import {getDisplayedChannels} from 'selectors/views/channel_sidebar';
+import {getDisplayedChannels, getSidebarGroupChannels} from 'selectors/views/channel_sidebar';
 import store from 'stores/redux_store';
 
 import {Constants, Preferences, UserStatuses} from 'utils/constants';
@@ -303,13 +303,7 @@ export async function loadProfilesForSidebar() {
 }
 
 export const getGMsForLoading = (state: GlobalState) => {
-    // Get all channels visible on the current team which doesn't include hidden GMs/DMs
-    let channels = getDisplayedChannels(state);
-
-    // Make sure we only have GMs
-    channels = channels.filter((channel) => channel.type === General.GM_CHANNEL);
-
-    return channels;
+    return getSidebarGroupChannels(state);
 };
 
 export async function loadProfilesForGM() {

webapp/channels/src/selectors/views/channel_sidebar.ts

@@ -21,6 +21,7 @@ import {
 } from 'mattermost-redux/selectors/entities/channels';
 import {shouldShowUnreadsCategory, isCollapsedThreadsEnabled} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
+import {isGroupChannel} from 'mattermost-redux/utils/channel_utils';
 import {memoizeResult} from 'mattermost-redux/utils/helpers';
 
 import type {DraggingState, GlobalState} from 'types/store';
@@ -103,6 +104,17 @@ export const getChannelsInCategoryOrder = (() => {
     );
 })();
 
+export const getAllChannelsInCategoryOrder = (() => {
+    return createSelector(
+        'getAllChannelsInCategoryOrder',
+        getCategoriesForCurrentTeam,
+        getChannelsByCategoryForCurrentTeam,
+        (categories, channelsByCategory) => {
+            return categories.map((category) => channelsByCategory[category.id]).flat();
+        },
+    );
+})();
+
 // getUnreadChannels returns an array of all unread channels on the current team for display with the unread filter
 // enabled. Channels are sorted by recency with channels containing a mention grouped first.
 export const getUnreadChannels = (() => {
@@ -188,6 +200,14 @@ export const getDisplayedChannels = createSelector(
     },
 );
 
+export const getSidebarGroupChannels = createSelector(
+    'getSidebarGroupChannels',
+    getAllChannelsInCategoryOrder,
+    (allChannels) => {
+        return allChannels.filter(isGroupChannel);
+    },
+);
+
 // Returns a selector that, given a category, returns the ids of channels visible in that category. The returned channels do not
 // include unread channels when the Unreads category is enabled.
 export function makeGetFilteredChannelIdsForCategory(): (state: GlobalState, category: ChannelCategory) => string[] {