toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Filter archived channels from channel list (#6250)

Browse source
This commit is contained in:
Elias Nahum 2022-05-08 19:14:54 -04:00 committed by GitHub
parent 2aa73968b8
commit a80505496c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/screens/home/channel_list/categories_list/categories/body/index.ts
View file

@ -39,6 +39,10 @@ const sortAlpha = (locale: string, a: ChannelData, b: ChannelData) => {
return a.displayName.localeCompare(b.displayName, locale, {numeric: true});
};
const filterArchived = (channels: Array<ChannelModel | null>, currentChannelId: string) => {
return channels.filter((c): c is ChannelModel => c != null && ((c.deleteAt > 0 && c.id === currentChannelId) || !c.deleteAt));
};
const buildAlphaData = (channels: ChannelModel[], settings: MyChannelSettingsModel[], locale: string) => {
const settingsById = settings.reduce((result: Record<string, MyChannelSettingsModel>, s) => {
result[s.id] = s;
@ -112,8 +116,11 @@ const withUserId = withObservables([], ({database}: WithDatabaseArgs) => ({curre
const enhance = withObservables(['category', 'isTablet', 'locale'], ({category, locale, isTablet, database, currentUserId}: EnhanceProps) => {
const observedCategory = category.observe();
const currentChannelId = observeCurrentChannelId(database);
const sortedChannels = observedCategory.pipe(
switchMap((c) => getSortedChannels(database, c, locale)),
combineLatestWith(currentChannelId),
map(([cs, ccId]) => filterArchived(cs, ccId)),
);
const dmMap = (p: PreferenceModel) => getDirectChannelName(p.name, currentUserId);
@ -169,11 +176,10 @@ const enhance = withObservables(['category', 'isTablet', 'locale'], ({category,
}),
);
const currentChannelId = observeCurrentChannelId(database);
const filtered = sortedChannels.pipe(
combineLatestWith(currentChannelId, filterUnreads, unreadsOnTop),
map(([channels, ccId, unreadIds, unreadTop]) => {
return channels.filter((c) => c && ((c.deleteAt > 0 && c.id === ccId) || !c.deleteAt) && (unreadTop ? !unreadIds.has(c.id) : true));
combineLatestWith(filterUnreads, unreadsOnTop),
map(([channels, unreadIds, unreadTop]) => {
return channels.filter((c) => (unreadTop ? !unreadIds.has(c.id) : true));
}),
);
@ -184,7 +190,7 @@ const enhance = withObservables(['category', 'isTablet', 'locale'], ({category,
category: observedCategory,
unreadChannels: sortedChannels.pipe(
combineLatestWith(filterUnreads, unreadsOnTop),
map(([sorted, unreadIds, unreadsTop]) => (unreadsTop ? [] : sorted.filter((c) => c && unreadIds.has(c.id)))),
map(([sorted, unreadIds, unreadsTop]) => (unreadsTop ? [] : sorted.filter((c) => unreadIds.has(c.id)))),
),
};
});