From 71fb10ae7a20107b219ec51daee246832f197b61 Mon Sep 17 00:00:00 2001 From: "Sinan Sonmez (Chaush)" <37421564+sinansonmez@users.noreply.github.com> Date: Sat, 9 Sep 2023 11:17:06 +0200 Subject: [PATCH] MM-54260: In Browse Channel Modal fix member count on private channels and when there is only 1 member in the channel (#24452) --- server/channels/store/sqlstore/channel_store.go | 4 ++++ .../src/components/browse_channels/browse_channels.tsx | 1 + 2 files changed, 5 insertions(+) diff --git a/server/channels/store/sqlstore/channel_store.go b/server/channels/store/sqlstore/channel_store.go index 2b9c19a809..81d3f51795 100644 --- a/server/channels/store/sqlstore/channel_store.go +++ b/server/channels/store/sqlstore/channel_store.go @@ -2312,6 +2312,10 @@ func (s SqlChannelStore) GetChannelsMemberCount(channelIDs []string) (_ map[stri defer rows.Close() memberCounts := make(map[string]int64) + // Initialize member counts for channels with zero members + for _, channelID := range channelIDs { + memberCounts[channelID] = 0 + } for rows.Next() { var channelID string var count int64 diff --git a/webapp/channels/src/components/browse_channels/browse_channels.tsx b/webapp/channels/src/components/browse_channels/browse_channels.tsx index f26a42e198..c5cbebf724 100644 --- a/webapp/channels/src/components/browse_channels/browse_channels.tsx +++ b/webapp/channels/src/components/browse_channels/browse_channels.tsx @@ -116,6 +116,7 @@ export default class BrowseChannels extends React.PureComponent { return result.data ? result.data.map((channel) => channel.id) : []; }, ); + this.props.privateChannels.forEach((channel) => channelIDsForMemberCount.push(channel.id)); if (channelIDsForMemberCount.length > 0) { this.props.actions.getChannelsMemberCount(channelIDsForMemberCount); }