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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Allow multiple filters.
Mike Caob48efef38b80
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.jsindex 3bb313cdf..a918c0fb6 100644--- a/components/metrics/MetricsTable.js+++ b/components/metrics/MetricsTable.js@@ -73,16 +73,27 @@ export function MetricsTable({const filteredData = useMemo(() => {if (data) {- const dataWithoutNullValues = data.filter(val => val.x !== null);- let items = percentFilter(- dataFilter ? dataFilter(dataWithoutNullValues, filterOptions) : dataWithoutNullValues,- );+ let items;++ if (dataFilter) {+ if (Array.isArray(dataFilter)) {+ items = dataFilter.reduce((arr, filter) => {+ return filter(arr);+ }, data);+ } else {+ items = dataFilter(data);+ }+ }++ items = percentFilter(items);+if (limit) {items = items.filter((e, i) => i < limit);}if (filterOptions?.sort === false) {return items;}+return items.sort(firstBy('y', -1).thenBy('x'));}return [];diff --git a/components/metrics/QueryParametersTable.js b/components/metrics/QueryParametersTable.jsindex c5f573e3c..23193c2e1 100644--- a/components/metrics/QueryParametersTable.js+++ b/components/metrics/QueryParametersTable.js@@ -9,7 +9,7 @@ import styles from './QueryParametersTable.module.css';const filters = {[FILTER_RAW]: emptyFilter,- [FILTER_COMBINED]: paramFilter,+ [FILTER_COMBINED]: [emptyFilter, paramFilter],};export function QueryParametersTable({ websiteId, showFilters, ...props }) {