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

Updated tracker and collect.

Browse source
This commit is contained in:
Mike Cao 2023-03-26 04:15:08 -07:00
parent 43ef6884df
commit cdacb640c6
12 changed files with 234 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/metrics/EventsChart.js
View file

@ -17,7 +17,7 @@ export default function EventsChart({ websiteId, className, token }) {
query: { url, eventName },
} = usePageQuery();
const { data, isLoading } = useQuery(['events', { websiteId, modified, eventName }], () =>
const { data, isLoading } = useQuery(['events', websiteId, modified, eventName], () =>
get(`/websites/${websiteId}/events`, {
startAt: +startDate,
endAt: +endDate,
@ -33,12 +33,12 @@ export default function EventsChart({ websiteId, className, token }) {
if (!data) return [];
if (isLoading) return data;
const map = data.reduce((obj, { x, y }) => {
const map = data.reduce((obj, { x, t, y }) => {
if (!obj[x]) {
obj[x] = [];
}
obj[x].push({ x, y });
obj[x].push({ x: t, y });
return obj;
}, {});
@ -58,22 +58,12 @@ export default function EventsChart({ websiteId, className, token }) {
borderWidth: 1,
};
});
}, [data, isLoading]);
function handleUpdate(chart) {
chart.data.datasets = datasets;
chart.update();
}
}, [data, isLoading, startDate, endDate, unit]);
if (isLoading) {
return <Loading icon="dots" />;
}
if (!data) {
return null;
}
return (
<BarChart
className={className}
@ -81,7 +71,6 @@ export default function EventsChart({ websiteId, className, token }) {
unit={unit}
height={300}
records={getDateLength(startDate, endDate, unit)}
onUpdate={handleUpdate}
loading={isLoading}
stacked
/>