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

src/components/icons.ts

@@ -59,6 +59,7 @@ export {
   Funnel,
   Lightbulb,
   Lightning,
+  Location,
   Magnet,
   Money,
   Network,

src/queries/sql/reports/getFunnel.ts

@@ -32,14 +32,13 @@ async function relationalQuery(
 ): Promise<FunnelResult[]> {
   const { startDate, endDate, window, steps } = parameters;
   const { rawQuery, getAddIntervalQuery, parseFilters } = prisma;
-  const { levelOneQuery, levelQuery, sumQuery, params } = getFunnelQuery(steps, window);
-
   const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({
     ...filters,
     websiteId,
     startDate,
     endDate,
   });
+  const { levelOneQuery, levelQuery, sumQuery, params } = getFunnelQuery(steps, window);
 
   function getFunnelQuery(
     steps: { type: string; value: string }[],

src/queries/sql/reports/getGoal.ts

@@ -48,15 +48,15 @@ async function relationalQuery(
       from website_event
       ${cohortQuery}
       ${joinSessionQuery}
-      where website_id = {websiteId:UUID}
+      where website_id = {{websiteId::uuid}}
       ${dateQuery}
       ${filterQuery}
     ) as total
     from website_event
     ${cohortQuery}
     ${joinSessionQuery}
-    where website_id = {websiteId:UUID}
-      and ${column} = {value:String}
+    where website_id = {{websiteId::uuid}}
+      and ${column} = {{value}}
       ${dateQuery}
       ${filterQuery}
     `,

src/queries/sql/reports/getRevenue.ts

@@ -75,7 +75,7 @@ async function relationalQuery(
     `
     select
       session.country as name,
-      sum(r.revenue) value
+      sum(revenue) value
     from revenue 
     join website_event
       on website_event.website_id = revenue.website_id