From 53bcd0515e9af0972be5bfddb694aeb658cd46c6 Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 13 Feb 2025 10:10:33 -0800 Subject: [PATCH 1/5] Fix type error for getChannels --- .../api/websites/[websiteId]/metrics/route.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/api/websites/[websiteId]/metrics/route.ts b/src/app/api/websites/[websiteId]/metrics/route.ts index 70ed9f90..c0958739 100644 --- a/src/app/api/websites/[websiteId]/metrics/route.ts +++ b/src/app/api/websites/[websiteId]/metrics/route.ts @@ -131,35 +131,35 @@ function getChannels(data: { domain: string; query: string; visitors: number }[] for (const { domain, query, visitors } of data) { if (!domain && !query) { - channels.direct += visitors; + channels.direct += Number(visitors); } const prefix = /utm_medium=(.*cp.*|ppc|retargeting|paid.*)/.test(query) ? 'paid' : 'organic'; if (SEARCH_DOMAINS.some(match(domain)) || /utm_medium=organic/.test(query)) { - channels[`${prefix}Search`] += visitors; + channels[`${prefix}Search`] += Number(visitors); } else if ( SOCIAL_DOMAINS.some(match(domain)) || /utm_medium=(social|social-network|social-media|sm|social network|social media)/.test(query) ) { - channels[`${prefix}Social`] += visitors; + channels[`${prefix}Social`] += Number(visitors); } else if (EMAIL_DOMAINS.some(match(domain)) || /utm_medium=(.*e[-_ ]?mail.*)/.test(query)) { - channels.email += visitors; + channels.email += Number(visitors); } else if ( SHOPPING_DOMAINS.some(match(domain)) || /utm_campaign=(.*(([^a-df-z]|^)shop|shopping).*)/.test(query) ) { - channels[`${prefix}Shopping`] += visitors; + channels[`${prefix}Shopping`] += Number(visitors); } else if (VIDEO_DOMAINS.some(match(domain)) || /utm_medium=(.*video.*)/.test(query)) { - channels[`${prefix}Video`] += visitors; + channels[`${prefix}Video`] += Number(visitors); } else if (PAID_AD_PARAMS.some(match(query))) { - channels.paidAds += visitors; + channels.paidAds += Number(visitors); } else if (/utm_medium=(referral|app|link)/.test(query)) { - channels.referral += visitors; + channels.referral += Number(visitors); } else if (/utm_medium=affiliate/.test(query)) { - channels.affiliate += visitors; + channels.affiliate += Number(visitors); } else if (/utm_(source|medium)=sms/.test(query)) { - channels.sms += visitors; + channels.sms += Number(visitors); } } From 97f21d6f23cce7692e881af0ed0158a4a1808f3f Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 13 Feb 2025 11:20:50 -0800 Subject: [PATCH 2/5] fix syntax error on session properties query --- src/queries/sql/sessions/getSessionDataProperties.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/queries/sql/sessions/getSessionDataProperties.ts b/src/queries/sql/sessions/getSessionDataProperties.ts index ed914518..20fb11d5 100644 --- a/src/queries/sql/sessions/getSessionDataProperties.ts +++ b/src/queries/sql/sessions/getSessionDataProperties.ts @@ -29,7 +29,7 @@ async function relationalQuery( from website_event e join session_data d on d.session_id = e.session_id - where e.website_id = {{websiteId:uuid}} + where e.website_id = {{websiteId::uuid}} and e.created_at between {{startDate}} and {{endDate}} ${filterQuery} group by 1 From 089b4fee69a451392b75c887cd094d8f982881fd Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 13 Feb 2025 11:29:22 -0800 Subject: [PATCH 3/5] fix zod validation for revenue report --- src/app/api/reports/revenue/route.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/api/reports/revenue/route.ts b/src/app/api/reports/revenue/route.ts index f8f4041f..13a34f38 100644 --- a/src/app/api/reports/revenue/route.ts +++ b/src/app/api/reports/revenue/route.ts @@ -29,6 +29,7 @@ export async function GET(request: Request) { export async function POST(request: Request) { const schema = z.object({ + currency: z.string(), ...reportParms, timezone: timezoneParam, }); From 575c50cdfeb8f5a01f4c49cfdc115aa5898db4fa Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 13 Feb 2025 13:21:15 -0800 Subject: [PATCH 4/5] fix websiteselect search --- src/components/input/WebsiteSelect.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsx index ed78efc8..0a112e89 100644 --- a/src/components/input/WebsiteSelect.tsx +++ b/src/components/input/WebsiteSelect.tsx @@ -14,12 +14,12 @@ export function WebsiteSelect({ onSelect?: (key: any) => void; }) { const { formatMessage, labels, messages } = useMessages(); - const [query, setQuery] = useState(''); + const [search, setSearch] = useState(''); const [selectedId, setSelectedId] = useState(websiteId); const { data: website } = useWebsite(selectedId as string); - const queryResult = useWebsites({ teamId }, { query, pageSize: 5 }); + const queryResult = useWebsites({ teamId }, { search }); const renderValue = () => { return website?.name; @@ -35,7 +35,7 @@ export function WebsiteSelect({ }; const handleSearch = (value: string) => { - setQuery(value); + setSearch(value); }; return ( From 3e5866832ffffeb4408b17fe9e31eee922ed500f Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 13 Feb 2025 13:24:06 -0800 Subject: [PATCH 5/5] fix search bug --- src/components/input/WebsiteSelect.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsx index 0a112e89..8a7e4ac0 100644 --- a/src/components/input/WebsiteSelect.tsx +++ b/src/components/input/WebsiteSelect.tsx @@ -19,7 +19,7 @@ export function WebsiteSelect({ const { data: website } = useWebsite(selectedId as string); - const queryResult = useWebsites({ teamId }, { search }); + const queryResult = useWebsites({ teamId }, { search, pageSize: 5 }); const renderValue = () => { return website?.name;