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
Redo events tab to show all events.
Mike Cao9c3205784146
diff --git a/src/app/(main)/reports/event-data/EventDataParameters.tsx b/src/app/(main)/reports/event-data/EventDataParameters.tsxindex e0afda3f5..7b61c1129 100644--- a/src/app/(main)/reports/event-data/EventDataParameters.tsx+++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx@@ -48,7 +48,7 @@ export function EventDataParameters() {groups,};- const handleSubmit = values => {+ const handleSubmit = (values: any) => {runReport(values);};diff --git a/src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataPage.tsxdeleted file mode 100644index 77d367e58..000000000--- a/src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx+++ /dev/null@@ -1,12 +0,0 @@-'use client';-import WebsiteHeader from '../WebsiteHeader';-import WebsiteEventData from './WebsiteEventData';--export default function EventDataPage({ websiteId }) {- return (- <>- <WebsiteHeader websiteId={websiteId} />- <WebsiteEventData websiteId={websiteId} />- </>- );-}diff --git a/src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataTable.tsxdeleted file mode 100644index 71c369922..000000000--- a/src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx+++ /dev/null@@ -1,37 +0,0 @@-import Link from 'next/link';-import { GridTable, GridColumn } from 'react-basics';-import { useMessages, useNavigation } from 'components/hooks';-import Empty from 'components/common/Empty';-import { DATA_TYPES } from 'lib/constants';--export function EventDataTable({ data = [] }) {- const { formatMessage, labels } = useMessages();- const { renderUrl } = useNavigation();-- if (data.length === 0) {- return <Empty />;- }-- return (- <GridTable data={data}>- <GridColumn name="eventName" label={formatMessage(labels.event)}>- {row => (- <Link href={renderUrl({ event: row.eventName })} shallow={true}>- {row.eventName}- </Link>- )}- </GridColumn>- <GridColumn name="fieldName" label={formatMessage(labels.field)}>- {row => row.fieldName}- </GridColumn>- <GridColumn name="dataType" label={formatMessage(labels.type)}>- {row => DATA_TYPES[row.dataType]}- </GridColumn>- <GridColumn name="total" label={formatMessage(labels.totalRecords)}>- {({ total }) => total.toLocaleString()}- </GridColumn>- </GridTable>- );-}--export default EventDataTable;diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsxnew file mode 100644index 000000000..f2bf7cb9d--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx@@ -0,0 +1,25 @@+import { useWebsiteEvents } from 'components/hooks';+import EventsTable from './EventsTable';+import DataTable from 'components/common/DataTable';+import { ReactNode } from 'react';++export default function EventsDataTable({+ websiteId,+ children,+}: {+ websiteId?: string;+ teamId?: string;+ children?: ReactNode;+}) {+ const queryResult = useWebsiteEvents(websiteId);++ if (queryResult?.result?.data?.length === 0) {+ return children;+ }++ return (+ <DataTable queryResult={queryResult} allowSearch={false}>+ {({ data }) => <EventsTable data={data} />}+ </DataTable>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsxnew file mode 100644index 000000000..8f793d81e--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@ -0,0 +1,12 @@+'use client';+import WebsiteHeader from '../WebsiteHeader';+import EventsDataTable from './EventsDataTable';++export default function EventsPage({ websiteId }) {+ return (+ <>+ <WebsiteHeader websiteId={websiteId} />+ <EventsDataTable websiteId={websiteId} />+ </>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsxnew file mode 100644index 000000000..5a625ee94--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx@@ -0,0 +1,43 @@+import { GridTable, GridColumn } from 'react-basics';+import { useLocale, useMessages } from 'components/hooks';+import Empty from 'components/common/Empty';+import { formatDistance } from 'date-fns';+import Profile from 'components/common/Profile';+import Link from 'next/link';++export function EventsTable({ data = [] }) {+ const { dateLocale } = useLocale();+ const { formatMessage, labels } = useMessages();++ if (data.length === 0) {+ return <Empty />;+ }++ return (+ <GridTable data={data}>+ <GridColumn name="id" label="ID" />+ <GridColumn name="session" label={formatMessage(labels.session)}>+ {row => (+ <Link href={`/sessions/`}>+ <Profile seed={row.sessionId} size={64} />+ </Link>+ )}+ </GridColumn>+ <GridColumn name="eventName" label={formatMessage(labels.event)}>+ {row => formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}+ </GridColumn>+ <GridColumn name="eventName" label={formatMessage(labels.name)} />+ <GridColumn name="urlPath" label={formatMessage(labels.path)} />+ <GridColumn name="created" label={formatMessage(labels.created)}>+ {row =>+ formatDistance(new Date(row.createdAt), new Date(), {+ addSuffix: true,+ locale: dateLocale,+ })+ }+ </GridColumn>+ </GridTable>+ );+}++export default EventsTable;diff --git a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsxindex d7d24ceed..296c8a66b 100644--- a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx+++ b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx@@ -1,5 +1,5 @@import { Flexbox, Loading } from 'react-basics';-import EventDataTable from './EventDataTable';+import EventsTable from './EventsTable';import EventDataValueTable from './EventDataValueTable';import { EventDataMetricsBar } from './EventDataMetricsBar';import { useDateRange, useApi, useNavigation } from 'components/hooks';@@ -33,7 +33,7 @@ export default function WebsiteEventData({ websiteId }) {return (<Flexbox className={styles.container} direction="column" gap={20}><EventDataMetricsBar websiteId={websiteId} />- {!event && <EventDataTable data={data} />}+ {!event && <EventsTable data={data} />}{isLoading && <Loading position="page" />}{event && data && <EventDataValueTable event={event} data={data} />}</Flexbox>diff --git a/src/app/(main)/websites/[websiteId]/events/page.tsx b/src/app/(main)/websites/[websiteId]/events/page.tsxindex 24cf4feaa..b5dc4d62c 100644--- a/src/app/(main)/websites/[websiteId]/events/page.tsx+++ b/src/app/(main)/websites/[websiteId]/events/page.tsx@@ -1,8 +1,8 @@import { Metadata } from 'next';-import EventDataPage from './EventDataPage';+import EventsPage from './EventsPage';export default async function ({ params: { websiteId } }) {- return <EventDataPage websiteId={websiteId} />;+ return <EventsPage websiteId={websiteId} />;}export const metadata: Metadata = {diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsxindex ed910def7..041c2ba5e 100644--- a/src/components/common/DataTable.tsx+++ b/src/components/common/DataTable.tsx@@ -1,7 +1,7 @@import { ReactNode } from 'react';import classNames from 'classnames';import { Banner, Loading, SearchField } from 'react-basics';-import { useMessages } from 'components/hooks';+import { useMessages, useNavigation } from 'components/hooks';import Empty from 'components/common/Empty';import Pager from 'components/common/Pager';import { FilterQueryResult } from 'lib/types';@@ -35,6 +35,7 @@ export function DataTable({const { query } = params || {};const hasData = Boolean(!isLoading && data?.length);const noResults = Boolean(!isLoading && query && !hasData);+ const { router, renderUrl } = useNavigation();const handleSearch = (query: string) => {setParams({ ...params, query, page: params.page ? page : 1 });@@ -42,6 +43,7 @@ export function DataTable({const handlePageChange = (page: number) => {setParams({ ...params, query, page });+ router.push(renderUrl({ page }));};if (error) {diff --git a/src/components/hooks/queries/useFilterQuery.ts b/src/components/hooks/queries/useFilterQuery.tsindex 5963d0997..82fc4d614 100644--- a/src/components/hooks/queries/useFilterQuery.ts+++ b/src/components/hooks/queries/useFilterQuery.ts@@ -2,15 +2,17 @@ import { UseQueryOptions } from '@tanstack/react-query';import { useState } from 'react';import { useApi } from './useApi';import { PageResult, PageParams, FilterQueryResult } from 'lib/types';+import { useNavigation } from '../useNavigation';export function useFilterQuery<T = any>({queryKey,queryFn,...options}: Omit<UseQueryOptions, 'queryFn'> & { queryFn: (params?: object) => any }): FilterQueryResult<T> {- const [params, setParams] = useState<T | PageParams>({+ const { query: queryParams } = useNavigation();+ const [params, setParams] = useState<PageParams>({query: '',- page: 1,+ page: +queryParams.page || 1,});const { useQuery } = useApi();@@ -21,7 +23,7 @@ export function useFilterQuery<T = any>({});return {- result: data as PageResult<any>,+ result: data as PageResult<T>,query,params,setParams,diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.tsindex 588d4fb56..f0132470f 100644--- a/src/components/hooks/queries/useWebsiteEvents.ts+++ b/src/components/hooks/queries/useWebsiteEvents.ts@@ -1,17 +1,19 @@import useApi from './useApi';-import { useFilterParams } from '../useFilterParams';import { UseQueryOptions } from '@tanstack/react-query';+import { useFilterParams } from '../useFilterParams';+import { useFilterQuery } from 'components/hooks';export function useWebsiteEvents(websiteId: string,options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,) {- const { get, useQuery } = useApi();+ const { get } = useApi();const params = useFilterParams(websiteId);- return useQuery({+ return useFilterQuery({queryKey: ['websites:events', { websiteId, ...params }],- queryFn: () => get(`/websites/${websiteId}/events`, params),+ queryFn: pageParams =>+ get(`/websites/${websiteId}/events`, { ...params, ...pageParams, pageSize: 20 }),enabled: !!websiteId,...options,});diff --git a/src/components/messages.ts b/src/components/messages.tsindex 2dfe61ee6..703ccba3c 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -130,6 +130,7 @@ export const labels = defineMessages({selectRole: { id: 'label.select-role', defaultMessage: 'Select role' },selectDate: { id: 'label.select-date', defaultMessage: 'Select date' },all: { id: 'label.all', defaultMessage: 'All' },+ session: { id: 'label.session', defaultMessage: 'Session' },sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },pageNotFound: { id: 'message.page-not-found', defaultMessage: 'Page not found' },activityLog: { id: 'label.activity-log', defaultMessage: 'Activity log' },@@ -275,6 +276,7 @@ export const labels = defineMessages({lastSeen: { id: 'label.last-seen', defaultMessage: 'Last seen' },firstSeen: { id: 'label.first-seen', defaultMessage: 'First seen' },properties: { id: 'label.properties', defaultMessage: 'Properties' },+ path: { id: 'label.path', defaultMessage: 'Path' },});export const messages = defineMessages({diff --git a/src/pages/api/event-data/events.ts b/src/pages/api/events/[eventId]/data.tssimilarity index 100%rename from src/pages/api/event-data/events.tsrename to src/pages/api/events/[eventId]/data.tsdiff --git a/src/pages/api/websites/[websiteId]/events/index.ts b/src/pages/api/websites/[websiteId]/events/index.tsnew file mode 100644index 000000000..2aa791b11--- /dev/null+++ b/src/pages/api/websites/[websiteId]/events/index.ts@@ -0,0 +1,42 @@+import * as yup from 'yup';+import { canViewWebsite } from 'lib/auth';+import { useAuth, useCors, useValidate } from 'lib/middleware';+import { NextApiRequestQueryBody, PageParams } from 'lib/types';+import { NextApiResponse } from 'next';+import { methodNotAllowed, ok, unauthorized } from 'next-basics';+import { pageInfo } from 'lib/schema';+import { getWebsiteEvents } from 'queries';++export interface ReportsRequestQuery extends PageParams {+ websiteId: string;+}++const schema = {+ GET: yup.object().shape({+ websiteId: yup.string().uuid().required(),+ ...pageInfo,+ }),+};++export default async (+ req: NextApiRequestQueryBody<ReportsRequestQuery, any>,+ res: NextApiResponse,+) => {+ await useCors(req, res);+ await useAuth(req, res);+ await useValidate(schema, req, res);++ const { websiteId } = req.query;++ if (req.method === 'GET') {+ if (!(await canViewWebsite(req.auth, websiteId))) {+ return unauthorized(res);+ }++ const data = await getWebsiteEvents(websiteId, {}, req.query);++ return ok(res, data);+ }++ return methodNotAllowed(res);+};diff --git a/src/pages/api/websites/[websiteId]/events.ts b/src/pages/api/websites/[websiteId]/events/series.tssimilarity index 100%rename from src/pages/api/websites/[websiteId]/events.tsrename to src/pages/api/websites/[websiteId]/events/series.tsdiff --git a/src/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getWebsiteEvents.tssimilarity index 97%rename from src/queries/analytics/events/getEvents.tsrename to src/queries/analytics/events/getWebsiteEvents.tsindex 540c1a05d..b76d1ee54 100644--- a/src/queries/analytics/events/getEvents.ts+++ b/src/queries/analytics/events/getWebsiteEvents.ts@@ -3,7 +3,7 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';import prisma from 'lib/prisma';import { PageParams, QueryFilters } from 'lib/types';-export function getEvents(+export function getWebsiteEvents(...args: [websiteId: string, filters: QueryFilters, pageParams?: PageParams]) {return runQuery({diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.tsindex e25cc8661..3e691b4ed 100644--- a/src/queries/analytics/getRealtimeData.ts+++ b/src/queries/analytics/getRealtimeData.ts@@ -1,4 +1,9 @@-import { getWebsiteSessions, getEvents, getPageviewStats, getSessionStats } from 'queries/index';+import {+ getWebsiteSessions,+ getWebsiteEvents,+ getPageviewStats,+ getSessionStats,+} from 'queries/index';const MAX_SIZE = 50;@@ -19,7 +24,7 @@ export async function getRealtimeData(const { startDate, timezone } = criteria;const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };const [events, sessions, pageviews, sessionviews] = await Promise.all([- getEvents(websiteId, { startDate, timezone }, { pageSize: 10000 }),+ getWebsiteEvents(websiteId, { startDate, timezone }, { pageSize: 10000 }),getWebsiteSessions(websiteId, { startDate, timezone }, { pageSize: 10000 }),getPageviewStats(websiteId, filters),getSessionStats(websiteId, filters),diff --git a/src/queries/index.ts b/src/queries/index.tsindex 82d40ee5d..51c1e14b9 100644--- a/src/queries/index.ts+++ b/src/queries/index.ts@@ -8,7 +8,7 @@ export * from './analytics/events/getEventDataFields';export * from './analytics/events/getEventDataStats';export * from './analytics/events/getEventDataUsage';export * from './analytics/events/getEventMetrics';-export * from './analytics/events/getEvents';+export * from './analytics/events/getWebsiteEvents';export * from './analytics/events/getEventUsage';export * from './analytics/events/saveEvent';export * from './analytics/reports/getFunnel';