🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance organization filters with search functionality
Bill Yangc23c8b44b561
diff --git a/client/messages/cs.json b/client/messages/cs.jsonindex 398ead7ac..523431054 100644--- a/client/messages/cs.json+++ b/client/messages/cs.json@@ -543,6 +543,7 @@"bGIAle": "Členové ({count})","hQZhn8": "Převzít identitu","2ZpsMl": "Žádní členové",+ "nJuUfX": "Hledat podle názvu, slugu, domény nebo e-mailu člena...","RllRQH": "Zobrazit organizace s 0 událostmi (30d)","7OL11E": "Pouze přes limit","qslgbX": "Všechny úrovně",@@ -554,7 +555,6 @@"52UMW3": "Celé období","PFdt2l": "Využití celé služby – celé období","uL0dMG": "Využití celé služby – posledních {timePeriod}",- "nJuUfX": "Hledat podle názvu, slugu, domény nebo e-mailu člena...","SVwJTM": "Exportovat","K56Dim": "Organizace","ORGv1Q": "Vytvořeno",diff --git a/client/messages/de.json b/client/messages/de.jsonindex db3fefb67..d19990eb7 100644--- a/client/messages/de.json+++ b/client/messages/de.json@@ -194,8 +194,8 @@"Zx7WPP": "Alle Event-Reihen ausgeblendet","AKRVhS": "Klicken Sie auf ein Legendenelement, um es anzuzeigen","NuhCPH": "Erfahren Sie, wie Sie Events verfolgen",- "/aq5/F": "Keine benutzerdefinierten Events gefunden","ES6IYH": "Versuchen Sie einen anderen Zeitraum oder Filter",+ "/aq5/F": "Keine benutzerdefinierten Events gefunden","j7BiRg": "Kein Event ausgewählt.","kF9XUo": "Zeitstempel","EwRIOm": "Benutzer",@@ -543,6 +543,7 @@"bGIAle": "Mitglieder ({count})","hQZhn8": "Identität annehmen","2ZpsMl": "Keine Mitglieder",+ "nJuUfX": "Nach Name, Slug, Domain oder Mitglieds-E-Mail suchen...","RllRQH": "Organisationen mit 0 Events (30d) anzeigen","7OL11E": "Nur über Limit","qslgbX": "Alle Stufen",@@ -554,7 +555,6 @@"52UMW3": "Gesamtzeitraum","PFdt2l": "Dienstweite Nutzung - Gesamtzeitraum","uL0dMG": "Dienstweite Nutzung - Letzte {timePeriod}",- "nJuUfX": "Nach Name, Slug, Domain oder Mitglieds-E-Mail suchen...","SVwJTM": "Exportieren","K56Dim": "Organisation","ORGv1Q": "Erstellt",diff --git a/client/messages/en.json b/client/messages/en.jsonindex 7a316f7f8..8ae4a06e7 100644--- a/client/messages/en.json+++ b/client/messages/en.json@@ -194,8 +194,8 @@"Zx7WPP": "All event series hidden","AKRVhS": "Click a legend item to show it","NuhCPH": "Learn how to track events",- "/aq5/F": "No custom events found","ES6IYH": "Try a different date range or filter",+ "/aq5/F": "No custom events found","j7BiRg": "No event selected.","kF9XUo": "Timestamp","EwRIOm": "User",@@ -543,6 +543,7 @@"bGIAle": "Members ({count})","hQZhn8": "Impersonate","2ZpsMl": "No members",+ "nJuUfX": "Search by name, slug, domain, or member email...","RllRQH": "Show orgs with 0 events (30d)","7OL11E": "Only over limit","qslgbX": "All tiers",@@ -554,7 +555,6 @@"52UMW3": "All Time","PFdt2l": "Service-wide Usage - All Time","uL0dMG": "Service-wide Usage - Last {timePeriod}",- "nJuUfX": "Search by name, slug, domain, or member email...","SVwJTM": "Export","K56Dim": "Organization","ORGv1Q": "Created",diff --git a/client/messages/es.json b/client/messages/es.jsonindex fc933de0d..debe0def3 100644--- a/client/messages/es.json+++ b/client/messages/es.json@@ -194,8 +194,8 @@"Zx7WPP": "Todas las series de eventos ocultas","AKRVhS": "Haz clic en un elemento de la leyenda para mostrarlo","NuhCPH": "Aprende cómo rastrear eventos",- "/aq5/F": "No se encontraron eventos personalizados","ES6IYH": "Prueba un rango de fechas o filtro diferente",+ "/aq5/F": "No se encontraron eventos personalizados","j7BiRg": "Ningún evento seleccionado.","kF9XUo": "Marca de tiempo","EwRIOm": "Usuario",@@ -543,6 +543,7 @@"bGIAle": "Miembros ({count})","hQZhn8": "Suplantar","2ZpsMl": "No hay miembros",+ "nJuUfX": "Buscar por nombre, slug, dominio o correo de miembro...","RllRQH": "Mostrar organizaciones con 0 eventos (30d)","7OL11E": "Solo sobre el límite","qslgbX": "Todos los niveles",@@ -554,7 +555,6 @@"52UMW3": "Todo el tiempo","PFdt2l": "Uso de todo el servicio - Todo el tiempo","uL0dMG": "Uso de todo el servicio - Últimos {timePeriod}",- "nJuUfX": "Buscar por nombre, slug, dominio o correo de miembro...","SVwJTM": "Exportar","K56Dim": "Organización","ORGv1Q": "Creado",diff --git a/client/messages/fr.json b/client/messages/fr.jsonindex 515a411cd..83f8a820d 100644--- a/client/messages/fr.json+++ b/client/messages/fr.json@@ -194,8 +194,8 @@"Zx7WPP": "Toutes les séries d'événements masquées","AKRVhS": "Cliquez sur un élément de la légende pour l'afficher","NuhCPH": "Apprenez à suivre les événements",- "/aq5/F": "Aucun événement personnalisé trouvé","ES6IYH": "Essayez une autre période ou un autre filtre",+ "/aq5/F": "Aucun événement personnalisé trouvé","j7BiRg": "Aucun événement sélectionné.","kF9XUo": "Horodatage","EwRIOm": "Utilisateur",@@ -543,6 +543,7 @@"bGIAle": "Membres ({count})","hQZhn8": "Usurper l'identité","2ZpsMl": "Aucun membre",+ "nJuUfX": "Rechercher par nom, slug, domaine ou e-mail de membre...","RllRQH": "Afficher les org. avec 0 événement (30j)","7OL11E": "Uniquement au-dessus de la limite","qslgbX": "Tous les niveaux",@@ -554,7 +555,6 @@"52UMW3": "Depuis toujours","PFdt2l": "Utilisation globale du service - Depuis toujours","uL0dMG": "Utilisation globale du service - {timePeriod} derniers",- "nJuUfX": "Rechercher par nom, slug, domaine ou e-mail de membre...","SVwJTM": "Exporter","K56Dim": "Organisation","ORGv1Q": "Créé",diff --git a/client/messages/it.json b/client/messages/it.jsonindex c4ae1fa48..4b1a730e0 100644--- a/client/messages/it.json+++ b/client/messages/it.json@@ -194,8 +194,8 @@"Zx7WPP": "Tutte le serie di eventi nascoste","AKRVhS": "Clicca un elemento della legenda per mostrarlo","NuhCPH": "Scopri come tracciare gli eventi",- "/aq5/F": "Nessun evento personalizzato trovato","ES6IYH": "Prova un intervallo di date diverso o un filtro",+ "/aq5/F": "Nessun evento personalizzato trovato","j7BiRg": "Nessun evento selezionato.","kF9XUo": "Timestamp","EwRIOm": "Utente",@@ -543,6 +543,7 @@"bGIAle": "Membri ({count})","hQZhn8": "Impersona","2ZpsMl": "Nessun membro",+ "nJuUfX": "Cerca per nome, slug, dominio o email del membro...","RllRQH": "Mostra organizzazioni con 0 eventi (30g)","7OL11E": "Solo oltre il limite","qslgbX": "Tutti i livelli",@@ -554,7 +555,6 @@"52UMW3": "Tutto il tempo","PFdt2l": "Utilizzo dell'intero servizio - Tutto il tempo","uL0dMG": "Utilizzo dell'intero servizio - Ultimi {timePeriod}",- "nJuUfX": "Cerca per nome, slug, dominio o email del membro...","SVwJTM": "Esporta","K56Dim": "Organizzazione","ORGv1Q": "Creata",diff --git a/client/messages/ja.json b/client/messages/ja.jsonindex 4009bc197..3639e4b1c 100644--- a/client/messages/ja.json+++ b/client/messages/ja.json@@ -194,8 +194,8 @@"Zx7WPP": "すべてのイベント系列が非表示です","AKRVhS": "凡例の項目をクリックして表示します","NuhCPH": "イベントのトラッキング方法を学ぶ",- "/aq5/F": "カスタムイベントが見つかりません","ES6IYH": "別の日付範囲またはフィルターをお試しください",+ "/aq5/F": "カスタムイベントが見つかりません","j7BiRg": "イベントが選択されていません。","kF9XUo": "タイムスタンプ","EwRIOm": "ユーザー",@@ -543,6 +543,7 @@"bGIAle": "メンバー({count})","hQZhn8": "なりすまし","2ZpsMl": "メンバーなし",+ "nJuUfX": "名前、スラッグ、ドメイン、またはメンバーメールで検索...","RllRQH": "30日間イベント0の組織を表示","7OL11E": "上限超過のみ","qslgbX": "すべてのティア",@@ -554,7 +555,6 @@"52UMW3": "全期間","PFdt2l": "サービス全体の使用量 - 全期間","uL0dMG": "サービス全体の使用量 - 過去{timePeriod}",- "nJuUfX": "名前、スラッグ、ドメイン、またはメンバーメールで検索...","SVwJTM": "エクスポート","K56Dim": "組織","ORGv1Q": "作成日",diff --git a/client/messages/ko.json b/client/messages/ko.jsonindex 79bc97df5..11adf17be 100644--- a/client/messages/ko.json+++ b/client/messages/ko.json@@ -194,8 +194,8 @@"Zx7WPP": "모든 이벤트 시리즈 숨김","AKRVhS": "범례 항목을 클릭하여 표시","NuhCPH": "이벤트 추적 방법 알아보기",- "/aq5/F": "사용자 정의 이벤트를 찾을 수 없음","ES6IYH": "다른 날짜 범위 또는 필터를 시도하세요",+ "/aq5/F": "사용자 정의 이벤트를 찾을 수 없음","j7BiRg": "이벤트가 선택되지 않았습니다.","kF9XUo": "타임스탬프","EwRIOm": "사용자",@@ -543,6 +543,7 @@"bGIAle": "멤버 ({count})","hQZhn8": "대리 로그인","2ZpsMl": "멤버 없음",+ "nJuUfX": "이름, 슬러그, 도메인 또는 멤버 이메일로 검색...","RllRQH": "이벤트 0인 조직 표시 (30일)","7OL11E": "한도 초과만","qslgbX": "모든 등급",@@ -554,7 +555,6 @@"52UMW3": "전체 기간","PFdt2l": "서비스 전체 사용량 - 전체 기간","uL0dMG": "서비스 전체 사용량 - 최근 {timePeriod}",- "nJuUfX": "이름, 슬러그, 도메인 또는 멤버 이메일로 검색...","SVwJTM": "내보내기","K56Dim": "조직","ORGv1Q": "생성일",diff --git a/client/messages/pl.json b/client/messages/pl.jsonindex baca41faa..6bf3d4847 100644--- a/client/messages/pl.json+++ b/client/messages/pl.json@@ -194,8 +194,8 @@"Zx7WPP": "Wszystkie serie zdarzeń ukryte","AKRVhS": "Kliknij element legendy, aby go wyświetlić","NuhCPH": "Dowiedz się, jak śledzić zdarzenia",- "/aq5/F": "Nie znaleziono niestandardowych zdarzeń","ES6IYH": "Spróbuj innego zakresu dat lub filtra",+ "/aq5/F": "Nie znaleziono niestandardowych zdarzeń","j7BiRg": "Nie wybrano zdarzenia.","kF9XUo": "Znacznik czasu","EwRIOm": "Użytkownik",@@ -543,6 +543,7 @@"bGIAle": "Członkowie ({count})","hQZhn8": "Podszywaj się","2ZpsMl": "Brak członków",+ "nJuUfX": "Szukaj po nazwie, identyfikatorze, domenie lub e-mailu członka...","RllRQH": "Pokaż organizacje z 0 zdarzeniami (30d)","7OL11E": "Tylko powyżej limitu","qslgbX": "Wszystkie plany",@@ -554,7 +555,6 @@"52UMW3": "Cały czas","PFdt2l": "Wykorzystanie usługi - cały czas","uL0dMG": "Wykorzystanie usługi - ostatnie {timePeriod}",- "nJuUfX": "Szukaj po nazwie, identyfikatorze, domenie lub e-mailu członka...","SVwJTM": "Eksport","K56Dim": "Organizacja","ORGv1Q": "Utworzono",diff --git a/client/messages/pt.json b/client/messages/pt.jsonindex 39dd59b50..0770b6e0a 100644--- a/client/messages/pt.json+++ b/client/messages/pt.json@@ -194,8 +194,8 @@"Zx7WPP": "Todas as séries de eventos ocultas","AKRVhS": "Clique em um item da legenda para exibi-lo","NuhCPH": "Saiba como rastrear eventos",- "/aq5/F": "Nenhum evento personalizado encontrado","ES6IYH": "Tente um intervalo de datas diferente ou filtro",+ "/aq5/F": "Nenhum evento personalizado encontrado","j7BiRg": "Nenhum evento selecionado.","kF9XUo": "Data/Hora","EwRIOm": "Usuário",@@ -543,6 +543,7 @@"bGIAle": "Membros ({count})","hQZhn8": "Personificar","2ZpsMl": "Sem membros",+ "nJuUfX": "Pesquisar por nome, slug, domínio ou email do membro...","RllRQH": "Mostrar orgs com 0 eventos (30d)","7OL11E": "Apenas acima do limite","qslgbX": "Todos os planos",@@ -554,7 +555,6 @@"52UMW3": "Todo o Período","PFdt2l": "Uso do Serviço - Todo o Período","uL0dMG": "Uso do Serviço - Últimos {timePeriod}",- "nJuUfX": "Pesquisar por nome, slug, domínio ou email do membro...","SVwJTM": "Exportar","K56Dim": "Organização","ORGv1Q": "Criado",diff --git a/client/messages/zh.json b/client/messages/zh.jsonindex ad52979aa..43bf91f25 100644--- a/client/messages/zh.json+++ b/client/messages/zh.json@@ -194,8 +194,8 @@"Zx7WPP": "所有事件系列已隐藏","AKRVhS": "点击图例项以显示它","NuhCPH": "了解如何追踪事件",- "/aq5/F": "未找到自定义事件","ES6IYH": "尝试不同的日期范围或过滤器",+ "/aq5/F": "未找到自定义事件","j7BiRg": "未选择事件。","kF9XUo": "时间戳","EwRIOm": "用户",@@ -543,6 +543,7 @@"bGIAle": "成员 ({count})","hQZhn8": "模拟身份","2ZpsMl": "无成员",+ "nJuUfX": "按名称、标识符、域名或成员邮箱搜索...","RllRQH": "显示 0 个事件的组织 (30天)","7OL11E": "仅超额","qslgbX": "所有层级",@@ -554,7 +555,6 @@"52UMW3": "所有时间","PFdt2l": "全服务使用情况 - 所有时间","uL0dMG": "全服务使用情况 - 过去 {timePeriod}",- "nJuUfX": "按名称、标识符、域名或成员邮箱搜索...","SVwJTM": "导出","K56Dim": "组织","ORGv1Q": "已创建",diff --git a/client/src/app/admin/components/organizations/OrganizationFilters.tsx b/client/src/app/admin/components/organizations/OrganizationFilters.tsxindex 5141f46ab..f6fe424ee 100644--- a/client/src/app/admin/components/organizations/OrganizationFilters.tsx+++ b/client/src/app/admin/components/organizations/OrganizationFilters.tsx@@ -2,7 +2,9 @@import { Switch } from "@/components/ui/switch";import { Label } from "@/components/ui/label";+import { Button } from "@/components/ui/button";import { MultiSelect } from "@/components/MultiSelect";+import { SearchInput } from "../shared/SearchInput";import { useExtracted } from "next-intl";export interface TierOption {@@ -10,7 +12,16 @@ export interface TierOption {label: string;}+const QUICK_TIER_FILTERS = [+ { key: "appsumo", label: "AppSumo", match: (tier: string) => tier.toLowerCase().includes("appsumo") },+ { key: "basic", label: "Basic", match: (tier: string) => tier.toLowerCase().includes("basic") },+ { key: "standard", label: "Standard", match: (tier: string) => tier.toLowerCase().includes("standard") },+ { key: "pro", label: "Pro", match: (tier: string) => tier.toLowerCase().includes("pro") },+] as const;+interface OrganizationFiltersProps {+ searchQuery: string;+ setSearchQuery: (value: string) => void;showZeroEvents: boolean;setShowZeroEvents: (value: boolean) => void;showOnlyOverLimit: boolean;@@ -21,6 +32,8 @@ interface OrganizationFiltersProps {}export function OrganizationFilters({+ searchQuery,+ setSearchQuery,showZeroEvents,setShowZeroEvents,showOnlyOverLimit,@@ -30,28 +43,81 @@ export function OrganizationFilters({setSelectedTiers,}: OrganizationFiltersProps) {const t = useExtracted();++ const handleQuickTierFilter = (filter: (typeof QUICK_TIER_FILTERS)[number]) => {+ const matchingTiers = availableTiers.filter((tier) => filter.match(tier.value));+ if (matchingTiers.length === 0) return;++ // Check if all matching tiers are already selected+ const allSelected = matchingTiers.every((mt) =>+ selectedTiers.some((st) => st.value === mt.value)+ );++ if (allSelected) {+ // Remove matching tiers+ setSelectedTiers(+ selectedTiers.filter((st) => !matchingTiers.some((mt) => mt.value === st.value))+ );+ } else {+ // Add matching tiers (without duplicates)+ const existing = new Set(selectedTiers.map((t) => t.value));+ const newTiers = [...selectedTiers, ...matchingTiers.filter((mt) => !existing.has(mt.value))];+ setSelectedTiers(newTiers);+ }+ };++ const isQuickFilterActive = (filter: (typeof QUICK_TIER_FILTERS)[number]) => {+ const matchingTiers = availableTiers.filter((tier) => filter.match(tier.value));+ return matchingTiers.length > 0 && matchingTiers.every((mt) =>+ selectedTiers.some((st) => st.value === mt.value)+ );+ };+return (- <div className="flex items-start gap-4 sm:flex-row flex-col sm:items-center">+ <div className="space-y-2"><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">- {t("Show orgs with 0 events (30d)")}- </Label>+ <SearchInput+ placeholder={t("Search by name, slug, domain, or member email...")}+ value={searchQuery}+ onChange={setSearchQuery}+ className="max-w-sm"+ />+ <div className="flex items-center gap-1">+ {QUICK_TIER_FILTERS.map((filter) => (+ <Button+ key={filter.key}+ size="sm"+ variant={isQuickFilterActive(filter) ? "default" : "outline"}+ onClick={() => handleQuickTierFilter(filter)}+ className="h-9 text-xs"+ >+ {filter.label}+ </Button>+ ))}+ </div></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">- {t("Only over limit")}- </Label>+ <div className="flex items-start gap-4 sm:flex-row flex-col sm:items-center">+ <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">+ {t("Show orgs with 0 events (30d)")}+ </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">+ {t("Only over limit")}+ </Label>+ </div>+ <MultiSelect+ className="min-w-[200px] flex-1"+ options={availableTiers}+ value={selectedTiers}+ onChange={(newValue) => setSelectedTiers(newValue as TierOption[])}+ placeholder={t("All tiers")}+ isClearable+ /></div>- <MultiSelect- className="min-w-[200px] flex-1"- options={availableTiers}- value={selectedTiers}- onChange={(newValue) => setSelectedTiers(newValue as TierOption[])}- placeholder={t("All tiers")}- isClearable- /></div>);}diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsxindex 22b421eb3..68e863f63 100644--- a/client/src/app/admin/components/organizations/Organizations.tsx+++ b/client/src/app/admin/components/organizations/Organizations.tsx@@ -5,7 +5,6 @@ import { useAdminOrganizations } from "@/api/admin/hooks/useAdminOrganizations";import { Button } from "@/components/ui/button";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";@@ -131,12 +130,9 @@ export function Organizations() {</TabsContent></Tabs><div className="space-y-2">- <SearchInput- placeholder={t("Search by name, slug, domain, or member email...")}- value={searchQuery}- onChange={setSearchQuery}- /><OrganizationFilters+ searchQuery={searchQuery}+ setSearchQuery={setSearchQuery}showZeroEvents={showZeroEvents}setShowZeroEvents={setShowZeroEvents}showOnlyOverLimit={showOnlyOverLimit}