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
Use FormattedMessage. Updated icons. Fixed bugs.
Mike Cao83a014e8846f
diff --git a/src/app/(main)/links/LinkDeleteButton.tsx b/src/app/(main)/links/LinkDeleteButton.tsxindex 05a3217f7..6754074f2 100644--- a/src/app/(main)/links/LinkDeleteButton.tsx+++ b/src/app/(main)/links/LinkDeleteButton.tsx@@ -15,7 +15,7 @@ export function LinkDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { formatMessage, labels, getErrorMessage, FormattedMessage } = useMessages();const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/links/${linkId}`);const handleConfirm = async (close: () => void) => {@@ -33,9 +33,14 @@ export function LinkDeleteButton({<Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>{({ close }) => (<ConfirmationForm- message={formatMessage(messages.confirmRemove, {- target: name,- })}+ message={+ <FormattedMessage+ {...messages.confirmRemove}+ values={{+ target: <b>{name}</b>,+ }}+ />+ }isLoading={isPending}error={getErrorMessage(error)}onConfirm={handleConfirm.bind(null, close)}diff --git a/src/app/(main)/pixels/PixelDeleteButton.tsx b/src/app/(main)/pixels/PixelDeleteButton.tsxindex c90261e55..98e34c1f9 100644--- a/src/app/(main)/pixels/PixelDeleteButton.tsx+++ b/src/app/(main)/pixels/PixelDeleteButton.tsx@@ -13,7 +13,7 @@ export function PixelDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { formatMessage, labels, getErrorMessage, FormattedMessage } = useMessages();const { mutateAsync, isPending, error } = useDeleteQuery(`/pixels/${pixelId}`);const { touch } = useModified();@@ -32,9 +32,14 @@ export function PixelDeleteButton({<Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>{({ close }) => (<ConfirmationForm- message={formatMessage(messages.confirmRemove, {- target: name,- })}+ message={+ <FormattedMessage+ {...messages.confirmRemove}+ values={{+ target: <b>{name}</b>,+ }}+ />+ }isLoading={isPending}error={getErrorMessage(error)}onConfirm={handleConfirm.bind(null, close)}diff --git a/src/app/(main)/teams/TeamLeaveForm.tsx b/src/app/(main)/teams/TeamLeaveForm.tsxindex c8063365b..1c7846b8d 100644--- a/src/app/(main)/teams/TeamLeaveForm.tsx+++ b/src/app/(main)/teams/TeamLeaveForm.tsx@@ -14,7 +14,7 @@ export function TeamLeaveForm({onSave: () => void;onClose: () => void;}) {- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { formatMessage, labels, messages, getErrorMessage, FormattedMessage } = useMessages();const { mutateAsync, error, isPending } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);const { touch } = useModified();@@ -31,9 +31,14 @@ export function TeamLeaveForm({return (<ConfirmationFormbuttonLabel={formatMessage(labels.leave)}- message={formatMessage(messages.confirmLeave, {- target: teamName,- })}+ message={+ <FormattedMessage+ {...messages.confirmLeave}+ values={{+ target: <b>{teamName}</b>,+ }}+ />+ }onConfirm={handleConfirm}onClose={onClose}isLoading={isPending}diff --git a/src/app/(main)/teams/TeamsDataTable.tsx b/src/app/(main)/teams/TeamsDataTable.tsxindex 6475c456a..5f81bca17 100644--- a/src/app/(main)/teams/TeamsDataTable.tsx+++ b/src/app/(main)/teams/TeamsDataTable.tsx@@ -1,16 +1,9 @@-import { ReactNode } from 'react';import Link from 'next/link';import { DataGrid } from '@/components/common/DataGrid';import { TeamsTable } from './TeamsTable';import { useLoginQuery, useNavigation, useUserTeamsQuery } from '@/components/hooks';-export function TeamsDataTable({- showActions,-}: {- allowEdit?: boolean;- showActions?: boolean;- children?: ReactNode;-}) {+export function TeamsDataTable() {const { user } = useLoginQuery();const query = useUserTeamsQuery(user.id);const { pathname } = useNavigation();@@ -27,7 +20,7 @@ export function TeamsDataTable({return (<DataGrid query={query}>{({ data }) => {- return <TeamsTable data={data} showActions={showActions} renderLink={renderLink} />;+ return <TeamsTable data={data} renderLink={renderLink} />;}}</DataGrid>);diff --git a/src/app/(main)/teams/TeamsJoinButton.tsx b/src/app/(main)/teams/TeamsJoinButton.tsxindex 7e1e24e7c..742954970 100644--- a/src/app/(main)/teams/TeamsJoinButton.tsx+++ b/src/app/(main)/teams/TeamsJoinButton.tsx@@ -1,5 +1,5 @@import { Button, Icon, Modal, DialogTrigger, Dialog, Text, useToast } from '@umami/react-zen';-import { AddUser } from '@/components/icons';+import { UserPlus } from '@/components/icons';import { useMessages, useModified } from '@/components/hooks';import { TeamJoinForm } from './TeamJoinForm';@@ -17,7 +17,7 @@ export function TeamsJoinButton() {<DialogTrigger><Button><Icon>- <AddUser />+ <UserPlus /></Icon><Text>{formatMessage(labels.joinTeam)}</Text></Button>diff --git a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsxindex 22c871a30..065f637bd 100644--- a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx@@ -17,7 +17,7 @@ export function TeamMemberRemoveButton({disabled?: boolean;onSave?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { formatMessage, labels, FormattedMessage } = useMessages();const { mutateAsync, isPending, error } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);const { touch } = useModified();@@ -36,9 +36,14 @@ export function TeamMemberRemoveButton({<Dialog title={formatMessage(labels.removeMember)} style={{ width: 400 }}>{({ close }) => (<ConfirmationForm- message={formatMessage(messages.confirmRemove, {- target: userName,- })}+ message={+ <FormattedMessage+ {...messages.confirmRemove}+ values={{+ target: <b>{userName}</b>,+ }}+ />+ }isLoading={isPending}error={error}onConfirm={handleConfirm.bind(null, close)}diff --git a/src/app/(main)/teams/[teamId]/TeamSettings.tsx b/src/app/(main)/teams/[teamId]/TeamSettings.tsxindex c5994c0d3..9649c4f7c 100644--- a/src/app/(main)/teams/[teamId]/TeamSettings.tsx+++ b/src/app/(main)/teams/[teamId]/TeamSettings.tsx@@ -2,7 +2,7 @@ import Link from 'next/link';import { Column, Icon, Text, Row } from '@umami/react-zen';import { useLoginQuery, useMessages, useNavigation, useTeam } from '@/components/hooks';import { ROLES } from '@/lib/constants';-import { Users, Arrow } from '@/components/icons';+import { Users, ArrowRight } from '@/components/icons';import { TeamLeaveButton } from '@/app/(main)/teams/TeamLeaveButton';import { TeamManage } from './TeamManage';import { TeamEditForm } from './TeamEditForm';@@ -35,7 +35,7 @@ export function TeamSettings({ teamId }: { teamId: string }) {<Link href="/settings/teams"><Row marginTop="2" alignItems="center" gap><Icon rotate={180}>- <Arrow />+ <ArrowRight /></Icon><Text>{formatMessage(labels.teams)}</Text></Row>diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsxindex 313dccc7d..5f1aaae8d 100644--- a/src/app/(main)/websites/WebsitesPage.tsx+++ b/src/app/(main)/websites/WebsitesPage.tsx@@ -14,7 +14,7 @@ export function WebsitesPage() {return (<PageBody><Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.websites)}>+ <PageHeader title={formatMessage(labels.websites)} label={'back'} description={'Websites'}><WebsiteAddButton teamId={teamId} /></PageHeader><Panel>diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsxindex a4a0c1897..723c0249b 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx@@ -14,12 +14,12 @@ export function WebsiteFilterButton({showText?: boolean;}) {const { formatMessage, labels } = useMessages();- const { replaceParams, router } = useNavigation();+ const { updateParams, router } = useNavigation();const handleChange = ({ filters, segment, cohort }: any) => {const params = filtersArrayToObject(filters);- const url = replaceParams({ ...params, segment, cohort });+ const url = updateParams({ ...params, segment, cohort });router.push(url);};diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsxindex 239193b0d..32a9180db 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx@@ -16,7 +16,7 @@ export function CohortDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { formatMessage, labels, FormattedMessage } = useMessages();const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}/segments/${cohortId}`,);@@ -36,9 +36,14 @@ export function CohortDeleteButton({<Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>{({ close }) => (<ConfirmationForm- message={formatMessage(messages.confirmRemove, {- target: name,- })}+ message={+ <FormattedMessage+ {...messages.confirmRemove}+ values={{+ target: <b>{name}</b>,+ }}+ />+ }isLoading={isPending}error={error}onConfirm={handleConfirm.bind(null, close)}diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsxindex df4329012..7150f43f8 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx@@ -3,7 +3,7 @@ import { useFormat, 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 { LightningSvg, Eye } from '@/components/icons';import { DateDistance } from '@/components/common/DateDistance';import { TypeIcon } from '@/components/common/TypeIcon';@@ -25,7 +25,7 @@ export function EventsTable({ data = [] }) {<Link href={renderUrl(`/websites/${row.websiteId}/sessions/${row.sessionId}`)}><Avatar seed={row.sessionId} size={32} /></Link>- <Icon>{row.eventName ? <Bolt /> : <Eye />}</Icon>+ <Icon>{row.eventName ? <LightningSvg /> : <Eye />}</Icon><Text>{formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}</Text>diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsxindex c7bd13476..e994831d6 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx@@ -8,7 +8,7 @@ import {useTimezone,useWebsite,} from '@/components/hooks';-import { Eye, Visitor, Bolt } from '@/components/icons';+import { Eye, User, LightningSvg } from '@/components/icons';import { BROWSERS, OS_NAMES } from '@/lib/constants';import { stringToColor } from '@/lib/format';import { useMemo, useState } from 'react';@@ -23,14 +23,14 @@ const TYPE_EVENT = 'event';const icons = {[TYPE_PAGEVIEW]: <Eye />,- [TYPE_SESSION]: <Visitor />,- [TYPE_EVENT]: <Bolt />,+ [TYPE_SESSION]: <User />,+ [TYPE_EVENT]: <LightningSvg />,};export function RealtimeLog({ data }: { data: any }) {const website = useWebsite();const [search, setSearch] = useState('');- const { formatMessage, labels, messages } = useMessages();+ const { formatMessage, labels, messages, FormattedMessage } = useMessages();const { formatValue } = useFormat();const { locale } = useLocale();const { formatTimezoneDate } = useTimezone();@@ -74,20 +74,25 @@ export function RealtimeLog({ data }: { data: any }) {const { __type, eventName, urlPath, browser, os, country, device } = log;if (__type === TYPE_EVENT) {- return formatMessage(messages.eventLog, {- event: <b key="b">{eventName || formatMessage(labels.unknown)}</b>,- url: (- <a- key="a"- href={`//${website?.domain}${urlPath}`}- className={styles.link}- target="_blank"- rel="noreferrer noopener"- >- {urlPath}- </a>- ),- });+ return (+ <FormattedMessage+ {...messages.eventLog}+ values={{+ event: <b key="b">{eventName || formatMessage(labels.unknown)}</b>,+ url: (+ <a+ key="a"+ href={`//${website?.domain}${urlPath}`}+ className={styles.link}+ target="_blank"+ rel="noreferrer noopener"+ >+ {urlPath}+ </a>+ ),+ }}+ />+ );}if (__type === TYPE_PAGEVIEW) {@@ -104,12 +109,17 @@ export function RealtimeLog({ data }: { data: any }) {}if (__type === TYPE_SESSION) {- return formatMessage(messages.visitorLog, {- country: <b key="country">{countryNames[country] || formatMessage(labels.unknown)}</b>,- browser: <b key="browser">{BROWSERS[browser]}</b>,- os: <b key="os">{OS_NAMES[os] || os}</b>,- device: <b key="device">{formatMessage(labels[device] || labels.unknown)}</b>,- });+ return (+ <FormattedMessage+ {...messages.visitorLog}+ values={{+ country: <b key="country">{countryNames[country] || formatMessage(labels.unknown)}</b>,+ browser: <b key="browser">{BROWSERS[browser]}</b>,+ os: <b key="os">{OS_NAMES[os] || os}</b>,+ device: <b key="device">{formatMessage(labels[device] || labels.unknown)}</b>,+ }}+ />+ );}};diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsxindex a588d11a3..6cbc24bd8 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx@@ -16,7 +16,7 @@ export function SegmentDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { formatMessage, labels, FormattedMessage } = useMessages();const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}/segments/${segmentId}`,);@@ -36,9 +36,14 @@ export function SegmentDeleteButton({<Dialog title={formatMessage(labels.confirm)} style={{ width: 400 }}>{({ close }) => (<ConfirmationForm- message={formatMessage(messages.confirmRemove, {- target: name,- })}+ message={+ <FormattedMessage+ {...messages.confirmRemove}+ values={{+ target: <b>{name}</b>,+ }}+ />+ }isLoading={isPending}error={error}onConfirm={handleConfirm.bind(null, close)}diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsxindex d88fff7ab..4ef120f71 100644--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx@@ -12,7 +12,7 @@ import {Dialog,} from '@umami/react-zen';import { LoadingPanel } from '@/components/common/LoadingPanel';-import { Bolt, Eye, FileText } from '@/components/icons';+import { LightningSvg, Eye, FileText } from '@/components/icons';import { useMessages, useSessionActivityQuery, useTimezone } from '@/components/hooks';import { EventData } from '@/components/metrics/EventData';@@ -52,7 +52,7 @@ export function SessionActivity({{formatTimezoneDate(createdAt, 'pp')}</StatusLight><Row alignItems="center" gap="2">- <Icon>{eventName ? <Bolt /> : <Eye />}</Icon>+ <Icon>{eventName ? <LightningSvg /> : <Eye />}</Icon><Text>{eventName? formatMessage(labels.triggeredEvent)diff --git a/src/components/common/PageHeader.tsx b/src/components/common/PageHeader.tsxindex 4d0dac5c2..a5850f732 100644--- a/src/components/common/PageHeader.tsx+++ b/src/components/common/PageHeader.tsx@@ -4,6 +4,7 @@ import { Heading, Icon, Row, RowProps, Text, Column } from '@umami/react-zen';export function PageHeader({title,description,+ label,icon,showBorder = true,children,@@ -11,6 +12,7 @@ export function PageHeader({}: {title: string;description?: string;+ label?: ReactNode;icon?: ReactNode;showBorder?: boolean;allowEdit?: boolean;@@ -26,7 +28,8 @@ export function PageHeader({width="100%"{...props}>- <Column>+ <Column gap="2">+ {label}<Row alignItems="center" gap="3">{icon && (<Icon size="md" color="muted">diff --git a/src/components/hooks/useMessages.ts b/src/components/hooks/useMessages.tsindex 48b1ba60f..42bbeb01e 100644--- a/src/components/hooks/useMessages.ts+++ b/src/components/hooks/useMessages.ts@@ -1,7 +1,22 @@-import { useIntl } from 'react-intl';+import { useIntl, FormattedMessage, type MessageDescriptor } from 'react-intl';import { messages, labels } from '@/components/messages';-export function useMessages() {+type FormatMessage = (+ descriptor: MessageDescriptor,+ values?: Record<string, string | number | boolean | null | undefined>,+ opts?: any,+) => string | null;++interface UseMessages {+ formatMessage: FormatMessage;+ messages: typeof messages;+ labels: typeof labels;+ getMessage: (id: string) => string;+ getErrorMessage: (error: unknown) => string | undefined;+ FormattedMessage: typeof FormattedMessage;+}++export function useMessages(): UseMessages {const intl = useIntl();const getMessage = (id: string) => {@@ -21,15 +36,12 @@ export function useMessages() {};const formatMessage = (- descriptor: {- id: string;- defaultMessage: string;- },- values?: Record<string, string>,+ descriptor: MessageDescriptor,+ values?: Record<string, string | number | boolean | null | undefined>,opts?: any,) => {return descriptor ? intl.formatMessage(descriptor, values, opts) : null;};- return { formatMessage, messages, labels, getMessage, getErrorMessage };+ return { formatMessage, messages, labels, getMessage, getErrorMessage, FormattedMessage };}diff --git a/src/components/icons.ts b/src/components/icons.tsindex 0280c31a5..bdba73673 100644--- a/src/components/icons.ts+++ b/src/components/icons.ts@@ -1,17 +1,13 @@export * from 'lucide-react';export {Logo as LogoSvg,- Bolt as BoltSvg,- Change as ChangeSvg,Compare as CompareSvg,Funnel as FunnelSvg,- Lightbulb as LightbulbSvg,Lightning as LightningSvg,Location as LocationSvg,Magnet as MagnetSvg,Money as MoneySvg,Network as NetworkSvg,Path as PathSvg,- Tag as TagSvg,Target as TargetSvg,} from '@/components/svg';diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsxindex 475fce44a..1045de211 100644--- a/src/components/input/WebsiteDateFilter.tsx+++ b/src/components/input/WebsiteDateFilter.tsx@@ -18,7 +18,7 @@ export function WebsiteDateFilter({showButtons = true,allowCompare,}: WebsiteDateFilterProps) {- const { dateRange } = useDateRange(websiteId);+ const { dateRange, saveDateRange } = useDateRange(websiteId);const { value, endDate } = dateRange;const { formatMessage, labels } = useMessages();const {@@ -32,6 +32,7 @@ export function WebsiteDateFilter({const disableForward = value === 'all' || isAfter(endDate, new Date());const handleChange = (date: string) => {+ saveDateRange(date);router.push(updateParams({ date, offset: undefined }));};diff --git a/src/components/metrics/WeeklyTraffic.tsx b/src/components/metrics/WeeklyTraffic.tsxindex ff6147392..82d1c1c1f 100644--- a/src/components/metrics/WeeklyTraffic.tsx+++ b/src/components/metrics/WeeklyTraffic.tsx@@ -85,7 +85,7 @@ export function WeeklyTraffic({ websiteId }: { websiteId: string }) {height="16px"borderRadius="full"style={{ margin: '0 auto' }}- role="cell"+ role="button"><RowbackgroundColor="primary"diff --git a/src/lib/request.ts b/src/lib/request.tsindex fb01a0494..e6cc43acc 100644--- a/src/lib/request.ts+++ b/src/lib/request.ts@@ -136,7 +136,7 @@ export async function getQueryFilters(...dateRange,...filters,page: params?.page,- pageSize: params?.page ? params?.pageSize || DEFAULT_PAGE_SIZE : undefined,+ pageSize: params?.pageSize ? params?.pageSize || DEFAULT_PAGE_SIZE : undefined,orderBy: params?.orderBy,sortDescending: params?.sortDescending,search: params?.search,