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

Updated log merge logic to prevent duplicates.

Browse source
This commit is contained in:
Mike Cao 2020-10-09 10:48:47 -07:00
parent 8e0ea48c87
commit 5dd3110fbf
5 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/common/Table.module.css
View file

@ -21,6 +21,7 @@
}
.row {
display: flex;
border-bottom: 1px solid var(--gray300);
padding: 10px 0;
}

2
components/metrics/RealtimeLog.js
View file

@ -103,7 +103,7 @@ export default function RealtimeLog({ data, websites }) {
return (
<FormattedMessage
id="message.log.visitor"
defaultMessage="A visitor from {country} using {browser} on {os} {device}"
defaultMessage="Visitor from {country} using {browser} on {os} {device}"
values={{ country: countryNames[country], browser: BROWSERS[browser], os, device }}
/>
);

22
components/pages/RealtimeDashboard.js
View file

@ -11,20 +11,22 @@ import RealtimeLog from '../metrics/RealtimeLog';
const REALTIME_RANGE = 30;
const REALTIME_INTERVAL = 5000;
function filterTime(data, time) {
return data.filter(({ created_at }) => new Date(created_at).getTime() >= time);
function mergeData(state, data, time) {
const ids = state.map(({ __id }) => __id);
return state
.concat(data.filter(({ __id }) => !ids.includes(__id)))
.filter(({ created_at }) => new Date(created_at).getTime() >= time);
}
export default function RealtimeDashboard() {
const [data, setData] = useState();
const [website, setWebsite] = useState();
const [lastTime, setLastTime] = useState();
const { data: init, loading } = useFetch('/api/realtime', { type: 'init' });
const { data: updates } = useFetch(
'/api/realtime',
{ type: 'update', start_at: lastTime },
{ type: 'update', start_at: data?.timestamp },
{
disabled: !init?.token,
disabled: !init?.token || !data,
interval: REALTIME_INTERVAL,
headers: { 'x-umami-token': init?.token },
},
@ -34,15 +36,15 @@ export default function RealtimeDashboard() {
if (init && !data) {
setData(init.data);
} else if (updates) {
const { pageviews, sessions, events } = updates;
const { pageviews, sessions, events, timestamp } = updates;
const minTime = subMinutes(startOfMinute(new Date()), REALTIME_RANGE).getTime();
setData(state => ({
pageviews: filterTime(state.pageviews.concat(pageviews), minTime),
sessions: filterTime(state.sessions.concat(sessions), minTime),
events: filterTime(state.events.concat(events), minTime),
pageviews: mergeData(state.pageviews, pageviews, minTime),
sessions: mergeData(state.sessions, sessions, minTime),
events: mergeData(state.events, events, minTime),
timestamp,
}));
}
setLastTime(Date.now());
}, [init, updates]);
if (!init || loading || !data) {