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

Refactor chart components.

Browse source
This commit is contained in:
Mike Cao 2020-10-14 22:09:00 -07:00
parent 37bc082efc
commit 7d659212b0
12 changed files with 157 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/metrics/EventsChart.js
View file

@ -16,7 +16,7 @@ export default function EventsChart({ websiteId, className, token }) {
const { query } = usePageQuery();
const shareToken = useShareToken();
const { data } = useFetch(
const { data, loading } = useFetch(
`/api/website/${websiteId}/events`,
{
params: {
@ -31,8 +31,10 @@ export default function EventsChart({ websiteId, className, token }) {
},
[modified],
);
const datasets = useMemo(() => {
if (!data) return [];
if (loading) return data;
const map = data.reduce((obj, { x, t, y }) => {
if (!obj[x]) {
@ -59,7 +61,7 @@ export default function EventsChart({ websiteId, className, token }) {
borderWidth: 1,
};
});
}, [data]);
}, [data, loading]);
function handleUpdate(chart) {
chart.data.datasets = datasets;
@ -79,6 +81,7 @@ export default function EventsChart({ websiteId, className, token }) {
unit={unit}
records={getDateLength(startDate, endDate, unit)}
onUpdate={handleUpdate}
loading={loading}
stacked
/>
);