🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor Organizations component for improved organization management
Bill Yang6c7d0ae7b9bc
diff --git a/client/src/app/admin/components/organizations/OrganizationExpandedRow.tsx b/client/src/app/admin/components/organizations/OrganizationExpandedRow.tsxnew file mode 100644index 000000000..b5d001abc--- /dev/null+++ b/client/src/app/admin/components/organizations/OrganizationExpandedRow.tsx@@ -0,0 +1,163 @@+"use client";++import { useCallback } from "react";+import { useRouter } from "next/navigation";+import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { Badge } from "@/components/ui/badge";+import { formatDistanceToNow } from "date-fns";+import { formatter } from "@/lib/utils";+import { User, Building2, CreditCard, UserCheck, ExternalLink } from "lucide-react";+import Link from "next/link";+import { Button } from "@/components/ui/button";+import { authClient } from "@/lib/auth";+import { userStore } from "@/lib/userStore";+import { CopyText } from "../../../../components/CopyText";++interface OrganizationExpandedRowProps {+ organization: AdminOrganizationData;+}++export function OrganizationExpandedRow({ organization }: OrganizationExpandedRowProps) {+ const router = useRouter();++ const handleImpersonate = useCallback(+ async (userId: string) => {+ try {+ await authClient.admin.impersonateUser({+ userId,+ });+ window.location.reload();+ router.push("/");+ return true;+ } catch (err) {+ const errorMessage = err instanceof Error ? err.message : "Unknown error occurred";+ console.error(`Failed to impersonate user: ${errorMessage}`);+ return false;+ }+ },+ [router]+ );++ return (+ <div className="space-y-6">+ <CopyText text={organization.id}></CopyText>++ {/* Subscription Details */}+ <div>+ <div className="flex items-center gap-2 text-sm font-semibold mb-3">+ <CreditCard className="h-4 w-4" />+ Subscription Details+ </div>+ <div className="grid grid-cols-1 md:grid-cols-4 gap-4 p-4 border border-neutral-100 dark:border-neutral-800 rounded">+ <div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Plan</div>+ <div className="font-medium">{organization.subscription.planName}</div>+ </div>+ <div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Status</div>+ <div className="font-medium">{organization.subscription.status}</div>+ </div>+ <div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Event Limit</div>+ <div className="font-medium">+ {organization.subscription.eventLimit ? formatter(organization.subscription.eventLimit) : "Unlimited"}+ </div>+ </div>+ {organization.subscription.currentPeriodEnd && (+ <div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Period End</div>+ <div className="font-medium">+ {formatDistanceToNow(new Date(organization.subscription.currentPeriodEnd), {+ addSuffix: true,+ })}+ </div>+ </div>+ )}+ {organization.subscription.cancelAtPeriodEnd && (+ <div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Cancellation</div>+ <div className="font-medium text-orange-400">Cancels at period end</div>+ </div>+ )}+ </div>+ </div>++ {/* Sites */}+ <div>+ <div className="flex items-center gap-2 text-sm font-semibold mb-3">+ <Building2 className="h-4 w-4" />+ Sites ({organization.sites.length})+ </div>+ {organization.sites.length > 0 ? (+ <div className="flex flex-wrap gap-2">+ {organization.sites.map(site => (+ <Link+ key={site.siteId}+ href={`/${site.siteId}`}+ target="_blank"+ className="inline-flex items-center gap-2 px-3 py-2 bg-neutral-100 dark:bg-neutral-800 hover:bg-neutral-200 dark:hover:bg-neutral-700 border border-neutral-200 dark:border-neutral-700 rounded-md text-sm transition-colors"+ >+ <div className="flex flex-col">+ <span className="font-medium">{site.domain}</span>+ <span className="text-xs text-neutral-500 dark:text-neutral-400">+ {formatter(site.eventsLast24Hours)} events (24h) · {formatter(site.eventsLast30Days)} (30d)+ </span>+ </div>+ <ExternalLink className="h-3 w-3" />+ </Link>+ ))}+ </div>+ ) : (+ <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">+ No sites+ </div>+ )}+ </div>++ {/* Members */}+ <div>+ <div className="flex items-center gap-2 text-sm font-semibold mb-3">+ <User className="h-4 w-4" />+ Members ({organization.members.length})+ </div>+ {organization.members.length > 0 ? (+ <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3">+ {organization.members.map(member => (+ <div+ key={member.userId}+ className="p-3 border border-neutral-100 dark:border-neutral-800 rounded flex items-center justify-between"+ >+ <div className="flex flex-col gap-1">+ <div className="font-medium flex items-center gap-2">+ {member.name}{" "}+ <Badge variant="outline" className="text-xs">+ {member.role}+ </Badge>+ </div>+ <div className="text-sm text-neutral-700 dark:text-neutral-200">{member.email}</div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400">+ <CopyText text={member.userId} className="text-xs"></CopyText>+ </div>+ <Button+ onClick={() => handleImpersonate(member.userId)}+ size="sm"+ variant="outline"+ className="flex items-center gap-1"+ disabled={member.userId === userStore.getState().user?.id}+ >+ <UserCheck className="h-3 w-3" />+ Impersonate+ </Button>+ </div>+ </div>+ ))}+ </div>+ ) : (+ <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">+ No members+ </div>+ )}+ </div>+ </div>+ );+}diff --git a/client/src/app/admin/components/organizations/OrganizationFilters.tsx b/client/src/app/admin/components/organizations/OrganizationFilters.tsxnew file mode 100644index 000000000..2e8ed438e--- /dev/null+++ b/client/src/app/admin/components/organizations/OrganizationFilters.tsx@@ -0,0 +1,45 @@+"use client";++import { Switch } from "@/components/ui/switch";+import { Label } from "@/components/ui/label";++interface OrganizationFiltersProps {+ showZeroEvents: boolean;+ setShowZeroEvents: (value: boolean) => void;+ showFreeUsers: boolean;+ setShowFreeUsers: (value: boolean) => void;+ showOnlyOverLimit: boolean;+ setShowOnlyOverLimit: (value: boolean) => void;+}++export function OrganizationFilters({+ showZeroEvents,+ setShowZeroEvents,+ showFreeUsers,+ setShowFreeUsers,+ showOnlyOverLimit,+ setShowOnlyOverLimit,+}: OrganizationFiltersProps) {+ return (+ <div className="flex items-center gap-6 mb-4 p-4 bg-neutral-50 dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 rounded-lg">+ <div className="flex items-center gap-2">+ <Switch id="show-zero-events" checked={showZeroEvents} onCheckedChange={setShowZeroEvents} />+ <Label htmlFor="show-zero-events" className="text-sm cursor-pointer">+ Show orgs with 0 events (30d)+ </Label>+ </div>+ <div className="flex items-center gap-2">+ <Switch id="show-free-users" checked={showFreeUsers} onCheckedChange={setShowFreeUsers} />+ <Label htmlFor="show-free-users" className="text-sm cursor-pointer">+ Show free users+ </Label>+ </div>+ <div className="flex items-center gap-2">+ <Switch id="show-only-over-limit" checked={showOnlyOverLimit} onCheckedChange={setShowOnlyOverLimit} />+ <Label htmlFor="show-only-over-limit" className="text-sm cursor-pointer">+ Only over limit+ </Label>+ </div>+ </div>+ );+}diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsxindex 04dd0cd63..b21f127ed 100644--- a/client/src/app/admin/components/organizations/Organizations.tsx+++ b/client/src/app/admin/components/organizations/Organizations.tsx@@ -1,62 +1,27 @@"use client";-import { useState, useMemo, useCallback } from "react";-import { useRouter } from "next/navigation";-import { useAdminOrganizations, AdminOrganizationData } from "@/api/admin/getAdminOrganizations";-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";-import { Badge } from "@/components/ui/badge";-import { Skeleton } from "@/components/ui/skeleton";-import { formatDistanceToNow } from "date-fns";-import { parseUtcTimestamp } from "@/lib/dateTimeUtils";-import { formatter } from "@/lib/utils";-import { DateTime } from "luxon";-import {- ChevronDown,- ChevronRight,- User,- Building2,- CreditCard,- UserCheck,- ExternalLink,- Activity,- Zap,-} from "lucide-react";-import Link from "next/link";+import { useState, useMemo } from "react";+import { useAdminOrganizations } from "@/api/admin/getAdminOrganizations";+import { Building2, CreditCard, Activity, Zap } from "lucide-react";import { Button } from "@/components/ui/button";-import { Pagination } from "@/components/pagination";-import { authClient } from "@/lib/auth";-import { userStore } from "@/lib/userStore";-import {- ColumnDef,- flexRender,- getCoreRowModel,- useReactTable,- getSortedRowModel,- SortingState,-} from "@tanstack/react-table";-import { SortableHeader } from "../shared/SortableHeader";+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";+import { DateTime } from "luxon";import { SearchInput } from "../shared/SearchInput";import { ErrorAlert } from "../shared/ErrorAlert";import { AdminLayout } from "../shared/AdminLayout";import { GrowthChart } from "../shared/GrowthChart";import { OverviewCards } from "../shared/OverviewCards";import { ServiceUsageChart } from "../shared/ServiceUsageChart";-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";-import { Switch } from "@/components/ui/switch";-import { Label } from "@/components/ui/label";-import { CopyText } from "../../../../components/CopyText";+import { SubscriptionTiersTable } from "./SubscriptionTiersTable";+import { OrganizationsTable } from "./OrganizationsTable";+import { OrganizationFilters } from "./OrganizationFilters";+import { useOrganizationStats } from "./useOrganizationStats";+import { useFilteredOrganizations } from "./useFilteredOrganizations";export function Organizations() {- const router = useRouter();const { data: organizations, isLoading, isError } = useAdminOrganizations();const [searchQuery, setSearchQuery] = useState("");- const [expandedOrgs, setExpandedOrgs] = useState<Set<string>>(new Set());- const [sorting, setSorting] = useState<SortingState>([]);- const [pagination, setPagination] = useState({- pageIndex: 0,- pageSize: 50,- });// Filter statesconst [showZeroEvents, setShowZeroEvents] = useState(true);@@ -72,7 +37,6 @@ export function Organizations() {const end = now.toFormat("yyyy-MM-dd");if (timePeriod === "all") {- // For all time, start from May 2025const start = "2025-05-01";return { startDate: start, endDate: end };}@@ -83,244 +47,15 @@ export function Organizations() {return { startDate: start, endDate: end };}, [timePeriod]);- // Calculate stats from organizations data- const stats = useMemo(() => {- if (!organizations) {- return {- totalOrganizations: 0,- activeOrganizations: 0,- paidOrganizations: 0,- totalEventsLast30Days: 0,- };- }-- const totalOrganizations = organizations.length;-- // Count organizations with at least 1 event in past 30 days- const activeOrganizations = organizations.filter(org => org.sites.some(site => site.eventsLast30Days > 0)).length;-- // Count paid organizations (with a subscription)- const paidOrganizations = organizations.filter(org => org.subscription.planName !== "free").length;-- // Sum all events from past 30 days- const totalEventsLast30Days = organizations.reduce(- (total, org) => total + org.sites.reduce((sum, site) => sum + Number(site.eventsLast30Days), 0),- 0- );-- return {- totalOrganizations,- activeOrganizations,- paidOrganizations,- totalEventsLast30Days,- };- }, [organizations]);-- const toggleExpand = useCallback(- (orgId: string) => {- const newExpanded = new Set(expandedOrgs);- if (newExpanded.has(orgId)) {- newExpanded.delete(orgId);- } else {- newExpanded.add(orgId);- }- setExpandedOrgs(newExpanded);- },- [expandedOrgs]- );-- // Filter organizations based on search query and filter toggles- const filteredOrganizations = useMemo(() => {- if (!organizations) return [];-- let filtered = organizations;-- // Apply search filter- if (searchQuery.trim()) {- const lowerSearchQuery = searchQuery.toLowerCase();- filtered = filtered.filter(org => {- return (- org.name.toLowerCase().includes(lowerSearchQuery) ||- org.sites.some(site => site.domain.toLowerCase().includes(lowerSearchQuery)) ||- org.members.some(- member =>- member.email.toLowerCase().includes(lowerSearchQuery) ||- member.name.toLowerCase().includes(lowerSearchQuery)- )- );- });- }-- // Filter out organizations with 0 events in last 30 days- if (!showZeroEvents) {- filtered = filtered.filter(org => org.sites.some(site => site.eventsLast30Days > 0));- }-- // Filter out free users- if (!showFreeUsers) {- filtered = filtered.filter(org => org.subscription.planName !== "free");- }-- // Show only organizations over their event limit- if (showOnlyOverLimit) {- filtered = filtered.filter(org => org.overMonthlyLimit);- }+ const stats = useOrganizationStats(organizations);- return filtered;- }, [organizations, searchQuery, showZeroEvents, showFreeUsers, showOnlyOverLimit]);-- const handleImpersonate = useCallback(- async (userId: string) => {- try {- await authClient.admin.impersonateUser({- userId,- });- window.location.reload();- router.push("/");- return true;- } catch (err) {- const errorMessage = err instanceof Error ? err.message : "Unknown error occurred";- console.error(`Failed to impersonate user: ${errorMessage}`);- return false;- }- },- [router]- );-- const formatSubscriptionStatus = (subscription: AdminOrganizationData["subscription"]) => {- const statusColor =- subscription.status === "active" ? "default" : subscription.status === "canceled" ? "destructive" : "secondary";-- return <Badge variant={statusColor}>{subscription.planName}</Badge>;- };-- // Define columns for the table- const columns = useMemo<ColumnDef<AdminOrganizationData>[]>(- () => [- {- id: "expand",- header: "",- cell: ({ row }) => (- <Button variant="ghost" size="icon" className="h-5 w-5 p-0" onClick={() => toggleExpand(row.original.id)}>- {expandedOrgs.has(row.original.id) ? (- <ChevronDown className="h-4 w-4" />- ) : (- <ChevronRight className="h-4 w-4" />- )}- </Button>- ),- enableSorting: false,- },- {- accessorKey: "name",- header: ({ column }) => <SortableHeader column={column}>Organization</SortableHeader>,- cell: ({ row }) => <div className="font-medium">{row.getValue("name")}</div>,- },- {- accessorKey: "createdAt",- header: ({ column }) => <SortableHeader column={column}>Created</SortableHeader>,- cell: ({ row }) => <div>{parseUtcTimestamp(row.getValue("createdAt")).toRelative()}</div>,- },- {- accessorKey: "monthlyEventCount",- header: ({ column }) => <SortableHeader column={column}>Monthly Events</SortableHeader>,- cell: ({ row }) => {- const count = row.getValue("monthlyEventCount") as number;- const isOverLimit = row.original.overMonthlyLimit;- return (- <div className={`font-medium ${isOverLimit ? "text-red-400" : ""}`}>- {formatter(count || 0)}- {isOverLimit && <span className="text-red-400 ml-1">⚠️</span>}- </div>- );- },- },- {- id: "eventsLast24Hours",- header: ({ column }) => <SortableHeader column={column}>24h Events</SortableHeader>,- accessorFn: row => row.sites.reduce((total, site) => total + Number(site.eventsLast24Hours || 0), 0),- cell: ({ row }) => {- const total = row.original.sites.reduce((sum, site) => sum + Number(site.eventsLast24Hours || 0), 0);- return formatter(total);- },- },- {- id: "eventsLast30Days",- header: ({ column }) => <SortableHeader column={column}>30d Events</SortableHeader>,- accessorFn: row => row.sites.reduce((total, site) => total + Number(site.eventsLast30Days || 0), 0),- cell: ({ row }) => {- const total = row.original.sites.reduce((sum, site) => sum + Number(site.eventsLast30Days || 0), 0);- return formatter(total);- },- },- {- id: "subscription",- header: ({ column }) => <SortableHeader column={column}>Subscription</SortableHeader>,- accessorFn: row => row.subscription.planName,- cell: ({ row }) => formatSubscriptionStatus(row.original.subscription),- },- {- id: "sites",- header: ({ column }) => <SortableHeader column={column}>Sites</SortableHeader>,- accessorFn: row => row.sites.length,- cell: ({ row }) => row.original.sites.length,- },- {- id: "members",- header: ({ column }) => <SortableHeader column={column}>Members</SortableHeader>,- accessorFn: row => row.members.length,- cell: ({ row }) => row.original.members.length,- },- ],- [toggleExpand]- );-- // Initialize the table- const table = useReactTable({- data: filteredOrganizations || [],- columns,- state: {- sorting,- },- onSortingChange: setSorting,- getCoreRowModel: getCoreRowModel(),- getSortedRowModel: getSortedRowModel(),- manualSorting: false,+ const filteredOrganizations = useFilteredOrganizations(organizations, {+ searchQuery,+ showZeroEvents,+ showFreeUsers,+ showOnlyOverLimit,});- // Paginate the sorted and filtered organizations- const paginatedOrganizations = table- .getRowModel()- .rows.slice(pagination.pageIndex * pagination.pageSize, (pagination.pageIndex + 1) * pagination.pageSize);-- // Pagination controller for TablePagination- const paginationController = {- getState: () => ({ pagination }),- getCanPreviousPage: () => pagination.pageIndex > 0,- getCanNextPage: () =>- table.getRowModel().rows.length > 0- ? pagination.pageIndex < Math.ceil(table.getRowModel().rows.length / pagination.pageSize) - 1- : false,- getPageCount: () =>- table.getRowModel().rows.length > 0 ? Math.ceil(table.getRowModel().rows.length / pagination.pageSize) : 0,- setPageIndex: (index: number) => setPagination({ ...pagination, pageIndex: index }),- previousPage: () =>- setPagination({- ...pagination,- pageIndex: Math.max(0, pagination.pageIndex - 1),- }),- nextPage: () =>- setPagination({- ...pagination,- pageIndex: Math.min(- table.getRowModel().rows.length > 0- ? Math.ceil(table.getRowModel().rows.length / pagination.pageSize) - 1- : 0,- pagination.pageIndex + 1- ),- }),- };-if (isError) {return (<AdminLayout>@@ -363,6 +98,7 @@ export function Organizations() {<TabsList><TabsTrigger value="growth">Organization Growth</TabsTrigger><TabsTrigger value="usage">Service Usage</TabsTrigger>+ <TabsTrigger value="subscriptions">Subscription Tiers</TabsTrigger></TabsList></div><TabsContent value="growth">@@ -409,6 +145,9 @@ export function Organizations() {title={`Service-wide Usage - ${timePeriod === "all" ? "All Time" : `Last ${timePeriod}`}`}/></TabsContent>+ <TabsContent value="subscriptions">+ <SubscriptionTiersTable organizations={organizations} isLoading={isLoading} />+ </TabsContent></Tabs><div className="mb-4">@@ -419,253 +158,20 @@ export function Organizations() {/></div>- <div className="flex items-center gap-6 mb-4 p-4 bg-neutral-50 dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 rounded-lg">- <div className="flex items-center gap-2">- <Switch id="show-zero-events" checked={showZeroEvents} onCheckedChange={setShowZeroEvents} />- <Label htmlFor="show-zero-events" className="text-sm cursor-pointer">- Show orgs with 0 events (30d)- </Label>- </div>- <div className="flex items-center gap-2">- <Switch id="show-free-users" checked={showFreeUsers} onCheckedChange={setShowFreeUsers} />- <Label htmlFor="show-free-users" className="text-sm cursor-pointer">- Show free users- </Label>- </div>- <div className="flex items-center gap-2">- <Switch id="show-only-over-limit" checked={showOnlyOverLimit} onCheckedChange={setShowOnlyOverLimit} />- <Label htmlFor="show-only-over-limit" className="text-sm cursor-pointer">- Only over limit- </Label>- </div>- </div>-- <div className="rounded-md border border-neutral-100 dark:border-neutral-800">- <Table>- <TableHeader>- {table.getHeaderGroups().map(headerGroup => (- <TableRow key={headerGroup.id}>- {headerGroup.headers.map(header => (- <TableHead key={header.id} className={header.id === "expand" ? "w-8" : ""}>- {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}- </TableHead>- ))}- </TableRow>- ))}- </TableHeader>- <TableBody>- {isLoading ? (- Array(pagination.pageSize)- .fill(0)- .map((_, index) => (- <TableRow key={index}>- <TableCell>- <Skeleton className="h-5 w-5" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-32" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-24" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-24" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-20" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-20" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-20" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-16" />- </TableCell>- <TableCell>- <Skeleton className="h-5 w-16" />- </TableCell>- </TableRow>- ))- ) : paginatedOrganizations && paginatedOrganizations.length > 0 ? (- paginatedOrganizations.map(row => (- <>- <TableRow key={row.id} className="group">- {row.getVisibleCells().map(cell => (- <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>- ))}- </TableRow>- {expandedOrgs.has(row.original.id) && (- <TableRow>- <TableCell colSpan={columns.length} className="bg-neutral-50 dark:bg-neutral-900 py-4 px-8">- <div className="space-y-6">- {/* Subscription Details */}- <CopyText text={row.original.id}></CopyText>- <div>- <div className="flex items-center gap-2 text-sm font-semibold mb-3">- <CreditCard className="h-4 w-4" />- Subscription Details- </div>- <div className="grid grid-cols-1 md:grid-cols-4 gap-4 p-4 border border-neutral-100 dark:border-neutral-800 rounded">- <div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">- Plan- </div>- <div className="font-medium">{row.original.subscription.planName}</div>- </div>- <div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">- Status- </div>- <div className="font-medium">{row.original.subscription.status}</div>- </div>- <div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">- Event Limit- </div>- <div className="font-medium">- {row.original.subscription.eventLimit- ? formatter(row.original.subscription.eventLimit)- : "Unlimited"}- </div>- </div>- {row.original.subscription.currentPeriodEnd && (- <div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">- Period End- </div>- <div className="font-medium">- {formatDistanceToNow(new Date(row.original.subscription.currentPeriodEnd), {- addSuffix: true,- })}- </div>- </div>- )}- {row.original.subscription.cancelAtPeriodEnd && (- <div>- <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">- Cancellation- </div>- <div className="font-medium text-orange-400">Cancels at period end</div>- </div>- )}- </div>- </div>-- {/* Sites */}- <div>- <div className="flex items-center gap-2 text-sm font-semibold mb-3">- <Building2 className="h-4 w-4" />- Sites ({row.original.sites.length})- </div>- {row.original.sites.length > 0 ? (- <div className="flex flex-wrap gap-2">- {row.original.sites.map(site => (- <Link- key={site.siteId}- href={`/${site.siteId}`}- target="_blank"- className="inline-flex items-center gap-2 px-3 py-2 bg-neutral-100 dark:bg-neutral-800 hover:bg-neutral-200 dark:hover:bg-neutral-700 border border-neutral-200 dark:border-neutral-700 rounded-md text-sm transition-colors"- >- <div className="flex flex-col">- <span className="font-medium">{site.domain}</span>- <span className="text-xs text-neutral-500 dark:text-neutral-400">- {formatter(site.eventsLast24Hours)} events (24h) ·{" "}- {formatter(site.eventsLast30Days)} (30d)- </span>- </div>- <ExternalLink className="h-3 w-3" />- </Link>- ))}- </div>- ) : (- <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">- No sites- </div>- )}- </div>-- {/* Members */}- <div>- <div className="flex items-center gap-2 text-sm font-semibold mb-3">- <User className="h-4 w-4" />- Members ({row.original.members.length})- </div>- {row.original.members.length > 0 ? (- <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3">- {row.original.members.map(member => (- <div- key={member.userId}- className="p-3 border border-neutral-100 dark:border-neutral-800 rounded flex items-center justify-between"- >- <div className="flex flex-col gap-1">- <div className="font-medium flex items-center gap-2">- {member.name}{" "}- <Badge variant="outline" className="text-xs">- {member.role}- </Badge>- </div>- <div className="text-sm text-neutral-700 dark:text-neutral-200">- {member.email}- </div>- <div className="text-xs text-neutral-500 dark:text-neutral-400">- <CopyText text={member.userId} className="text-xs"></CopyText>- </div>- <Button- onClick={() => handleImpersonate(member.userId)}- size="sm"- variant="outline"- className="flex items-center gap-1"- disabled={member.userId === userStore.getState().user?.id}- >- <UserCheck className="h-3 w-3" />- Impersonate- </Button>- </div>- </div>- ))}- </div>- ) : (- <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">- No members- </div>- )}- </div>- </div>- </TableCell>- </TableRow>- )}- </>- ))- ) : (- <TableRow>- <TableCell colSpan={columns.length} className="text-center py-6 text-muted-foreground">- {searchQuery ? "No organizations match your search" : "No organizations found"}- </TableCell>- </TableRow>- )}- </TableBody>- </Table>- </div>+ <OrganizationFilters+ showZeroEvents={showZeroEvents}+ setShowZeroEvents={setShowZeroEvents}+ showFreeUsers={showFreeUsers}+ setShowFreeUsers={setShowFreeUsers}+ showOnlyOverLimit={showOnlyOverLimit}+ setShowOnlyOverLimit={setShowOnlyOverLimit}+ />- <div className="mt-4">- <Pagination- table={paginationController}- data={- table.getRowModel().rows.length > 0- ? {- items: table.getRowModel().rows,- total: table.getRowModel().rows.length,- }- : undefined- }- pagination={pagination}- setPagination={setPagination}- isLoading={isLoading}- itemName="organizations"- />- </div>+ <OrganizationsTable+ organizations={filteredOrganizations}+ isLoading={isLoading}+ searchQuery={searchQuery}+ /></AdminLayout>);}diff --git a/client/src/app/admin/components/organizations/OrganizationsTable.tsx b/client/src/app/admin/components/organizations/OrganizationsTable.tsxnew file mode 100644index 000000000..b1768ad5b--- /dev/null+++ b/client/src/app/admin/components/organizations/OrganizationsTable.tsx@@ -0,0 +1,277 @@+"use client";++import { useState, useMemo, useCallback } from "react";+import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";+import { Badge } from "@/components/ui/badge";+import { Skeleton } from "@/components/ui/skeleton";+import { parseUtcTimestamp } from "@/lib/dateTimeUtils";+import { formatter } from "@/lib/utils";+import { ChevronDown, ChevronRight } from "lucide-react";+import { Button } from "@/components/ui/button";+import { Pagination } from "@/components/pagination";+import {+ ColumnDef,+ flexRender,+ getCoreRowModel,+ useReactTable,+ getSortedRowModel,+ SortingState,+} from "@tanstack/react-table";+import { SortableHeader } from "../shared/SortableHeader";+import { OrganizationExpandedRow } from "./OrganizationExpandedRow";++interface OrganizationsTableProps {+ organizations: AdminOrganizationData[];+ isLoading: boolean;+ searchQuery: string;+}++export function OrganizationsTable({ organizations, isLoading, searchQuery }: OrganizationsTableProps) {+ const [expandedOrgs, setExpandedOrgs] = useState<Set<string>>(new Set());+ const [sorting, setSorting] = useState<SortingState>([]);+ const [pagination, setPagination] = useState({+ pageIndex: 0,+ pageSize: 50,+ });++ const toggleExpand = useCallback(+ (orgId: string) => {+ const newExpanded = new Set(expandedOrgs);+ if (newExpanded.has(orgId)) {+ newExpanded.delete(orgId);+ } else {+ newExpanded.add(orgId);+ }+ setExpandedOrgs(newExpanded);+ },+ [expandedOrgs]+ );++ const formatSubscriptionStatus = (subscription: AdminOrganizationData["subscription"]) => {+ const statusColor =+ subscription.status === "active" ? "default" : subscription.status === "canceled" ? "destructive" : "secondary";+ return <Badge variant={statusColor}>{subscription.planName}</Badge>;+ };++ const columns = useMemo<ColumnDef<AdminOrganizationData>[]>(+ () => [+ {+ id: "expand",+ header: "",+ cell: ({ row }) => (+ <Button variant="ghost" size="icon" className="h-5 w-5 p-0" onClick={() => toggleExpand(row.original.id)}>+ {expandedOrgs.has(row.original.id) ? (+ <ChevronDown className="h-4 w-4" />+ ) : (+ <ChevronRight className="h-4 w-4" />+ )}+ </Button>+ ),+ enableSorting: false,+ },+ {+ accessorKey: "name",+ header: ({ column }) => <SortableHeader column={column}>Organization</SortableHeader>,+ cell: ({ row }) => <div className="font-medium">{row.getValue("name")}</div>,+ },+ {+ accessorKey: "createdAt",+ header: ({ column }) => <SortableHeader column={column}>Created</SortableHeader>,+ cell: ({ row }) => <div>{parseUtcTimestamp(row.getValue("createdAt")).toRelative()}</div>,+ },+ {+ accessorKey: "monthlyEventCount",+ header: ({ column }) => <SortableHeader column={column}>Monthly Events</SortableHeader>,+ cell: ({ row }) => {+ const count = row.getValue("monthlyEventCount") as number;+ const isOverLimit = row.original.overMonthlyLimit;+ return (+ <div className={`font-medium ${isOverLimit ? "text-red-400" : ""}`}>+ {formatter(count || 0)}+ {isOverLimit && <span className="text-red-400 ml-1">⚠️</span>}+ </div>+ );+ },+ },+ {+ id: "eventsLast24Hours",+ header: ({ column }) => <SortableHeader column={column}>24h Events</SortableHeader>,+ accessorFn: row => row.sites.reduce((total, site) => total + Number(site.eventsLast24Hours || 0), 0),+ cell: ({ row }) => {+ const total = row.original.sites.reduce((sum, site) => sum + Number(site.eventsLast24Hours || 0), 0);+ return formatter(total);+ },+ },+ {+ id: "eventsLast30Days",+ header: ({ column }) => <SortableHeader column={column}>30d Events</SortableHeader>,+ accessorFn: row => row.sites.reduce((total, site) => total + Number(site.eventsLast30Days || 0), 0),+ cell: ({ row }) => {+ const total = row.original.sites.reduce((sum, site) => sum + Number(site.eventsLast30Days || 0), 0);+ return formatter(total);+ },+ },+ {+ id: "subscription",+ header: ({ column }) => <SortableHeader column={column}>Subscription</SortableHeader>,+ accessorFn: row => row.subscription.planName,+ cell: ({ row }) => formatSubscriptionStatus(row.original.subscription),+ },+ {+ id: "sites",+ header: ({ column }) => <SortableHeader column={column}>Sites</SortableHeader>,+ accessorFn: row => row.sites.length,+ cell: ({ row }) => row.original.sites.length,+ },+ {+ id: "members",+ header: ({ column }) => <SortableHeader column={column}>Members</SortableHeader>,+ accessorFn: row => row.members.length,+ cell: ({ row }) => row.original.members.length,+ },+ ],+ [toggleExpand, expandedOrgs]+ );++ const table = useReactTable({+ data: organizations || [],+ columns,+ state: {+ sorting,+ },+ onSortingChange: setSorting,+ getCoreRowModel: getCoreRowModel(),+ getSortedRowModel: getSortedRowModel(),+ manualSorting: false,+ });++ const paginatedOrganizations = table+ .getRowModel()+ .rows.slice(pagination.pageIndex * pagination.pageSize, (pagination.pageIndex + 1) * pagination.pageSize);++ const paginationController = {+ getState: () => ({ pagination }),+ getCanPreviousPage: () => pagination.pageIndex > 0,+ getCanNextPage: () =>+ table.getRowModel().rows.length > 0+ ? pagination.pageIndex < Math.ceil(table.getRowModel().rows.length / pagination.pageSize) - 1+ : false,+ getPageCount: () =>+ table.getRowModel().rows.length > 0 ? Math.ceil(table.getRowModel().rows.length / pagination.pageSize) : 0,+ setPageIndex: (index: number) => setPagination({ ...pagination, pageIndex: index }),+ previousPage: () =>+ setPagination({+ ...pagination,+ pageIndex: Math.max(0, pagination.pageIndex - 1),+ }),+ nextPage: () =>+ setPagination({+ ...pagination,+ pageIndex: Math.min(+ table.getRowModel().rows.length > 0+ ? Math.ceil(table.getRowModel().rows.length / pagination.pageSize) - 1+ : 0,+ pagination.pageIndex + 1+ ),+ }),+ };++ return (+ <>+ <div className="rounded-md border border-neutral-100 dark:border-neutral-800">+ <Table>+ <TableHeader>+ {table.getHeaderGroups().map(headerGroup => (+ <TableRow key={headerGroup.id}>+ {headerGroup.headers.map(header => (+ <TableHead key={header.id} className={header.id === "expand" ? "w-8" : ""}>+ {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}+ </TableHead>+ ))}+ </TableRow>+ ))}+ </TableHeader>+ <TableBody>+ {isLoading ? (+ Array(pagination.pageSize)+ .fill(0)+ .map((_, index) => (+ <TableRow key={index}>+ <TableCell>+ <Skeleton className="h-5 w-5" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-32" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-24" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-24" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-20" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-20" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-20" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-16" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-5 w-16" />+ </TableCell>+ </TableRow>+ ))+ ) : paginatedOrganizations && paginatedOrganizations.length > 0 ? (+ paginatedOrganizations.map(row => (+ <>+ <TableRow key={row.id} className="group">+ {row.getVisibleCells().map(cell => (+ <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>+ ))}+ </TableRow>+ {expandedOrgs.has(row.original.id) && (+ <TableRow>+ <TableCell colSpan={columns.length} className="bg-neutral-50 dark:bg-neutral-900 py-4 px-8">+ <OrganizationExpandedRow organization={row.original} />+ </TableCell>+ </TableRow>+ )}+ </>+ ))+ ) : (+ <TableRow>+ <TableCell colSpan={columns.length} className="text-center py-6 text-muted-foreground">+ {searchQuery ? "No organizations match your search" : "No organizations found"}+ </TableCell>+ </TableRow>+ )}+ </TableBody>+ </Table>+ </div>++ <div className="mt-4">+ <Pagination+ table={paginationController}+ data={+ table.getRowModel().rows.length > 0+ ? {+ items: table.getRowModel().rows,+ total: table.getRowModel().rows.length,+ }+ : undefined+ }+ pagination={pagination}+ setPagination={setPagination}+ isLoading={isLoading}+ itemName="organizations"+ />+ </div>+ </>+ );+}diff --git a/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx b/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsxnew file mode 100644index 000000000..2e0010a52--- /dev/null+++ b/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx@@ -0,0 +1,173 @@+"use client";++import { useState, useMemo } from "react";+import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";+import { Badge } from "@/components/ui/badge";+import { Skeleton } from "@/components/ui/skeleton";+import { formatter } from "@/lib/utils";+import { ChevronDown } from "lucide-react";++interface SubscriptionTiersTableProps {+ organizations: AdminOrganizationData[] | undefined;+ isLoading: boolean;+}++export function SubscriptionTiersTable({ organizations, isLoading }: SubscriptionTiersTableProps) {+ const [tierSorting, setTierSorting] = useState<{ column: string; direction: "asc" | "desc" }>({+ column: "count",+ direction: "desc",+ });++ const subscriptionBreakdown = useMemo(() => {+ if (!organizations || organizations.length === 0) return [];++ const tierData: Record<string, { count: number; events24h: number; events30d: number }> = {};+ let totalEvents24h = 0;+ let totalEvents30d = 0;++ organizations.forEach(org => {+ const planName = org.subscription.planName || "unknown";+ if (!tierData[planName]) {+ tierData[planName] = { count: 0, events24h: 0, events30d: 0 };+ }+ tierData[planName].count += 1;+ const org24h = org.sites.reduce((sum, site) => sum + Number(site.eventsLast24Hours || 0), 0);+ const org30d = org.sites.reduce((sum, site) => sum + Number(site.eventsLast30Days || 0), 0);+ tierData[planName].events24h += org24h;+ tierData[planName].events30d += org30d;+ totalEvents24h += org24h;+ totalEvents30d += org30d;+ });++ const totalOrgs = organizations.length;+ const result = Object.entries(tierData).map(([tier, data]) => ({+ tier,+ count: data.count,+ countPct: ((data.count / totalOrgs) * 100).toFixed(1),+ events24h: data.events24h,+ events24hPct: totalEvents24h > 0 ? ((data.events24h / totalEvents24h) * 100).toFixed(1) : "0.0",+ events30d: data.events30d,+ events30dPct: totalEvents30d > 0 ? ((data.events30d / totalEvents30d) * 100).toFixed(1) : "0.0",+ }));++ return result.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];+ if (typeof aVal === "number" && typeof bVal === "number") {+ return (aVal - bVal) * multiplier;+ }+ return String(aVal).localeCompare(String(bVal)) * multiplier;+ });+ }, [organizations, tierSorting]);++ const handleTierSort = (column: string) => {+ setTierSorting(prev => ({+ column,+ direction: prev.column === column && prev.direction === "desc" ? "asc" : "desc",+ }));+ };++ const SortIcon = ({ column }: { column: string }) =>+ tierSorting.column === column ? (+ <ChevronDown+ className={`h-4 w-4 transition-transform ${tierSorting.direction === "asc" ? "rotate-180" : ""}`}+ />+ ) : null;++ return (+ <div className="rounded-md border border-neutral-100 dark:border-neutral-800">+ <Table>+ <TableHeader>+ <TableRow>+ <TableHead+ className="cursor-pointer hover:bg-neutral-100 dark:hover:bg-neutral-800"+ onClick={() => handleTierSort("tier")}+ >+ <div className="flex items-center gap-1">+ Subscription Tier+ <SortIcon column="tier" />+ </div>+ </TableHead>+ <TableHead+ className="text-right cursor-pointer hover:bg-neutral-100 dark:hover:bg-neutral-800"+ onClick={() => handleTierSort("count")}+ >+ <div className="flex items-center justify-end gap-1">+ Organizations+ <SortIcon column="count" />+ </div>+ </TableHead>+ <TableHead+ className="text-right cursor-pointer hover:bg-neutral-100 dark:hover:bg-neutral-800"+ onClick={() => handleTierSort("events24h")}+ >+ <div className="flex items-center justify-end gap-1">+ 24h Events+ <SortIcon column="events24h" />+ </div>+ </TableHead>+ <TableHead+ className="text-right cursor-pointer hover:bg-neutral-100 dark:hover:bg-neutral-800"+ onClick={() => handleTierSort("events30d")}+ >+ <div className="flex items-center justify-end gap-1">+ 30d Events+ <SortIcon column="events30d" />+ </div>+ </TableHead>+ </TableRow>+ </TableHeader>+ <TableBody>+ {isLoading ? (+ Array(5)+ .fill(0)+ .map((_, index) => (+ <TableRow key={index}>+ <TableCell>+ <Skeleton className="h-5 w-24" />+ </TableCell>+ <TableCell className="text-right">+ <Skeleton className="h-5 w-24 ml-auto" />+ </TableCell>+ <TableCell className="text-right">+ <Skeleton className="h-5 w-28 ml-auto" />+ </TableCell>+ <TableCell className="text-right">+ <Skeleton className="h-5 w-28 ml-auto" />+ </TableCell>+ </TableRow>+ ))+ ) : subscriptionBreakdown.length > 0 ? (+ subscriptionBreakdown.map(({ tier, count, countPct, events24h, events24hPct, events30d, events30dPct }) => (+ <TableRow key={tier}>+ <TableCell>+ <Badge variant={tier === "free" ? "secondary" : "default"}>{tier}</Badge>+ </TableCell>+ <TableCell className="text-right">+ <span className="font-medium">{formatter(count)}</span>+ <span className="text-neutral-500 dark:text-neutral-400 ml-1">({countPct}%)</span>+ </TableCell>+ <TableCell className="text-right">+ <span className="font-medium">{formatter(events24h)}</span>+ <span className="text-neutral-500 dark:text-neutral-400 ml-1">({events24hPct}%)</span>+ </TableCell>+ <TableCell className="text-right">+ <span className="font-medium">{formatter(events30d)}</span>+ <span className="text-neutral-500 dark:text-neutral-400 ml-1">({events30dPct}%)</span>+ </TableCell>+ </TableRow>+ ))+ ) : (+ <TableRow>+ <TableCell colSpan={4} className="text-center py-6 text-muted-foreground">+ No subscription data available+ </TableCell>+ </TableRow>+ )}+ </TableBody>+ </Table>+ </div>+ );+}diff --git a/client/src/app/admin/components/organizations/useFilteredOrganizations.ts b/client/src/app/admin/components/organizations/useFilteredOrganizations.tsnew file mode 100644index 000000000..c2b59d7e1--- /dev/null+++ b/client/src/app/admin/components/organizations/useFilteredOrganizations.ts@@ -0,0 +1,53 @@+import { useMemo } from "react";+import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";++interface FilterOptions {+ searchQuery: string;+ showZeroEvents: boolean;+ showFreeUsers: boolean;+ showOnlyOverLimit: boolean;+}++export function useFilteredOrganizations(+ organizations: AdminOrganizationData[] | undefined,+ { searchQuery, showZeroEvents, showFreeUsers, showOnlyOverLimit }: FilterOptions+) {+ return useMemo(() => {+ if (!organizations) return [];++ let filtered = organizations;++ // Apply search filter+ if (searchQuery.trim()) {+ const lowerSearchQuery = searchQuery.toLowerCase();+ filtered = filtered.filter(org => {+ return (+ org.name.toLowerCase().includes(lowerSearchQuery) ||+ org.sites.some(site => site.domain.toLowerCase().includes(lowerSearchQuery)) ||+ org.members.some(+ member =>+ member.email.toLowerCase().includes(lowerSearchQuery) ||+ member.name.toLowerCase().includes(lowerSearchQuery)+ )+ );+ });+ }++ // Filter out organizations with 0 events in last 30 days+ if (!showZeroEvents) {+ filtered = filtered.filter(org => org.sites.some(site => site.eventsLast30Days > 0));+ }++ // Filter out free users+ if (!showFreeUsers) {+ filtered = filtered.filter(org => org.subscription.planName !== "free");+ }++ // Show only organizations over their event limit+ if (showOnlyOverLimit) {+ filtered = filtered.filter(org => org.overMonthlyLimit);+ }++ return filtered;+ }, [organizations, searchQuery, showZeroEvents, showFreeUsers, showOnlyOverLimit]);+}diff --git a/client/src/app/admin/components/organizations/useOrganizationStats.ts b/client/src/app/admin/components/organizations/useOrganizationStats.tsnew file mode 100644index 000000000..c4a9c6789--- /dev/null+++ b/client/src/app/admin/components/organizations/useOrganizationStats.ts@@ -0,0 +1,41 @@+import { useMemo } from "react";+import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";++export function useOrganizationStats(organizations: AdminOrganizationData[] | undefined) {+ return useMemo(() => {+ if (!organizations) {+ return {+ totalOrganizations: 0,+ activeOrganizations: 0,+ paidOrganizations: 0,+ totalEventsLast30Days: 0,+ };+ }++ const totalOrganizations = organizations.length;++ // Count organizations with at least 1 event in past 30 days+ const activeOrganizations = organizations.filter(org =>+ org.sites.some(site => site.eventsLast30Days > 0)+ ).length;++ // Count paid organizations (with a subscription)+ const paidOrganizations = organizations.filter(+ org => org.subscription.planName !== "free"+ ).length;++ // Sum all events from past 30 days+ const totalEventsLast30Days = organizations.reduce(+ (total, org) =>+ total + org.sites.reduce((sum, site) => sum + Number(site.eventsLast30Days), 0),+ 0+ );++ return {+ totalOrganizations,+ activeOrganizations,+ paidOrganizations,+ totalEventsLast30Days,+ };+ }, [organizations]);+}