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

Refactored referrer logic. Display stats for no referrers.

Browse source
This commit is contained in:
Mike Cao 2022-07-21 01:11:10 -07:00
parent 0026b4b1ea
commit be8291c856
92 changed files with 687 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/queries.js
View file

@ -59,11 +59,11 @@ export function getTimestampInterval(field) {
}
}
export function getFilterQuery(table, filters = {}, params = []) {
export function getFilterQuery(table, column, filters = {}, params = []) {
const query = Object.keys(filters).reduce((arr, key) => {
const value = filters[key];
if (value === undefined) {
if (!value || value === true) {
return arr;
}
@ -94,7 +94,8 @@ export function getFilterQuery(table, filters = {}, params = []) {
case 'referrer':
if (table === 'pageview') {
arr.push(`and ${table}.referrer like $${params.length + 1}`);
arr.push(`and ${table}.referrer like $${params.length + 1} `);
arr.push(`and ${table}.referrer not like '/%'`);
params.push(`%${decodeURIComponent(value)}%`);
}
break;
@ -114,7 +115,7 @@ export function getFilterQuery(table, filters = {}, params = []) {
return query.join('\n');
}
export function parseFilters(table, filters = {}, params = []) {
export function parseFilters(table, column, filters = {}, params = []) {
const { domain, url, event_url, referrer, os, browser, device, country, event_type } = filters;
const pageviewFilters = { domain, url, referrer };
@ -130,9 +131,9 @@ export function parseFilters(table, filters = {}, params = []) {
os || browser || device || country
? `inner join session on ${table}.session_id = session.session_id`
: '',
pageviewQuery: getFilterQuery('pageview', pageviewFilters, params),
sessionQuery: getFilterQuery('session', sessionFilters, params),
eventQuery: getFilterQuery('event', eventFilters, params),
pageviewQuery: getFilterQuery('pageview', column, pageviewFilters, params),
sessionQuery: getFilterQuery('session', column, sessionFilters, params),
eventQuery: getFilterQuery('event', column, eventFilters, params),
};
}