Merge remote-tracking branch 'origin/dev' into dev

umami-software · Feb 14, 2025 · 0793407 · 0793407
2 parents 35dc6ef + 3e58668
commit 0793407
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git 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,
   });

diff --git 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);
     }
   }
 

diff --git 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<Key>(websiteId);
 
   const { data: website } = useWebsite(selectedId as string);
 
-  const queryResult = useWebsites({ teamId }, { query, pageSize: 5 });
+  const queryResult = useWebsites({ teamId }, { search, pageSize: 5 });
 
   const renderValue = () => {
     return website?.name;
@@ -35,7 +35,7 @@ export function WebsiteSelect({
   };
 
   const handleSearch = (value: string) => {
-    setQuery(value);
+    setSearch(value);
   };
 
   return (

diff --git 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