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

Updated filtering logic.

Browse source
This commit is contained in:
Mike Cao 2023-08-07 12:43:43 -07:00
parent 112005212e
commit 9d86385f5c
8 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/pages/event-data/EventDataTable.js
View file

@ -16,7 +16,7 @@ export function EventDataTable({ data = [] }) {
<GridTable data={data}>
<GridColumn name="eventName" label={formatMessage(labels.event)}>
{row => (
<Link href={resolveUrl({ eventName: row.eventName })} shallow={true}>
<Link href={resolveUrl({ event: row.eventName })} shallow={true}>
{row.eventName}
</Link>
)}

6
components/pages/event-data/EventDataValueTable.js
View file

@ -6,14 +6,14 @@ import PageHeader from 'components/layout/PageHeader';
import Empty from 'components/common/Empty';
import { DATA_TYPES } from 'lib/constants';
export function EventDataValueTable({ data = [], eventName }) {
export function EventDataValueTable({ data = [], event }) {
const { formatMessage, labels } = useMessages();
const { resolveUrl } = usePageQuery();
const Title = () => {
return (
<>
<Link href={resolveUrl({ eventName: undefined })}>
<Link href={resolveUrl({ event: undefined })}>
<Button>
<Icon rotate={180}>
<Icons.ArrowRight />
@ -21,7 +21,7 @@ export function EventDataValueTable({ data = [], eventName }) {
<Text>{formatMessage(labels.back)}</Text>
</Button>
</Link>
<Text>{eventName}</Text>
<Text>{event}</Text>
</>
);
};

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

@ -26,15 +26,15 @@ function useData(websiteId, eventName) {
export default function WebsiteEventData({ websiteId }) {
const {
query: { eventName },
query: { event },
} = usePageQuery();
const { data } = useData(websiteId, eventName);
const { data } = useData(websiteId, event);
return (
<Flexbox className={styles.container} direction="column" gap={20}>
<EventDataMetricsBar websiteId={websiteId} />
{!eventName && <EventDataTable data={data} />}
{eventName && <EventDataValueTable eventName={eventName} data={data} />}
{!event && <EventDataTable data={data} />}
{event && <EventDataValueTable event={event} data={data} />}
</Flexbox>
);
}