watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 1a04856a8b into 8cd3c03702

Browse source
This commit is contained in:
daniyil kotov 2026-02-08 10:54:39 +02:00 • committed by GitHub
commit 7b983e5e13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 95 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/metrics/MetricsTable.tsx
View file

@ -41,21 +41,25 @@ export function MetricsTable({
const filteredData = useMemo(() => {
if (data) {
let items = data as any[];
// Handle both old format (array) and new format ({ data, total })
const items = Array.isArray(data) ? data : data.data;
const total = Array.isArray(data) ? undefined : data.total;
let filtered = items as any[];
if (dataFilter) {
if (Array.isArray(dataFilter)) {
items = dataFilter.reduce((arr, filter) => {
filtered = dataFilter.reduce((arr, filter) => {
return filter(arr);
}, items);
}, filtered);
} else {
items = dataFilter(items);
filtered = dataFilter(filtered);
}
}
items = percentFilter(items);
filtered = percentFilter(filtered, total);
return items.map(({ x, y, z, ...props }) => ({ label: x, count: y, percent: z, ...props }));
return filtered.map(({ x, y, z, ...props }) => ({ label: x, count: y, percent: z, ...props }));
}
return [];
}, [data, dataFilter, limit, type]);