From 5468ca5dd32d4e900426fd8066ce10bb7ecaf421 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 19 Feb 2024 11:18:50 -0800
Subject: [PATCH] fix getActiveVisitors return type

---
 src/components/metrics/ActiveUsers.tsx     | 2 +-
 src/queries/analytics/getActiveVisitors.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/metrics/ActiveUsers.tsx b/src/components/metrics/ActiveUsers.tsx
index 9a5ff327..05d0fc1d 100644
--- a/src/components/metrics/ActiveUsers.tsx
+++ b/src/components/metrics/ActiveUsers.tsx
@@ -24,7 +24,7 @@ export function ActiveUsers({
 
   const count = useMemo(() => {
     if (websiteId) {
-      return data?.[0]?.x || 0;
+      return data?.x || 0;
     }
 
     return value !== undefined ? value : 0;
diff --git a/src/queries/analytics/getActiveVisitors.ts b/src/queries/analytics/getActiveVisitors.ts
index 962bea35..9913977f 100644
--- a/src/queries/analytics/getActiveVisitors.ts
+++ b/src/queries/analytics/getActiveVisitors.ts
@@ -13,7 +13,7 @@ export async function getActiveVisitors(...args: [websiteId: string]) {
 async function relationalQuery(websiteId: string) {
   const { rawQuery } = prisma;
 
-  return rawQuery(
+  const result = await rawQuery(
     `
     select count(distinct session_id) x
     from website_event
@@ -22,6 +22,8 @@ async function relationalQuery(websiteId: string) {
     `,
     { websiteId, startAt: subMinutes(new Date(), 5) },
   );
+
+  return result[0] ?? null;
 }
 
 async function clickhouseQuery(websiteId: string): Promise<{ x: number }> {