🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance SubscriptionTiersTable with filtering and average calculations
Bill Yang69766405010e
diff --git a/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx b/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsxindex 51ff91b24..27aa64374 100644--- a/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx+++ b/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx@@ -6,6 +6,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";import { formatter } from "@/lib/utils";+import { Input } from "@/components/ui/input";import { ChevronDown } from "lucide-react";interface SubscriptionTiersTableProps {@@ -14,6 +15,7 @@ interface SubscriptionTiersTableProps {}export function SubscriptionTiersTable({ organizations, isLoading }: SubscriptionTiersTableProps) {+ const [tierFilter, setTierFilter] = useState("");const [tierSorting, setTierSorting] = useState<{ column: string; direction: "asc" | "desc" }>({column: "count",direction: "desc",@@ -49,9 +51,15 @@ export function SubscriptionTiersTable({ organizations, isLoading }: Subscriptioevents24hPct: totalEvents24h > 0 ? ((data.events24h / totalEvents24h) * 100).toFixed(1) : "0.0",events30d: data.events30d,events30dPct: totalEvents30d > 0 ? ((data.events30d / totalEvents30d) * 100).toFixed(1) : "0.0",+ avgEvents24h: data.count > 0 ? Math.round(data.events24h / data.count) : 0,+ avgEvents30d: data.count > 0 ? Math.round(data.events30d / data.count) : 0,}));- return result.sort((a, b) => {+ const filtered = tierFilter+ ? result.filter(r => r.tier.toLowerCase().includes(tierFilter.toLowerCase()))+ : result;++ return filtered.sort((a, b) => {const multiplier = tierSorting.direction === "asc" ? 1 : -1;const aVal = a[tierSorting.column as keyof typeof a];const bVal = b[tierSorting.column as keyof typeof b];@@ -60,7 +68,7 @@ export function SubscriptionTiersTable({ organizations, isLoading }: Subscriptio}return String(aVal).localeCompare(String(bVal)) * multiplier;});- }, [organizations, tierSorting]);+ }, [organizations, tierSorting, tierFilter]);const handleTierSort = (column: string) => {setTierSorting(prev => ({@@ -77,6 +85,13 @@ export function SubscriptionTiersTable({ organizations, isLoading }: Subscriptio) : null;return (+ <div className="space-y-2">+ <Input+ placeholder="Filter subscription tiers..."+ value={tierFilter}+ onChange={e => setTierFilter(e.target.value)}+ className="max-w-xs"+ /><div className="rounded-md border border-neutral-100 dark:border-neutral-800"><Table><TableHeader>@@ -117,6 +132,24 @@ export function SubscriptionTiersTable({ organizations, isLoading }: Subscriptio<SortIcon column="events30d" /></div></TableHead>+ <TableHead+ className="text-right cursor-pointer hover:bg-neutral-100 dark:hover:bg-neutral-800"+ onClick={() => handleTierSort("avgEvents24h")}+ >+ <div className="flex items-center justify-end gap-1">+ Avg 24h+ <SortIcon column="avgEvents24h" />+ </div>+ </TableHead>+ <TableHead+ className="text-right cursor-pointer hover:bg-neutral-100 dark:hover:bg-neutral-800"+ onClick={() => handleTierSort("avgEvents30d")}+ >+ <div className="flex items-center justify-end gap-1">+ Avg 30d+ <SortIcon column="avgEvents30d" />+ </div>+ </TableHead></TableRow></TableHeader><TableBody>@@ -137,10 +170,16 @@ export function SubscriptionTiersTable({ organizations, isLoading }: Subscriptio<TableCell className="text-right"><Skeleton className="h-5 w-28 ml-auto" /></TableCell>+ <TableCell className="text-right">+ <Skeleton className="h-5 w-20 ml-auto" />+ </TableCell>+ <TableCell className="text-right">+ <Skeleton className="h-5 w-20 ml-auto" />+ </TableCell></TableRow>))) : subscriptionBreakdown.length > 0 ? (- subscriptionBreakdown.map(({ tier, count, countPct, events24h, events24hPct, events30d, events30dPct }) => (+ subscriptionBreakdown.map(({ tier, count, countPct, events24h, events24hPct, events30d, events30dPct, avgEvents24h, avgEvents30d }) => (<TableRow key={tier}><TableCell><Badge variant={tier === "free" ? "secondary" : "default"}>{tier}</Badge>@@ -157,11 +196,17 @@ export function SubscriptionTiersTable({ organizations, isLoading }: Subscriptio<span className="font-medium">{formatter(events30d)}</span><span className="text-neutral-500 dark:text-neutral-400 ml-1">({events30dPct}%)</span></TableCell>+ <TableCell className="text-right">+ <span className="font-medium">{formatter(avgEvents24h)}</span>+ </TableCell>+ <TableCell className="text-right">+ <span className="font-medium">{formatter(avgEvents30d)}</span>+ </TableCell></TableRow>))) : (<TableRow>- <TableCell colSpan={4} className="text-center py-6 text-muted-foreground">+ <TableCell colSpan={6} className="text-center py-6 text-muted-foreground">No subscription data available</TableCell></TableRow>@@ -169,5 +214,6 @@ export function SubscriptionTiersTable({ organizations, isLoading }: Subscriptio</TableBody></Table></div>+ </div>);}