Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

add pagetitle to queries

Francis Cao93650a2f663f
diff --git a/db/mysql/migrations/01_init/migration.sql b/db/mysql/migrations/01_init/migration.sql
index 59c559cd9..ce941edd5 100644
--- a/db/mysql/migrations/01_init/migration.sql
+++ b/db/mysql/migrations/01_init/migration.sql
@@ -121,3 +121,6 @@ CREATE TABLE `team_website` (
INDEX `team_website_website_id_idx`(`website_id`),
PRIMARY KEY (`team_website_id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- AddSystemUser
+INSERT INTO "user" (user_id, username, role, password) VALUES ('41e2b680-648e-4b09-bcd7-3e2b10c06264' , 'admin', 'admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa');
\ No newline at end of file
diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
index 5420e969c..18898ce08 100644
--- a/lib/clickhouse.ts
+++ b/lib/clickhouse.ts
@@ -112,6 +112,7 @@ function getFilterQuery(filters = {}, params = {}) {
switch (key) {
case 'url':
+ case 'pageTitle':
case 'os':
case 'browser':
case 'device':
@@ -155,6 +156,7 @@ function parseFilters(filters: any = {}, params: any = {}) {
url,
eventUrl,
referrer,
+ pageTitle,
os,
browser,
device,
@@ -166,7 +168,7 @@ function parseFilters(filters: any = {}, params: any = {}) {
query,
} = filters;
- const pageviewFilters = { domain, url, referrer, query };
+ const pageviewFilters = { domain, url, referrer, query, pageTitle };
const sessionFilters = { os, browser, device, country, subdivision1, subdivision2, city };
const eventFilters = { url: eventUrl, eventName };
diff --git a/lib/prisma.ts b/lib/prisma.ts
index 11db678bc..667160e22 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -133,6 +133,7 @@ function getFilterQuery(filters = {}, params = []): string {
switch (key) {
case 'url':
case 'os':
+ case 'pageTitle':
case 'browser':
case 'device':
case 'subdivision1':
@@ -179,6 +180,7 @@ function parseFilters(
url,
eventUrl,
referrer,
+ pageTitle,
os,
browser,
device,
@@ -190,7 +192,7 @@ function parseFilters(
query,
} = filters;
- const pageviewFilters = { domain, url, referrer, query };
+ const pageviewFilters = { domain, url, referrer, query, pageTitle };
const sessionFilters = { os, browser, device, country, subdivision1, subdivision2, city };
const eventFilters = { url: eventUrl, eventName };
diff --git a/pages/api/collect.ts b/pages/api/collect.ts
index 24dcbee14..1d023a8e0 100644
--- a/pages/api/collect.ts
+++ b/pages/api/collect.ts
@@ -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,
});
diff --git a/pages/api/websites/[id]/metrics.ts b/pages/api/websites/[id]/metrics.ts
index 70dcd7a6f..c547daee2 100644
--- a/pages/api/websites/[id]/metrics.ts
+++ b/pages/api/websites/[id]/metrics.ts
@@ -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,
diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.ts
index f21760496..475c9ee12 100644
--- a/pages/api/websites/[id]/pageviews.ts
+++ b/pages/api/websites/[id]/pageviews.ts
@@ -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,
diff --git a/pages/api/websites/[id]/stats.ts b/pages/api/websites/[id]/stats.ts
index 138ede608..8ef94bc7c 100644
--- a/pages/api/websites/[id]/stats.ts
+++ b/pages/api/websites/[id]/stats.ts
@@ -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,
diff --git a/queries/analytics/event/saveEvent.ts b/queries/analytics/event/saveEvent.ts
index 81cb10b48..4631152ab 100644
--- a/queries/analytics/event/saveEvent.ts
+++ b/queries/analytics/event/saveEvent.ts
@@ -10,6 +10,7 @@ export async function saveEvent(args: {
websiteId: string;
url: string;
referrer?: string;
+ pageTitle?: string;
eventName?: string;
eventData?: any;
hostname?: string;
@@ -34,10 +35,11 @@ async function relationalQuery(data: {
websiteId: string;
url: string;
referrer?: string;
+ pageTitle?: string;
eventName?: string;
eventData?: any;
}) {
- const { websiteId, id: sessionId, url, eventName, eventData, referrer } = data;
+ const { websiteId, id: sessionId, url, eventName, eventData, referrer, pageTitle } = data;
return prisma.client.websiteEvent.create({
data: {
@@ -46,6 +48,7 @@ async function relationalQuery(data: {
sessionId,
url: url?.substring(0, URL_LENGTH),
referrer: referrer?.substring(0, URL_LENGTH),
+ pageTitle: pageTitle,
eventType: EVENT_TYPE.customEvent,
eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
eventData,
@@ -58,6 +61,7 @@ async function clickhouseQuery(data) {
websiteId,
id: sessionId,
url,
+ pageTitle,
eventName,
eventData,
country,
@@ -79,6 +83,7 @@ async function clickhouseQuery(data) {
subdivision2: subdivision2 ? subdivision2 : null,
city: city ? city : null,
url: url?.substring(0, URL_LENGTH),
+ page_title: pageTitle,
event_type: EVENT_TYPE.customEvent,
event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
event_data: eventData ? JSON.stringify(eventData) : null,
diff --git a/queries/analytics/pageview/savePageView.ts b/queries/analytics/pageview/savePageView.ts
index 6682edadc..c0e31f7c4 100644
--- a/queries/analytics/pageview/savePageView.ts
+++ b/queries/analytics/pageview/savePageView.ts
@@ -10,6 +10,7 @@ export async function savePageView(args: {
websiteId: string;
url: string;
referrer?: string;
+ pageTitle?: string;
hostname?: string;
browser?: string;
os?: string;
@@ -32,8 +33,9 @@ async function relationalQuery(data: {
websiteId: string;
url: string;
referrer?: string;
+ pageTitle?: string;
}) {
- const { websiteId, id: sessionId, url, referrer } = data;
+ const { websiteId, id: sessionId, url, referrer, pageTitle } = data;
return prisma.client.websiteEvent.create({
data: {
@@ -42,6 +44,7 @@ async function relationalQuery(data: {
sessionId,
url: url?.substring(0, URL_LENGTH),
referrer: referrer?.substring(0, URL_LENGTH),
+ pageTitle: pageTitle,
eventType: EVENT_TYPE.pageView,
},
});
@@ -53,6 +56,7 @@ async function clickhouseQuery(data) {
id: sessionId,
url,
referrer,
+ pageTitle,
country,
subdivision1,
subdivision2,
@@ -72,6 +76,7 @@ async function clickhouseQuery(data) {
city: city ? city : null,
url: url?.substring(0, URL_LENGTH),
referrer: referrer?.substring(0, URL_LENGTH),
+ page_title: pageTitle,
event_type: EVENT_TYPE.pageView,
created_at: getDateFormat(new Date()),
...args,