UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2025-06-26 18:27:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1075 from Hexastack/1056-bug---inbox-channel-filter-ineffective-when-combined-with-keyword-search-inbox-search

Browse Source 
fix(frontend): resolve useInfiniteLiveSubscribers hook or operator bug
This commit is contained in:
Med Marrouchi 2025-06-02 08:23:00 +01:00 committed by GitHub
commit d70b1088d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2024 Hexastack. All rights reserved. * Copyright © 2025 Hexastack. All rights reserved.
* *
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -29,14 +29,15 @@ export const useInfiniteLiveSubscribers = (props: {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const params = { const params = {
where: { where: {
...(props.channels.length > 0
? {
or: props.channels.map((channel) => ({
"channel.name": channel,
})),
}
: {}),
...props.searchPayload.where, ...props.searchPayload.where,
...(props.channels.length > 0 && {
or: [
...(props.searchPayload.where.or || []),
...props.channels.map((channel) => ({
"channel.name": channel,
})),
],
}),
...(props.assignedTo === AssignedTo.ME ...(props.assignedTo === AssignedTo.ME
? { assignedTo: user?.id } ? { assignedTo: user?.id }
: props.assignedTo === AssignedTo.OTHERS : props.assignedTo === AssignedTo.OTHERS