m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-06-30 13:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow multiple filters.

Browse Source
This commit is contained in:
Mike Cao 2023-05-16 19:17:12 -07:00
parent 2ce62c1023
commit b48efef38b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/metrics/MetricsTable.js
View File

@ -73,16 +73,27 @@ export function MetricsTable({
const filteredData = useMemo(() => { const filteredData = useMemo(() => {
if (data) { if (data) {
const dataWithoutNullValues = data.filter(val => val.x !== null); let items;
let items = percentFilter(
dataFilter ? dataFilter(dataWithoutNullValues, filterOptions) : dataWithoutNullValues, if (dataFilter) {
); if (Array.isArray(dataFilter)) {
items = dataFilter.reduce((arr, filter) => {
return filter(arr);
}, data);
} else {
items = dataFilter(data);
}
}
items = percentFilter(items);
if (limit) { if (limit) {
items = items.filter((e, i) => i < limit); items = items.filter((e, i) => i < limit);
} }
if (filterOptions?.sort === false) { if (filterOptions?.sort === false) {
return items; return items;
} }
return items.sort(firstBy('y', -1).thenBy('x')); return items.sort(firstBy('y', -1).thenBy('x'));
} }
return []; return [];

2
components/metrics/QueryParametersTable.js
View File

@ -9,7 +9,7 @@ import styles from './QueryParametersTable.module.css';
const filters = { const filters = {
[FILTER_RAW]: emptyFilter, [FILTER_RAW]: emptyFilter,
[FILTER_COMBINED]: paramFilter, [FILTER_COMBINED]: [emptyFilter, paramFilter],
}; };
export function QueryParametersTable({ websiteId, showFilters, ...props }) { export function QueryParametersTable({ websiteId, showFilters, ...props }) {