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

Fixed event data display.

Browse source
This commit is contained in:
Mike Cao 2023-08-04 15:31:46 -07:00
parent 89f7b39bfe
commit 91d2b596d6
4 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/pages/websites/WebsiteEventData.js
View file

@ -5,18 +5,18 @@ import { EventDataMetricsBar } from 'components/pages/event-data/EventDataMetric
import { useDateRange, useApi, usePageQuery } from 'hooks';
import styles from './WebsiteEventData.module.css';
function useData(websiteId, event) {
function useData(websiteId, eventName) {
const [dateRange] = useDateRange(websiteId);
const { startDate, endDate } = dateRange;
const { get, useQuery } = useApi();
const { data, error, isLoading } = useQuery(
['event-data:events', { websiteId, startDate, endDate, event }],
['event-data:events', { websiteId, startDate, endDate, eventName }],
() =>
get('/event-data/events', {
websiteId,
startAt: +startDate,
endAt: +endDate,
event,
eventName,
}),
{ enabled: !!(websiteId && startDate && endDate) },
);
@ -26,15 +26,15 @@ function useData(websiteId, event) {
export default function WebsiteEventData({ websiteId }) {
const {
query: { event },
query: { eventName },
} = usePageQuery();
const { data } = useData(websiteId, event);
const { data } = useData(websiteId, eventName);
return (
<Flexbox className={styles.container} direction="column" gap={20}>
<EventDataMetricsBar websiteId={websiteId} />
{!event && <EventDataTable data={data} />}
{event && <EventDataValueTable event={event} data={data} />}
{!eventName && <EventDataTable data={data} />}
{eventName && <EventDataValueTable eventName={eventName} data={data} />}
</Flexbox>
);
}