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
Updated events/sessions pages. Added DateDistance component.
Mike Cao5b300f1ff56f
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsxindex 7e7e04405..fbf11e8ef 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@ -3,7 +3,6 @@ import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';import { EventsTable } from '@/components/metrics/EventsTable';import { useState } from 'react';import { EventsDataTable } from './EventsDataTable';-import { EventsMetricsBar } from './EventsMetricsBar';import { Panel } from '@/components/common/Panel';import { EventsChart } from '@/components/metrics/EventsChart';import { GridRow } from '@/components/common/GridRow';@@ -23,7 +22,6 @@ export function EventsPage({ websiteId }) {return (<Column gap="3"><WebsiteControls websiteId={websiteId} />- <EventsMetricsBar websiteId={websiteId} /><GridRow layout="two-one"><Panel gridColumn="span 2"><EventsChart websiteId={websiteId} focusLabel={label} />diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsxindex 3cb1a7508..9a21f21dd 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx@@ -1,12 +1,12 @@import { DataTable, DataColumn, Icon, Row } from '@umami/react-zen';-import { useMessages, useNavigation, useTimezone } from '@/components/hooks';+import { useMessages, useNavigation } from '@/components/hooks';import { Empty } from '@/components/common/Empty';import { Avatar } from '@/components/common/Avatar';import Link from 'next/link';import { Bolt, Eye } from '@/components/icons';+import { DateDistance } from '@/components/common/DateDistance';export function EventsTable({ data = [] }) {- const { formatTimezoneDate } = useTimezone();const { formatMessage, labels } = useMessages();const { renderUrl } = useNavigation();@@ -34,8 +34,8 @@ export function EventsTable({ data = [] }) {);}}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)} width="1fr">- {(row: any) => formatTimezoneDate(row.createdAt, 'PPPpp')}+ <DataColumn id="created" label={formatMessage(labels.created)} width="200px">+ {(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn></DataTable>);diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsxindex 1ff848e74..7e18bbedb 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx@@ -2,12 +2,8 @@import { useState } from 'react';import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';import { SessionsDataTable } from './SessionsDataTable';-import { SessionsMetricsBar } from './SessionsMetricsBar';import { SessionProperties } from './SessionProperties';-import { WorldMap } from '@/components/metrics/WorldMap';-import { GridRow } from '@/components/common/GridRow';import { useMessages } from '@/components/hooks';-import { SessionsWeekly } from './SessionsWeekly';import { Panel } from '@/components/common/Panel';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';@@ -18,15 +14,6 @@ export function SessionsPage({ websiteId }) {return (<Column gap="3"><WebsiteControls websiteId={websiteId} />- <SessionsMetricsBar websiteId={websiteId} />- <GridRow layout="two-one">- <Panel gridColumn="span 2" noPadding>- <WorldMap websiteId={websiteId} />- </Panel>- <Panel>- <SessionsWeekly websiteId={websiteId} />- </Panel>- </GridRow><Panel><Tabs selectedKey={tab} onSelectionChange={(value: any) => setTab(value)}><TabList>diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsxindex 901d54730..0b9ad43bc 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx@@ -1,11 +1,11 @@import Link from 'next/link';import { DataColumn, DataTable } from '@umami/react-zen';-import { useFormat, useMessages, useTimezone } from '@/components/hooks';+import { useFormat, useMessages } from '@/components/hooks';import { Avatar } from '@/components/common/Avatar';import { TypeIcon } from '@/components/common/TypeIcon';+import { DateDistance } from '@/components/common/DateDistance';export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {- const { formatTimezoneDate } = useTimezone();const { formatMessage, labels } = useMessages();const { formatValue } = useFormat();@@ -50,7 +50,7 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean)}</DataColumn><DataColumn id="lastAt" label={formatMessage(labels.lastSeen)}>- {(row: any) => formatTimezoneDate(row.createdAt, 'PPPpp')}+ {(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn></DataTable>);diff --git a/src/app/api/websites/[websiteId]/events/route.ts b/src/app/api/websites/[websiteId]/events/route.tsindex fb3db328a..ef20dd7cf 100644--- a/src/app/api/websites/[websiteId]/events/route.ts+++ b/src/app/api/websites/[websiteId]/events/route.ts@@ -28,7 +28,7 @@ export async function GET(return unauthorized();}- const data = await getWebsiteEvents(websiteId, { startDate, endDate }, query);+ const data = await getWebsiteEvents(websiteId, { ...query, startDate, endDate }, query);return json(data);}diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsxindex 8cbf5f8dc..3f3efd3be 100644--- a/src/components/charts/BarChart.tsx+++ b/src/components/charts/BarChart.tsx@@ -21,7 +21,7 @@ const dateFormats = {};export interface BarChartProps extends ChartProps {- unit: string;+ unit?: string;stacked?: boolean;currency?: string;renderXLabel?: (label: string, index: number, values: any[]) => string;diff --git a/src/components/common/DateDistance.tsx b/src/components/common/DateDistance.tsxnew file mode 100644index 000000000..43056b0c1--- /dev/null+++ b/src/components/common/DateDistance.tsx@@ -0,0 +1,17 @@+import { Tooltip, TooltipTrigger, Text, Focusable } from '@umami/react-zen';+import { formatDistanceToNow } from 'date-fns';+import { useLocale, useTimezone } from '@/components/hooks';++export function DateDistance({ date }: { date: Date }) {+ const { formatTimezoneDate } = useTimezone();+ const { dateLocale } = useLocale();++ return (+ <TooltipTrigger delay={0}>+ <Focusable>+ <Text>{formatDistanceToNow(date, { addSuffix: true, locale: dateLocale })}</Text>+ </Focusable>+ <Tooltip>{formatTimezoneDate(date.toISOString(), 'PPPpp')}</Tooltip>+ </TooltipTrigger>+ );+}diff --git a/src/components/hooks/queries/useResultQuery.ts b/src/components/hooks/queries/useResultQuery.tsindex e82e4519b..098124c55 100644--- a/src/components/hooks/queries/useResultQuery.ts+++ b/src/components/hooks/queries/useResultQuery.ts@@ -2,7 +2,7 @@ import { useApi } from '../useApi';import { useFilterParams } from '../useFilterParams';import { ReactQueryOptions } from '@/lib/types';-export function useResultQuery<T>(+export function useResultQuery<T = any>(type: string,params?: { [key: string]: any },options?: ReactQueryOptions<T>,diff --git a/src/components/hooks/queries/useTeamsQuery.ts b/src/components/hooks/queries/useTeamsQuery.tsindex a4edc287c..a70aca24a 100644--- a/src/components/hooks/queries/useTeamsQuery.ts+++ b/src/components/hooks/queries/useTeamsQuery.ts@@ -1,12 +1,11 @@import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';export function useTeamsQuery(userId: string) {- const { get } = useApi();+ const { get, useQuery } = useApi();const { modified } = useModified(`teams`);- return usePagedQuery({+ return useQuery({queryKey: ['teams', { userId, modified }],queryFn: (params: any) => {return get(`/users/${userId}/teams`, params);diff --git a/src/components/hooks/queries/useWebsiteEventsQuery.ts b/src/components/hooks/queries/useWebsiteEventsQuery.tsindex 8699ab317..7b465f70d 100644--- a/src/components/hooks/queries/useWebsiteEventsQuery.ts+++ b/src/components/hooks/queries/useWebsiteEventsQuery.ts@@ -5,12 +5,11 @@ import { ReactQueryOptions } from '@/lib/types';export function useWebsiteEventsQuery(websiteId: string, options?: ReactQueryOptions<any>) {const { get } = useApi();- const params = useFilterParams(websiteId);+ const filterParams = useFilterParams(websiteId);return usePagedQuery({- queryKey: ['websites:events', { websiteId, ...params }],- queryFn: pageParams =>- get(`/websites/${websiteId}/events`, { ...params, ...pageParams, pageSize: 20 }),+ queryKey: ['websites:events', { websiteId, ...filterParams }],+ queryFn: () => get(`/websites/${websiteId}/events`, { ...filterParams, pageSize: 20 }),enabled: !!websiteId,...options,});diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.tsindex f725eb807..d0b84f95c 100644--- a/src/components/hooks/useFilterParams.ts+++ b/src/components/hooks/useFilterParams.ts@@ -22,14 +22,19 @@ export function useFilterParams(websiteId: string) {event,tag,hostname,+ page,+ pageSize,+ search,},} = useNavigation();return {+ // Date rangestartAt: +toUtc(startDate),endAt: +toUtc(endDate),unit,timezone,+ // Filterspath,referrer,title,@@ -44,5 +49,9 @@ export function useFilterParams(websiteId: string) {event,tag,hostname,+ // Paging+ page,+ pageSize,+ search,};}diff --git a/src/components/hooks/usePagedQuery.ts b/src/components/hooks/usePagedQuery.tsindex 1f85afc0d..6b995ea5d 100644--- a/src/components/hooks/usePagedQuery.ts+++ b/src/components/hooks/usePagedQuery.ts@@ -12,7 +12,7 @@ export function usePagedQuery<T = any>({const { query: queryParams } = useNavigation();const [params, setParams] = useState<PageParams>({search: '',- page: +queryParams?.page || 1,+ page: queryParams?.page || '1',});const { useQuery } = useApi();@@ -25,7 +25,7 @@ export function usePagedQuery<T = any>({return {result: data as PageResult<T>,query,- filterParams: params,+ params,setParams,};}diff --git a/src/lib/types.ts b/src/lib/types.tsindex f6f2c8a1c..2bc4bc61c 100644--- a/src/lib/types.ts+++ b/src/lib/types.ts@@ -29,7 +29,7 @@ export interface PageResult<T> {sortDescending?: boolean;}-export interface PagedQueryResult<T> {+export interface PagedQueryResult<T = any> {result: PageResult<T>;query: any;params: PageParams;