Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor OrganizationFilters and Organizations components to enhance filtering capabilities

Bill Yangeab15446fcf8
diff --git a/client/src/app/admin/components/organizations/FilteredStatsCards.tsx b/client/src/app/admin/components/organizations/FilteredStatsCards.tsx
new file mode 100644
index 000000000..d051538ae
--- /dev/null
+++ b/client/src/app/admin/components/organizations/FilteredStatsCards.tsx
@@ -0,0 +1,84 @@
+"use client";
+
+import { useMemo } from "react";
+import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Building2, Activity, Zap, Clock } from "lucide-react";
+
+interface FilteredStatsCardsProps {
+ organizations: AdminOrganizationData[];
+ isLoading: boolean;
+}
+
+export function FilteredStatsCards({ organizations, isLoading }: FilteredStatsCardsProps) {
+ const stats = useMemo(() => {
+ const totalOrganizations = organizations.length;
+
+ const activeOrganizations = organizations.filter(org =>
+ org.sites.some(site => site.eventsLast30Days > 0)
+ ).length;
+
+ const events24h = organizations.reduce(
+ (total, org) => total + org.sites.reduce((sum, site) => sum + Number(site.eventsLast24Hours || 0), 0),
+ 0
+ );
+
+ const events30d = organizations.reduce(
+ (total, org) => total + org.sites.reduce((sum, site) => sum + Number(site.eventsLast30Days || 0), 0),
+ 0
+ );
+
+ return { totalOrganizations, activeOrganizations, events24h, events30d };
+ }, [organizations]);
+
+ const cards = [
+ {
+ title: "Total Organizations",
+ value: stats.totalOrganizations,
+ icon: Building2,
+ },
+ {
+ title: "Active Organizations",
+ value: stats.activeOrganizations,
+ icon: Activity,
+ description: "With events in past 30 days",
+ },
+ {
+ title: "24h Events",
+ value: stats.events24h,
+ icon: Clock,
+ },
+ {
+ title: "30d Events",
+ value: stats.events30d,
+ icon: Zap,
+ },
+ ];
+
+ return (
+ <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
+ {cards.map((card, index) => {
+ const Icon = card.icon;
+ return (
+ <div
+ key={index}
+ className="bg-neutral-50 dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 rounded-lg p-6 hover:border-neutral-200 dark:hover:border-neutral-700 transition-colors"
+ >
+ <div className="flex items-center justify-between mb-2">
+ <div className="text-sm font-medium text-neutral-600 dark:text-neutral-400">{card.title}</div>
+ <Icon className="h-4 w-4 text-neutral-500 dark:text-neutral-500" />
+ </div>
+ {isLoading ? (
+ <Skeleton className="h-8 w-24" />
+ ) : (
+ <div className="text-2xl font-bold">{card.value.toLocaleString()}</div>
+ )}
+ {card.description && (
+ <div className="text-xs text-neutral-500 dark:text-neutral-500 mt-1">{card.description}</div>
+ )}
+ </div>
+ );
+ })}
+ </div>
+ );
+}
diff --git a/client/src/app/admin/components/organizations/OrganizationFilters.tsx b/client/src/app/admin/components/organizations/OrganizationFilters.tsx
index 2e8ed438e..54e805a61 100644
--- a/client/src/app/admin/components/organizations/OrganizationFilters.tsx
+++ b/client/src/app/admin/components/organizations/OrganizationFilters.tsx
@@ -2,23 +2,31 @@
import { Switch } from "@/components/ui/switch";
import { Label } from "@/components/ui/label";
+import { MultiSelect } from "@/components/MultiSelect";
+
+export interface TierOption {
+ value: string;
+ label: string;
+}
interface OrganizationFiltersProps {
showZeroEvents: boolean;
setShowZeroEvents: (value: boolean) => void;
- showFreeUsers: boolean;
- setShowFreeUsers: (value: boolean) => void;
showOnlyOverLimit: boolean;
setShowOnlyOverLimit: (value: boolean) => void;
+ availableTiers: TierOption[];
+ selectedTiers: TierOption[];
+ setSelectedTiers: (tiers: TierOption[]) => void;
}
export function OrganizationFilters({
showZeroEvents,
setShowZeroEvents,
- showFreeUsers,
- setShowFreeUsers,
showOnlyOverLimit,
setShowOnlyOverLimit,
+ availableTiers,
+ selectedTiers,
+ setSelectedTiers,
}: 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">
@@ -28,18 +36,23 @@ export function OrganizationFilters({
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 className="flex items-center gap-2 flex-1">
+ <Label className="text-sm whitespace-nowrap">Subscription Tiers:</Label>
+ <MultiSelect
+ className="min-w-[200px] flex-1"
+ options={availableTiers}
+ value={selectedTiers}
+ onChange={(newValue) => setSelectedTiers(newValue as TierOption[])}
+ placeholder="All tiers"
+ isClearable
+ />
+ </div>
</div>
);
}
diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsx
index b21f127ed..f770f7cd9 100644
--- a/client/src/app/admin/components/organizations/Organizations.tsx
+++ b/client/src/app/admin/components/organizations/Organizations.tsx
@@ -2,7 +2,6 @@
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 { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { DateTime } from "luxon";
@@ -10,12 +9,11 @@ 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 { SubscriptionTiersTable } from "./SubscriptionTiersTable";
import { OrganizationsTable } from "./OrganizationsTable";
-import { OrganizationFilters } from "./OrganizationFilters";
-import { useOrganizationStats } from "./useOrganizationStats";
+import { OrganizationFilters, TierOption } from "./OrganizationFilters";
+import { FilteredStatsCards } from "./FilteredStatsCards";
import { useFilteredOrganizations } from "./useFilteredOrganizations";
export function Organizations() {
@@ -25,12 +23,21 @@ export function Organizations() {
// Filter states
const [showZeroEvents, setShowZeroEvents] = useState(true);
- const [showFreeUsers, setShowFreeUsers] = useState(true);
const [showOnlyOverLimit, setShowOnlyOverLimit] = useState(false);
+ const [selectedTiers, setSelectedTiers] = useState<TierOption[]>([]);
// Time period for service usage chart
const [timePeriod, setTimePeriod] = useState<"30d" | "60d" | "120d" | "all">("30d");
+ // Calculate available tiers from organizations data
+ const availableTiers = useMemo(() => {
+ if (!organizations) return [];
+ const tiers = new Set(organizations.map(org => org.subscription.planName));
+ return Array.from(tiers)
+ .sort()
+ .map(tier => ({ value: tier, label: tier }));
+ }, [organizations]);
+
// Calculate date range based on time period
const { startDate, endDate } = useMemo(() => {
const now = DateTime.now();
@@ -47,12 +54,10 @@ export function Organizations() {
return { startDate: start, endDate: end };
}, [timePeriod]);
- const stats = useOrganizationStats(organizations);
-
const filteredOrganizations = useFilteredOrganizations(organizations, {
searchQuery,
showZeroEvents,
- showFreeUsers,
+ selectedTiers,
showOnlyOverLimit,
});
@@ -66,33 +71,6 @@ export function Organizations() {
return (
<AdminLayout>
- <OverviewCards
- isLoading={isLoading}
- cards={[
- {
- title: "Total Organizations",
- value: stats.totalOrganizations,
- icon: Building2,
- },
- {
- title: "Active Organizations",
- value: stats.activeOrganizations,
- icon: Activity,
- description: "With events in past 30 days",
- },
- {
- title: "Paid Organizations",
- value: stats.paidOrganizations,
- icon: CreditCard,
- },
- {
- title: "Total Events (30d)",
- value: stats.totalEventsLast30Days,
- icon: Zap,
- },
- ]}
- />
-
<Tabs defaultValue="growth" className="mb-6">
<div className="flex items-center justify-between mb-2">
<TabsList>
@@ -161,12 +139,15 @@ export function Organizations() {
<OrganizationFilters
showZeroEvents={showZeroEvents}
setShowZeroEvents={setShowZeroEvents}
- showFreeUsers={showFreeUsers}
- setShowFreeUsers={setShowFreeUsers}
showOnlyOverLimit={showOnlyOverLimit}
setShowOnlyOverLimit={setShowOnlyOverLimit}
+ availableTiers={availableTiers}
+ selectedTiers={selectedTiers}
+ setSelectedTiers={setSelectedTiers}
/>
+ <FilteredStatsCards organizations={filteredOrganizations} isLoading={isLoading} />
+
<OrganizationsTable
organizations={filteredOrganizations}
isLoading={isLoading}
diff --git a/client/src/app/admin/components/organizations/useFilteredOrganizations.ts b/client/src/app/admin/components/organizations/useFilteredOrganizations.ts
index c2b59d7e1..22c2b5ee4 100644
--- a/client/src/app/admin/components/organizations/useFilteredOrganizations.ts
+++ b/client/src/app/admin/components/organizations/useFilteredOrganizations.ts
@@ -1,16 +1,17 @@
import { useMemo } from "react";
import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";
+import { TierOption } from "./OrganizationFilters";
interface FilterOptions {
searchQuery: string;
showZeroEvents: boolean;
- showFreeUsers: boolean;
+ selectedTiers: TierOption[];
showOnlyOverLimit: boolean;
}
export function useFilteredOrganizations(
organizations: AdminOrganizationData[] | undefined,
- { searchQuery, showZeroEvents, showFreeUsers, showOnlyOverLimit }: FilterOptions
+ { searchQuery, showZeroEvents, selectedTiers, showOnlyOverLimit }: FilterOptions
) {
return useMemo(() => {
if (!organizations) return [];
@@ -38,9 +39,10 @@ export function useFilteredOrganizations(
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");
+ // Filter by selected subscription tiers (if any selected)
+ if (selectedTiers.length > 0) {
+ const tierValues = selectedTiers.map(t => t.value);
+ filtered = filtered.filter(org => tierValues.includes(org.subscription.planName));
}
// Show only organizations over their event limit
@@ -49,5 +51,5 @@ export function useFilteredOrganizations(
}
return filtered;
- }, [organizations, searchQuery, showZeroEvents, showFreeUsers, showOnlyOverLimit]);
+ }, [organizations, searchQuery, showZeroEvents, selectedTiers, showOnlyOverLimit]);
}
diff --git a/client/src/app/admin/components/organizations/useOrganizationStats.ts b/client/src/app/admin/components/organizations/useOrganizationStats.ts
deleted file mode 100644
index c4a9c6789..000000000
--- a/client/src/app/admin/components/organizations/useOrganizationStats.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-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]);
-}
diff --git a/client/src/app/admin/components/shared/OverviewCards.tsx b/client/src/app/admin/components/shared/OverviewCards.tsx
deleted file mode 100644
index 9e6065e6e..000000000
--- a/client/src/app/admin/components/shared/OverviewCards.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-"use client";
-
-import { Skeleton } from "@/components/ui/skeleton";
-import { formatter } from "@/lib/utils";
-import { LucideIcon } from "lucide-react";
-
-export interface OverviewCardData {
- title: string;
- value: number;
- icon: LucideIcon;
- description?: string;
-}
-
-interface OverviewCardsProps {
- cards: OverviewCardData[];
- isLoading: boolean;
-}
-
-export function OverviewCards({ cards, isLoading }: OverviewCardsProps) {
- return (
- <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
- {cards.map((card, index) => {
- const Icon = card.icon;
- return (
- <div
- key={index}
- className="bg-neutral-50 dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 rounded-lg p-6 hover:border-neutral-200 dark:hover:border-neutral-700 transition-colors"
- >
- <div className="flex items-center justify-between mb-2">
- <div className="text-sm font-medium text-neutral-600 dark:text-neutral-400">{card.title}</div>
- <Icon className="h-4 w-4 text-neutral-500 dark:text-neutral-500" />
- </div>
- {isLoading ? (
- <Skeleton className="h-8 w-24" />
- ) : (
- <div className="text-2xl font-bold">{card.value.toLocaleString()}</div>
- )}
- {card.description && <div className="text-xs text-neutral-500 dark:text-neutral-500 mt-1">{card.description}</div>}
- </div>
- );
- })}
- </div>
- );
-}