Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Events filtering. Closes #3356
Mike Caod4b786380be2
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsxindex cf4c19ef4..285a230e8 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@ -4,27 +4,33 @@ import EventsDataTable from './EventsDataTable';import EventsMetricsBar from './EventsMetricsBar';import EventsChart from '@/components/metrics/EventsChart';import { GridRow } from '@/components/layout/Grid';-import MetricsTable from '@/components/metrics/MetricsTable';+import EventsTable from '@/components/metrics/EventsTable';import { useMessages } from '@/components/hooks';import { Item, Tabs } from 'react-basics';import { useState } from 'react';import EventProperties from './EventProperties';export default function EventsPage({ websiteId }) {+ const [label, setLabel] = useState(null);const [tab, setTab] = useState('activity');const { formatMessage, labels } = useMessages();+ const handleLabelClick = (value: string) => {+ setLabel(value !== label ? value : '');+ };+return (<><WebsiteHeader websiteId={websiteId} /><EventsMetricsBar websiteId={websiteId} /><GridRow columns="two-one">- <EventsChart websiteId={websiteId} />- <MetricsTable+ <EventsChart websiteId={websiteId} focusLabel={label} />+ <EventsTablewebsiteId={websiteId}type="event"title={formatMessage(labels.events)}metric={formatMessage(labels.actions)}+ onLabelClick={handleLabelClick}/></GridRow><div>diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsxindex dde01eb44..a21086bf4 100644--- a/src/components/charts/Chart.tsx+++ b/src/components/charts/Chart.tsx@@ -34,7 +34,7 @@ export function Chart({className,chartOptions,}: ChartProps) {- const canvas = useRef();+ const canvas = useRef(null);const chart = useRef(null);const [legendItems, setLegendItems] = useState([]);@@ -86,7 +86,7 @@ export function Chart({dataset.data = data?.datasets[index]?.data;if (chart.current.legend.legendItems[index]) {- chart.current.legend.legendItems[index].text = data?.datasets[index]?.label;+ chart.current.legend.legendItems[index].text = data.datasets[index]?.label;}}});@@ -95,6 +95,12 @@ export function Chart({}}+ if (data.focusLabel !== null) {+ chart.current.data.datasets.forEach(ds => {+ ds.hidden = data.focusLabel ? ds.label !== data.focusLabel : false;+ });+ }+chart.current.options = options;// Allow config changes before update@@ -105,16 +111,6 @@ export function Chart({setLegendItems(chart.current.legend.legendItems);};- useEffect(() => {- if (data) {- if (!chart.current) {- createChart(data);- } else {- updateChart(data);- }- }- }, [data, options]);-const handleLegendClick = (item: LegendItem) => {if (type === 'bar') {const { datasetIndex } = item;@@ -136,6 +132,16 @@ export function Chart({setLegendItems(chart.current.legend.legendItems);};+ useEffect(() => {+ if (data) {+ if (!chart.current) {+ createChart(data);+ } else {+ updateChart(data);+ }+ }+ }, [data, options]);+return (<><div className={classNames(styles.chart, className)}>diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsxindex 9655c4a47..594a69f7c 100644--- a/src/components/metrics/EventsChart.tsx+++ b/src/components/metrics/EventsChart.tsx@@ -1,21 +1,23 @@+import { useMemo, useState, useEffect } from 'react';import { colord } from 'colord';import BarChart from '@/components/charts/BarChart';import { useDateRange, useLocale, useWebsiteEventsSeries } from '@/components/hooks';import { renderDateLabels } from '@/lib/charts';import { CHART_COLORS } from '@/lib/constants';-import { useMemo } from 'react';export interface EventsChartProps {websiteId: string;className?: string;+ focusLabel?: string;}-export function EventsChart({ websiteId, className }: EventsChartProps) {+export function EventsChart({ websiteId, className, focusLabel }: EventsChartProps) {const {dateRange: { startDate, endDate, unit, value },} = useDateRange(websiteId);const { locale } = useLocale();const { data, isLoading } = useWebsiteEventsSeries(websiteId);+ const [label, setLabel] = useState<string>(focusLabel);const chartData = useMemo(() => {if (!data) return [];@@ -42,8 +44,15 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {borderWidth: 1,};}),+ focusLabel,};- }, [data, startDate, endDate, unit]);+ }, [data, startDate, endDate, unit, focusLabel]);++ useEffect(() => {+ if (label !== focusLabel) {+ setLabel(focusLabel);+ }+ }, [focusLabel]);return (<BarChartdiff --git a/src/components/metrics/EventsTable.tsx b/src/components/metrics/EventsTable.tsxindex bc753b3b2..45b810941 100644--- a/src/components/metrics/EventsTable.tsx+++ b/src/components/metrics/EventsTable.tsx@@ -1,12 +1,28 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';import { useMessages } from '@/components/hooks';-export function EventsTable(props: MetricsTableProps) {+export interface EventsTableProps extends MetricsTableProps {+ onLabelClick?: (value: string) => void;+}++export function EventsTable({ onLabelClick, ...props }: EventsTableProps) {const { formatMessage, labels } = useMessages();- function handleDataLoad(data: any) {+ const handleDataLoad = (data: any) => {props.onDataLoad?.(data);- }+ };++ const renderLabel = ({ x: label }) => {+ if (onLabelClick) {+ return (+ <div onClick={() => onLabelClick(label)} style={{ cursor: 'pointer' }}>+ {label}+ </div>+ );+ }++ return label;+ };return (<MetricsTable@@ -15,6 +31,7 @@ export function EventsTable(props: MetricsTableProps) {type="event"metric={formatMessage(labels.actions)}onDataLoad={handleDataLoad}+ renderLabel={renderLabel}/>);}