diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts index ac934d8c..343aea9f 100644 --- 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 index f7200ce3..a8b2b0f5 100644 --- 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 index 95758b6f..94b983c6 100644 --- 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 index b8aabdad..08cade12 100644 --- 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 index 4a881ef9..3dac217b 100644 --- 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 index bc363228..badb8a47 100644 --- 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 index 3f6c4e34..0189627a 100644 --- 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(),