Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Allow filtering same metric via API.

Mike Cao401decaa259d
diff --git a/src/components/metrics/MetricsTable.js b/src/components/metrics/MetricsTable.js
index 39578381d..6521c4155 100644
--- a/src/components/metrics/MetricsTable.js
+++ b/src/components/metrics/MetricsTable.js
@@ -54,21 +54,18 @@ export function MetricsTable({
city,
},
],
- () =>
- get(`/websites/${websiteId}/metrics`, {
+ () => {
+ const filters = { url, title, referrer, os, browser, device, country, region, city };
+
+ filters[type] = undefined;
+
+ return get(`/websites/${websiteId}/metrics`, {
type,
startAt: +startDate,
endAt: +endDate,
- url,
- title,
- referrer,
- os,
- browser,
- device,
- country,
- region,
- city,
- }),
+ ...filters,
+ });
+ },
{ onSuccess: onDataLoad, retryDelay: delay || DEFAULT_ANIMATION_DURATION },
);
diff --git a/src/pages/api/websites/[id]/metrics.ts b/src/pages/api/websites/[id]/metrics.ts
index 67c15ecae..b8c37339d 100644
--- a/src/pages/api/websites/[id]/metrics.ts
+++ b/src/pages/api/websites/[id]/metrics.ts
@@ -13,23 +13,26 @@ export interface WebsiteMetricsRequestQuery {
type: string;
startAt: number;
endAt: number;
- url: string;
- referrer: string;
- title: string;
- query: string;
- event: string;
- os: string;
- browser: string;
- device: string;
- country: string;
- region: string;
- city: string;
- language: string;
+ url?: string;
+ referrer?: string;
+ title?: string;
+ query?: string;
+ os?: string;
+ browser?: string;
+ device?: string;
+ country?: string;
+ region?: string;
+ city?: string;
+ language?: string;
+ event?: string;
}
const schema = {
GET: yup.object().shape({
id: yup.string().uuid().required(),
+ type: yup.string().required(),
+ startAt: yup.number().required(),
+ endAt: yup.number().required(),
}),
};
@@ -50,7 +53,6 @@ export default async (
referrer,
title,
query,
- event,
os,
browser,
device,
@@ -58,6 +60,7 @@ export default async (
region,
city,
language,
+ event,
} = req.query;
if (req.method === 'GET') {
@@ -74,7 +77,6 @@ export default async (
referrer,
title,
query,
- event,
os,
browser,
device,
@@ -82,10 +84,9 @@ export default async (
region,
city,
language,
+ event,
};
- filters[type] = undefined;
-
const column = FILTER_COLUMNS[type] || type;
if (SESSION_COLUMNS.includes(type)) {