🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
refactor(client): remove event icon compatibility wrappers (#1272)
Goldflaga51e0d3d8430
diff --git a/client/src/app/[site]/globe/components/GlobeSessions.tsx b/client/src/app/[site]/globe/components/GlobeSessions.tsxindex e8a228712..d0d9c719b 100644--- a/client/src/app/[site]/globe/components/GlobeSessions.tsx+++ b/client/src/app/[site]/globe/components/GlobeSessions.tsx@@ -9,7 +9,7 @@ import { useGetSessionsInfinite } from "../../../../api/analytics/hooks/useGetUsimport { GetSessionsResponse } from "../../../../api/analytics/endpoints";import { Avatar, generateName } from "../../../../components/Avatar";import { Channel } from "../../../../components/Channel";-import { EventIcon, PageviewIcon } from "../../../../components/EventIcons";+import { EventTypeIcon } from "../../../../components/EventIcons";import { SessionCard as FullSessionCard } from "../../../../components/Sessions/SessionCard";import {BrowserTooltipIcon,@@ -113,7 +113,7 @@ function SessionCard({ session, onClick }: { session: GetSessionsResponse[number<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-800 text-neutral-300">- <PageviewIcon />+ <EventTypeIcon type="pageview" /><span>{formatter(session.pageviews)}</span></Badge></TooltipTrigger>@@ -122,7 +122,7 @@ function SessionCard({ session, onClick }: { session: GetSessionsResponse[number<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-800 text-neutral-300">- <EventIcon />+ <EventTypeIcon type="custom_event" /><span>{formatter(session.events)}</span></Badge></TooltipTrigger>diff --git a/client/src/app/[site]/user/[userId]/components/UserStatBand.tsx b/client/src/app/[site]/user/[userId]/components/UserStatBand.tsxindex 0ca94fb66..e8fe7916e 100644--- a/client/src/app/[site]/user/[userId]/components/UserStatBand.tsx+++ b/client/src/app/[site]/user/[userId]/components/UserStatBand.tsx@@ -5,7 +5,7 @@ import { DateTime } from "luxon";import { useExtracted } from "next-intl";import { ReactNode } from "react";import { UserInfo } from "../../../../../api/analytics/endpoints";-import { EventIcon, PageviewIcon } from "../../../../../components/EventIcons";+import { EventTypeIcon } from "../../../../../components/EventIcons";import { Skeleton } from "../../../../../components/ui/skeleton";import { useDateTimeFormat } from "../../../../../hooks/useDateTimeFormat";import { formatDuration } from "../../../../../lib/dateTimeUtils";@@ -85,14 +85,14 @@ export function UserStatBand({ data, isLoading }: { data: UserInfo | undefined;isLoading={isLoading}/><StatCell- icon={<PageviewIcon className="h-3 w-3" />}+ icon={<EventTypeIcon type="pageview" className="h-3 w-3" />}label={t("Pageviews")}value={count(data?.pageviews)}title={countTitle(data?.pageviews)}isLoading={isLoading}/><StatCell- icon={<EventIcon className="h-3 w-3" />}+ icon={<EventTypeIcon type="custom_event" className="h-3 w-3" />}label={t("Events")}value={count(data?.events)}title={countTitle(data?.events)}diff --git a/client/src/components/EventIcons.tsx b/client/src/components/EventIcons.tsxindex edb6b4c45..72e71afb0 100644--- a/client/src/components/EventIcons.tsx+++ b/client/src/components/EventIcons.tsx@@ -69,12 +69,3 @@ export function EventTypeIcon({ type, className, tooltip = true }: EventTypeIcon</Tooltip>);}--// Backwards-compatible aliases-export function PageviewIcon({ className }: { className?: string }) {- return <EventTypeIcon type="pageview" className={className} />;-}--export function EventIcon({ className }: { className?: string }) {- return <EventTypeIcon type="custom_event" className={className} />;-}diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsxindex a9cd4eca1..ab7c6a333 100644--- a/client/src/components/Sessions/SessionCard.tsx+++ b/client/src/components/Sessions/SessionCard.tsx@@ -14,7 +14,7 @@ import { formatShortDuration } from "../../lib/dateTimeUtils";import { cn, formatter, getUserDisplayName, truncateString } from "../../lib/utils";import { Avatar } from "../Avatar";import { Channel } from "../Channel";-import { EventIcon, PageviewIcon } from "../EventIcons";+import { EventTypeIcon } from "../EventIcons";import { IdentifiedBadge } from "../IdentifiedBadge";import {BrowserTooltipIcon,@@ -153,7 +153,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">- <PageviewIcon />+ <EventTypeIcon type="pageview" /><span>{formatter(session.pageviews)}</span></Badge></TooltipTrigger>@@ -162,7 +162,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">- <EventIcon />+ <EventTypeIcon type="custom_event" /><span>{formatter(session.events + (session.button_clicks || 0) + (session.copies || 0) + (session.form_submits || 0) + (session.input_changes || 0))}</span></Badge></TooltipTrigger>@@ -243,7 +243,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">- <PageviewIcon />+ <EventTypeIcon type="pageview" /><span>{formatter(session.pageviews)}</span></Badge></TooltipTrigger>@@ -252,7 +252,7 @@ export function SessionCard({ session, onClick, userId, expandedByDefault, highl<Tooltip><TooltipTrigger asChild><Badge className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 text-neutral-600 dark:text-neutral-300">- <EventIcon />+ <EventTypeIcon type="custom_event" /><span>{formatter(session.events + (session.button_clicks || 0) + (session.copies || 0) + (session.form_submits || 0) + (session.input_changes || 0))}</span></Badge></TooltipTrigger>