ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update metric tables when filtering on referrer 

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
pull/1043/head
Kevin Decherf 2022-03-20 22:14:54 +01:00
parent bb7d26d19f
commit 35f9c7ef6c
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/metrics/MetricsTable.js
View File

@ -30,7 +30,7 @@ export default function MetricsTable({
const { const {
resolve, resolve,
router, router,
query: { url }, query: { url, referrer },
} = usePageQuery(); } = usePageQuery();
const { data, loading, error } = useFetch( const { data, loading, error } = useFetch(
@ -41,12 +41,13 @@ export default function MetricsTable({
start_at: +startDate, start_at: +startDate,
end_at: +endDate, end_at: +endDate,
url, url,
referrer,
}, },
onDataLoad, onDataLoad,
delay: DEFAULT_ANIMATION_DURATION, delay: DEFAULT_ANIMATION_DURATION,
headers: { [TOKEN_HEADER]: shareToken?.token }, headers: { [TOKEN_HEADER]: shareToken?.token },
}, },
[modified], [modified, url, referrer],
); );
const filteredData = useMemo(() => { const filteredData = useMemo(() => {

9
lib/queries.js
View File

@ -444,10 +444,11 @@ export function getSessionMetrics(website_id, start_at, end_at, field, filters =
export function getPageviewMetrics(website_id, start_at, end_at, field, table, filters = {}) { export function getPageviewMetrics(website_id, start_at, end_at, field, table, filters = {}) {
const params = [website_id, start_at, end_at]; const params = [website_id, start_at, end_at];
const { domain, url } = filters; const { domain, url, referrer } = filters;
let domainFilter = ''; let domainFilter = '';
let urlFilter = ''; let urlFilter = '';
let refFilter = '';
if (domain) { if (domain) {
domainFilter = `and referrer not like $${params.length + 1} and referrer not like '/%'`; domainFilter = `and referrer not like $${params.length + 1} and referrer not like '/%'`;
@ -459,6 +460,11 @@ export function getPageviewMetrics(website_id, start_at, end_at, field, table, f
params.push(decodeURIComponent(url)); params.push(decodeURIComponent(url));
} }
if (referrer) {
refFilter = `and referrer like $${params.length + 1}`;
params.push(`%${decodeURIComponent(referrer)}%`);
}
return rawQuery( return rawQuery(
` `
select ${field} x, count(*) y select ${field} x, count(*) y
@ -467,6 +473,7 @@ export function getPageviewMetrics(website_id, start_at, end_at, field, table, f
and created_at between $2 and $3 and created_at between $2 and $3
${domainFilter} ${domainFilter}
${urlFilter} ${urlFilter}
${refFilter}
group by 1 group by 1
order by 2 desc order by 2 desc
`, `,

3
pages/api/website/[id]/metrics.js
View File

@ -30,7 +30,7 @@ export default async (req, res) => {
return unauthorized(res); return unauthorized(res);
} }
const { id, type, start_at, end_at, url } = req.query; const { id, type, start_at, end_at, url, referrer } = req.query;
const websiteId = +id; const websiteId = +id;
const startDate = new Date(+start_at); const startDate = new Date(+start_at);
@ -75,6 +75,7 @@ export default async (req, res) => {
{ {
domain, domain,
url: type !== 'url' && url, url: type !== 'url' && url,
referrer: referrer,
}, },
); );