watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-24 06:25:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed properties queries.

Browse source
This commit is contained in:
Mike Cao 2025-07-15 01:31:08 -07:00
parent 465a03f987
commit 5e6799a715
38 changed files with 139 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
View file

@ -13,8 +13,8 @@ export function EventsDataTable({
children?: ReactNode;
}) {
const { formatMessage, labels } = useMessages();
const query = useWebsiteEventsQuery(websiteId);
const [view, setView] = useState('all');
const query = useWebsiteEventsQuery(websiteId);
const buttons = [
{

42
src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
View file

@ -1,5 +1,5 @@
import { DataTable, DataColumn, Icon, Row } from '@umami/react-zen';
import { useMessages, useNavigation } from '@/components/hooks';
import { useFormat, useMessages, useNavigation } from '@/components/hooks';
import { Empty } from '@/components/common/Empty';
import { Avatar } from '@/components/common/Avatar';
import Link from 'next/link';
@ -10,6 +10,7 @@ import { TypeIcon } from '@/components/common/TypeIcon';
export function EventsTable({ data = [] }) {
const { formatMessage, labels } = useMessages();
const { renderUrl } = useNavigation();
const { formatValue } = useFormat();
if (data.length === 0) {
return <Empty />;
@ -20,7 +21,10 @@ export function EventsTable({ data = [] }) {
<DataColumn id="event" label={formatMessage(labels.event)} width="2fr">
{(row: any) => {
return (
<Row alignItems="center" gap="2">
<Row alignItems="center" gap>
<Link href={renderUrl(`/websites/${row.websiteId}/sessions/${row.sessionId}`)}>
<Avatar seed={row.sessionId} size={32} />
</Link>
<Icon>{row.eventName ? <Bolt /> : <Eye />}</Icon>
{formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}
<strong>{row.eventName || row.urlPath}</strong>
@ -28,22 +32,30 @@ export function EventsTable({ data = [] }) {
);
}}
</DataColumn>
<DataColumn id="created" width="1fr" align="end">
<DataColumn id="location" label={formatMessage(labels.location)}>
{(row: any) => (
<Row alignItems="center" gap>
<DateDistance date={new Date(row.createdAt)} />
<Link href={renderUrl(`/websites/${row.websiteId}/sessions/${row.sessionId}`)}>
<Avatar seed={row.sessionId} size={32} />
</Link>
<Row alignItems="center" gap="1">
<TypeIcon type="country" value={row.country} />
<TypeIcon type="browser" value={row.browser} />
<TypeIcon type="os" value={row.os} />
<TypeIcon type="device" value={row.device} />
</Row>
</Row>
<TypeIcon type="country" value={row.country}>
{row.city ? `${row.city}, ` : ''} {formatValue(row.country, 'country')}
</TypeIcon>
)}
</DataColumn>
<DataColumn id="browser" label={formatMessage(labels.browser)}>
{(row: any) => (
<TypeIcon type="browser" value={row.browser}>
{formatValue(row.browser, 'browser')}
</TypeIcon>
)}
</DataColumn>
<DataColumn id="device" label={formatMessage(labels.device)}>
{(row: any) => (
<TypeIcon type="device" value={row.device}>
{formatValue(row.device, 'device')}
</TypeIcon>
)}
</DataColumn>
<DataColumn id="created" width="160px" align="end">
{(row: any) => <DateDistance date={new Date(row.createdAt)} />}
</DataColumn>
</DataTable>
);
}