fix host filtering

COMPFEST · Jun 19, 2024 · 3f477c5 · 3f477c5
1 parent cda3ba3
commit 3f477c5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
@@ -8,7 +8,7 @@ export function useFilterParams(websiteId: string) {
   const { startDate, endDate, unit } = dateRange;
   const { timezone } = useTimezone();
   const {
-    query: { url, referrer, title, query, os, browser, device, country, region, city, event },
+    query: { url, referrer, title, query, host, os, browser, device, country, region, city, event },
   } = useNavigation();
 
   return {
@@ -20,6 +20,7 @@ export function useFilterParams(websiteId: string) {
     referrer,
     title,
     query,
+    host,
     os,
     browser,
     device,

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -33,7 +33,7 @@ export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event', 'host'];
+export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
   'browser',

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -181,6 +181,7 @@ export interface QueryFilters {
   referrer?: string;
   title?: string;
   query?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;

diff --git a/src/pages/api/websites/[websiteId]/events.ts b/src/pages/api/websites/[websiteId]/events.ts
@@ -1,6 +1,6 @@
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { getRequestFilters, getRequestDateRange } from 'lib/request';
+import { getRequestDateRange, getRequestFilters } from 'lib/request';
 import { NextApiRequestQueryBody, WebsiteMetric } from 'lib/types';
 import { TimezoneTest, UnitTypeTest } from 'lib/yup';
 import { NextApiResponse } from 'next';
@@ -17,6 +17,7 @@ export interface WebsiteEventsRequestQuery {
   url: string;
   referrer?: string;
   title?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -35,6 +36,7 @@ const schema = {
     url: yup.string(),
     referrer: yup.string(),
     title: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),

diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.ts
@@ -17,6 +17,7 @@ export interface WebsiteMetricsRequestQuery {
   referrer?: string;
   title?: string;
   query?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -40,6 +41,7 @@ const schema = {
     referrer: yup.string(),
     title: yup.string(),
     query: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),

diff --git a/src/pages/api/websites/[websiteId]/pageviews.ts b/src/pages/api/websites/[websiteId]/pageviews.ts
@@ -17,8 +17,8 @@ export interface WebsitePageviewRequestQuery {
   timezone?: string;
   url?: string;
   referrer?: string;
-  host?: string;
   title?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -37,8 +37,8 @@ const schema = {
     timezone: TimezoneTest,
     url: yup.string(),
     referrer: yup.string(),
-    host: yup.string(),
     title: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),

diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
@@ -14,10 +14,10 @@ export interface WebsiteStatsRequestQuery {
   endAt: number;
   url?: string;
   referrer?: string;
-  host?: string;
   title?: string;
   query?: string;
   event?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -34,10 +34,10 @@ const schema = {
     endAt: yup.number().required(),
     url: yup.string(),
     referrer: yup.string(),
-    host: yup.string(),
     title: yup.string(),
     query: yup.string(),
     event: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),