watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 15:17:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

add pagetitle to queries

Browse source
This commit is contained in:
Francis Cao 2023-03-01 10:53:57 -08:00
parent 6c302a7325
commit 93650a2f66
9 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pages/api/collect.ts
View file

@ -34,7 +34,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
const { type, payload } = getJsonBody(req);
const { referrer, eventName, eventData } = payload;
const { referrer, eventName, eventData, pageTitle } = payload;
let { url } = payload;
// Validate eventData is JSON
@ -98,12 +98,13 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
}
if (type === 'pageview') {
await savePageView({ ...session, url, referrer });
await savePageView({ ...session, url, referrer, pageTitle });
} else if (type === 'event') {
await saveEvent({
...session,
url,
referrer,
pageTitle,
eventName,
eventData,
});

5
pages/api/websites/[id]/metrics.ts
View file

@ -7,7 +7,7 @@ import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getPageviewMetrics, getSessionMetrics, getWebsite } from 'queries';
const sessionColumns = ['browser', 'os', 'device', 'screen', 'country', 'language'];
const pageviewColumns = ['url', 'referrer', 'query'];
const pageviewColumns = ['url', 'referrer', 'query', 'pageTitle'];
function getTable(type) {
if (type === 'event') {
@ -42,6 +42,7 @@ export interface WebsiteMetricsRequestQuery {
endAt: number;
url: string;
referrer: string;
pageTitle: string;
os: string;
browser: string;
device: string;
@ -65,6 +66,7 @@ export default async (
endAt,
url,
referrer,
pageTitle,
os,
browser,
device,
@ -136,6 +138,7 @@ export default async (
domain,
url: type !== 'url' && table !== 'event' ? url : undefined,
referrer: type !== 'referrer' && table !== 'event' ? referrer : FILTER_IGNORED,
pageTitle: type !== 'pageTitle' && table !== 'event' ? pageTitle : undefined,
os: type !== 'os' ? os : undefined,
browser: type !== 'browser' ? browser : undefined,
device: type !== 'device' ? device : undefined,

4
pages/api/websites/[id]/pageviews.ts
View file

@ -17,6 +17,7 @@ export interface WebsitePageviewRequestQuery {
timezone: string;
url?: string;
referrer?: string;
pageTitle?: string;
os?: string;
browser?: string;
device?: string;
@ -41,6 +42,7 @@ export default async (
timezone,
url,
referrer,
pageTitle,
os,
browser,
device,
@ -72,6 +74,7 @@ export default async (
filters: {
url,
referrer,
pageTitle,
os,
browser,
device,
@ -89,6 +92,7 @@ export default async (
count: 'distinct website_event.',
filters: {
url,
pageTitle,
os,
browser,
device,

4
pages/api/websites/[id]/stats.ts
View file

@ -13,6 +13,7 @@ export interface WebsiteStatsRequestQuery {
endAt: number;
url: string;
referrer: string;
pageTitle: string;
os: string;
browser: string;
device: string;
@ -35,6 +36,7 @@ export default async (
endAt,
url,
referrer,
pageTitle,
os,
browser,
device,
@ -62,6 +64,7 @@ export default async (
filters: {
url,
referrer,
pageTitle,
os,
browser,
device,
@ -77,6 +80,7 @@ export default async (
filters: {
url,
referrer,
pageTitle,
os,
browser,
device,