[lib] Simplify filterChatThreadList
ClosedPublic
Actions

Authored by ashoat on Feb 8 2022, 7:42 PM.

Details

Reviewers

• jacek
tomek

Commits

rCOMM03db030f6828: [lib] Simplify filterChatThreadList

Summary

It's good this function got factored out, because it turns out the logic can be significantly simplified now.

Depends on D2885

Test Plan

Flow, careful code inspection

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ashoat created this revision.Feb 8 2022, 7:42 PM

Herald added subscribers: • karol, atul, • adrian. · View Herald TranscriptFeb 8 2022, 7:42 PM

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 8 2022, 7:44 PM

Harbormaster failed remote builds in B6663: Diff 9431!

Build failure is unrelated (backup service)

tomek accepted this revision.Feb 9 2022, 3:34 AM

This revision is now accepted and ready to land.Feb 9 2022, 3:34 AM

Herald added a subscriber: • benschac. · View Herald TranscriptFeb 9 2022, 3:34 AM

• jacek accepted this revision.Feb 11 2022, 2:39 AM

Rebase

Harbormaster completed remote builds in B6847: Diff 9690.Feb 15 2022, 11:03 AM

Closed by commit rCOMM03db030f6828: [lib] Simplify filterChatThreadList (authored by ashoat). · Explain WhyFeb 15 2022, 7:54 PM

This revision was automatically updated to reflect the committed changes.

ashoat added a commit: rCOMM03db030f6828: [lib] Simplify filterChatThreadList.

Revision Contents
Changeset List

Path

Size

lib/

shared/

thread-utils.js

54 lines

Diff 9706

View Options

lib/shared/thread-utils.js

	Show First 20 Lines • Show All 1,184 Lines • ▼ Show 20 Lines
	function getThreadListSearchResults(			function getThreadListSearchResults(
	chatListData: $ReadOnlyArray<ChatThreadItem>,			chatListData: $ReadOnlyArray<ChatThreadItem>,
	searchText: string,			searchText: string,
	threadFilter: ThreadInfo => boolean,			threadFilter: ThreadInfo => boolean,
	threadSearchResults: $ReadOnlySet<string>,			threadSearchResults: $ReadOnlySet<string>,
	usersSearchResults: $ReadOnlyArray<GlobalAccountUserInfo>,			usersSearchResults: $ReadOnlyArray<GlobalAccountUserInfo>,
	viewerID: ?string,			viewerID: ?string,
	): $ReadOnlyArray<ChatThreadItem> {			): $ReadOnlyArray<ChatThreadItem> {
	const chatItems = [];
	if (!searchText) {			if (!searchText) {
	chatItems.push(			return chatListData.filter(
	...chatListData.filter(
	item =>			item =>
	threadIsTopLevel(item.threadInfo) && threadFilter(item.threadInfo),			threadIsTopLevel(item.threadInfo) && threadFilter(item.threadInfo),
	),
	);			);
	} else {			}

	const privateThreads = [];			const privateThreads = [];
	const personalThreads = [];			const personalThreads = [];
	const otherThreads = [];			const otherThreads = [];
	for (const item of chatListData) {			for (const item of chatListData) {
	if (!threadSearchResults.has(item.threadInfo.id)) {			if (!threadSearchResults.has(item.threadInfo.id)) {
	continue;			continue;
	}			}
	if (item.threadInfo.type === threadTypes.PRIVATE) {			if (item.threadInfo.type === threadTypes.PRIVATE) {
	privateThreads.push({ ...item, sidebars: [] });			privateThreads.push({ ...item, sidebars: [] });
	} else if (item.threadInfo.type === threadTypes.PERSONAL) {			} else if (item.threadInfo.type === threadTypes.PERSONAL) {
	personalThreads.push({ ...item, sidebars: [] });			personalThreads.push({ ...item, sidebars: [] });
	} else {			} else {
	otherThreads.push({ ...item, sidebars: [] });			otherThreads.push({ ...item, sidebars: [] });
	}			}
	}			}
	chatItems.push(...privateThreads, ...personalThreads, ...otherThreads);
				const chatItems = [...privateThreads, ...personalThreads, ...otherThreads];
	if (viewerID) {			if (viewerID) {
	chatItems.push(			chatItems.push(
	...usersSearchResults.map(user =>			...usersSearchResults.map(user =>
	createPendingThreadItem(viewerID, user),			createPendingThreadItem(viewerID, user),
	),			),
	);			);
	}			}
	}
	return chatItems;			return chatItems;
	}			}

	type ThreadListSearchResult = {			type ThreadListSearchResult = {
	+threadSearchResults: $ReadOnlySet<string>,			+threadSearchResults: $ReadOnlySet<string>,
	+usersSearchResults: $ReadOnlyArray<GlobalAccountUserInfo>,			+usersSearchResults: $ReadOnlyArray<GlobalAccountUserInfo>,
	};			};
	function useThreadListSearch(			function useThreadListSearch(
	▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines

[lib] Simplify filterChatThreadListClosedPublicActions