watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Mike Cao 2022-12-27 00:00:42 -08:00
commit c90bd941b5
6 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/clickhouse.js
View file

@ -120,11 +120,15 @@ function getFilterQuery(filters = {}, params = []) {
case 'browser':
case 'device':
case 'country':
case 'eventName':
arr.push(`and ${key}=$${params.length + 1}`);
params.push(decodeURIComponent(filter));
break;
case 'eventName':
arr.push(`and event_name=$${params.length + 1}`);
params.push(decodeURIComponent(filter));
break;
case 'referrer':
arr.push(`and referrer like $${params.length + 1}`);
params.push(`%${decodeURIComponent(filter)}%`);
@ -147,12 +151,12 @@ function getFilterQuery(filters = {}, params = []) {
}
function parseFilters(filters = {}, params = []) {
const { domain, url, event_url, referrer, os, browser, device, country, eventName, query } =
const { domain, url, eventUrl, referrer, os, browser, device, country, eventName, query } =
filters;
const pageviewFilters = { domain, url, referrer, query };
const sessionFilters = { os, browser, device, country };
const eventFilters = { url: event_url, eventName };
const eventFilters = { url: eventUrl, eventName };
return {
pageviewFilters,

13
lib/prisma.ts
View file

@ -124,19 +124,26 @@ function getFilterQuery(filters = {}, params = []): string {
case 'browser':
case 'device':
case 'country':
case 'eventName':
arr.push(`and ${key}=$${params.length + 1}`);
params.push(decodeURIComponent(filter));
break;
case 'eventName':
arr.push(`and event_name=$${params.length + 1}`);
params.push(decodeURIComponent(filter));
break;
case 'referrer':
arr.push(`and referrer like $${params.length + 1}`);
params.push(`%${decodeURIComponent(filter)}%`);
break;
case 'domain':
arr.push(`and referrer not like $${params.length + 1}`);
arr.push(`and referrer not like '/%'`);
params.push(`%://${filter}/%`);
break;
case 'query':
arr.push(`and url like '%?%'`);
}
@ -152,12 +159,12 @@ function parseFilters(
params = [],
sessionKey = 'session_id',
) {
const { domain, url, event_url, referrer, os, browser, device, country, eventName, query } =
const { domain, url, eventUrl, referrer, os, browser, device, country, eventName, query } =
filters;
const pageviewFilters = { domain, url, referrer, query };
const sessionFilters = { os, browser, device, country };
const eventFilters = { url: event_url, eventName };
const eventFilters = { url: eventUrl, eventName };
return {
pageviewFilters,