From c3adc0d00c3196486b17f2fb099a713709ebfa32 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Tue, 21 Jan 2025 14:29:28 +0800 Subject: [PATCH] feat: filter group --- src/pages/Server.tsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/Server.tsx b/src/pages/Server.tsx index 7a95628..db37c74 100644 --- a/src/pages/Server.tsx +++ b/src/pages/Server.tsx @@ -72,7 +72,16 @@ export default function Servers() { restoreScrollPosition() }, []) - const groupTabs = ["All", ...(groupData?.data?.map((item: ServerGroup) => item.group.name) || [])] + const nezhaWsData = lastMessage ? (JSON.parse(lastMessage.data) as NezhaWebsocketResponse) : null + + const groupTabs = [ + "All", + ...(groupData?.data + ?.filter((item: ServerGroup) => { + return Array.isArray(item.servers) && item.servers.some((serverId) => nezhaWsData?.servers?.some((server) => server.id === serverId)) + }) + ?.map((item: ServerGroup) => item.group.name) || []), + ] if (!connected && !lastMessage) { return ( @@ -85,8 +94,6 @@ export default function Servers() { ) } - const nezhaWsData = lastMessage ? (JSON.parse(lastMessage.data) as NezhaWebsocketResponse) : null - if (!nezhaWsData) { return (