diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx index 453aa9a85..94040497e 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx @@ -6,12 +6,13 @@ import { useState } from 'react'; import { CHART_COLORS } from '@/lib/constants'; import styles from './EventProperties.module.css'; -export function EventProperties({ websiteId }: { websiteId: string }) { +export function EventProperties({ websiteId, label }: { websiteId: string; label: string }) { const [propertyName, setPropertyName] = useState(''); const [eventName, setEventName] = useState(''); const { formatMessage, labels } = useMessages(); - const { data, isLoading, isFetched, error } = useEventDataProperties(websiteId); + const { data: eventData = [], isLoading, isFetched, error } = useEventDataProperties(websiteId); const { data: values } = useEventDataValues(websiteId, eventName, propertyName); + const data = label ? eventData.filter(({ eventName }) => eventName === label) : eventData; const chartData = propertyName && values ? { diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx index ce9048d31..1a1732cc6 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx @@ -5,8 +5,10 @@ import { ReactNode } from 'react'; export default function EventsDataTable({ websiteId, + label, }: { websiteId?: string; + label?: string; teamId?: string; children?: ReactNode; }) { @@ -14,7 +16,10 @@ export default function EventsDataTable({ return ( - {({ data }) => } + {({ data: eventData = [] }) => { + const data = label ? eventData.filter(({ eventName }) => eventName === label) : eventData; + return ; + }} ); } diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx index 285a230e8..21a2ff0ca 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx @@ -42,8 +42,8 @@ export default function EventsPage({ websiteId }) { {formatMessage(labels.activity)} {formatMessage(labels.properties)} - {tab === 'activity' && } - {tab === 'properties' && } + {tab === 'activity' && } + {tab === 'properties' && } );