m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix region / city filters

Browse Source
This commit is contained in:
Francis Cao 2023-04-17 00:10:51 -07:00
parent 672608b2f5
commit 43499eb4fd
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/metrics/MetricsBar.js
View File

@ -16,11 +16,14 @@ export default function MetricsBar({ websiteId }) {
const { startDate, endDate, modified } = dateRange; const { startDate, endDate, modified } = dateRange;
const [format, setFormat] = useState(true); const [format, setFormat] = useState(true);
const { const {
query: { url, referrer, os, browser, device, country }, query: { url, referrer, os, browser, device, country, region, city },
} = usePageQuery(); } = usePageQuery();
const { data, error, isLoading, isFetched } = useQuery( const { data, error, isLoading, isFetched } = useQuery(
['websites:stats', { websiteId, modified, url, referrer, os, browser, device, country }], [
'websites:stats',
{ websiteId, modified, url, referrer, os, browser, device, country, region, city },
],
() => () =>
get(`/websites/${websiteId}/stats`, { get(`/websites/${websiteId}/stats`, {
startAt: +startDate, startAt: +startDate,
@ -31,6 +34,8 @@ export default function MetricsBar({ websiteId }) {
browser, browser,
device, device,
country, country,
region,
city,
}), }),
); );

4
lib/prisma.ts
View File

@ -127,11 +127,11 @@ function parseFilters(
params = [], params = [],
sessionKey = 'session_id', sessionKey = 'session_id',
) { ) {
const { os, browser, device, country, subdivision1, subdivision2, city } = filters; const { os, browser, device, country, region, city } = filters;
return { return {
joinSession: joinSession:
os || browser || device || country || subdivision1 || subdivision2 || city os || browser || device || country || region || city
? `inner join session on website_event.${sessionKey} = session.${sessionKey}` ? `inner join session on website_event.${sessionKey} = session.${sessionKey}`
: '', : '',
filterQuery: getFilterQuery(filters, params), filterQuery: getFilterQuery(filters, params),

3
lib/types.ts
View File

@ -82,8 +82,7 @@ export interface WebsiteMetricFilter {
browser?: string; browser?: string;
device?: string; device?: string;
country?: string; country?: string;
subdivision1?: string; region?: string;
subdivision2?: string;
city?: string; city?: string;
} }

12
pages/api/websites/[id]/pageviews.ts
View File

@ -21,8 +21,7 @@ export interface WebsitePageviewRequestQuery {
browser?: string; browser?: string;
device?: string; device?: string;
country?: string; country?: string;
subdivision1?: string; region: string;
subdivision2?: string;
city?: string; city?: string;
} }
@ -46,8 +45,7 @@ export default async (
browser, browser,
device, device,
country, country,
subdivision1, region,
subdivision2,
city, city,
} = req.query; } = req.query;
@ -78,8 +76,7 @@ export default async (
browser, browser,
device, device,
country, country,
subdivision1, region,
subdivision2,
city, city,
}, },
}), }),
@ -96,8 +93,7 @@ export default async (
browser, browser,
device, device,
country, country,
subdivision1, region,
subdivision2,
city, city,
}, },
}), }),

12
pages/api/websites/[id]/stats.ts
View File

@ -18,8 +18,7 @@ export interface WebsiteStatsRequestQuery {
browser: string; browser: string;
device: string; device: string;
country: string; country: string;
subdivision1: string; region: string;
subdivision2: string;
city: string; city: string;
} }
@ -43,8 +42,7 @@ export default async (
browser, browser,
device, device,
country, country,
subdivision1, region,
subdivision2,
city, city,
} = req.query; } = req.query;
@ -73,8 +71,7 @@ export default async (
browser, browser,
device, device,
country, country,
subdivision1, region,
subdivision2,
city, city,
}, },
}); });
@ -91,8 +88,7 @@ export default async (
browser, browser,
device, device,
country, country,
subdivision1, region,
subdivision2,
city, city,
}, },
}); });