watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactored query parameters.

Browse source
This commit is contained in:
Mike Cao 2022-08-08 01:26:20 -07:00
parent 69962eb08d
commit 89781d4847
99 changed files with 452 additions and 2273 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/db.js
View file

@ -168,7 +168,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;
@ -203,6 +202,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;
@ -212,9 +216,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 };