Skip to content

[IMPROVE] Remove differentiation between public x private channels in sidebar #22160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabriellsh merged 2 commits into from
Jun 7, 2021
Merged

[IMPROVE] Remove differentiation between public x private channels in sidebar #22160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5069250
improve: public-private-sidebar
May 27, 2021
0473643
Merge branch 'develop' into improve/public-private-sidebar
Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions client/sidebar/hooks/useRoomList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ export const useRoomList = (): Array<ISubscription> => {
const team = new Set();
const omnichannel = new Set();
const unread = new Set();
const _private = new Set();
const _public = new Set();
const channels = new Set();
const direct = new Set();
const discussion = new Set();
const conversation = new Set();
Expand All @@ -62,12 +61,8 @@ export const useRoomList = (): Array<ISubscription> => {
return discussion.add(room);
}

if (room.t === 'c') {
_public.add(room);
}

if (room.t === 'p') {
_private.add(room);
if (room.t === 'c' || room.t === 'p') {
channels.add(room);
}

if (room.t === 'l' && room.onHold) {
Expand Down Expand Up @@ -100,9 +95,8 @@ export const useRoomList = (): Array<ISubscription> => {
isDiscussionEnabled &&
discussion.size &&
groups.set('Discussions', discussion);
sidebarGroupByType && _private.size && groups.set('Private', _private);
sidebarGroupByType && _public.size && groups.set('Public', _public);
sidebarGroupByType && direct.size && groups.set('Direct', direct);
sidebarGroupByType && channels.size && groups.set('Channels', channels);
sidebarGroupByType && direct.size && groups.set('Direct_Messages', direct);
!sidebarGroupByType && groups.set('Conversations', conversation);
return [...groups.entries()].flatMap(([key, group]) => [key, ...group]);
});
Expand Down