mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-14 21:10:34 +01:00
Merge branch 'dev' into feat/um-285-report-schema
This commit is contained in:
commit
cb038a51f3
@ -73,13 +73,13 @@ export function MetricsTable({
|
|||||||
|
|
||||||
const filteredData = useMemo(() => {
|
const filteredData = useMemo(() => {
|
||||||
if (data) {
|
if (data) {
|
||||||
let items;
|
let items = data;
|
||||||
|
|
||||||
if (dataFilter) {
|
if (dataFilter) {
|
||||||
if (Array.isArray(dataFilter)) {
|
if (Array.isArray(dataFilter)) {
|
||||||
items = dataFilter.reduce((arr, filter) => {
|
items = dataFilter.reduce((arr, filter) => {
|
||||||
return filter(arr);
|
return filter(arr);
|
||||||
}, data);
|
}, items);
|
||||||
} else {
|
} else {
|
||||||
items = dataFilter(data);
|
items = dataFilter(data);
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,9 @@ export default function RealtimeDetailsPage() {
|
|||||||
const { id: websiteId } = router.query;
|
const { id: websiteId } = router.query;
|
||||||
const { formatMessage, labels } = useMessages();
|
const { formatMessage, labels } = useMessages();
|
||||||
const { get, useQuery } = useApi();
|
const { get, useQuery } = useApi();
|
||||||
const { data: website } = useQuery(['websites', websiteId], () =>
|
const { data: website } = useQuery(['websites', websiteId], () => get(`/websites/${websiteId}`), {
|
||||||
websiteId ? get(`/websites/${websiteId}`, { enabled: !!websiteId }) : null,
|
enabled: !!websiteId,
|
||||||
);
|
});
|
||||||
const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`;
|
const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`;
|
||||||
|
|
||||||
if (!websiteId) {
|
if (!websiteId) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user