m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 17:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update filters and sorting.

Browse Source
This commit is contained in:
Mike Cao 2020-10-21 16:14:51 -07:00
parent a8255707a0
commit f34c8f8ec8
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/metrics/MetricsTable.js
View File

@ -1,5 +1,6 @@
import React, { useMemo } from 'react';
import { FormattedMessage } from 'react-intl';
import firstBy from 'thenby';
import classNames from 'classnames';
import Link from 'components/common/Link';
import Loading from 'components/common/Loading';
@ -55,9 +56,9 @@ export default function MetricsTable({
if (data) {
const items = percentFilter(dataFilter ? dataFilter(data, filterOptions) : data);
if (limit) {
return items.filter((e, i) => i < limit);
return items.filter((e, i) => i < limit).sort(firstBy('y', -1).thenBy('x'));
}
return items;
return items.sort(firstBy('y', -1).thenBy('x'));
}
return [];
}, [data, error, dataFilter, filterOptions]);

11
lib/filters.js
View File

@ -1,4 +1,3 @@
import firstBy from 'thenby';
import { BROWSERS } from './constants';
import { removeTrailingSlash, removeWWW, getDomainName } from './url';
@ -43,9 +42,7 @@ export const urlFilter = (data, { raw }) => {
return obj;
}, {});
return Object.keys(map)
.map(key => ({ x: key, y: map[key] }))
.sort(firstBy('y', -1).thenBy('x'));
return Object.keys(map).map(key => ({ x: key, y: map[key] }));
};
export const refFilter = (data, { domain, domainOnly, raw }) => {
@ -70,7 +67,7 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
}
if (domainOnly && hostname) {
return hostname;
return removeWWW(hostname);
}
if (!origin || origin === 'null') {
@ -113,9 +110,7 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
return obj;
}, {});
return Object.keys(map)
.map(key => ({ x: key, y: map[key], w: links[key] }))
.sort(firstBy('y', -1).thenBy('x'));
return Object.keys(map).map(key => ({ x: key, y: map[key], w: links[key] }));
};
export const browserFilter = data =>