Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

try improve overview

Carl-Gerhard Lindesvärdee2ccbaa9817
diff --git a/apps/web/src/app/(app)/[organizationId]/[projectId]/overview-metrics.tsx b/apps/web/src/app/(app)/[organizationId]/[projectId]/overview-metrics.tsx
index 77383e5e1..bf1fb31cd 100644
--- a/apps/web/src/app/(app)/[organizationId]/[projectId]/overview-metrics.tsx
+++ b/apps/web/src/app/(app)/[organizationId]/[projectId]/overview-metrics.tsx
@@ -182,7 +182,7 @@ export default function OverviewMetrics({ projectId }: OverviewMetricsProps) {
name: 'Visit duration',
range,
previous,
- formula: 'A/1000/60',
+ formula: 'A/1000',
metric: 'average',
unit: 'min',
},
@@ -192,24 +192,26 @@ export default function OverviewMetrics({ projectId }: OverviewMetricsProps) {
return (
<>
- {reports.map((report, index) => (
- <button
- key={index}
- className="relative col-span-6 md:col-span-3 lg:col-span-2 group"
- onClick={() => {
- setMetric(index);
- }}
- >
- <ChartSwitch hideID {...report} />
- <div
- className={cn(
- 'transition-opacity top-0 left-0 right-0 bottom-0 absolute rounded-md w-full h-full border ring-1 border-chart-0 ring-chart-0',
- metric === index ? 'opacity-100' : 'opacity-0'
- )}
- />
- {/* add active border */}
- </button>
- ))}
+ <div className="grid grid-cols-6 col-span-6 gap-1">
+ {reports.map((report, index) => (
+ <button
+ key={index}
+ className="relative col-span-3 md:col-span-2 lg:col-span-1 group"
+ onClick={() => {
+ setMetric(index);
+ }}
+ >
+ <ChartSwitch hideID {...report} />
+ <div
+ className={cn(
+ 'transition-opacity top-0 left-0 right-0 bottom-0 absolute rounded-md w-full h-full border ring-1 border-black ring-black',
+ metric === index ? 'opacity-100' : 'opacity-0'
+ )}
+ />
+ {/* add active border */}
+ </button>
+ ))}
+ </div>
<Widget className="col-span-6">
<WidgetHead>
<div className="title">{selectedMetric.events[0]?.displayName}</div>
diff --git a/apps/web/src/components/overview/overview-live-histogram.tsx b/apps/web/src/components/overview/overview-live-histogram.tsx
index 78d3741bc..fc434345b 100644
--- a/apps/web/src/components/overview/overview-live-histogram.tsx
+++ b/apps/web/src/components/overview/overview-live-histogram.tsx
@@ -42,7 +42,7 @@ export function OverviewLiveHistogram({
metric: 'sum',
breakdowns: [],
lineType: 'monotone',
- previous: true,
+ previous: false,
};
return (
diff --git a/apps/web/src/components/report/PreviousDiffIndicator.tsx b/apps/web/src/components/report/PreviousDiffIndicator.tsx
index 7d3c30038..ff8dc8eda 100644
--- a/apps/web/src/components/report/PreviousDiffIndicator.tsx
+++ b/apps/web/src/components/report/PreviousDiffIndicator.tsx
@@ -5,6 +5,25 @@ import { TrendingDownIcon, TrendingUpIcon } from 'lucide-react';
import { Badge } from '../ui/badge';
import { useChartContext } from './chart/ChartProvider';
+export function getDiffIndicator<A, B, C>(
+ inverted: boolean | undefined,
+ state: string | undefined | null,
+ positive: A,
+ negative: B,
+ neutral: C
+): A | B | C {
+ if (state === 'neutral' || !state) {
+ return neutral;
+ }
+
+ if (inverted === true) {
+ return state === 'positive' ? negative : positive;
+ }
+ return state === 'positive' ? positive : negative;
+}
+
+// TODO: Fix this mess!
+
interface PreviousDiffIndicatorProps {
diff?: number | null | undefined;
state?: string | null | undefined;
@@ -18,38 +37,77 @@ export function PreviousDiffIndicator({
children,
}: PreviousDiffIndicatorProps) {
const { previous, previousIndicatorInverted } = useChartContext();
+ const variant = getDiffIndicator(
+ previousIndicatorInverted,
+ state,
+ 'success',
+ 'destructive',
+ undefined
+ );
const number = useNumber();
+
if (diff === null || diff === undefined || previous === false) {
return children ?? null;
}
- if (previousIndicatorInverted === true) {
- return (
- <>
- <Badge
- className="flex gap-1"
- variant={state === 'positive' ? 'destructive' : 'success'}
- >
- {state === 'negative' && <TrendingUpIcon size={15} />}
- {state === 'positive' && <TrendingDownIcon size={15} />}
- {number.format(diff)}%
- </Badge>
- {children}
- </>
- );
- }
+ const renderIcon = () => {
+ if (state === 'positive') {
+ return <TrendingUpIcon size={15} />;
+ }
+ if (state === 'negative') {
+ return <TrendingDownIcon size={15} />;
+ }
+ return null;
+ };
return (
<>
- <Badge
- className="flex gap-1"
- variant={state === 'positive' ? 'success' : 'destructive'}
- >
- {state === 'positive' && <TrendingUpIcon size={15} />}
- {state === 'negative' && <TrendingDownIcon size={15} />}
+ <Badge className="flex gap-1" variant={variant}>
+ {renderIcon()}
{number.format(diff)}%
</Badge>
{children}
</>
);
}
+
+export function PreviousDiffIndicatorText({
+ diff,
+ state,
+ className,
+}: PreviousDiffIndicatorProps & { className?: string }) {
+ const { previous, previousIndicatorInverted } = useChartContext();
+ const number = useNumber();
+ if (diff === null || diff === undefined || previous === false) {
+ return null;
+ }
+
+ const renderIcon = () => {
+ if (state === 'positive') {
+ return <TrendingUpIcon size={15} />;
+ }
+ if (state === 'negative') {
+ return <TrendingDownIcon size={15} />;
+ }
+ return null;
+ };
+
+ return (
+ <div
+ className={cn([
+ 'flex gap-0.5 items-center',
+ getDiffIndicator(
+ previousIndicatorInverted,
+ state,
+ 'text-emerald-600',
+ 'text-red-600',
+ undefined
+ ),
+ className,
+ ])}
+ >
+ {renderIcon()}
+ {number.format(diff)}%
+ </div>
+ );
+}
diff --git a/apps/web/src/components/report/chart/MetricCard.tsx b/apps/web/src/components/report/chart/MetricCard.tsx
index de57b9549..122b9c547 100644
--- a/apps/web/src/components/report/chart/MetricCard.tsx
+++ b/apps/web/src/components/report/chart/MetricCard.tsx
@@ -2,14 +2,19 @@
import type { IChartData } from '@/app/_trpc/client';
import { ColorSquare } from '@/components/ColorSquare';
-import { useNumber } from '@/hooks/useNumerFormatter';
+import { fancyMinutes, useNumber } from '@/hooks/useNumerFormatter';
import { theme } from '@/utils/theme';
import AutoSizer from 'react-virtualized-auto-sizer';
import { Area, AreaChart } from 'recharts';
import type { IChartMetric } from '@mixan/validation';
-import { PreviousDiffIndicator } from '../PreviousDiffIndicator';
+import {
+ getDiffIndicator,
+ PreviousDiffIndicator,
+ PreviousDiffIndicatorText,
+} from '../PreviousDiffIndicator';
+import { useChartContext } from './ChartProvider';
interface MetricCardProps {
serie: IChartData['series'][number];
@@ -24,14 +29,39 @@ export function MetricCard({
metric,
unit,
}: MetricCardProps) {
+ const { previousIndicatorInverted } = useChartContext();
const color = _color || theme?.colors['chart-0'];
const number = useNumber();
+
+ const renderValue = (value: number, unitClassName?: string) => {
+ if (unit === 'min') {
+ return <>{fancyMinutes(value)}</>;
+ }
+
+ return (
+ <>
+ {number.short(value)}
+ {unit && <span className={unitClassName}>{unit}</span>}
+ </>
+ );
+ };
+
+ const previous = serie.metrics.previous[metric];
+
+ const graphColors = getDiffIndicator(
+ previousIndicatorInverted,
+ previous?.state,
+ 'green',
+ 'red',
+ 'blue'
+ );
+
return (
<div
- className="group relative border border-border p-4 rounded-md bg-white overflow-hidden h-24"
+ className="group relative border border-border p-2 rounded-md bg-white overflow-hidden h-24"
key={serie.name}
>
- <div className="absolute -top-1 -left-1 -right-1 -bottom-1 z-0 opacity-10 transition-opacity duration-300 group-hover:opacity-50">
+ <div className="absolute -top-2 -left-2 -right-2 -bottom-2 z-0 opacity-20 transition-opacity duration-300 group-hover:opacity-50 rounded-md">
<AutoSizer>
{({ width, height }) => (
<AreaChart
@@ -41,17 +71,25 @@ export function MetricCard({
style={{ marginTop: (height / 3) * 2 }}
>
<defs>
- <linearGradient id="area" x1="0" y1="0" x2="0" y2="1">
- <stop offset="5%" stopColor={color} stopOpacity={0.3} />
- <stop offset="95%" stopColor={color} stopOpacity={0.1} />
+ <linearGradient id="red" x1="0" y1="0" x2="0" y2="1">
+ <stop offset="5%" stopColor={'red'} stopOpacity={0.5} />
+ <stop offset="95%" stopColor={'red'} stopOpacity={0.2} />
+ </linearGradient>
+ <linearGradient id="green" x1="0" y1="0" x2="0" y2="1">
+ <stop offset="5%" stopColor={'green'} stopOpacity={0.5} />
+ <stop offset="95%" stopColor={'green'} stopOpacity={0.2} />
+ </linearGradient>
+ <linearGradient id="blue" x1="0" y1="0" x2="0" y2="1">
+ <stop offset="5%" stopColor={'blue'} stopOpacity={0.5} />
+ <stop offset="95%" stopColor={'blue'} stopOpacity={0.2} />
</linearGradient>
</defs>
<Area
dataKey="count"
type="monotone"
- fill="url(#area)"
+ fill={`url(#${graphColors})`}
fillOpacity={1}
- stroke={color}
+ stroke={graphColors}
strokeWidth={2}
/>
</AreaChart>
@@ -60,23 +98,22 @@ export function MetricCard({
</div>
<div className="relative">
<div className="flex items-center justify-between gap-2">
- <div className="flex items-center gap-2 font-medium">
+ <div className="flex items-center gap-2 font-medium text-left min-w-0">
<ColorSquare>{serie.event.id}</ColorSquare>
- {serie.name || serie.event.displayName || serie.event.name}
+ <span className="text-ellipsis overflow-hidden whitespace-nowrap">
+ {serie.name || serie.event.displayName || serie.event.name}
+ </span>
</div>
- <PreviousDiffIndicator {...serie.metrics.previous[metric]} />
+ {/* <PreviousDiffIndicator {...serie.metrics.previous[metric]} /> */}
</div>
<div className="flex justify-between items-end mt-2">
- <div className="text-2xl font-bold">
- {number.format(serie.metrics[metric])}
- {unit && <span className="ml-1 font-light text-xl">{unit}</span>}
+ <div className="text-2xl font-bold text-ellipsis overflow-hidden whitespace-nowrap">
+ {renderValue(serie.metrics[metric], 'ml-1 font-light text-xl')}
</div>
- {!!serie.metrics.previous[metric] && (
- <div>
- {number.format(serie.metrics.previous[metric]?.value)}
- {unit}
- </div>
- )}
+ <PreviousDiffIndicatorText
+ {...serie.metrics.previous[metric]}
+ className="font-medium text-xs mb-0.5"
+ />
</div>
</div>
</div>
diff --git a/apps/web/src/components/report/chart/ReportAreaChart.tsx b/apps/web/src/components/report/chart/ReportAreaChart.tsx
index 64a6b188a..8d88b55a8 100644
--- a/apps/web/src/components/report/chart/ReportAreaChart.tsx
+++ b/apps/web/src/components/report/chart/ReportAreaChart.tsx
@@ -1,10 +1,9 @@
import React from 'react';
import type { IChartData } from '@/app/_trpc/client';
-import { AutoSizer } from '@/components/AutoSizer';
import { useFormatDateInterval } from '@/hooks/useFormatDateInterval';
+import { useNumber } from '@/hooks/useNumerFormatter';
import { useRechartDataModel } from '@/hooks/useRechartDataModel';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
-import { cn } from '@/utils/cn';
import { getChartColor } from '@/utils/theme';
import {
Area,
@@ -38,6 +37,7 @@ export function ReportAreaChart({
const { series, setVisibleSeries } = useVisibleSeries(data);
const formatDate = useFormatDateInterval(interval);
const rechartData = useRechartDataModel(series);
+ const number = useNumber();
return (
<>
@@ -59,6 +59,7 @@ export function ReportAreaChart({
axisLine={false}
tickLine={false}
allowDecimals={false}
+ tickFormatter={number.short}
/>
{series.map((serie) => {
diff --git a/apps/web/src/components/report/chart/ReportHistogramChart.tsx b/apps/web/src/components/report/chart/ReportHistogramChart.tsx
index 402a6bbb4..969b07e06 100644
--- a/apps/web/src/components/report/chart/ReportHistogramChart.tsx
+++ b/apps/web/src/components/report/chart/ReportHistogramChart.tsx
@@ -1,10 +1,9 @@
import React from 'react';
import type { IChartData } from '@/app/_trpc/client';
-import { AutoSizer } from '@/components/AutoSizer';
import { useFormatDateInterval } from '@/hooks/useFormatDateInterval';
+import { useNumber } from '@/hooks/useNumerFormatter';
import { useRechartDataModel } from '@/hooks/useRechartDataModel';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
-import { cn } from '@/utils/cn';
import { getChartColor, theme } from '@/utils/theme';
import { Bar, BarChart, CartesianGrid, Tooltip, XAxis, YAxis } from 'recharts';
@@ -40,8 +39,8 @@ export function ReportHistogramChart({
const { editMode, previous } = useChartContext();
const formatDate = useFormatDateInterval(interval);
const { series, setVisibleSeries } = useVisibleSeries(data);
-
const rechartData = useRechartDataModel(series);
+ const number = useNumber();
return (
<>
@@ -64,6 +63,7 @@ export function ReportHistogramChart({
width={getYAxisWidth(data.metrics.max)}
allowDecimals={false}
domain={[0, data.metrics.max]}
+ tickFormatter={number.short}
/>
{series.map((serie) => {
return (
diff --git a/apps/web/src/components/report/chart/ReportLineChart.tsx b/apps/web/src/components/report/chart/ReportLineChart.tsx
index 4284f9833..d6559e593 100644
--- a/apps/web/src/components/report/chart/ReportLineChart.tsx
+++ b/apps/web/src/components/report/chart/ReportLineChart.tsx
@@ -2,11 +2,10 @@
import React from 'react';
import type { IChartData } from '@/app/_trpc/client';
-import { AutoSizer } from '@/components/AutoSizer';
import { useFormatDateInterval } from '@/hooks/useFormatDateInterval';
+import { useNumber } from '@/hooks/useNumerFormatter';
import { useRechartDataModel } from '@/hooks/useRechartDataModel';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
-import { cn } from '@/utils/cn';
import { getChartColor } from '@/utils/theme';
import {
CartesianGrid,
@@ -40,7 +39,7 @@ export function ReportLineChart({
const formatDate = useFormatDateInterval(interval);
const { series, setVisibleSeries } = useVisibleSeries(data);
const rechartData = useRechartDataModel(series);
-
+ const number = useNumber();
return (
<>
<ResponsiveContainer>
@@ -57,6 +56,7 @@ export function ReportLineChart({
axisLine={false}
tickLine={false}
allowDecimals={false}
+ tickFormatter={number.short}
/>
<Tooltip content={<ReportChartTooltip />} />
<XAxis
diff --git a/apps/web/src/components/report/chart/chart-utils.ts b/apps/web/src/components/report/chart/chart-utils.ts
index 90105777e..e37d5e801 100644
--- a/apps/web/src/components/report/chart/chart-utils.ts
+++ b/apps/web/src/components/report/chart/chart-utils.ts
@@ -1,9 +1,11 @@
-import { round } from '@/utils/math';
+const formatter = new Intl.NumberFormat('en', {
+ notation: 'compact',
+});
export function getYAxisWidth(value: number) {
if (!isFinite(value)) {
return 7.8 + 7.8;
}
- return round(value, 0).toString().length * 7.8 + 7.8;
+ return formatter.format(value).toString().length * 7.8 + 7.8;
}
diff --git a/apps/web/src/hooks/useNumerFormatter.ts b/apps/web/src/hooks/useNumerFormatter.ts
index e027a61dc..2533d427d 100644
--- a/apps/web/src/hooks/useNumerFormatter.ts
+++ b/apps/web/src/hooks/useNumerFormatter.ts
@@ -1,16 +1,34 @@
+import { round } from '@/utils/math';
import { isNil } from 'ramda';
+export function fancyMinutes(time: number) {
+ const minutes = Math.floor(time / 60);
+ const seconds = round(time - minutes * 60, 0);
+ return `${minutes}m ${seconds}s`;
+}
+
export function useNumber() {
const locale = 'en-gb';
+ const format = (value: number | null | undefined) => {
+ if (isNil(value)) {
+ return 'N/A';
+ }
+ return new Intl.NumberFormat(locale, {
+ maximumSignificantDigits: 20,
+ }).format(value);
+ };
+ const short = (value: number | null | undefined) => {
+ if (isNil(value)) {
+ return 'N/A';
+ }
+ return new Intl.NumberFormat(locale, {
+ notation: 'compact',
+ }).format(value);
+ };
+
return {
- format: (value: number | null | undefined) => {
- if (isNil(value)) {
- return 'N/A';
- }
- return new Intl.NumberFormat(locale, {
- maximumSignificantDigits: 20,
- }).format(value);
- },
+ format,
+ short,
};
}