Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Add table view as alternative to donut chart for event properties

Bas Broekhuizen0c78e313004f
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
index 0b9c011d1..a56df28f6 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
@@ -14,12 +14,14 @@
color: var(--primary400);
}
+.header {
+ margin-bottom: 40px;
+}
+
.title {
- text-align: center;
font-weight: bold;
- margin: 20px 0;
}
-.chart {
+.data {
min-height: 620px;
}
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
index 453aa9a85..6d555e5dd 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
@@ -1,7 +1,9 @@
-import { GridColumn, GridTable } from 'react-basics';
+import { useMemo } from 'react';
+import { GridColumn, GridTable, Flexbox, Button, ButtonGroup } from 'react-basics';
import { useEventDataProperties, useEventDataValues, useMessages } from '@/components/hooks';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import PieChart from '@/components/charts/PieChart';
+import ListTable from '@/components/metrics/ListTable';
import { useState } from 'react';
import { CHART_COLORS } from '@/lib/constants';
import styles from './EventProperties.module.css';
@@ -9,22 +11,38 @@ import styles from './EventProperties.module.css';
export function EventProperties({ websiteId }: { websiteId: string }) {
const [propertyName, setPropertyName] = useState('');
const [eventName, setEventName] = useState('');
+ const [propertyView, setPropertyView] = useState('table');
+
const { formatMessage, labels } = useMessages();
const { data, isLoading, isFetched, error } = useEventDataProperties(websiteId);
const { data: values } = useEventDataValues(websiteId, eventName, propertyName);
- const chartData =
- propertyName && values
- ? {
- labels: values.map(({ value }) => value),
- datasets: [
- {
- data: values.map(({ total }) => total),
- backgroundColor: CHART_COLORS,
- borderWidth: 0,
- },
- ],
- }
- : null;
+
+ const propertySum = useMemo(() => {
+ return values?.reduce((sum, { total }) => sum + total, 0) ?? 0;
+ }, [values]);
+
+ const chartData = useMemo(() => {
+ if (!propertyName || !values) return null;
+ return {
+ labels: values.map(({ value }) => value),
+ datasets: [
+ {
+ data: values.map(({ total }) => total),
+ backgroundColor: CHART_COLORS,
+ borderWidth: 0,
+ },
+ ],
+ };
+ }, [propertyName, values]);
+
+ const tableData = useMemo(() => {
+ if (!propertyName || !values || propertySum === 0) return [];
+ return values.map(({ value, total }) => ({
+ x: value,
+ y: total,
+ z: 100 * (total / propertySum),
+ }));
+ }, [propertyName, values, propertySum]);
const handleRowClick = row => {
setEventName(row.eventName);
@@ -52,9 +70,25 @@ export function EventProperties({ websiteId }: { websiteId: string }) {
<GridColumn name="total" label={formatMessage(labels.count)} alignment="end" />
</GridTable>
{propertyName && (
- <div className={styles.chart}>
- <div className={styles.title}>{propertyName}</div>
- <PieChart key={propertyName + eventName} type="doughnut" data={chartData} />
+ <div className={styles.data}>
+ <Flexbox className={styles.header} gap={12} justifyContent="space-between">
+ <div className={styles.title}>{`${eventName}: ${propertyName}`}</div>
+ <ButtonGroup
+ selectedKey={propertyView}
+ onSelect={key => setPropertyView(key as string)}
+ >
+ <Button key="table">{formatMessage(labels.table)}</Button>
+ <Button key="chart">{formatMessage(labels.chart)}</Button>
+ </ButtonGroup>
+ </Flexbox>
+
+ {values?.length === 0 ? (
+ <div>{formatMessage(labels.noData)}</div>
+ ) : propertyView === 'table' ? (
+ <ListTable data={tableData} />
+ ) : (
+ <PieChart key={propertyName + eventName} type="doughnut" data={chartData} />
+ )}
</div>
)}
</div>
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 19912b057..893bf141d 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -310,6 +310,8 @@ export const labels = defineMessages({
paidVideo: { id: 'label.paid-video', defaultMessage: 'Paid video' },
grouped: { id: 'label.grouped', defaultMessage: 'Grouped' },
other: { id: 'label.other', defaultMessage: 'Other' },
+ chart: { id: 'label.chart', defaultMessage: 'Chart' },
+ table: { id: 'label.table', defaultMessage: 'Table' },
});
export const messages = defineMessages({