watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 22:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' of https://github.com/umami-software/umami into francis/uc-24-kafka-test

Browse source
This commit is contained in:
Francis Cao 2022-08-08 08:36:21 -07:00
commit fc3c39be3c
110 changed files with 635 additions and 2499 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/db.js
View file

@ -203,7 +203,6 @@ export function getFilterQuery(table, column, filters = {}, params = []) {
if (table === 'pageview' || table === 'event') {
arr.push(`and ${table}.${key}=$${params.length + 1}`);
params.push(decodeURIComponent(filter));
console.log(params);
}
break;
@ -238,6 +237,11 @@ export function getFilterQuery(table, column, filters = {}, params = []) {
params.push(`%://${filter}/%`);
}
break;
case 'query':
if (table === 'pageview') {
arr.push(`and ${table}.url like '%?%'`);
}
}
return arr;
@ -247,9 +251,12 @@ export function getFilterQuery(table, column, filters = {}, params = []) {
}
export function parseFilters(table, column, filters = {}, params = [], sessionKey = 'session_id') {
const { domain, url, event_url, referrer, os, browser, device, country, event_name } = filters;
const { domain, url, event_url, referrer, os, browser, device, country, event_name, query } =
filters;
const pageviewFilters = { domain, url, referrer };
console.log({ table, column, filters, params });
const pageviewFilters = { domain, url, referrer, query };
const sessionFilters = { os, browser, device, country };
const eventFilters = { url: event_url, event_name };