Skip to content

[stable32] fix(search): immediately show filtered results #17841

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
Antreesy merged 1 commit into from
Apr 28, 2026
Merged

[stable32] fix(search): immediately show filtered results #17841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions src/components/LeftSidebar/LeftSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
ref="searchResults"
class="scroller"
:searchText="searchText"
:contactsLoading="contactsLoading"
:searchResultsLoading="searchResultsLoading"
:conversationsList="conversationsList"
:searchResults="searchResults"
:searchResultsListedConversations="searchResultsListedConversations"
Expand Down Expand Up @@ -477,8 +477,7 @@ export default {
searchText: '',
searchResults: [],
searchResultsListedConversations: [],
contactsLoading: false,
listedConversationsLoading: false,
searchResultsLoading: true,
canStartConversations: getTalkConfig('local', 'conversations', 'can-create'),
cancelSearchPossibleConversations: () => {},
cancelSearchListedConversations: () => {},
Expand Down Expand Up @@ -758,8 +757,6 @@ export default {
},

async fetchPossibleConversations() {
this.contactsLoading = true

try {
// FIXME: move to conversationsStore
this.cancelSearchPossibleConversations('canceled')
Expand All @@ -782,8 +779,6 @@ export default {
this.searchResults = response?.data?.ocs?.data.filter((match) => {
return !(match.source === ATTENDEE.ACTOR_TYPE.USERS && oneToOneMap.includes(match.id))
}) ?? []

this.contactsLoading = false
} catch (exception) {
if (CancelableRequest.isCancel(exception)) {
return
Expand All @@ -795,16 +790,13 @@ export default {

async fetchListedConversations() {
try {
this.listedConversationsLoading = true

// FIXME: move to conversationsStore
this.cancelSearchListedConversations('canceled')
const { request, cancel } = CancelableRequest(searchListedConversations)
this.cancelSearchListedConversations = cancel

const response = await request(this.searchText)
this.searchResultsListedConversations = response.data.ocs.data
this.listedConversationsLoading = false
} catch (exception) {
if (CancelableRequest.isCancel(exception)) {
return
Expand All @@ -824,7 +816,9 @@ export default {
this.showThreadsList = false

this.resetNavigation()
this.searchResultsLoading = true
await Promise.all([this.fetchPossibleConversations(), this.fetchListedConversations()])
this.searchResultsLoading = false
this.initializeNavigation()
},

Expand Down
24 changes: 8 additions & 16 deletions src/components/LeftSidebar/SearchConversationsResults/SearchConversationsResults.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { getPreloadedUserStatus } from '../../../utils/userStatus.ts'
const props = defineProps<{
searchText: string
conversationsList: TypeConversation[]
contactsLoading: boolean
searchResultsLoading: boolean
searchResultsListedConversations: TypeConversation[]
searchResults: ParticipantSearchResult[]
}>()
Expand Down Expand Up @@ -105,6 +105,13 @@ const searchResultsVirtual = computed<VirtualListItem[]>(() => {
virtualList.push({ type: 'action', id: 'new_conversation', name: props.searchText, subname: t('spreed', 'New private conversation') })
}

// Add 'Loading' message if there are no results received from the server yet
if (props.searchResultsLoading && !props.searchResultsListedConversations.length && !props.searchResults.length) {
virtualList.push({ type: 'caption', id: 'loading_results_caption', name: t('spreed', 'Other sources') })
virtualList.push({ type: 'hint', id: 'loading_results_hint', hint: t('spreed', 'Loading …') })
return virtualList
}

// Add open conversations section if any
if (props.searchResultsListedConversations.length !== 0) {
virtualList.push({ type: 'caption', id: 'open_conversation_caption', name: t('spreed', 'Open conversations') })
Expand Down Expand Up @@ -186,11 +193,6 @@ function iconData(item: ParticipantSearchResult) {
}
}

const hasSourcesWithoutResults = computed(() => {
return !searchResultsVirtual.value.some((item) => item.type === 'user' || item.type === 'group'
|| (item.type === 'circle' && isCirclesEnabled))
})

/**
* Generate the message for the "No results" section
*
Expand Down Expand Up @@ -221,10 +223,6 @@ function sourcesWithoutResults(list: SubListType): string {
}
}

const footerMargin = computed(() => {
return isCompact.value ? '0' : '18px' // 54px (item height) - 36px (current height)
})

const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.SIZE.DEFAULT)
</script>

Expand All @@ -233,13 +231,7 @@ const iconSize = computed(() => isCompact.value ? AVATAR.SIZE.COMPACT : AVATAR.S
:ref="containerProps.ref"
:style="containerProps.style"
@scroll="containerProps.onScroll">
<NavigationHint
v-if="contactsLoading && !hasSourcesWithoutResults"
:style="{ marginBlockStart: footerMargin }"
tabindex="-1"
:hint="t('spreed', 'Loading …')" />
<ul
v-else
:style="wrapperProps.style">
<template
v-for="item in list"
Expand Down
Loading