From f1c7d889c31f88fbdc9d59a4a07e54f551b75cca Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Sat, 31 May 2025 17:30:10 +0100 Subject: [PATCH 1/2] fix(frontend): resolve useInfiniteLiveSubscribers hook or operator issue --- .../inbox/hooks/useInfiniteLiveSubscribers.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts b/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts index 66c6bad4..c903c43d 100644 --- a/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts +++ b/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts @@ -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: * 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 params = { where: { - ...(props.channels.length > 0 - ? { - or: props.channels.map((channel) => ({ - "channel.name": channel, - })), - } - : {}), ...props.searchPayload.where, + ...(props.channels.length > 0 && { + or: [ + ...props.searchPayload.where.or, + ...props.channels.map((channel) => ({ + "channel.name": channel, + })), + ], + }), ...(props.assignedTo === AssignedTo.ME ? { assignedTo: user?.id } : props.assignedTo === AssignedTo.OTHERS From 154384360d84cf2ad08d3c1b0af72e6551a3f638 Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Sat, 31 May 2025 17:40:15 +0100 Subject: [PATCH 2/2] fix(frontend): apply feedback --- .../src/components/inbox/hooks/useInfiniteLiveSubscribers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts b/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts index c903c43d..e4f8f626 100644 --- a/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts +++ b/frontend/src/components/inbox/hooks/useInfiniteLiveSubscribers.ts @@ -32,7 +32,7 @@ export const useInfiniteLiveSubscribers = (props: { ...props.searchPayload.where, ...(props.channels.length > 0 && { or: [ - ...props.searchPayload.where.or, + ...(props.searchPayload.where.or || []), ...props.channels.map((channel) => ({ "channel.name": channel, })),