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

Merge pull request #1057 from ilhamsyahids/master

Browse Source 
Fix active users not appear
This commit is contained in:
Mike Cao 2022-04-11 00:23:21 -07:00 committed by GitHub
commit 46cfab864c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/metrics/ActiveUsers.js
View File

@ -9,14 +9,18 @@ import styles from './ActiveUsers.module.css';
export default function ActiveUsers({ websiteId, className, value, interval = 60000 }) {
const shareToken = useShareToken();
const url = value !== undefined && websiteId ? `/website/${websiteId}/active` : null;
const url = websiteId ? `/website/${websiteId}/active` : null;
const { data } = useFetch(url, {
interval,
headers: { [TOKEN_HEADER]: shareToken?.token },
});
const count = useMemo(() => {
return value || data?.[0]?.x || 0;
}, [data, value]);
if (websiteId) {
return data?.[0]?.x || 0
}
return value !== undefined ? value : 0;
}, [data, value, websiteId]);
if (count === 0) {
return null;

2
components/metrics/RealtimeHeader.js
View File

@ -33,7 +33,7 @@ export default function RealtimeHeader({ websites, data, websiteId, onSelect })
<FormattedMessage id="label.realtime" defaultMessage="Realtime" />
</div>
<div>
<ActiveUsers className={styles.active} value={count} />
<ActiveUsers className={styles.active} value={count} websiteId={websiteId} />
</div>
<DropDown value={websiteId} options={options} onChange={onSelect} />
</PageHeader>