Skip to content
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

Jump to bottom

fix: Use qualified Ids when matching users for search filtering [WPB-4823] #16138

Merged
merged 2 commits into from
Nov 1, 2023
Merged

fix: Use qualified Ids when matching users for search filtering [WPB-4823] #16138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8130e04
fix: Use qualified Ids when matching users for search filtering
atomrc Nov 1, 2023
0cdb723
Update src/script/conversation/ConversationState.ts
atomrc Nov 1, 2023
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
3 changes: 1 addition & 2 deletions src/script/components/UserSearchableList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,13 @@ const UserSearchableList: React.FC<UserListProps> = ({
// Filter all list items if a filter is provided

useEffect(() => {
const connectedUsers = conversationState.connectedUsers();
const {query: normalizedQuery} = searchRepository.normalizeQuery(filter);
const results = searchRepository
.searchUserInSet(filter, users)
.filter(
user =>
user.isMe ||
connectedUsers.includes(user) ||
conversationState.hasConversationWith(user) ||
teamRepository.isSelfConnectedTo(user.id) ||
user.username() === normalizedQuery,
);
Expand Down
8 changes: 8 additions & 0 deletions src/script/conversation/ConversationState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ export class ConversationState {
});
}

/**
* indicate whether the selfUser has a conversation (1:1 or group conversation) with this other user
* @param user the user to check
*/
hasConversationWith(user: User) {
return this.connectedUsers().some(connectedUser => matchQualifiedIds(connectedUser.qualifiedId, user.qualifiedId));
}

isSelfConversation(conversationId: QualifiedId): boolean {
const selfConversationIds: QualifiedId[] = [this.selfProteusConversation(), this.selfMLSConversation()]
.filter((conversation): conversation is Conversation => !!conversation)
Expand Down
12 changes: 8 additions & 4 deletions src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ export const PeopleTab = ({
const [hasFederationError, setHasFederationError] = useState(false);
const currentSearchQuery = useRef('');

const {connectedUsers} = useKoSubscribableChildren(conversationState, ['connectedUsers']);
const {inTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);

const getLocalUsers = (unfiltered?: boolean) => {
const connectedUsers = conversationState.connectedUsers();
if (!canSearchUnconnectedUsers) {
return connectedUsers;
}
Expand All @@ -118,7 +118,9 @@ export const PeopleTab = ({

contacts = unfiltered
? teamUsers
: teamUsers.filter(user => connectedUsers.includes(user) || teamRepository.isSelfConnectedTo(user.id));
: teamUsers.filter(
user => conversationState.hasConversationWith(user) || teamRepository.isSelfConnectedTo(user.id),
);
}

return contacts.filter(user => user.isAvailable());
Expand Down Expand Up @@ -178,9 +180,11 @@ export const PeopleTab = ({
const localSearchSources = getLocalUsers(true);

const contactResults = searchRepository.searchUserInSet(searchQuery, localSearchSources);
const connectedUsers = conversationState.connectedUsers();
const filteredResults = contactResults.filter(
user => connectedUsers.includes(user) || teamRepository.isSelfConnectedTo(user.id) || user.username() === query,
user =>
conversationState.hasConversationWith(user) ||
teamRepository.isSelfConnectedTo(user.id) ||
user.username() === query,
);

const localSearchResults: SearchResultsData = {
Expand Down
Loading