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 Title filters

Browse Source
This commit is contained in:
Francis Cao 2023-04-25 23:25:51 -07:00
parent 9b349b53c4
commit dcb9f69c43
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/metrics/MetricsBar.js
View File

@ -16,13 +16,13 @@ export 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, region, city }, query: { url, referrer, title, os, browser, device, country, region, city },
} = usePageQuery(); } = usePageQuery();
const { data, error, isLoading, isFetched } = useQuery( const { data, error, isLoading, isFetched } = useQuery(
[ [
'websites:stats', 'websites:stats',
{ websiteId, modified, url, referrer, os, browser, device, country, region, city }, { websiteId, modified, url, referrer, title, os, browser, device, country, region, city },
], ],
() => () =>
get(`/websites/${websiteId}/stats`, { get(`/websites/${websiteId}/stats`, {
@ -30,6 +30,7 @@ export function MetricsBar({ websiteId }) {
endAt: +endDate, endAt: +endDate,
url, url,
referrer, referrer,
title,
os, os,
browser, browser,
device, device,

18
components/metrics/MetricsTable.js
View File

@ -30,7 +30,7 @@ export function MetricsTable({
const { const {
resolveUrl, resolveUrl,
router, router,
query: { url, referrer, os, browser, device, country, region, city }, query: { url, referrer, title, os, browser, device, country, region, city },
} = usePageQuery(); } = usePageQuery();
const { formatMessage, labels } = useMessages(); const { formatMessage, labels } = useMessages();
const { get, useQuery } = useApi(); const { get, useQuery } = useApi();
@ -38,7 +38,20 @@ export function MetricsTable({
const { data, isLoading, isFetched, error } = useQuery( const { data, isLoading, isFetched, error } = useQuery(
[ [
'websites:metrics', 'websites:metrics',
{ websiteId, type, modified, url, referrer, os, browser, device, country, region, city }, {
websiteId,
type,
modified,
url,
referrer,
os,
title,
browser,
device,
country,
region,
city,
},
], ],
() => () =>
get(`/websites/${websiteId}/metrics`, { get(`/websites/${websiteId}/metrics`, {
@ -46,6 +59,7 @@ export function MetricsTable({
startAt: +startDate, startAt: +startDate,
endAt: +endDate, endAt: +endDate,
url, url,
title,
referrer, referrer,
os, os,
browser, browser,

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

@ -16,7 +16,7 @@ export interface WebsitePageviewRequestQuery {
timezone: string; timezone: string;
url?: string; url?: string;
referrer?: string; referrer?: string;
pageTitle?: string; title?: string;
os?: string; os?: string;
browser?: string; browser?: string;
device?: string; device?: string;
@ -40,7 +40,7 @@ export default async (
timezone, timezone,
url, url,
referrer, referrer,
pageTitle, title,
os, os,
browser, browser,
device, device,
@ -71,7 +71,7 @@ export default async (
filters: { filters: {
url, url,
referrer, referrer,
pageTitle, title,
os, os,
browser, browser,
device, device,
@ -88,7 +88,7 @@ export default async (
count: 'distinct website_event.', count: 'distinct website_event.',
filters: { filters: {
url, url,
pageTitle, title,
os, os,
browser, browser,
device, device,