Skip to content

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

Remove unused keys and improve localization strings in multiple language files

Bill Yang4e86624eddb9
diff --git a/client/messages/cs.json b/client/messages/cs.json
index a43297142..633aff96d 100644
--- a/client/messages/cs.json
+++ b/client/messages/cs.json
@@ -770,11 +770,6 @@
"bLT8zd": "Hledat podle {field}...",
"8DuSnR": "ID uživatele",
"PE3u2y": "Vlastnosti",
- "Bn1ifZ": "Celkem organizací",
- "eKzHLW": "Aktivní organizace",
- "vQpXiH": "S událostmi za posledních 30 dní",
- "eDqstJ": "Události (24h)",
- "uiy9pN": "Události (30d)",
"9juexR": "Detail předplatného",
"fz0z4c": "Plán",
"T8qVXf": "Limit událostí",
@@ -790,20 +785,25 @@
"hQZhn8": "Převzít identitu",
"2ZpsMl": "Žádní členové",
"nJuUfX": "Hledat podle názvu, slugu, domény nebo e-mailu člena...",
+ "qslgbX": "Všechny úrovně",
"RllRQH": "Zobrazit organizace s 0 událostmi (30d)",
"7OL11E": "Pouze přes limit",
- "qslgbX": "Všechny úrovně",
"K40gq+": "Nepodařilo se načíst data organizací. Zkus to prosím později.",
- "saAiB9": "Růst organizací",
- "DZIViS": "Využití služby",
- "ohQoQR": "Úrovně předplatného",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Vše",
"JD2pwH": "Organizace",
- "52UMW3": "Celé období",
- "PFdt2l": "Využití celé služby – celé období",
- "uL0dMG": "Využití celé služby – posledních {timePeriod}",
- "SVwJTM": "Exportovat",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Události (24h)",
+ "J4r/Gi": "Události (30d)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Organizace",
"JKxOsh": "Měsíční události",
+ "eDqstJ": "Události (24h)",
+ "uiy9pN": "Události (30d)",
"R/6nsx": "Předplatné",
"DDhP4z": "Weby",
"+a+2ug": "Členové",
@@ -814,6 +814,7 @@
"VRK2Am": "Průměr 24h",
"G7giEo": "Průměr 30d",
"NUXhb8": "Žádná data o předplatném k dispozici",
+ "9G0GOP": "",
"sMjIBZ": "Došlo k chybě. Zkus to prosím později.",
"up5jqD": "",
"/0tjRq": "",
@@ -826,11 +827,12 @@
"Qzul6+": "ID webu",
"uhu5aG": "Veřejný",
"viXE32": "Soukromý",
- "6hdNA5": "Události (24h)",
- "J4r/Gi": "Události (30d)",
"C2EM7h": "E-mail vlastníka",
"sEqhTf": "Nepodařilo se načíst data webů. Zkus to prosím později.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Hledej podle domény nebo emailu vlastníka...",
+ "QLY4X4": "",
"QQ3i6V": "Žádné weby neodpovídají tvému hledání",
"JXGHuf": "Vyber prosím organizaci",
"wSHezm": "Uživatel úspěšně přidán do organizace",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Přidávám...",
"v+BwPW": "Přidat do organizace",
"Msn3jj": "Filtrovat podle emailu...",
- "gO9HzB": "Filtrovat podle role",
- "9nrF+x": "Všechny role",
+ "0QowWF": "",
"PoyENW": "Nepodařilo se načíst uživatele. Zkus to prosím později.",
"X2y59E": "Uživatel úspěšně odebrán z organizace",
"uA0DvF": "Nepodařilo se odebrat uživatele z organizace",
- "PW+sL4": "N/A",
- "wittYy": "Vytvořeno",
+ "x61Ey6": "",
"bdcMGy": "Otevřít menu",
"6gHGy0": "Odebrat z organizace",
+ "Qp/Bnx": "",
"J2wna+": "Odebrat uživatele z organizace?",
"rDEYPT": "Vyber organizaci, ze které chceš odebrat {email}. Ztratí přístup ke všem zdrojům v dané organizaci.",
- "3Vr8ps": "Administrátorský panel",
+ "jjTzIr": "",
"KI5ndC": "Neplatný formát domény. Musí být platná doména jako example.com nebo sub.example.com",
"KI57sV": "",
"cGNlRB": "Upgraduj na Pro pro přidání více webů",
@@ -1047,7 +1048,9 @@
"kil8JO": "Upravit člena",
"BHHDty": "Upravit nastavení pro {name}",
"B3uRNN": "Omezit přístup na konkrétní weby",
+ "9YyR5G": "Tento člen bude mít přístup k vybraným webům a také k webům uděleným prostřednictvím jeho týmů ({teams}).",
"cEIr3W": "Tento člen bude mít přístup pouze k vybraným webům.",
+ "wDjYR2": "Tento člen má přístup k webům uděleným prostřednictvím jeho týmů ({teams}) a také ke všem webům nepřiřazeným žádnému týmu.",
"/EBXiO": "Tento člen má přístup ke všem webům v organizaci.",
"IZ9nkN": "Vlastníci organizace",
"yAaNQA": "Správci",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Přístup k webu",
"l8wanU": "Připojil se",
"OtSSs+": "{count} webů",
+ "qO9iuL": "Přístup udělen prostřednictvím webů tohoto týmu",
"iv7EVe": "Všechny weby",
"qrWOxx": "Žádní členové nenalezeni",
"soeWeh": "Nastavení organizace",
@@ -1220,6 +1224,7 @@
"3PZa76": "Tento měsíc",
"cfMkrE": "Minulý měsíc",
"OGk6DC": "Tento rok",
+ "52UMW3": "Celé období",
"XnjTRS": "Posledních {hours} hodin",
"T+D/1o": "Posledních {minutes} minut",
"fNCCY7": "Basic",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} skupin",
"zOY+qa": "{count} klávesových událostí",
"dP8bUe": "Úroveň podrobností události",
- "zQvVDJ": "Vše",
"BYZnfs": "Žádné zaznamenané události.",
"QgBzsm": "V této relaci nejsou žádné klávesové interakce.",
"XkmpXm": "Zobrazit uživatele",
@@ -1289,6 +1293,7 @@
"op7jCp": "Informace o uživateli",
"1bqKv/": "ID uživatele:",
"fiNfmb": "Jazyk:",
+ "PW+sL4": "N/A",
"JyRQ6S": "Země:",
"Ue9DHy": "Region:",
"puODkp": "Město:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "",
"IQ5tZg": "",
"+B+qvw": "",
- "vDpLV2": "",
- "qO9iuL": "Přístup udělen prostřednictvím webů tohoto týmu",
- "9YyR5G": "Tento člen bude mít přístup k vybraným webům a také k webům uděleným prostřednictvím jeho týmů ({teams}).",
- "wDjYR2": "Tento člen má přístup k webům uděleným prostřednictvím jeho týmů ({teams}) a také ke všem webům nepřiřazeným žádnému týmu."
+ "vDpLV2": ""
}
diff --git a/client/messages/de.json b/client/messages/de.json
index 1188b50d0..87586de0f 100644
--- a/client/messages/de.json
+++ b/client/messages/de.json
@@ -770,11 +770,6 @@
"bLT8zd": "Nach {field} suchen...",
"8DuSnR": "Benutzer-ID",
"PE3u2y": "Merkmale",
- "Bn1ifZ": "Organisationen gesamt",
- "eKzHLW": "Aktive Organisationen",
- "vQpXiH": "Mit Events in den letzten 30 Tagen",
- "eDqstJ": "24h-Events",
- "uiy9pN": "30d-Events",
"9juexR": "Abonnementdetails",
"fz0z4c": "Plan",
"T8qVXf": "Event-Limit",
@@ -790,20 +785,25 @@
"hQZhn8": "Identität annehmen",
"2ZpsMl": "Keine Mitglieder",
"nJuUfX": "Nach Name, Slug, Domain oder Mitglieds-E-Mail suchen...",
+ "qslgbX": "Alle Stufen",
"RllRQH": "Organisationen mit 0 Events (30d) anzeigen",
"7OL11E": "Nur über Limit",
- "qslgbX": "Alle Stufen",
"K40gq+": "Organisationsdaten konnten nicht geladen werden. Bitte versuchen Sie es später erneut.",
- "saAiB9": "Organisationswachstum",
- "DZIViS": "Dienstnutzung",
- "ohQoQR": "Abonnement-Stufen",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Alle",
"JD2pwH": "Organisationen",
- "52UMW3": "Gesamtzeitraum",
- "PFdt2l": "Dienstweite Nutzung - Gesamtzeitraum",
- "uL0dMG": "Dienstweite Nutzung - Letzte {timePeriod}",
- "SVwJTM": "Exportieren",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Ereignisse (24 Std.)",
+ "J4r/Gi": "Ereignisse (30 Tage)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Organisation",
"JKxOsh": "Monatliche Events",
+ "eDqstJ": "24h-Events",
+ "uiy9pN": "30d-Events",
"R/6nsx": "Abonnement",
"DDhP4z": "Websites",
"+a+2ug": "Mitglieder",
@@ -814,6 +814,7 @@
"VRK2Am": "Durchschn. 24h",
"G7giEo": "Durchschn. 30d",
"NUXhb8": "Keine Abonnementdaten verfügbar",
+ "9G0GOP": "",
"sMjIBZ": "Ein Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.",
"up5jqD": "Website erfolgreich verschoben",
"/0tjRq": "Website konnte nicht verschoben werden",
@@ -826,11 +827,12 @@
"Qzul6+": "Website-ID",
"uhu5aG": "Öffentlich",
"viXE32": "Privat",
- "6hdNA5": "Ereignisse (24 Std.)",
- "J4r/Gi": "Ereignisse (30 Tage)",
"C2EM7h": "Inhaber-E-Mail",
"sEqhTf": "Website-Daten konnten nicht geladen werden. Bitte versuchen Sie es später erneut.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Nach Domain oder Inhaber-E-Mail suchen...",
+ "QLY4X4": "",
"QQ3i6V": "Keine Websites entsprechen Ihrer Suche",
"JXGHuf": "Bitte wählen Sie eine Organisation aus",
"wSHezm": "Benutzer erfolgreich zur Organisation hinzugefügt",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Wird hinzugefügt...",
"v+BwPW": "Zur Organisation hinzufügen",
"Msn3jj": "Nach E-Mail filtern...",
- "gO9HzB": "Nach Rolle filtern",
- "9nrF+x": "Alle Rollen",
+ "0QowWF": "",
"PoyENW": "Benutzer konnten nicht geladen werden. Bitte versuchen Sie es später erneut.",
"X2y59E": "Benutzer erfolgreich aus Organisation entfernt",
"uA0DvF": "Benutzer konnte nicht aus Organisation entfernt werden",
- "PW+sL4": "k.A.",
- "wittYy": "Erstellt am",
+ "x61Ey6": "",
"bdcMGy": "Menü öffnen",
"6gHGy0": "Aus Organisation entfernen",
+ "Qp/Bnx": "",
"J2wna+": "Benutzer aus Organisation entfernen?",
"rDEYPT": "Wählen Sie die Organisation, aus der {email} entfernt werden soll. Der Zugriff auf alle Ressourcen dieser Organisation geht verloren.",
- "3Vr8ps": "Admin-Dashboard",
+ "jjTzIr": "",
"KI5ndC": "Ungültiges Domainformat. Muss eine gültige Domain wie beispiel.de oder sub.beispiel.de sein",
"KI57sV": "Ungültige App-Kennung. Verwenden Sie eine Bundle-/Paketkennung wie com.beispiel.app",
"cGNlRB": "Upgrade auf Pro, um weitere Websites hinzuzufügen",
@@ -1047,7 +1048,9 @@
"kil8JO": "Mitglied bearbeiten",
"BHHDty": "Einstellungen für {name} bearbeiten",
"B3uRNN": "Zugriff auf bestimmte Websites einschränken",
+ "9YyR5G": "Dieses Mitglied hat Zugriff auf die ausgewählten Websites sowie auf Websites, die über seine Teams ({teams}) gewährt werden.",
"cEIr3W": "Dieses Mitglied hat nur Zugriff auf die ausgewählten Websites.",
+ "wDjYR2": "Dieses Mitglied hat Zugriff auf Websites, die über seine Teams ({teams}) gewährt werden, sowie auf alle Websites, die keinem Team zugewiesen sind.",
"/EBXiO": "Dieses Mitglied hat Zugriff auf alle Websites der Organisation.",
"IZ9nkN": "Organisationseigentümer",
"yAaNQA": "Administratoren",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Website-Zugriff",
"l8wanU": "Beigetreten",
"OtSSs+": "{count} Websites",
+ "qO9iuL": "Zugriff über die Websites dieses Teams",
"iv7EVe": "Alle Websites",
"qrWOxx": "Keine Mitglieder gefunden",
"soeWeh": "Organisationseinstellungen",
@@ -1220,6 +1224,7 @@
"3PZa76": "Dieser Monat",
"cfMkrE": "Letzter Monat",
"OGk6DC": "Dieses Jahr",
+ "52UMW3": "Gesamtzeitraum",
"XnjTRS": "Letzte {hours} Stunden",
"T+D/1o": "Letzte {minutes} Minuten",
"fNCCY7": "Basis",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} Gruppen",
"zOY+qa": "{count} Tastaturereignisse",
"dP8bUe": "Ereignisdetailstufe",
- "zQvVDJ": "Alle",
"BYZnfs": "Keine Ereignisse aufgezeichnet.",
"QgBzsm": "Keine Tastaturinteraktionen in dieser Sitzung.",
"XkmpXm": "Benutzer anzeigen",
@@ -1289,6 +1293,7 @@
"op7jCp": "Benutzerinformationen",
"1bqKv/": "Benutzer-ID:",
"fiNfmb": "Sprache:",
+ "PW+sL4": "k.A.",
"JyRQ6S": "Land:",
"Ue9DHy": "Region:",
"puODkp": "Stadt:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "Formular an \"{action}\" gesendet",
"IQ5tZg": "Formular abgesendet",
"+B+qvw": "{type}eingabefeld \"{name}\" geändert",
- "vDpLV2": "{type}eingabefeld geändert",
- "qO9iuL": "Zugriff über die Websites dieses Teams",
- "9YyR5G": "Dieses Mitglied hat Zugriff auf die ausgewählten Websites sowie auf Websites, die über seine Teams ({teams}) gewährt werden.",
- "wDjYR2": "Dieses Mitglied hat Zugriff auf Websites, die über seine Teams ({teams}) gewährt werden, sowie auf alle Websites, die keinem Team zugewiesen sind."
+ "vDpLV2": "{type}eingabefeld geändert"
}
diff --git a/client/messages/en.json b/client/messages/en.json
index 9fe63ca42..434c9840f 100644
--- a/client/messages/en.json
+++ b/client/messages/en.json
@@ -770,11 +770,6 @@
"bLT8zd": "Search by {field}...",
"8DuSnR": "user ID",
"PE3u2y": "Traits",
- "Bn1ifZ": "Total Organizations",
- "eKzHLW": "Active Organizations",
- "vQpXiH": "With events in past 30 days",
- "eDqstJ": "24h Events",
- "uiy9pN": "30d Events",
"9juexR": "Subscription Details",
"fz0z4c": "Plan",
"T8qVXf": "Event Limit",
@@ -790,20 +785,25 @@
"hQZhn8": "Impersonate",
"2ZpsMl": "No members",
"nJuUfX": "Search by name, slug, domain, or member email...",
+ "qslgbX": "All tiers",
"RllRQH": "Show orgs with 0 events (30d)",
"7OL11E": "Only over limit",
- "qslgbX": "All tiers",
"K40gq+": "Failed to load organizations data. Please try again later.",
- "saAiB9": "Organization Growth",
- "DZIViS": "Service Usage",
- "ohQoQR": "Subscription Tiers",
+ "M6W/5v": "Copied {count} owner emails",
+ "g12Dke": "Growth",
+ "Ft71sH": "Tiers",
+ "zQvVDJ": "All",
"JD2pwH": "Organizations",
- "52UMW3": "All Time",
- "PFdt2l": "Service-wide Usage - All Time",
- "uL0dMG": "Service-wide Usage - Last {timePeriod}",
- "SVwJTM": "Export",
+ "MlE01W": "Active (30d)",
+ "n+GeZI": "with events in the last 30 days",
+ "6hdNA5": "Events (24h)",
+ "J4r/Gi": "Events (30d)",
+ "XQDKiY": "Copy owner emails",
+ "ggVKyN": "Toggle details",
"K56Dim": "Organization",
"JKxOsh": "Monthly Events",
+ "eDqstJ": "24h Events",
+ "uiy9pN": "30d Events",
"R/6nsx": "Subscription",
"DDhP4z": "Sites",
"+a+2ug": "Members",
@@ -814,6 +814,7 @@
"VRK2Am": "Avg 24h",
"G7giEo": "Avg 30d",
"NUXhb8": "No subscription data available",
+ "9G0GOP": "Checking access...",
"sMjIBZ": "An error occurred. Please try again later.",
"up5jqD": "Site moved successfully",
"/0tjRq": "Failed to move site",
@@ -826,11 +827,12 @@
"Qzul6+": "Site ID",
"uhu5aG": "Public",
"viXE32": "Private",
- "6hdNA5": "Events (24h)",
- "J4r/Gi": "Events (30d)",
"C2EM7h": "Owner Email",
"sEqhTf": "Failed to load sites data. Please try again later.",
+ "bsSPrn": "New sites per day",
+ "hQLBM5": "{count} total",
"r9Y1x6": "Search by domain or owner email...",
+ "QLY4X4": "{count} matching",
"QQ3i6V": "No sites match your search",
"JXGHuf": "Please select an organization",
"wSHezm": "User added to organization successfully",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Adding...",
"v+BwPW": "Add to Organization",
"Msn3jj": "Filter by email...",
- "gO9HzB": "Filter by role",
- "9nrF+x": "All Roles",
+ "0QowWF": "All roles",
"PoyENW": "Failed to load users. Please try again later.",
"X2y59E": "User removed from organization successfully",
"uA0DvF": "Failed to remove user from organization",
- "PW+sL4": "N/A",
- "wittYy": "Created At",
+ "x61Ey6": "admin",
"bdcMGy": "Open menu",
"6gHGy0": "Remove from Organization",
+ "Qp/Bnx": "No users match the current filters",
"J2wna+": "Remove user from organization?",
"rDEYPT": "Select the organization to remove {email} from. They will lose access to all resources in that organization.",
- "3Vr8ps": "Admin Dashboard",
+ "jjTzIr": "Database",
"KI5ndC": "Invalid domain format. Must be a valid domain like example.com or sub.example.com",
"KI57sV": "Invalid app identifier. Use a bundle/package identifier like com.example.app",
"cGNlRB": "Upgrade to Pro to add more websites",
@@ -1047,7 +1048,9 @@
"kil8JO": "Edit Member",
"BHHDty": "Edit settings for {name}",
"B3uRNN": "Restrict access to specific sites",
+ "9YyR5G": "This member will have access to the selected sites, plus sites granted through their teams ({teams}).",
"cEIr3W": "This member will only have access to the selected sites.",
+ "wDjYR2": "This member has access to sites granted through their teams ({teams}), plus any site not assigned to a team.",
"/EBXiO": "This member has access to all sites in the organization.",
"IZ9nkN": "Organization owners",
"yAaNQA": "Admins",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Site Access",
"l8wanU": "Joined",
"OtSSs+": "{count} sites",
+ "qO9iuL": "Access granted through this team's sites",
"iv7EVe": "All sites",
"qrWOxx": "No members found",
"soeWeh": "Organization Settings",
@@ -1220,6 +1224,7 @@
"3PZa76": "This Month",
"cfMkrE": "Last Month",
"OGk6DC": "This Year",
+ "52UMW3": "All Time",
"XnjTRS": "Last {hours} hours",
"T+D/1o": "Last {minutes} minutes",
"fNCCY7": "Basic",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} groups",
"zOY+qa": "{count} key events",
"dP8bUe": "Event detail level",
- "zQvVDJ": "All",
"BYZnfs": "No events recorded.",
"QgBzsm": "No key interactions in this session.",
"XkmpXm": "View User",
@@ -1289,6 +1293,7 @@
"op7jCp": "User Information",
"1bqKv/": "User ID:",
"fiNfmb": "Language:",
+ "PW+sL4": "N/A",
"JyRQ6S": "Country:",
"Ue9DHy": "Region:",
"puODkp": "City:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "Submitted form to \"{action}\"",
"IQ5tZg": "Submitted form",
"+B+qvw": "Changed {type}input \"{name}\"",
- "vDpLV2": "Changed {type}input",
- "qO9iuL": "Access granted through this team's sites",
- "9YyR5G": "This member will have access to the selected sites, plus sites granted through their teams ({teams}).",
- "wDjYR2": "This member has access to sites granted through their teams ({teams}), plus any site not assigned to a team."
+ "vDpLV2": "Changed {type}input"
}
diff --git a/client/messages/es.json b/client/messages/es.json
index 14f6f400a..6296289c2 100644
--- a/client/messages/es.json
+++ b/client/messages/es.json
@@ -770,11 +770,6 @@
"bLT8zd": "Buscar por {field}...",
"8DuSnR": "ID de usuario",
"PE3u2y": "Rasgos",
- "Bn1ifZ": "Total de organizaciones",
- "eKzHLW": "Organizaciones activas",
- "vQpXiH": "Con eventos en los últimos 30 días",
- "eDqstJ": "Eventos 24h",
- "uiy9pN": "Eventos 30d",
"9juexR": "Detalles de la suscripción",
"fz0z4c": "Plan",
"T8qVXf": "Límite de eventos",
@@ -790,20 +785,25 @@
"hQZhn8": "Suplantar",
"2ZpsMl": "No hay miembros",
"nJuUfX": "Buscar por nombre, slug, dominio o correo de miembro...",
+ "qslgbX": "Todos los niveles",
"RllRQH": "Mostrar organizaciones con 0 eventos (30d)",
"7OL11E": "Solo sobre el límite",
- "qslgbX": "Todos los niveles",
"K40gq+": "Error al cargar los datos de organizaciones. Inténtalo de nuevo más tarde.",
- "saAiB9": "Crecimiento de la organización",
- "DZIViS": "Uso del servicio",
- "ohQoQR": "Niveles de suscripción",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Todos",
"JD2pwH": "Organizaciones",
- "52UMW3": "Todo el tiempo",
- "PFdt2l": "Uso de todo el servicio - Todo el tiempo",
- "uL0dMG": "Uso de todo el servicio - Últimos {timePeriod}",
- "SVwJTM": "Exportar",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Eventos (24h)",
+ "J4r/Gi": "Eventos (30d)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Organización",
"JKxOsh": "Eventos mensuales",
+ "eDqstJ": "Eventos 24h",
+ "uiy9pN": "Eventos 30d",
"R/6nsx": "Suscripción",
"DDhP4z": "Sitios",
"+a+2ug": "Miembros",
@@ -814,6 +814,7 @@
"VRK2Am": "Promedio 24h",
"G7giEo": "Promedio 30d",
"NUXhb8": "No hay datos de suscripción disponibles",
+ "9G0GOP": "",
"sMjIBZ": "Ocurrió un error. Inténtalo de nuevo más tarde.",
"up5jqD": "Sitio movido correctamente",
"/0tjRq": "Error al mover el sitio",
@@ -826,11 +827,12 @@
"Qzul6+": "ID del sitio",
"uhu5aG": "Público",
"viXE32": "Privado",
- "6hdNA5": "Eventos (24h)",
- "J4r/Gi": "Eventos (30d)",
"C2EM7h": "Correo del propietario",
"sEqhTf": "Error al cargar los datos de sitios. Inténtalo de nuevo más tarde.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Buscar por dominio o correo del propietario...",
+ "QLY4X4": "",
"QQ3i6V": "Ningún sitio coincide con tu búsqueda",
"JXGHuf": "Por favor, selecciona una organización",
"wSHezm": "Usuario añadido a la organización correctamente",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Añadiendo...",
"v+BwPW": "Añadir a la organización",
"Msn3jj": "Filtrar por correo electrónico...",
- "gO9HzB": "Filtrar por rol",
- "9nrF+x": "Todos los roles",
+ "0QowWF": "",
"PoyENW": "Error al cargar usuarios. Inténtalo de nuevo más tarde.",
"X2y59E": "Usuario eliminado de la organización correctamente",
"uA0DvF": "Error al eliminar usuario de la organización",
- "PW+sL4": "N/A",
- "wittYy": "Creado el",
+ "x61Ey6": "",
"bdcMGy": "Abrir menú",
"6gHGy0": "Eliminar de la organización",
+ "Qp/Bnx": "",
"J2wna+": "¿Eliminar usuario de la organización?",
"rDEYPT": "Selecciona la organización de la que eliminar a {email}. Perderán acceso a todos los recursos en esa organización.",
- "3Vr8ps": "Panel de administración",
+ "jjTzIr": "",
"KI5ndC": "Formato de dominio no válido. Debe ser un dominio válido como example.com o sub.example.com",
"KI57sV": "Identificador de aplicación no válido. Usa un identificador de paquete como com.example.app",
"cGNlRB": "Actualiza a Pro para añadir más sitios web",
@@ -1047,7 +1048,9 @@
"kil8JO": "Editar Miembro",
"BHHDty": "Editar configuración de {name}",
"B3uRNN": "Restringir acceso a sitios específicos",
+ "9YyR5G": "Este miembro tendrá acceso a los sitios seleccionados, además de los sitios concedidos a través de sus equipos ({teams}).",
"cEIr3W": "Este miembro solo tendrá acceso a los sitios seleccionados.",
+ "wDjYR2": "Este miembro tiene acceso a los sitios concedidos a través de sus equipos ({teams}), además de cualquier sitio no asignado a un equipo.",
"/EBXiO": "Este miembro tiene acceso a todos los sitios de la organización.",
"IZ9nkN": "Propietarios de la organización",
"yAaNQA": "Administradores",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Acceso al sitio",
"l8wanU": "Unido",
"OtSSs+": "{count} sitios",
+ "qO9iuL": "Acceso concedido a través de los sitios de este equipo",
"iv7EVe": "Todos los sitios",
"qrWOxx": "No se encontraron miembros",
"soeWeh": "Configuración de la organización",
@@ -1220,6 +1224,7 @@
"3PZa76": "Este mes",
"cfMkrE": "Mes pasado",
"OGk6DC": "Este año",
+ "52UMW3": "Todo el tiempo",
"XnjTRS": "Últimas {hours} horas",
"T+D/1o": "Últimos {minutes} minutos",
"fNCCY7": "Básico",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} grupos",
"zOY+qa": "{count} eventos de teclado",
"dP8bUe": "Nivel de detalle del evento",
- "zQvVDJ": "Todos",
"BYZnfs": "No se registraron eventos.",
"QgBzsm": "No hay interacciones de teclado en esta sesión.",
"XkmpXm": "Ver usuario",
@@ -1289,6 +1293,7 @@
"op7jCp": "Información del usuario",
"1bqKv/": "ID de usuario:",
"fiNfmb": "Idioma:",
+ "PW+sL4": "N/A",
"JyRQ6S": "País:",
"Ue9DHy": "Región:",
"puODkp": "Ciudad:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "Formulario enviado a \"{action}\"",
"IQ5tZg": "Formulario enviado",
"+B+qvw": "{type}campo de entrada \"{name}\" cambiado",
- "vDpLV2": "{type}campo de entrada cambiado",
- "qO9iuL": "Acceso concedido a través de los sitios de este equipo",
- "9YyR5G": "Este miembro tendrá acceso a los sitios seleccionados, además de los sitios concedidos a través de sus equipos ({teams}).",
- "wDjYR2": "Este miembro tiene acceso a los sitios concedidos a través de sus equipos ({teams}), además de cualquier sitio no asignado a un equipo."
+ "vDpLV2": "{type}campo de entrada cambiado"
}
diff --git a/client/messages/fr.json b/client/messages/fr.json
index 03b821d22..31c415af9 100644
--- a/client/messages/fr.json
+++ b/client/messages/fr.json
@@ -770,11 +770,6 @@
"bLT8zd": "Rechercher par {field}...",
"8DuSnR": "ID utilisateur",
"PE3u2y": "Attributs",
- "Bn1ifZ": "Total des organisations",
- "eKzHLW": "Organisations actives",
- "vQpXiH": "Avec des événements ces 30 derniers jours",
- "eDqstJ": "Événements 24h",
- "uiy9pN": "Événements 30j",
"9juexR": "Détails de l'abonnement",
"fz0z4c": "Forfait",
"T8qVXf": "Limite d'événements",
@@ -790,20 +785,25 @@
"hQZhn8": "Usurper l'identité",
"2ZpsMl": "Aucun membre",
"nJuUfX": "Rechercher par nom, slug, domaine ou e-mail de membre...",
+ "qslgbX": "Tous les niveaux",
"RllRQH": "Afficher les org. avec 0 événement (30j)",
"7OL11E": "Uniquement au-dessus de la limite",
- "qslgbX": "Tous les niveaux",
"K40gq+": "Échec du chargement des données d'organisations. Veuillez réessayer plus tard.",
- "saAiB9": "Croissance des organisations",
- "DZIViS": "Utilisation du service",
- "ohQoQR": "Niveaux d'abonnement",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Tous",
"JD2pwH": "Organisations",
- "52UMW3": "Depuis toujours",
- "PFdt2l": "Utilisation globale du service - Depuis toujours",
- "uL0dMG": "Utilisation globale du service - {timePeriod} derniers",
- "SVwJTM": "Exporter",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Événements (24h)",
+ "J4r/Gi": "Événements (30j)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Organisation",
"JKxOsh": "Événements mensuels",
+ "eDqstJ": "Événements 24h",
+ "uiy9pN": "Événements 30j",
"R/6nsx": "Abonnement",
"DDhP4z": "Sites",
"+a+2ug": "Membres",
@@ -814,6 +814,7 @@
"VRK2Am": "Moy. 24h",
"G7giEo": "Moy. 30j",
"NUXhb8": "Aucune donnée d'abonnement disponible",
+ "9G0GOP": "",
"sMjIBZ": "Une erreur est survenue. Veuillez réessayer plus tard.",
"up5jqD": "Site déplacé avec succès",
"/0tjRq": "Échec du déplacement du site",
@@ -826,11 +827,12 @@
"Qzul6+": "ID du site",
"uhu5aG": "Public",
"viXE32": "Privé",
- "6hdNA5": "Événements (24h)",
- "J4r/Gi": "Événements (30j)",
"C2EM7h": "E-mail du propriétaire",
"sEqhTf": "Échec du chargement des données de sites. Veuillez réessayer plus tard.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Rechercher par domaine ou e-mail du propriétaire...",
+ "QLY4X4": "",
"QQ3i6V": "Aucun site ne correspond à votre recherche",
"JXGHuf": "Veuillez sélectionner une organisation",
"wSHezm": "Utilisateur ajouté à l'organisation avec succès",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Ajout en cours...",
"v+BwPW": "Ajouter à l'organisation",
"Msn3jj": "Filtrer par e-mail...",
- "gO9HzB": "Filtrer par rôle",
- "9nrF+x": "Tous les rôles",
+ "0QowWF": "",
"PoyENW": "Échec du chargement des utilisateurs. Veuillez réessayer plus tard.",
"X2y59E": "Utilisateur retiré de l'organisation avec succès",
"uA0DvF": "Échec du retrait de l'utilisateur de l'organisation",
- "PW+sL4": "N/A",
- "wittYy": "Créé le",
+ "x61Ey6": "",
"bdcMGy": "Ouvrir le menu",
"6gHGy0": "Retirer de l'organisation",
+ "Qp/Bnx": "",
"J2wna+": "Retirer l'utilisateur de l'organisation ?",
"rDEYPT": "Sélectionnez l'organisation d'où retirer {email}. L'accès à toutes les ressources de cette organisation sera perdu.",
- "3Vr8ps": "Tableau de bord admin",
+ "jjTzIr": "",
"KI5ndC": "Format de domaine invalide. Doit être un domaine valide comme exemple.com ou sub.exemple.com",
"KI57sV": "Identifiant d'application invalide. Utilisez un identifiant de bundle/package comme com.example.app",
"cGNlRB": "Passez à Pro pour ajouter plus de sites web",
@@ -1047,7 +1048,9 @@
"kil8JO": "Modifier le membre",
"BHHDty": "Modifier les paramètres de {name}",
"B3uRNN": "Restreindre l'accès à des sites spécifiques",
+ "9YyR5G": "Ce membre aura accès aux sites sélectionnés, ainsi qu'aux sites accordés via ses équipes ({teams}).",
"cEIr3W": "Ce membre n'aura accès qu'aux sites sélectionnés.",
+ "wDjYR2": "Ce membre a accès aux sites accordés via ses équipes ({teams}), ainsi qu'à tout site non attribué à une équipe.",
"/EBXiO": "Ce membre a accès à tous les sites de l'organisation.",
"IZ9nkN": "Propriétaires de l'organisation",
"yAaNQA": "Administrateurs",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Accès au site",
"l8wanU": "Rejoint",
"OtSSs+": "{count} sites",
+ "qO9iuL": "Accès accordé via les sites de cette équipe",
"iv7EVe": "Tous les sites",
"qrWOxx": "Aucun membre trouvé",
"soeWeh": "Paramètres de l'organisation",
@@ -1220,6 +1224,7 @@
"3PZa76": "Ce mois-ci",
"cfMkrE": "Mois dernier",
"OGk6DC": "Cette année",
+ "52UMW3": "Depuis toujours",
"XnjTRS": "{hours} dernières heures",
"T+D/1o": "{minutes} dernières minutes",
"fNCCY7": "Basique",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} groupes",
"zOY+qa": "{count} événements clavier",
"dP8bUe": "Niveau de détail des événements",
- "zQvVDJ": "Tous",
"BYZnfs": "Aucun événement enregistré.",
"QgBzsm": "Aucune interaction clavier dans cette session.",
"XkmpXm": "Voir l'utilisateur",
@@ -1289,6 +1293,7 @@
"op7jCp": "Informations utilisateur",
"1bqKv/": "ID utilisateur :",
"fiNfmb": "Langue :",
+ "PW+sL4": "N/A",
"JyRQ6S": "Pays :",
"Ue9DHy": "Région :",
"puODkp": "Ville :",
@@ -1555,8 +1560,5 @@
"QOaR8l": "Formulaire soumis à \"{action}\"",
"IQ5tZg": "Formulaire soumis",
"+B+qvw": "{type}champ de saisie \"{name}\" modifié",
- "vDpLV2": "{type}champ de saisie modifié",
- "qO9iuL": "Accès accordé via les sites de cette équipe",
- "9YyR5G": "Ce membre aura accès aux sites sélectionnés, ainsi qu'aux sites accordés via ses équipes ({teams}).",
- "wDjYR2": "Ce membre a accès aux sites accordés via ses équipes ({teams}), ainsi qu'à tout site non attribué à une équipe."
+ "vDpLV2": "{type}champ de saisie modifié"
}
diff --git a/client/messages/it.json b/client/messages/it.json
index 008ef1ea2..3fb125c56 100644
--- a/client/messages/it.json
+++ b/client/messages/it.json
@@ -770,11 +770,6 @@
"bLT8zd": "Cerca per {field}...",
"8DuSnR": "ID utente",
"PE3u2y": "Tratti",
- "Bn1ifZ": "Organizzazioni Totali",
- "eKzHLW": "Organizzazioni Attive",
- "vQpXiH": "Con eventi negli ultimi 30 giorni",
- "eDqstJ": "Eventi 24h",
- "uiy9pN": "Eventi 30g",
"9juexR": "Dettagli Abbonamento",
"fz0z4c": "Piano",
"T8qVXf": "Limite Eventi",
@@ -790,20 +785,25 @@
"hQZhn8": "Impersona",
"2ZpsMl": "Nessun membro",
"nJuUfX": "Cerca per nome, slug, dominio o email del membro...",
+ "qslgbX": "Tutti i livelli",
"RllRQH": "Mostra organizzazioni con 0 eventi (30g)",
"7OL11E": "Solo oltre il limite",
- "qslgbX": "Tutti i livelli",
"K40gq+": "Impossibile caricare i dati delle organizzazioni. Riprova più tardi.",
- "saAiB9": "Crescita dell'Organizzazione",
- "DZIViS": "Utilizzo del Servizio",
- "ohQoQR": "Livelli di Abbonamento",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Tutto",
"JD2pwH": "Organizzazioni",
- "52UMW3": "Tutto il tempo",
- "PFdt2l": "Utilizzo dell'intero servizio - Tutto il tempo",
- "uL0dMG": "Utilizzo dell'intero servizio - Ultimi {timePeriod}",
- "SVwJTM": "Esporta",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Eventi (24h)",
+ "J4r/Gi": "Eventi (30g)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Organizzazione",
"JKxOsh": "Eventi Mensili",
+ "eDqstJ": "Eventi 24h",
+ "uiy9pN": "Eventi 30g",
"R/6nsx": "Abbonamento",
"DDhP4z": "Siti",
"+a+2ug": "Membri",
@@ -814,6 +814,7 @@
"VRK2Am": "Media 24h",
"G7giEo": "Media 30g",
"NUXhb8": "Nessun dato di abbonamento disponibile",
+ "9G0GOP": "",
"sMjIBZ": "Si è verificato un errore. Riprova più tardi.",
"up5jqD": "Sito spostato con successo",
"/0tjRq": "Impossibile spostare il sito",
@@ -826,11 +827,12 @@
"Qzul6+": "ID Sito",
"uhu5aG": "Pubblico",
"viXE32": "Privato",
- "6hdNA5": "Eventi (24h)",
- "J4r/Gi": "Eventi (30g)",
"C2EM7h": "Email Proprietario",
"sEqhTf": "Impossibile caricare i dati dei siti. Riprova più tardi.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Cerca per dominio o email proprietario...",
+ "QLY4X4": "",
"QQ3i6V": "Nessun sito corrisponde alla tua ricerca",
"JXGHuf": "Seleziona un'organizzazione",
"wSHezm": "Utente aggiunto all'organizzazione con successo",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Aggiunta in corso...",
"v+BwPW": "Aggiungi all'Organizzazione",
"Msn3jj": "Filtra per email...",
- "gO9HzB": "Filtra per ruolo",
- "9nrF+x": "Tutti i Ruoli",
+ "0QowWF": "",
"PoyENW": "Impossibile caricare gli utenti. Riprova più tardi.",
"X2y59E": "Utente rimosso dall'organizzazione con successo",
"uA0DvF": "Impossibile rimuovere l'utente dall'organizzazione",
- "PW+sL4": "N/D",
- "wittYy": "Creato il",
+ "x61Ey6": "",
"bdcMGy": "Apri menu",
"6gHGy0": "Rimuovi dall'Organizzazione",
+ "Qp/Bnx": "",
"J2wna+": "Rimuovere l'utente dall'organizzazione?",
"rDEYPT": "Seleziona l'organizzazione da cui rimuovere {email}. Perderà l'accesso a tutte le risorse in quell'organizzazione.",
- "3Vr8ps": "Dashboard Amministratore",
+ "jjTzIr": "",
"KI5ndC": "Formato dominio non valido. Deve essere un dominio valido come example.com o sub.example.com",
"KI57sV": "Identificatore app non valido. Usa un identificatore bundle/pacchetto come com.example.app",
"cGNlRB": "Passa a Pro per aggiungere più siti web",
@@ -1047,7 +1048,9 @@
"kil8JO": "Modifica Membro",
"BHHDty": "Modifica le impostazioni per {name}",
"B3uRNN": "Limita l'accesso a siti specifici",
+ "9YyR5G": "Questo membro avrà accesso ai siti selezionati, oltre ai siti concessi tramite i suoi team ({teams}).",
"cEIr3W": "Questo membro avrà accesso solo ai siti selezionati.",
+ "wDjYR2": "Questo membro ha accesso ai siti concessi tramite i suoi team ({teams}), oltre a qualsiasi sito non assegnato a un team.",
"/EBXiO": "Questo membro ha accesso a tutti i siti dell'organizzazione.",
"IZ9nkN": "Proprietari dell'organizzazione",
"yAaNQA": "Amministratori",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Accesso al Sito",
"l8wanU": "Unito il",
"OtSSs+": "{count} siti",
+ "qO9iuL": "Accesso concesso tramite i siti di questo team",
"iv7EVe": "Tutti i siti",
"qrWOxx": "Nessun membro trovato",
"soeWeh": "Impostazioni organizzazione",
@@ -1220,6 +1224,7 @@
"3PZa76": "Questo Mese",
"cfMkrE": "Mese Scorso",
"OGk6DC": "Quest'Anno",
+ "52UMW3": "Tutto il tempo",
"XnjTRS": "Ultime {hours} ore",
"T+D/1o": "Ultimi {minutes} minuti",
"fNCCY7": "Base",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} gruppi",
"zOY+qa": "{count} eventi chiave",
"dP8bUe": "Livello di dettaglio degli eventi",
- "zQvVDJ": "Tutto",
"BYZnfs": "Nessun evento registrato.",
"QgBzsm": "Nessuna interazione con i tasti in questa sessione.",
"XkmpXm": "Visualizza Utente",
@@ -1289,6 +1293,7 @@
"op7jCp": "Informazioni Utente",
"1bqKv/": "ID Utente:",
"fiNfmb": "Lingua:",
+ "PW+sL4": "N/D",
"JyRQ6S": "Paese:",
"Ue9DHy": "Regione:",
"puODkp": "Città:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "Modulo inviato a \"{action}\"",
"IQ5tZg": "Modulo inviato",
"+B+qvw": "{type}campo di input \"{name}\" modificato",
- "vDpLV2": "{type}campo di input modificato",
- "qO9iuL": "Accesso concesso tramite i siti di questo team",
- "9YyR5G": "Questo membro avrà accesso ai siti selezionati, oltre ai siti concessi tramite i suoi team ({teams}).",
- "wDjYR2": "Questo membro ha accesso ai siti concessi tramite i suoi team ({teams}), oltre a qualsiasi sito non assegnato a un team."
+ "vDpLV2": "{type}campo di input modificato"
}
diff --git a/client/messages/ja.json b/client/messages/ja.json
index 0b2ac0fe9..14de88606 100644
--- a/client/messages/ja.json
+++ b/client/messages/ja.json
@@ -770,11 +770,6 @@
"bLT8zd": "{field}で検索...",
"8DuSnR": "ユーザーID",
"PE3u2y": "属性",
- "Bn1ifZ": "組織合計",
- "eKzHLW": "アクティブな組織",
- "vQpXiH": "過去30日間にイベントあり",
- "eDqstJ": "24時間イベント",
- "uiy9pN": "30日間イベント",
"9juexR": "サブスクリプション詳細",
"fz0z4c": "プラン",
"T8qVXf": "イベント上限",
@@ -790,20 +785,25 @@
"hQZhn8": "なりすまし",
"2ZpsMl": "メンバーなし",
"nJuUfX": "名前、スラッグ、ドメイン、またはメンバーメールで検索...",
+ "qslgbX": "すべてのティア",
"RllRQH": "30日間イベント0の組織を表示",
"7OL11E": "上限超過のみ",
- "qslgbX": "すべてのティア",
"K40gq+": "組織データの読み込みに失敗しました。後でもう一度お試しください。",
- "saAiB9": "組織の成長",
- "DZIViS": "サービス使用量",
- "ohQoQR": "サブスクリプションティア",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "すべて",
"JD2pwH": "組織",
- "52UMW3": "全期間",
- "PFdt2l": "サービス全体の使用量 - 全期間",
- "uL0dMG": "サービス全体の使用量 - 過去{timePeriod}",
- "SVwJTM": "エクスポート",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "イベント(24時間)",
+ "J4r/Gi": "イベント(30日間)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "組織",
"JKxOsh": "月間イベント",
+ "eDqstJ": "24時間イベント",
+ "uiy9pN": "30日間イベント",
"R/6nsx": "サブスクリプション",
"DDhP4z": "サイト",
"+a+2ug": "メンバー",
@@ -814,6 +814,7 @@
"VRK2Am": "平均24時間",
"G7giEo": "平均30日間",
"NUXhb8": "サブスクリプションデータがありません",
+ "9G0GOP": "",
"sMjIBZ": "エラーが発生しました。後でもう一度お試しください。",
"up5jqD": "サイトを移動しました",
"/0tjRq": "サイトの移動に失敗しました",
@@ -826,11 +827,12 @@
"Qzul6+": "サイトID",
"uhu5aG": "公開",
"viXE32": "非公開",
- "6hdNA5": "イベント(24時間)",
- "J4r/Gi": "イベント(30日間)",
"C2EM7h": "オーナーメール",
"sEqhTf": "サイトデータの読み込みに失敗しました。後でもう一度お試しください。",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "ドメインまたはオーナーメールで検索...",
+ "QLY4X4": "",
"QQ3i6V": "検索に一致するサイトはありません",
"JXGHuf": "組織を選択してください",
"wSHezm": "ユーザーを組織に追加しました",
@@ -848,18 +850,17 @@
"Nvr5Ce": "追加中...",
"v+BwPW": "組織に追加",
"Msn3jj": "メールでフィルター...",
- "gO9HzB": "ロールでフィルター",
- "9nrF+x": "すべてのロール",
+ "0QowWF": "",
"PoyENW": "ユーザーの読み込みに失敗しました。後でもう一度お試しください。",
"X2y59E": "ユーザーを組織から削除しました",
"uA0DvF": "ユーザーの組織からの削除に失敗しました",
- "PW+sL4": "N/A",
- "wittYy": "作成日時",
+ "x61Ey6": "",
"bdcMGy": "メニューを開く",
"6gHGy0": "組織から削除",
+ "Qp/Bnx": "",
"J2wna+": "ユーザーを組織から削除しますか?",
"rDEYPT": "{email}を削除する組織を選択してください。その組織のすべてのリソースへのアクセスが失われます。",
- "3Vr8ps": "管理者ダッシュボード",
+ "jjTzIr": "",
"KI5ndC": "無効なドメイン形式です。example.comまたはsub.example.comのような有効なドメインを入力してください",
"KI57sV": "無効なアプリ識別子です。com.example.appのようなバンドル/パッケージ識別子を使用してください",
"cGNlRB": "Proにアップグレードしてウェブサイトを追加",
@@ -1047,7 +1048,9 @@
"kil8JO": "メンバーを編集",
"BHHDty": "{name} の設定を編集",
"B3uRNN": "特定のサイトへのアクセスを制限",
+ "9YyR5G": "このメンバーは、選択したサイトに加えて、所属チーム({teams})を通じて付与されたサイトにアクセスできます。",
"cEIr3W": "このメンバーは選択したサイトにのみアクセスできます。",
+ "wDjYR2": "このメンバーは、所属チーム({teams})を通じて付与されたサイトに加えて、チームに割り当てられていないすべてのサイトにアクセスできます。",
"/EBXiO": "このメンバーは組織内のすべてのサイトにアクセスできます。",
"IZ9nkN": "組織オーナー",
"yAaNQA": "管理者",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "サイトアクセス",
"l8wanU": "参加日",
"OtSSs+": "{count}サイト",
+ "qO9iuL": "このチームのサイトを通じて付与されたアクセス",
"iv7EVe": "すべてのサイト",
"qrWOxx": "メンバーが見つかりません",
"soeWeh": "組織設定",
@@ -1220,6 +1224,7 @@
"3PZa76": "今月",
"cfMkrE": "先月",
"OGk6DC": "今年",
+ "52UMW3": "全期間",
"XnjTRS": "過去{hours}時間",
"T+D/1o": "過去{minutes}分",
"fNCCY7": "ベーシック",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} グループ",
"zOY+qa": "{count} キーイベント",
"dP8bUe": "イベント詳細レベル",
- "zQvVDJ": "すべて",
"BYZnfs": "記録されたイベントはありません。",
"QgBzsm": "このセッションにはキーインタラクションがありません。",
"XkmpXm": "ユーザーを表示",
@@ -1289,6 +1293,7 @@
"op7jCp": "ユーザー情報",
"1bqKv/": "ユーザーID:",
"fiNfmb": "言語:",
+ "PW+sL4": "N/A",
"JyRQ6S": "国:",
"Ue9DHy": "地域:",
"puODkp": "都市:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "「{action}」にフォームを送信しました",
"IQ5tZg": "フォームを送信しました",
"+B+qvw": "{type}入力フィールド「{name}」を変更しました",
- "vDpLV2": "{type}入力フィールドを変更しました",
- "qO9iuL": "このチームのサイトを通じて付与されたアクセス",
- "9YyR5G": "このメンバーは、選択したサイトに加えて、所属チーム({teams})を通じて付与されたサイトにアクセスできます。",
- "wDjYR2": "このメンバーは、所属チーム({teams})を通じて付与されたサイトに加えて、チームに割り当てられていないすべてのサイトにアクセスできます。"
+ "vDpLV2": "{type}入力フィールドを変更しました"
}
diff --git a/client/messages/ko.json b/client/messages/ko.json
index f7e0e1ffc..db56ee42b 100644
--- a/client/messages/ko.json
+++ b/client/messages/ko.json
@@ -770,11 +770,6 @@
"bLT8zd": "{field}(으)로 검색...",
"8DuSnR": "사용자 ID",
"PE3u2y": "특성",
- "Bn1ifZ": "전체 조직",
- "eKzHLW": "활성 조직",
- "vQpXiH": "최근 30일 내 이벤트 있음",
- "eDqstJ": "24시간 이벤트",
- "uiy9pN": "30일 이벤트",
"9juexR": "구독 상세",
"fz0z4c": "플랜",
"T8qVXf": "이벤트 한도",
@@ -790,20 +785,25 @@
"hQZhn8": "대리 로그인",
"2ZpsMl": "멤버 없음",
"nJuUfX": "이름, 슬러그, 도메인 또는 멤버 이메일로 검색...",
+ "qslgbX": "모든 등급",
"RllRQH": "이벤트 0인 조직 표시 (30일)",
"7OL11E": "한도 초과만",
- "qslgbX": "모든 등급",
"K40gq+": "조직 데이터를 로드하지 못했습니다. 나중에 다시 시도해 주세요.",
- "saAiB9": "조직 성장",
- "DZIViS": "서비스 사용량",
- "ohQoQR": "구독 등급",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "전체",
"JD2pwH": "조직",
- "52UMW3": "전체 기간",
- "PFdt2l": "서비스 전체 사용량 - 전체 기간",
- "uL0dMG": "서비스 전체 사용량 - 최근 {timePeriod}",
- "SVwJTM": "내보내기",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "이벤트 (24시간)",
+ "J4r/Gi": "이벤트 (30일)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "조직",
"JKxOsh": "월별 이벤트",
+ "eDqstJ": "24시간 이벤트",
+ "uiy9pN": "30일 이벤트",
"R/6nsx": "구독",
"DDhP4z": "사이트",
"+a+2ug": "멤버",
@@ -814,6 +814,7 @@
"VRK2Am": "평균 24시간",
"G7giEo": "평균 30일",
"NUXhb8": "사용 가능한 구독 데이터 없음",
+ "9G0GOP": "",
"sMjIBZ": "오류가 발생했습니다. 나중에 다시 시도해 주세요.",
"up5jqD": "사이트가 성공적으로 이동되었습니다",
"/0tjRq": "사이트 이동 실패",
@@ -826,11 +827,12 @@
"Qzul6+": "사이트 ID",
"uhu5aG": "공개",
"viXE32": "비공개",
- "6hdNA5": "이벤트 (24시간)",
- "J4r/Gi": "이벤트 (30일)",
"C2EM7h": "소유자 이메일",
"sEqhTf": "사이트 데이터를 로드하지 못했습니다. 나중에 다시 시도해 주세요.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "도메인 또는 소유자 이메일로 검색...",
+ "QLY4X4": "",
"QQ3i6V": "검색과 일치하는 사이트 없음",
"JXGHuf": "조직을 선택하세요",
"wSHezm": "사용자가 조직에 성공적으로 추가되었습니다",
@@ -848,18 +850,17 @@
"Nvr5Ce": "추가 중...",
"v+BwPW": "조직에 추가",
"Msn3jj": "이메일로 필터...",
- "gO9HzB": "역할로 필터",
- "9nrF+x": "모든 역할",
+ "0QowWF": "",
"PoyENW": "사용자 로드에 실패했습니다. 나중에 다시 시도해 주세요.",
"X2y59E": "사용자를 조직에서 성공적으로 제거했습니다",
"uA0DvF": "사용자를 조직에서 제거하는 데 실패했습니다",
- "PW+sL4": "해당 없음",
- "wittYy": "생성일",
+ "x61Ey6": "",
"bdcMGy": "메뉴 열기",
"6gHGy0": "조직에서 제거",
+ "Qp/Bnx": "",
"J2wna+": "사용자를 조직에서 제거하시겠습니까?",
"rDEYPT": "{email}을(를) 제거할 조직을 선택하세요. 해당 조직의 모든 리소스에 대한 액세스를 잃게 됩니다.",
- "3Vr8ps": "관리자 대시보드",
+ "jjTzIr": "",
"KI5ndC": "잘못된 도메인 형식입니다. example.com 또는 sub.example.com과 같은 유효한 도메인이어야 합니다",
"KI57sV": "유효하지 않은 앱 식별자입니다. com.example.app과 같은 번들/패키지 식별자를 사용하세요",
"cGNlRB": "Pro로 업그레이드하여 더 많은 웹사이트를 추가하세요",
@@ -1047,7 +1048,9 @@
"kil8JO": "멤버 편집",
"BHHDty": "{name}의 설정 편집",
"B3uRNN": "특정 사이트에 대한 액세스 제한",
+ "9YyR5G": "이 멤버는 선택한 사이트와 함께 소속 팀({teams})을 통해 부여된 사이트에 액세스할 수 있습니다.",
"cEIr3W": "이 멤버는 선택한 사이트에만 액세스할 수 있습니다.",
+ "wDjYR2": "이 멤버는 소속 팀({teams})을 통해 부여된 사이트와 함께 팀에 할당되지 않은 모든 사이트에 액세스할 수 있습니다.",
"/EBXiO": "이 멤버는 조직의 모든 사이트에 액세스할 수 있습니다.",
"IZ9nkN": "조직 소유자",
"yAaNQA": "관리자",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "사이트 접근",
"l8wanU": "가입일",
"OtSSs+": "{count}개 사이트",
+ "qO9iuL": "이 팀의 사이트를 통해 부여된 액세스",
"iv7EVe": "모든 사이트",
"qrWOxx": "멤버를 찾을 수 없음",
"soeWeh": "조직 설정",
@@ -1220,6 +1224,7 @@
"3PZa76": "이번 달",
"cfMkrE": "지난달",
"OGk6DC": "올해",
+ "52UMW3": "전체 기간",
"XnjTRS": "최근 {hours}시간",
"T+D/1o": "최근 {minutes}분",
"fNCCY7": "기본",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count}개 그룹",
"zOY+qa": "{count}개 키 이벤트",
"dP8bUe": "이벤트 세부 정보 수준",
- "zQvVDJ": "전체",
"BYZnfs": "기록된 이벤트가 없습니다.",
"QgBzsm": "이 세션에서 키 상호작용이 없습니다.",
"XkmpXm": "사용자 보기",
@@ -1289,6 +1293,7 @@
"op7jCp": "사용자 정보",
"1bqKv/": "사용자 ID:",
"fiNfmb": "언어:",
+ "PW+sL4": "해당 없음",
"JyRQ6S": "국가:",
"Ue9DHy": "지역:",
"puODkp": "도시:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "\"{action}\"에 양식 제출됨",
"IQ5tZg": "양식 제출됨",
"+B+qvw": "{type}입력 필드 \"{name}\" 변경됨",
- "vDpLV2": "{type}입력 필드 변경됨",
- "qO9iuL": "이 팀의 사이트를 통해 부여된 액세스",
- "9YyR5G": "이 멤버는 선택한 사이트와 함께 소속 팀({teams})을 통해 부여된 사이트에 액세스할 수 있습니다.",
- "wDjYR2": "이 멤버는 소속 팀({teams})을 통해 부여된 사이트와 함께 팀에 할당되지 않은 모든 사이트에 액세스할 수 있습니다."
+ "vDpLV2": "{type}입력 필드 변경됨"
}
diff --git a/client/messages/pl.json b/client/messages/pl.json
index 0589d5781..bb3641e3a 100644
--- a/client/messages/pl.json
+++ b/client/messages/pl.json
@@ -770,11 +770,6 @@
"bLT8zd": "Szukaj po {field}...",
"8DuSnR": "ID użytkownika",
"PE3u2y": "Cechy",
- "Bn1ifZ": "Łączna liczba organizacji",
- "eKzHLW": "Aktywne organizacje",
- "vQpXiH": "Ze zdarzeniami w ciągu ostatnich 30 dni",
- "eDqstJ": "Zdarzenia 24h",
- "uiy9pN": "Zdarzenia 30d",
"9juexR": "Szczegóły subskrypcji",
"fz0z4c": "Plan",
"T8qVXf": "Limit zdarzeń",
@@ -790,20 +785,25 @@
"hQZhn8": "Podszywaj się",
"2ZpsMl": "Brak członków",
"nJuUfX": "Szukaj po nazwie, identyfikatorze, domenie lub e-mailu członka...",
+ "qslgbX": "Wszystkie plany",
"RllRQH": "Pokaż organizacje z 0 zdarzeniami (30d)",
"7OL11E": "Tylko powyżej limitu",
- "qslgbX": "Wszystkie plany",
"K40gq+": "Nie udało się załadować danych organizacji. Spróbuj ponownie później.",
- "saAiB9": "Wzrost organizacji",
- "DZIViS": "Wykorzystanie usługi",
- "ohQoQR": "Plany subskrypcji",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Wszystko",
"JD2pwH": "Organizacje",
- "52UMW3": "Cały czas",
- "PFdt2l": "Wykorzystanie usługi - cały czas",
- "uL0dMG": "Wykorzystanie usługi - ostatnie {timePeriod}",
- "SVwJTM": "Eksport",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Zdarzenia (24h)",
+ "J4r/Gi": "Zdarzenia (30d)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Organizacja",
"JKxOsh": "Miesięczne zdarzenia",
+ "eDqstJ": "Zdarzenia 24h",
+ "uiy9pN": "Zdarzenia 30d",
"R/6nsx": "Subskrypcja",
"DDhP4z": "Strony",
"+a+2ug": "Członkowie",
@@ -814,6 +814,7 @@
"VRK2Am": "Śr. 24h",
"G7giEo": "Śr. 30d",
"NUXhb8": "Brak dostępnych danych subskrypcji",
+ "9G0GOP": "",
"sMjIBZ": "Wystąpił błąd. Spróbuj ponownie później.",
"up5jqD": "Witryna przeniesiona pomyślnie",
"/0tjRq": "Nie udało się przenieść witryny",
@@ -826,11 +827,12 @@
"Qzul6+": "ID strony",
"uhu5aG": "Publiczna",
"viXE32": "Prywatna",
- "6hdNA5": "Zdarzenia (24h)",
- "J4r/Gi": "Zdarzenia (30d)",
"C2EM7h": "E-mail właściciela",
"sEqhTf": "Nie udało się załadować danych stron. Spróbuj ponownie później.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Szukaj po domenie lub e-mailu właściciela...",
+ "QLY4X4": "",
"QQ3i6V": "Żadne strony nie pasują do wyszukiwania",
"JXGHuf": "Wybierz organizację",
"wSHezm": "Użytkownik dodany do organizacji pomyślnie",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Dodawanie...",
"v+BwPW": "Dodaj do organizacji",
"Msn3jj": "Filtruj po e-mailu...",
- "gO9HzB": "Filtruj po roli",
- "9nrF+x": "Wszystkie role",
+ "0QowWF": "",
"PoyENW": "Nie udało się załadować użytkowników. Spróbuj ponownie później.",
"X2y59E": "Użytkownik usunięty z organizacji pomyślnie",
"uA0DvF": "Nie udało się usunąć użytkownika z organizacji",
- "PW+sL4": "Nie dotyczy",
- "wittYy": "Data utworzenia",
+ "x61Ey6": "",
"bdcMGy": "Otwórz menu",
"6gHGy0": "Usuń z organizacji",
+ "Qp/Bnx": "",
"J2wna+": "Usunąć użytkownika z organizacji?",
"rDEYPT": "Wybierz organizację, z której chcesz usunąć {email}. Straci dostęp do wszystkich zasobów tej organizacji.",
- "3Vr8ps": "Panel administratora",
+ "jjTzIr": "",
"KI5ndC": "Nieprawidłowy format domeny. Musi być prawidłową domeną, np. example.com lub sub.example.com",
"KI57sV": "Nieprawidłowy identyfikator aplikacji. Użyj identyfikatora pakietu/bundle, np. com.example.app",
"cGNlRB": "Ulepsz do Pro, aby dodać więcej stron",
@@ -1047,7 +1048,9 @@
"kil8JO": "Edytuj członka",
"BHHDty": "Edytuj ustawienia dla {name}",
"B3uRNN": "Ogranicz dostęp do określonych witryn",
+ "9YyR5G": "Ten członek będzie mieć dostęp do wybranych witryn oraz do witryn przyznanych poprzez jego zespoły ({teams}).",
"cEIr3W": "Ten członek będzie miał dostęp tylko do wybranych witryn.",
+ "wDjYR2": "Ten członek ma dostęp do witryn przyznanych poprzez jego zespoły ({teams}) oraz do wszystkich witryn nieprzypisanych do żadnego zespołu.",
"/EBXiO": "Ten członek ma dostęp do wszystkich witryn w organizacji.",
"IZ9nkN": "Właściciele organizacji",
"yAaNQA": "Administratorzy",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Dostęp do stron",
"l8wanU": "Dołączył",
"OtSSs+": "{count} stron",
+ "qO9iuL": "Dostęp przyznany poprzez witryny tego zespołu",
"iv7EVe": "Wszystkie strony",
"qrWOxx": "Nie znaleziono członków",
"soeWeh": "Ustawienia organizacji",
@@ -1220,6 +1224,7 @@
"3PZa76": "Ten miesiąc",
"cfMkrE": "Poprzedni miesiąc",
"OGk6DC": "Ten rok",
+ "52UMW3": "Cały czas",
"XnjTRS": "Ostatnie {hours} godzin",
"T+D/1o": "Ostatnie {minutes} minut",
"fNCCY7": "Podstawowy",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} grup",
"zOY+qa": "{count} zdarzeń klawiszowych",
"dP8bUe": "Poziom szczegółowości zdarzeń",
- "zQvVDJ": "Wszystko",
"BYZnfs": "Brak zarejestrowanych zdarzeń.",
"QgBzsm": "Brak interakcji klawiszowych w tej sesji.",
"XkmpXm": "Zobacz użytkownika",
@@ -1289,6 +1293,7 @@
"op7jCp": "Informacje o użytkowniku",
"1bqKv/": "ID użytkownika:",
"fiNfmb": "Język:",
+ "PW+sL4": "Nie dotyczy",
"JyRQ6S": "Kraj:",
"Ue9DHy": "Region:",
"puODkp": "Miasto:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "Przesłano formularz do \"{action}\"",
"IQ5tZg": "Przesłano formularz",
"+B+qvw": "Zmieniono {type}pole wprowadzania \"{name}\"",
- "vDpLV2": "Zmieniono {type}pole wprowadzania",
- "qO9iuL": "Dostęp przyznany poprzez witryny tego zespołu",
- "9YyR5G": "Ten członek będzie mieć dostęp do wybranych witryn oraz do witryn przyznanych poprzez jego zespoły ({teams}).",
- "wDjYR2": "Ten członek ma dostęp do witryn przyznanych poprzez jego zespoły ({teams}) oraz do wszystkich witryn nieprzypisanych do żadnego zespołu."
+ "vDpLV2": "Zmieniono {type}pole wprowadzania"
}
diff --git a/client/messages/pt.json b/client/messages/pt.json
index 417a41c0b..72db89771 100644
--- a/client/messages/pt.json
+++ b/client/messages/pt.json
@@ -770,11 +770,6 @@
"bLT8zd": "Pesquisar por {field}...",
"8DuSnR": "ID do usuário",
"PE3u2y": "Atributos",
- "Bn1ifZ": "Total de Organizações",
- "eKzHLW": "Organizações Ativas",
- "vQpXiH": "Com eventos nos últimos 30 dias",
- "eDqstJ": "Eventos 24h",
- "uiy9pN": "Eventos 30d",
"9juexR": "Detalhes da Assinatura",
"fz0z4c": "Plano",
"T8qVXf": "Limite de Eventos",
@@ -790,20 +785,25 @@
"hQZhn8": "Personificar",
"2ZpsMl": "Sem membros",
"nJuUfX": "Pesquisar por nome, slug, domínio ou email do membro...",
+ "qslgbX": "Todos os planos",
"RllRQH": "Mostrar orgs com 0 eventos (30d)",
"7OL11E": "Apenas acima do limite",
- "qslgbX": "Todos os planos",
"K40gq+": "Falha ao carregar dados de organizações. Por favor, tente novamente mais tarde.",
- "saAiB9": "Crescimento de Organizações",
- "DZIViS": "Uso do Serviço",
- "ohQoQR": "Planos de Assinatura",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Todos",
"JD2pwH": "Organizações",
- "52UMW3": "Todo o Período",
- "PFdt2l": "Uso do Serviço - Todo o Período",
- "uL0dMG": "Uso do Serviço - Últimos {timePeriod}",
- "SVwJTM": "Exportar",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Eventos (24h)",
+ "J4r/Gi": "Eventos (30d)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Organização",
"JKxOsh": "Eventos Mensais",
+ "eDqstJ": "Eventos 24h",
+ "uiy9pN": "Eventos 30d",
"R/6nsx": "Assinatura",
"DDhP4z": "Sites",
"+a+2ug": "Membros",
@@ -814,6 +814,7 @@
"VRK2Am": "Média 24h",
"G7giEo": "Média 30d",
"NUXhb8": "Nenhum dado de assinatura disponível",
+ "9G0GOP": "",
"sMjIBZ": "Ocorreu um erro. Por favor, tente novamente mais tarde.",
"up5jqD": "Site movido com sucesso",
"/0tjRq": "Falha ao mover site",
@@ -826,11 +827,12 @@
"Qzul6+": "ID do Site",
"uhu5aG": "Público",
"viXE32": "Privado",
- "6hdNA5": "Eventos (24h)",
- "J4r/Gi": "Eventos (30d)",
"C2EM7h": "Email do Proprietário",
"sEqhTf": "Falha ao carregar dados de sites. Por favor, tente novamente mais tarde.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Pesquisar por domínio ou email do proprietário...",
+ "QLY4X4": "",
"QQ3i6V": "Nenhum site corresponde à sua pesquisa",
"JXGHuf": "Por favor, selecione uma organização",
"wSHezm": "Usuário adicionado à organização com sucesso",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Adicionando...",
"v+BwPW": "Adicionar à Organização",
"Msn3jj": "Filtrar por email...",
- "gO9HzB": "Filtrar por papel",
- "9nrF+x": "Todos os Papéis",
+ "0QowWF": "",
"PoyENW": "Falha ao carregar usuários. Por favor, tente novamente mais tarde.",
"X2y59E": "Usuário removido da organização com sucesso",
"uA0DvF": "Falha ao remover usuário da organização",
- "PW+sL4": "N/D",
- "wittYy": "Criado Em",
+ "x61Ey6": "",
"bdcMGy": "Abrir menu",
"6gHGy0": "Remover da Organização",
+ "Qp/Bnx": "",
"J2wna+": "Remover usuário da organização?",
"rDEYPT": "Selecione a organização da qual remover {email}. Ele perderá acesso a todos os recursos dessa organização.",
- "3Vr8ps": "Painel Administrativo",
+ "jjTzIr": "",
"KI5ndC": "Formato de domínio inválido. Deve ser um domínio válido como exemplo.com ou sub.exemplo.com",
"KI57sV": "Identificador de app inválido. Use um identificador de bundle/pacote como com.exemplo.app",
"cGNlRB": "Atualize para Pro para adicionar mais sites",
@@ -1047,7 +1048,9 @@
"kil8JO": "Editar Membro",
"BHHDty": "Editar configurações de {name}",
"B3uRNN": "Restringir acesso a sites específicos",
+ "9YyR5G": "Este membro terá acesso aos sites selecionados, além dos sites concedidos através de suas equipes ({teams}).",
"cEIr3W": "Este membro só terá acesso aos sites selecionados.",
+ "wDjYR2": "Este membro tem acesso aos sites concedidos através de suas equipes ({teams}), além de qualquer site não atribuído a uma equipe.",
"/EBXiO": "Este membro tem acesso a todos os sites da organização.",
"IZ9nkN": "Proprietários da organização",
"yAaNQA": "Administradores",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Acesso ao Site",
"l8wanU": "Entrou",
"OtSSs+": "{count} sites",
+ "qO9iuL": "Acesso concedido através dos sites desta equipe",
"iv7EVe": "Todos os sites",
"qrWOxx": "Nenhum membro encontrado",
"soeWeh": "Configurações da organização",
@@ -1220,6 +1224,7 @@
"3PZa76": "Este Mês",
"cfMkrE": "Mês Passado",
"OGk6DC": "Este Ano",
+ "52UMW3": "Todo o Período",
"XnjTRS": "Últimas {hours} horas",
"T+D/1o": "Últimos {minutes} minutos",
"fNCCY7": "Básico",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} grupos",
"zOY+qa": "{count} eventos de tecla",
"dP8bUe": "Nível de detalhes do evento",
- "zQvVDJ": "Todos",
"BYZnfs": "Nenhum evento registrado.",
"QgBzsm": "Nenhuma interação por teclas nesta sessão.",
"XkmpXm": "Ver Usuário",
@@ -1289,6 +1293,7 @@
"op7jCp": "Informações do Usuário",
"1bqKv/": "ID do Usuário:",
"fiNfmb": "Idioma:",
+ "PW+sL4": "N/D",
"JyRQ6S": "País:",
"Ue9DHy": "Região:",
"puODkp": "Cidade:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "Formulário enviado para \"{action}\"",
"IQ5tZg": "Formulário enviado",
"+B+qvw": "{type}campo de entrada \"{name}\" alterado",
- "vDpLV2": "{type}campo de entrada alterado",
- "qO9iuL": "Acesso concedido através dos sites desta equipe",
- "9YyR5G": "Este membro terá acesso aos sites selecionados, além dos sites concedidos através de suas equipes ({teams}).",
- "wDjYR2": "Este membro tem acesso aos sites concedidos através de suas equipes ({teams}), além de qualquer site não atribuído a uma equipe."
+ "vDpLV2": "{type}campo de entrada alterado"
}
diff --git a/client/messages/uk.json b/client/messages/uk.json
index a0be0a4ee..ea7c620a4 100644
--- a/client/messages/uk.json
+++ b/client/messages/uk.json
@@ -770,11 +770,6 @@
"bLT8zd": "Шукати за {field}...",
"8DuSnR": "ID користувача",
"PE3u2y": "Ознаки",
- "Bn1ifZ": "Усього організацій",
- "eKzHLW": "Активні організації",
- "vQpXiH": "З подіями за останні 30 днів",
- "eDqstJ": "Події (24 год)",
- "uiy9pN": "Події (30 днів)",
"9juexR": "Деталі підписки",
"fz0z4c": "План",
"T8qVXf": "Ліміт подій",
@@ -790,20 +785,25 @@
"hQZhn8": "Імперсонація",
"2ZpsMl": "Немає учасників",
"nJuUfX": "Пошук за назвою, slug, доменом або email учасника...",
+ "qslgbX": "Усі рівні тарифів",
"RllRQH": "Показати організації з 0 подій (30 днів)",
"7OL11E": "Лише ті, що перевищили ліміт",
- "qslgbX": "Усі рівні тарифів",
"K40gq+": "Не вдалося завантажити дані організацій. Будь ласка, спробуйте пізніше.",
- "saAiB9": "Ріст організації",
- "DZIViS": "Використання сервісу",
- "ohQoQR": "Рівні підписки",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "Усі",
"JD2pwH": "Організації",
- "52UMW3": "За весь час",
- "PFdt2l": "Використання всього сервісу - За весь час",
- "uL0dMG": "Використання всього сервісу - Останні {timePeriod}",
- "SVwJTM": "Експорт",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "Події (24 год)",
+ "J4r/Gi": "Події (30 днів)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "Організація",
"JKxOsh": "Щомісячні події",
+ "eDqstJ": "Події (24 год)",
+ "uiy9pN": "Події (30 днів)",
"R/6nsx": "Підписка",
"DDhP4z": "Сайти",
"+a+2ug": "Учасники",
@@ -814,6 +814,7 @@
"VRK2Am": "Сер. за 24 год",
"G7giEo": "Сер. за 30 днів",
"NUXhb8": "Дані про підписки недоступні",
+ "9G0GOP": "",
"sMjIBZ": "Сталася помилка. Будь ласка, спробуйте пізніше.",
"up5jqD": "",
"/0tjRq": "",
@@ -826,11 +827,12 @@
"Qzul6+": "ID сайту",
"uhu5aG": "Публічний",
"viXE32": "Приватний",
- "6hdNA5": "Події (24 год)",
- "J4r/Gi": "Події (30 днів)",
"C2EM7h": "Email власника",
"sEqhTf": "Не вдалося завантажити дані сайтів. Будь ласка, спробуйте пізніше.",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "Шукати за доменом або email власника...",
+ "QLY4X4": "",
"QQ3i6V": "Жоден сайт не відповідає пошуку",
"JXGHuf": "Будь ласка, виберіть організацію",
"wSHezm": "Користувача успішно додано до організації",
@@ -848,18 +850,17 @@
"Nvr5Ce": "Додавання...",
"v+BwPW": "Додати до організації",
"Msn3jj": "Фільтрувати за email...",
- "gO9HzB": "Фільтрувати за роллю",
- "9nrF+x": "Усі ролі",
+ "0QowWF": "",
"PoyENW": "Не вдалося завантажити користувачів. Будь ласка, спробуйте пізніше.",
"X2y59E": "Користувача успішно видалено з організації",
"uA0DvF": "Не вдалося видалити користувача з організації",
- "PW+sL4": "Н/Д",
- "wittYy": "Створено",
+ "x61Ey6": "",
"bdcMGy": "Відкрити меню",
"6gHGy0": "Видалити з організації",
+ "Qp/Bnx": "",
"J2wna+": "Видалити користувача з організації?",
"rDEYPT": "Виберіть організацію, з якої потрібно видалити {email}. Вони втратять доступ до всіх ресурсів у цій організації.",
- "3Vr8ps": "Панель адміністратора",
+ "jjTzIr": "",
"KI5ndC": "Недійсний формат домену. Має бути дійсний домен, наприклад, example.com або sub.example.com",
"KI57sV": "",
"cGNlRB": "Перейдіть на тариф Pro, щоб додати більше вебсайтів",
@@ -1047,7 +1048,9 @@
"kil8JO": "Редагувати учасника",
"BHHDty": "Редагувати налаштування для {name}",
"B3uRNN": "Обмежити доступ до конкретних сайтів",
+ "9YyR5G": "Цей учасник матиме доступ до вибраних сайтів, а також до сайтів, наданих через його команди ({teams}).",
"cEIr3W": "Цей учасник матиме доступ лише до вибраних сайтів.",
+ "wDjYR2": "Цей учасник має доступ до сайтів, наданих через його команди ({teams}), а також до будь-яких сайтів, не призначених жодній команді.",
"/EBXiO": "Цей учасник має доступ до всіх сайтів в організації.",
"IZ9nkN": "Власники організації",
"yAaNQA": "Адміністратори",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "Доступ до сайтів",
"l8wanU": "Приєднався",
"OtSSs+": "{count} сайтів",
+ "qO9iuL": "Доступ надано через сайти цієї команди",
"iv7EVe": "Усі сайти",
"qrWOxx": "Учасників не знайдено",
"soeWeh": "Налаштування організації",
@@ -1220,6 +1224,7 @@
"3PZa76": "Цього місяця",
"cfMkrE": "Минулого місяця",
"OGk6DC": "Цього року",
+ "52UMW3": "За весь час",
"XnjTRS": "Останні {hours} годин",
"T+D/1o": "Останні {minutes} хвилин",
"fNCCY7": "Базовий",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} груп",
"zOY+qa": "{count} клавішних подій",
"dP8bUe": "Рівень деталізації подій",
- "zQvVDJ": "Усі",
"BYZnfs": "Жодних зафіксованих подій.",
"QgBzsm": "У цій сесії немає клавішних взаємодій.",
"XkmpXm": "Переглянути користувача",
@@ -1289,6 +1293,7 @@
"op7jCp": "Інформація про користувача",
"1bqKv/": "ID користувача:",
"fiNfmb": "Мова:",
+ "PW+sL4": "Н/Д",
"JyRQ6S": "Країна:",
"Ue9DHy": "Регіон:",
"puODkp": "Місто:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "",
"IQ5tZg": "",
"+B+qvw": "",
- "vDpLV2": "",
- "qO9iuL": "Доступ надано через сайти цієї команди",
- "9YyR5G": "Цей учасник матиме доступ до вибраних сайтів, а також до сайтів, наданих через його команди ({teams}).",
- "wDjYR2": "Цей учасник має доступ до сайтів, наданих через його команди ({teams}), а також до будь-яких сайтів, не призначених жодній команді."
+ "vDpLV2": ""
}
diff --git a/client/messages/zh.json b/client/messages/zh.json
index 5b56c2941..9d446762e 100644
--- a/client/messages/zh.json
+++ b/client/messages/zh.json
@@ -770,11 +770,6 @@
"bLT8zd": "按 {field} 搜索...",
"8DuSnR": "用户 ID",
"PE3u2y": "特征",
- "Bn1ifZ": "总组织数",
- "eKzHLW": "活跃组织数",
- "vQpXiH": "过去 30 天内有事件",
- "eDqstJ": "24小时事件",
- "uiy9pN": "30天事件",
"9juexR": "订阅详情",
"fz0z4c": "计划",
"T8qVXf": "事件限制",
@@ -790,20 +785,25 @@
"hQZhn8": "模拟身份",
"2ZpsMl": "无成员",
"nJuUfX": "按名称、标识符、域名或成员邮箱搜索...",
+ "qslgbX": "所有层级",
"RllRQH": "显示 0 个事件的组织 (30天)",
"7OL11E": "仅超额",
- "qslgbX": "所有层级",
"K40gq+": "加载组织数据失败。请稍后重试。",
- "saAiB9": "组织增长",
- "DZIViS": "服务使用情况",
- "ohQoQR": "订阅层级",
+ "M6W/5v": "",
+ "g12Dke": "",
+ "Ft71sH": "",
+ "zQvVDJ": "全部",
"JD2pwH": "组织",
- "52UMW3": "所有时间",
- "PFdt2l": "全服务使用情况 - 所有时间",
- "uL0dMG": "全服务使用情况 - 过去 {timePeriod}",
- "SVwJTM": "导出",
+ "MlE01W": "",
+ "n+GeZI": "",
+ "6hdNA5": "事件 (24小时)",
+ "J4r/Gi": "事件 (30天)",
+ "XQDKiY": "",
+ "ggVKyN": "",
"K56Dim": "组织",
"JKxOsh": "每月事件",
+ "eDqstJ": "24小时事件",
+ "uiy9pN": "30天事件",
"R/6nsx": "订阅",
"DDhP4z": "网站",
"+a+2ug": "成员",
@@ -814,6 +814,7 @@
"VRK2Am": "平均 24小时",
"G7giEo": "平均 30天",
"NUXhb8": "无可用订阅数据",
+ "9G0GOP": "",
"sMjIBZ": "发生错误。请稍后重试。",
"up5jqD": "站点移动成功",
"/0tjRq": "站点移动失败",
@@ -826,11 +827,12 @@
"Qzul6+": "网站 ID",
"uhu5aG": "公开",
"viXE32": "私有",
- "6hdNA5": "事件 (24小时)",
- "J4r/Gi": "事件 (30天)",
"C2EM7h": "所有者电子邮件",
"sEqhTf": "加载网站数据失败。请稍后重试。",
+ "bsSPrn": "",
+ "hQLBM5": "",
"r9Y1x6": "按域名或所有者电子邮件搜索...",
+ "QLY4X4": "",
"QQ3i6V": "没有与您的搜索匹配的网站",
"JXGHuf": "请选择一个组织",
"wSHezm": "用户已成功添加到组织",
@@ -848,18 +850,17 @@
"Nvr5Ce": "正在添加...",
"v+BwPW": "添加到组织",
"Msn3jj": "按电子邮件过滤...",
- "gO9HzB": "按角色过滤",
- "9nrF+x": "所有角色",
+ "0QowWF": "",
"PoyENW": "加载用户失败。请稍后重试。",
"X2y59E": "用户已成功从组织中移除",
"uA0DvF": "从组织中移除用户失败",
- "PW+sL4": "不适用",
- "wittYy": "创建时间",
+ "x61Ey6": "",
"bdcMGy": "打开菜单",
"6gHGy0": "从组织中移除",
+ "Qp/Bnx": "",
"J2wna+": "从组织中移除用户?",
"rDEYPT": "选择要从中移除 {email} 的组织。他们将失去对该组织中所有资源的访问权限。",
- "3Vr8ps": "管理仪表板",
+ "jjTzIr": "",
"KI5ndC": "无效的域名格式。必须是有效的域名,例如 example.com 或 sub.example.com",
"KI57sV": "无效的应用标识符。请使用如 com.example.app 格式的包/Bundle ID",
"cGNlRB": "升级至 Pro 以添加更多网站",
@@ -1047,7 +1048,9 @@
"kil8JO": "编辑成员",
"BHHDty": "编辑 {name} 的设置",
"B3uRNN": "限制对特定站点的访问",
+ "9YyR5G": "该成员将可以访问所选网站,以及通过其团队({teams})授予的网站。",
"cEIr3W": "此成员只能访问所选站点。",
+ "wDjYR2": "该成员可以访问通过其团队({teams})授予的网站,以及任何未分配给团队的网站。",
"/EBXiO": "此成员可以访问组织中的所有站点。",
"IZ9nkN": "组织所有者",
"yAaNQA": "管理员",
@@ -1078,6 +1081,7 @@
"O8Sc7E": "网站访问权限",
"l8wanU": "已加入",
"OtSSs+": "{count} 个网站",
+ "qO9iuL": "通过此团队的网站授予的访问权限",
"iv7EVe": "所有网站",
"qrWOxx": "未找到成员",
"soeWeh": "组织设置",
@@ -1220,6 +1224,7 @@
"3PZa76": "本月",
"cfMkrE": "上个月",
"OGk6DC": "今年",
+ "52UMW3": "所有时间",
"XnjTRS": "过去 {hours} 小时",
"T+D/1o": "过去 {minutes} 分钟",
"fNCCY7": "基础版",
@@ -1278,7 +1283,6 @@
"qo2JCK": "{count} 组",
"zOY+qa": "{count} 个按键事件",
"dP8bUe": "事件详细级别",
- "zQvVDJ": "全部",
"BYZnfs": "没有记录事件。",
"QgBzsm": "此会话中没有按键交互。",
"XkmpXm": "查看用户",
@@ -1289,6 +1293,7 @@
"op7jCp": "用户信息",
"1bqKv/": "用户 ID:",
"fiNfmb": "语言:",
+ "PW+sL4": "不适用",
"JyRQ6S": "国家/地区:",
"Ue9DHy": "地区:",
"puODkp": "城市:",
@@ -1555,8 +1560,5 @@
"QOaR8l": "已提交表单到 \"{action}\"",
"IQ5tZg": "已提交表单",
"+B+qvw": "已更改 {type}输入框 \"{name}\"",
- "vDpLV2": "已更改 {type}输入框",
- "qO9iuL": "通过此团队的网站授予的访问权限",
- "9YyR5G": "该成员将可以访问所选网站,以及通过其团队({teams})授予的网站。",
- "wDjYR2": "该成员可以访问通过其团队({teams})授予的网站,以及任何未分配给团队的网站。"
+ "vDpLV2": "已更改 {type}输入框"
}
diff --git a/client/src/app/admin/components/database/Database.tsx b/client/src/app/admin/components/database/Database.tsx
index 7d5c4a67c..60d9b9c03 100644
--- a/client/src/app/admin/components/database/Database.tsx
+++ b/client/src/app/admin/components/database/Database.tsx
@@ -3,16 +3,16 @@
import { useState } from "react";
import { useQueryClient } from "@tanstack/react-query";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { useClickhouseStats } from "@/api/admin/hooks/useClickhouseStats";
-import { TableStatsCards } from "./TableStatsCards";
import { RowsTrendChart } from "./RowsTrendChart";
import { InsertRateChart } from "./InsertRateChart";
import { QueryLogTable } from "./QueryLogTable";
import { RefreshControls } from "./RefreshControls";
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
import { Skeleton } from "@/components/ui/skeleton";
+import { Panel } from "../shared/Panel";
+import { StatStrip } from "../shared/StatStrip";
function formatNumber(num: number): string {
if (num >= 1_000_000_000) {
@@ -27,10 +27,23 @@ function formatNumber(num: number): string {
return num.toLocaleString();
}
+function formatBytes(bytes: number): string {
+ if (bytes >= 1024 * 1024 * 1024) {
+ return (bytes / (1024 * 1024 * 1024)).toFixed(2) + " GB";
+ }
+ if (bytes >= 1024 * 1024) {
+ return (bytes / (1024 * 1024)).toFixed(2) + " MB";
+ }
+ if (bytes >= 1024) {
+ return (bytes / 1024).toFixed(2) + " KB";
+ }
+ return bytes + " B";
+}
+
function TableStatsTable({ tableStats, isLoading }: { tableStats: any[] | undefined; isLoading: boolean }) {
if (isLoading) {
return (
- <div className="space-y-2">
+ <div className="space-y-2 p-4">
{[...Array(4)].map((_, i) => (
<Skeleton key={i} className="h-10 w-full" />
))}
@@ -40,45 +53,43 @@ function TableStatsTable({ tableStats, isLoading }: { tableStats: any[] | undefi
if (!tableStats || tableStats.length === 0) {
return (
- <div className="text-center py-8 text-neutral-500 dark:text-neutral-400">
+ <div className="py-8 text-center text-neutral-500 dark:text-neutral-400">
No table statistics available
</div>
);
}
return (
- <div className="border rounded-lg overflow-hidden dark:border-neutral-800">
- <Table>
- <TableHeader>
- <TableRow>
- <TableHead>Table</TableHead>
- <TableHead className="text-right">Rows</TableHead>
- <TableHead className="text-right">Compressed</TableHead>
- <TableHead className="text-right">Uncompressed</TableHead>
- <TableHead className="text-right">Ratio</TableHead>
- </TableRow>
- </TableHeader>
- <TableBody>
- {tableStats.map(table => {
- const compressionRatio =
- table.uncompressedBytes > 0
- ? ((1 - table.compressedBytes / table.uncompressedBytes) * 100).toFixed(1)
- : "0";
- return (
- <TableRow key={table.table}>
- <TableCell className="font-medium font-mono text-xs">{table.table}</TableCell>
- <TableCell className="text-right text-xs">{formatNumber(table.totalRows)}</TableCell>
- <TableCell className="text-right text-xs">{table.compressedSize}</TableCell>
- <TableCell className="text-right text-xs">{table.uncompressedSize}</TableCell>
- <TableCell className="text-right text-xs text-emerald-600 dark:text-emerald-400">
- {compressionRatio}%
- </TableCell>
- </TableRow>
- );
- })}
- </TableBody>
- </Table>
- </div>
+ <Table>
+ <TableHeader>
+ <TableRow>
+ <TableHead>Table</TableHead>
+ <TableHead className="text-right">Rows</TableHead>
+ <TableHead className="text-right">Compressed</TableHead>
+ <TableHead className="text-right">Uncompressed</TableHead>
+ <TableHead className="text-right">Ratio</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {tableStats.map(table => {
+ const compressionRatio =
+ table.uncompressedBytes > 0
+ ? ((1 - table.compressedBytes / table.uncompressedBytes) * 100).toFixed(1)
+ : "0";
+ return (
+ <TableRow key={table.table}>
+ <TableCell className="font-medium font-mono text-xs">{table.table}</TableCell>
+ <TableCell className="text-right text-xs tabular-nums">{formatNumber(table.totalRows)}</TableCell>
+ <TableCell className="text-right text-xs tabular-nums">{table.compressedSize}</TableCell>
+ <TableCell className="text-right text-xs tabular-nums">{table.uncompressedSize}</TableCell>
+ <TableCell className="text-right text-xs tabular-nums text-neutral-500 dark:text-neutral-400">
+ {compressionRatio}%
+ </TableCell>
+ </TableRow>
+ );
+ })}
+ </TableBody>
+ </Table>
);
}
@@ -104,19 +115,46 @@ export function Database() {
const isInsertRateUnavailable = stats?.unavailableFeatures?.includes("insertRate") ?? false;
+ const tableStats = stats?.tableStats;
+ const totalRows = tableStats?.reduce((sum, t) => sum + t.totalRows, 0) ?? 0;
+ const totalCompressedBytes = tableStats?.reduce((sum, t) => sum + t.compressedBytes, 0) ?? 0;
+ const totalUncompressedBytes = tableStats?.reduce((sum, t) => sum + t.uncompressedBytes, 0) ?? 0;
+ const totalParts = tableStats?.reduce((sum, t) => sum + t.partsCount, 0) ?? 0;
+ const compressionRatio =
+ totalUncompressedBytes > 0 ? ((1 - totalCompressedBytes / totalUncompressedBytes) * 100).toFixed(1) : "0";
+
return (
<div className="space-y-6">
- <div className="flex items-center justify-between">
- <div>
- <h2 className="text-lg font-semibold">ClickHouse Database Health</h2>
- <p className="text-sm text-neutral-500 dark:text-neutral-400">
- Monitor database performance and storage metrics
- </p>
- </div>
+ <div className="flex flex-wrap items-center justify-between gap-2">
+ <h2 className="text-base font-semibold">ClickHouse</h2>
<RefreshControls lastUpdated={lastUpdated} onRefresh={handleRefresh} isRefetching={isRefetching} />
</div>
- <TableStatsCards tableStats={stats?.tableStats} isLoading={statsLoading} />
+ <StatStrip
+ isLoading={statsLoading}
+ stats={[
+ {
+ label: "Total rows",
+ value: tableStats ? formatNumber(totalRows) : "-",
+ hint: tableStats ? `across ${tableStats.length} tables` : undefined,
+ },
+ {
+ label: "Compressed",
+ value: tableStats ? formatBytes(totalCompressedBytes) : "-",
+ hint: tableStats ? `${compressionRatio}% compression` : undefined,
+ },
+ {
+ label: "Uncompressed",
+ value: tableStats ? formatBytes(totalUncompressedBytes) : "-",
+ hint: tableStats ? "original size" : undefined,
+ },
+ {
+ label: "Parts",
+ value: tableStats ? formatNumber(totalParts) : "-",
+ hint: tableStats ? "active data parts" : undefined,
+ },
+ ]}
+ />
<Tabs defaultValue="overview" value={activeTab} onValueChange={setActiveTab}>
<TabsList>
@@ -124,32 +162,26 @@ export function Database() {
<TabsTrigger value="query-log">Query Log</TabsTrigger>
</TabsList>
- <TabsContent value="overview" className="space-y-4 mt-4">
- <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
- <Card>
- <CardHeader>
- <CardTitle className="text-base">Table Statistics</CardTitle>
- </CardHeader>
- <CardContent>
- <TableStatsTable tableStats={stats?.tableStats} isLoading={statsLoading} />
- </CardContent>
- </Card>
-
- <Card>
- <CardHeader>
- <CardTitle className="text-base">Insert Rate (Last 24h)</CardTitle>
- </CardHeader>
- <CardContent>
- <InsertRateChart insertRate={stats?.insertRate} isLoading={statsLoading} isUnavailable={isInsertRateUnavailable} />
- </CardContent>
- </Card>
+ <TabsContent value="overview" className="mt-4 space-y-4">
+ <div className="grid grid-cols-1 gap-4 lg:grid-cols-2">
+ <Panel title="Table statistics" flush>
+ <TableStatsTable tableStats={tableStats} isLoading={statsLoading} />
+ </Panel>
+
+ <Panel title="Insert rate (last 24h)">
+ <InsertRateChart
+ insertRate={stats?.insertRate}
+ isLoading={statsLoading}
+ isUnavailable={isInsertRateUnavailable}
+ />
+ </Panel>
</div>
- <Card>
- <CardHeader className="flex flex-row items-center justify-between">
- <CardTitle className="text-base">Rows Inserted by Table</CardTitle>
- <Select value={String(rowsDays)} onValueChange={(v) => setRowsDays(Number(v))}>
- <SelectTrigger className="w-[140px] h-8 text-xs">
+ <Panel
+ title="Rows inserted by table"
+ actions={
+ <Select value={String(rowsDays)} onValueChange={v => setRowsDays(Number(v))}>
+ <SelectTrigger className="h-8 w-[140px] text-xs">
<SelectValue />
</SelectTrigger>
<SelectContent>
@@ -163,29 +195,17 @@ export function Database() {
<SelectItem value="0">All time</SelectItem>
</SelectContent>
</Select>
- </CardHeader>
- <CardContent>
- <RowsTrendChart rowsByDate={stats?.rowsByDate} isLoading={statsLoading} days={rowsDays} />
- </CardContent>
- </Card>
+ }
+ >
+ <RowsTrendChart rowsByDate={stats?.rowsByDate} isLoading={statsLoading} days={rowsDays} />
+ </Panel>
</TabsContent>
<TabsContent value="query-log" className="mt-4">
- <Card>
- <CardHeader>
- <CardTitle className="text-base">
- Query Log
- <span className="ml-2 text-sm font-normal text-neutral-500 dark:text-neutral-400">
- (last 24 hours)
- </span>
- </CardTitle>
- </CardHeader>
- <CardContent>
- <QueryLogTable />
- </CardContent>
- </Card>
+ <Panel title="Query log" actions={<span className="text-xs text-neutral-500 dark:text-neutral-400">last 24 hours</span>}>
+ <QueryLogTable />
+ </Panel>
</TabsContent>
-
</Tabs>
</div>
);
diff --git a/client/src/app/admin/components/database/InsertRateChart.tsx b/client/src/app/admin/components/database/InsertRateChart.tsx
index 0d6d54990..91f2efcff 100644
--- a/client/src/app/admin/components/database/InsertRateChart.tsx
+++ b/client/src/app/admin/components/database/InsertRateChart.tsx
@@ -117,7 +117,7 @@ export function InsertRateChart({ insertRate, isLoading, isUnavailable }: Insert
useMesh={true}
animate={false}
enableSlices="x"
- colors={["hsl(var(--emerald-400))"]}
+ colors={["hsl(var(--dataviz))"]}
enableArea={true}
areaOpacity={0.1}
sliceTooltip={({ slice }) => {
diff --git a/client/src/app/admin/components/database/TableStatsCards.tsx b/client/src/app/admin/components/database/TableStatsCards.tsx
deleted file mode 100644
index 1203c33ba..000000000
--- a/client/src/app/admin/components/database/TableStatsCards.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-"use client";
-
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Skeleton } from "@/components/ui/skeleton";
-import { TableStats } from "@/api/admin/endpoints/clickhouseStats";
-import { Database, HardDrive, Layers, Server } from "lucide-react";
-
-interface TableStatsCardsProps {
- tableStats: TableStats[] | undefined;
- isLoading: boolean;
-}
-
-function formatNumber(num: number): string {
- if (num >= 1_000_000_000) {
- return (num / 1_000_000_000).toFixed(2) + "B";
- }
- if (num >= 1_000_000) {
- return (num / 1_000_000).toFixed(2) + "M";
- }
- if (num >= 1_000) {
- return (num / 1_000).toFixed(2) + "K";
- }
- return num.toLocaleString();
-}
-
-export function TableStatsCards({ tableStats, isLoading }: TableStatsCardsProps) {
- if (isLoading) {
- return (
- <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
- {[...Array(4)].map((_, i) => (
- <Card key={i}>
- <CardHeader className="pb-2">
- <Skeleton className="h-4 w-24" />
- </CardHeader>
- <CardContent>
- <Skeleton className="h-8 w-20" />
- <Skeleton className="h-3 w-32 mt-2" />
- </CardContent>
- </Card>
- ))}
- </div>
- );
- }
-
- if (!tableStats || tableStats.length === 0) {
- return (
- <div className="text-center py-8 text-neutral-500 dark:text-neutral-400">
- No table statistics available
- </div>
- );
- }
-
- const totalRows = tableStats.reduce((sum, t) => sum + t.totalRows, 0);
- const totalCompressedBytes = tableStats.reduce((sum, t) => sum + t.compressedBytes, 0);
- const totalUncompressedBytes = tableStats.reduce((sum, t) => sum + t.uncompressedBytes, 0);
- const totalParts = tableStats.reduce((sum, t) => sum + t.partsCount, 0);
-
- const formatBytes = (bytes: number): string => {
- if (bytes >= 1024 * 1024 * 1024) {
- return (bytes / (1024 * 1024 * 1024)).toFixed(2) + " GB";
- }
- if (bytes >= 1024 * 1024) {
- return (bytes / (1024 * 1024)).toFixed(2) + " MB";
- }
- if (bytes >= 1024) {
- return (bytes / 1024).toFixed(2) + " KB";
- }
- return bytes + " B";
- };
-
- const compressionRatio =
- totalUncompressedBytes > 0 ? ((1 - totalCompressedBytes / totalUncompressedBytes) * 100).toFixed(1) : "0";
-
- return (
- <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
- <Card>
- <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
- <CardTitle className="text-sm font-medium">Total Rows</CardTitle>
- <Database className="h-4 w-4 text-neutral-500" />
- </CardHeader>
- <CardContent>
- <div className="text-2xl font-bold">{formatNumber(totalRows)}</div>
- <p className="text-xs text-neutral-500 dark:text-neutral-400">Across {tableStats.length} tables</p>
- </CardContent>
- </Card>
-
- <Card>
- <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
- <CardTitle className="text-sm font-medium">Compressed Size</CardTitle>
- <HardDrive className="h-4 w-4 text-neutral-500" />
- </CardHeader>
- <CardContent>
- <div className="text-2xl font-bold">{formatBytes(totalCompressedBytes)}</div>
- <p className="text-xs text-neutral-500 dark:text-neutral-400">{compressionRatio}% compression ratio</p>
- </CardContent>
- </Card>
-
- <Card>
- <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
- <CardTitle className="text-sm font-medium">Uncompressed Size</CardTitle>
- <Server className="h-4 w-4 text-neutral-500" />
- </CardHeader>
- <CardContent>
- <div className="text-2xl font-bold">{formatBytes(totalUncompressedBytes)}</div>
- <p className="text-xs text-neutral-500 dark:text-neutral-400">Original data size</p>
- </CardContent>
- </Card>
-
- <Card>
- <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
- <CardTitle className="text-sm font-medium">Total Parts</CardTitle>
- <Layers className="h-4 w-4 text-neutral-500" />
- </CardHeader>
- <CardContent>
- <div className="text-2xl font-bold">{formatNumber(totalParts)}</div>
- <p className="text-xs text-neutral-500 dark:text-neutral-400">Active data parts</p>
- </CardContent>
- </Card>
- </div>
- );
-}
diff --git a/client/src/app/admin/components/organizations/FilteredStatsCards.tsx b/client/src/app/admin/components/organizations/FilteredStatsCards.tsx
deleted file mode 100644
index bc4f08041..000000000
--- a/client/src/app/admin/components/organizations/FilteredStatsCards.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-"use client";
-
-import { useMemo } from "react";
-import { AdminOrganizationData } from "@/api/admin/endpoints";
-import { Skeleton } from "@/components/ui/skeleton";
-import { Building2, Activity, Zap, Clock } from "lucide-react";
-import { useExtracted } from "next-intl";
-
-interface FilteredStatsCardsProps {
- organizations: AdminOrganizationData[];
- isLoading: boolean;
-}
-
-export function FilteredStatsCards({ organizations, isLoading }: FilteredStatsCardsProps) {
- const t = useExtracted();
- 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: t("Total Organizations"),
- value: stats.totalOrganizations,
- icon: Building2,
- },
- {
- title: t("Active Organizations"),
- value: stats.activeOrganizations,
- icon: Activity,
- description: t("With events in past 30 days"),
- },
- {
- title: t("24h Events"),
- value: stats.events24h,
- icon: Clock,
- },
- {
- title: t("30d Events"),
- value: stats.events30d,
- icon: Zap,
- },
- ];
-
- return (
- <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
- {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-4 hover:border-neutral-200 dark:hover:border-neutral-700 transition-colors"
- >
- <div className="flex items-center justify-between">
- <div className="text-xs 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-xl 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 303fa1dee..d71ead3a5 100644
--- a/client/src/app/admin/components/organizations/OrganizationFilters.tsx
+++ b/client/src/app/admin/components/organizations/OrganizationFilters.tsx
@@ -14,10 +14,9 @@ import {
import { Label } from "@/components/ui/label";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { Switch } from "@/components/ui/switch";
-import { cn } from "@/lib/utils";
import { ChevronsUpDown, X } from "lucide-react";
import { useExtracted } from "next-intl";
-import { useState } from "react";
+import { ReactNode, useState } from "react";
import { SearchInput } from "../shared/SearchInput";
export interface TierOption {
@@ -42,6 +41,8 @@ interface OrganizationFiltersProps {
availableTiers: TierOption[];
selectedTiers: TierOption[];
setSelectedTiers: (tiers: TierOption[]) => void;
+ /** Rendered at the right edge of the toolbar (e.g. the copy-emails action). */
+ actions?: ReactNode;
}
function TierSelect({
@@ -81,7 +82,7 @@ function TierSelect({
variant="outline"
role="combobox"
aria-expanded={open}
- className="min-w-[200px] flex-1 justify-between min-h-9 h-auto py-1 font-normal"
+ className="min-w-[160px] max-w-md justify-between min-h-9 h-auto py-1 font-normal"
>
<div className="flex flex-wrap gap-1">
{selectedTiers.length > 0 ? (
@@ -144,6 +145,7 @@ export function OrganizationFilters({
availableTiers,
selectedTiers,
setSelectedTiers,
+ actions,
}: OrganizationFiltersProps) {
const t = useExtracted();
@@ -176,12 +178,12 @@ export function OrganizationFilters({
return (
<div className="space-y-2">
- <div className="flex items-center gap-2">
+ <div className="flex flex-wrap items-center gap-2">
<SearchInput
placeholder={t("Search by name, slug, domain, or member email...")}
value={searchQuery}
onChange={setSearchQuery}
- className="max-w-sm"
+ className="w-full sm:w-auto sm:min-w-[280px]"
/>
<div className="flex items-center gap-1">
{QUICK_TIER_FILTERS.map(filter => (
@@ -190,14 +192,21 @@ export function OrganizationFilters({
size="sm"
variant={isQuickFilterActive(filter) ? "default" : "outline"}
onClick={() => handleQuickTierFilter(filter)}
- className={cn("h-9 text-xs")}
+ className="h-9 text-xs"
>
{filter.label}
</Button>
))}
</div>
+ <TierSelect
+ availableTiers={availableTiers}
+ selectedTiers={selectedTiers}
+ setSelectedTiers={setSelectedTiers}
+ placeholder={t("All tiers")}
+ />
+ {actions && <div className="ml-auto">{actions}</div>}
</div>
- <div className="flex items-start gap-4 sm:flex-row flex-col sm:items-center">
+ <div className="flex flex-wrap items-center gap-x-5 gap-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">
@@ -214,12 +223,6 @@ export function OrganizationFilters({
{t("Only over limit")}
</Label>
</div>
- <TierSelect
- availableTiers={availableTiers}
- selectedTiers={selectedTiers}
- setSelectedTiers={setSelectedTiers}
- placeholder={t("All tiers")}
- />
</div>
</div>
);
diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsx
index 5ac3ec0cd..edbd3bd11 100644
--- a/client/src/app/admin/components/organizations/Organizations.tsx
+++ b/client/src/app/admin/components/organizations/Organizations.tsx
@@ -3,32 +3,30 @@
import { useState, useMemo } from "react";
import { useAdminOrganizations } from "@/api/admin/hooks/useAdminOrganizations";
import { Button } from "@/components/ui/button";
-import { Tabs, TabsContent } from "@/components/ui/tabs";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { toast } from "@/components/ui/sonner";
+import { cn, formatter } from "@/lib/utils";
import { DateTime } from "luxon";
+import { Copy } from "lucide-react";
+import { useExtracted } from "next-intl";
import { ErrorAlert } from "../shared/ErrorAlert";
-import { AdminLayout } from "../shared/AdminLayout";
import { GrowthChart } from "../shared/GrowthChart";
+import { Panel } from "../shared/Panel";
+import { StatStrip } from "../shared/StatStrip";
import { ServiceUsageChart } from "../shared/ServiceUsageChart";
import { SubscriptionTiersTable } from "./SubscriptionTiersTable";
import { OrganizationsTable } from "./OrganizationsTable";
import { OrganizationFilters, TierOption } from "./OrganizationFilters";
-import { FilteredStatsCards } from "./FilteredStatsCards";
import { useFilteredOrganizations } from "./useFilteredOrganizations";
-import { DownloadIcon } from "lucide-react";
-import { useExtracted } from "next-intl";
+
+const TIME_PERIODS = ["30d", "60d", "120d", "all"] as const;
+type TimePeriod = (typeof TIME_PERIODS)[number];
export function Organizations() {
const { data: organizations, isLoading, isError } = useAdminOrganizations();
const t = useExtracted();
- const [activeTab, setActiveTab] = useState("growth");
+ const [chartTab, setChartTab] = useState("growth");
const [searchQuery, setSearchQuery] = useState("");
// Filter states
@@ -37,7 +35,7 @@ export function Organizations() {
const [selectedTiers, setSelectedTiers] = useState<TierOption[]>([]);
// Time period for service usage chart
- const [timePeriod, setTimePeriod] = useState<"30d" | "60d" | "120d" | "all">("30d");
+ const [timePeriod, setTimePeriod] = useState<TimePeriod>("30d");
// Calculate available tiers from organizations data
const availableTiers = useMemo(() => {
@@ -71,78 +69,102 @@ export function Organizations() {
showOnlyOverLimit,
});
- if (isError) {
- return (
- <AdminLayout>
- <ErrorAlert message={t("Failed to load organizations data. Please try again later.")} />
- </AdminLayout>
+ const stats = useMemo(() => {
+ const orgs = filteredOrganizations ?? [];
+ const active = orgs.filter(org => org.sites.some(site => site.eventsLast30Days > 0)).length;
+ const events24h = orgs.reduce(
+ (total, org) => total + org.sites.reduce((sum, site) => sum + Number(site.eventsLast24Hours || 0), 0),
+ 0
+ );
+ const events30d = orgs.reduce(
+ (total, org) => total + org.sites.reduce((sum, site) => sum + Number(site.eventsLast30Days || 0), 0),
+ 0
);
+ return { total: orgs.length, active, events24h, events30d };
+ }, [filteredOrganizations]);
+
+ if (isError) {
+ return <ErrorAlert message={t("Failed to load organizations data. Please try again later.")} />;
}
+ const copyOwnerEmails = () => {
+ if (!filteredOrganizations?.length) return;
+ const emails = [...filteredOrganizations]
+ .sort((a, b) => a.name.localeCompare(b.name))
+ .flatMap(org => org.members.filter(m => m.role === "owner").map(m => m.email))
+ .filter(Boolean);
+ const unique = [...new Set(emails)];
+ navigator.clipboard.writeText(unique.join("\n"));
+ toast.success(t("Copied {count} owner emails", { count: String(unique.length) }));
+ };
+
return (
- <AdminLayout>
- <Tabs value={activeTab} onValueChange={setActiveTab} className="mb-6">
- <div className="flex items-center justify-between mb-2">
- <Select value={activeTab} onValueChange={setActiveTab}>
- <SelectTrigger className="w-[200px]">
- <SelectValue />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="growth">{t("Organization Growth")}</SelectItem>
- <SelectItem value="usage">{t("Service Usage")}</SelectItem>
- <SelectItem value="subscriptions">{t("Subscription Tiers")}</SelectItem>
- </SelectContent>
- </Select>
- </div>
- <TabsContent value="growth">
- <GrowthChart data={organizations} color="#8b5cf6" title={t("Organizations")} />
- </TabsContent>
- <TabsContent value="usage">
- <div className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 p-1 rounded-lg">
- <Button
- size="sm"
- variant={timePeriod === "30d" ? "default" : "ghost"}
- onClick={() => setTimePeriod("30d")}
- className="h-7 text-xs"
- >
- 30d
- </Button>
- <Button
- size="sm"
- variant={timePeriod === "60d" ? "default" : "ghost"}
- onClick={() => setTimePeriod("60d")}
- className="h-7 text-xs"
- >
- 60d
- </Button>
- <Button
- size="sm"
- variant={timePeriod === "120d" ? "default" : "ghost"}
- onClick={() => setTimePeriod("120d")}
- className="h-7 text-xs"
- >
- 120d
- </Button>
- <Button
- size="sm"
- variant={timePeriod === "all" ? "default" : "ghost"}
- onClick={() => setTimePeriod("all")}
- className="h-7 text-xs"
- >
- {t("All Time")}
- </Button>
- </div>
- <ServiceUsageChart
- startDate={startDate}
- endDate={endDate}
- title={timePeriod === "all" ? t("Service-wide Usage - All Time") : t("Service-wide Usage - Last {timePeriod}", { timePeriod })}
- />
- </TabsContent>
- <TabsContent value="subscriptions">
- <SubscriptionTiersTable organizations={organizations} isLoading={isLoading} />
- </TabsContent>
+ <div className="space-y-6">
+ <Tabs value={chartTab} onValueChange={setChartTab}>
+ <Panel
+ flush
+ title={
+ <TabsList className="h-8 p-0.5">
+ <TabsTrigger value="growth" className="h-7 px-2.5 text-xs">
+ {t("Growth")}
+ </TabsTrigger>
+ <TabsTrigger value="usage" className="h-7 px-2.5 text-xs">
+ {t("Usage")}
+ </TabsTrigger>
+ <TabsTrigger value="tiers" className="h-7 px-2.5 text-xs">
+ {t("Tiers")}
+ </TabsTrigger>
+ </TabsList>
+ }
+ actions={
+ chartTab === "usage" ? (
+ <div className="flex items-center gap-0.5 rounded-lg bg-neutral-100 p-0.5 dark:bg-neutral-800">
+ {TIME_PERIODS.map(period => (
+ <button
+ key={period}
+ type="button"
+ onClick={() => setTimePeriod(period)}
+ className={cn(
+ "h-6 rounded-md px-2 text-xs font-medium transition-colors",
+ "focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-400 dark:focus-visible:ring-neutral-500",
+ timePeriod === period
+ ? "bg-white text-neutral-950 shadow-sm dark:bg-neutral-950 dark:text-neutral-50"
+ : "text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-neutral-100"
+ )}
+ >
+ {period === "all" ? t("All") : period}
+ </button>
+ ))}
+ </div>
+ ) : undefined
+ }
+ >
+ <TabsContent value="growth" className="mt-0 p-4">
+ <GrowthChart data={organizations} title={t("Organizations")} />
+ </TabsContent>
+ <TabsContent value="usage" className="mt-0 p-4">
+ <ServiceUsageChart startDate={startDate} endDate={endDate} />
+ </TabsContent>
+ <TabsContent value="tiers" className="mt-0 p-4">
+ <SubscriptionTiersTable organizations={organizations} isLoading={isLoading} />
+ </TabsContent>
+ </Panel>
</Tabs>
- <div className="space-y-2">
+
+ <div className="space-y-3">
+ <StatStrip
+ isLoading={isLoading}
+ stats={[
+ { label: t("Organizations"), value: stats.total.toLocaleString() },
+ {
+ label: t("Active (30d)"),
+ value: stats.active.toLocaleString(),
+ hint: t("with events in the last 30 days"),
+ },
+ { label: t("Events (24h)"), value: formatter(stats.events24h) },
+ { label: t("Events (30d)"), value: formatter(stats.events30d) },
+ ]}
+ />
<OrganizationFilters
searchQuery={searchQuery}
setSearchQuery={setSearchQuery}
@@ -153,32 +175,20 @@ export function Organizations() {
availableTiers={availableTiers}
selectedTiers={selectedTiers}
setSelectedTiers={setSelectedTiers}
+ actions={
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={copyOwnerEmails}
+ disabled={isLoading || !filteredOrganizations?.length}
+ >
+ <Copy className="h-3.5 w-3.5" />
+ {t("Copy owner emails")}
+ </Button>
+ }
/>
- <FilteredStatsCards organizations={filteredOrganizations} isLoading={isLoading} />
- <Button
- variant="outline"
- size="sm"
- onClick={() => {
- if (!filteredOrganizations) return;
- const emails = filteredOrganizations
- .sort((a, b) => a.name.localeCompare(b.name))
- .flatMap((org) =>
- org.members.filter((m) => m.role === "owner").map((m) => m.email)
- )
- .filter(Boolean);
- const unique = [...new Set(emails)];
- navigator.clipboard.writeText(unique.join("\n"));
- }}
- >
- <DownloadIcon className="w-4 h-4" />
- {t("Export")}
- </Button>
- <OrganizationsTable
- organizations={filteredOrganizations}
- isLoading={isLoading}
- searchQuery={searchQuery}
- />
+ <OrganizationsTable organizations={filteredOrganizations} isLoading={isLoading} searchQuery={searchQuery} />
</div>
- </AdminLayout >
+ </div>
);
}
diff --git a/client/src/app/admin/components/organizations/OrganizationsTable.tsx b/client/src/app/admin/components/organizations/OrganizationsTable.tsx
index 1213b788a..ea5463aa3 100644
--- a/client/src/app/admin/components/organizations/OrganizationsTable.tsx
+++ b/client/src/app/admin/components/organizations/OrganizationsTable.tsx
@@ -7,9 +7,8 @@ import { Badge } from "@/components/ui/badge";
import { Skeleton } from "@/components/ui/skeleton";
import { useDateTimeFormat } from "../../../../hooks/useDateTimeFormat";
import { parseUtcTimestamp } from "@/lib/dateTimeUtils";
-import { formatter } from "@/lib/utils";
-import { ChevronDown, ChevronRight } from "lucide-react";
-import { Button } from "@/components/ui/button";
+import { cn, formatter } from "@/lib/utils";
+import { ChevronRight } from "lucide-react";
import { Pagination } from "@/components/pagination";
import {
ColumnDef,
@@ -20,6 +19,7 @@ import {
SortingState,
} from "@tanstack/react-table";
import { SortableHeader } from "../shared/SortableHeader";
+import { TableShell } from "../shared/Panel";
import { OrganizationExpandedRow } from "./OrganizationExpandedRow";
import { useExtracted } from "next-intl";
@@ -29,37 +29,50 @@ interface OrganizationsTableProps {
searchQuery: string;
}
+type ColumnAlignMeta = { align?: "right" };
+
+const SKELETON_CELLS: Array<{ width: string; right?: boolean }> = [
+ { width: "w-4" },
+ { width: "w-32" },
+ { width: "w-24" },
+ { width: "w-20", right: true },
+ { width: "w-16", right: true },
+ { width: "w-16", right: true },
+ { width: "w-20" },
+ { width: "w-8", right: true },
+ { width: "w-8", right: true },
+];
+
export function OrganizationsTable({ organizations, isLoading, searchQuery }: OrganizationsTableProps) {
const t = useExtracted();
const { formatRelative } = useDateTimeFormat();
const [expandedOrgs, setExpandedOrgs] = useState<Set<string>>(new Set());
- const [sorting, setSorting] = useState<SortingState>([]);
+ const [sorting, setSorting] = useState<SortingState>([{ id: "monthlyEventCount", desc: true }]);
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);
+ const toggleExpand = useCallback((orgId: string) => {
+ setExpandedOrgs(prev => {
+ const next = new Set(prev);
+ if (next.has(orgId)) {
+ next.delete(orgId);
} else {
- newExpanded.add(orgId);
+ next.add(orgId);
}
- setExpandedOrgs(newExpanded);
- },
- [expandedOrgs]
- );
+ return next;
+ });
+ }, []);
const formatSubscriptionStatus = (subscription: AdminOrganizationData["subscription"]) => {
- const statusColor =
- subscription.status === "active" || subscription.status === "trialing"
- ? "default"
- : subscription.status === "canceled"
- ? "destructive"
- : "secondary";
- return <Badge variant={statusColor}>{subscription.planName}</Badge>;
+ const variant =
+ subscription.status === "canceled"
+ ? ("destructive" as const)
+ : subscription.status === "active" || subscription.status === "trialing"
+ ? ("default" as const)
+ : ("secondary" as const);
+ return <Badge variant={variant}>{subscription.planName}</Badge>;
};
const columns = useMemo<ColumnDef<AdminOrganizationData>[]>(
@@ -68,13 +81,20 @@ export function OrganizationsTable({ organizations, isLoading, searchQuery }: Or
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>
+ <button
+ type="button"
+ aria-expanded={expandedOrgs.has(row.original.id)}
+ aria-label={t("Toggle details")}
+ onClick={e => {
+ e.stopPropagation();
+ toggleExpand(row.original.id);
+ }}
+ className="flex h-5 w-5 items-center justify-center rounded-sm text-neutral-400 hover:text-neutral-900 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-400 dark:hover:text-neutral-100"
+ >
+ <ChevronRight
+ className={cn("h-4 w-4 transition-transform", expandedOrgs.has(row.original.id) && "rotate-90")}
+ />
+ </button>
),
enableSorting: false,
},
@@ -86,39 +106,43 @@ export function OrganizationsTable({ organizations, isLoading, searchQuery }: Or
{
accessorKey: "createdAt",
header: ({ column }) => <SortableHeader column={column}>{t("Created")}</SortableHeader>,
- cell: ({ row }) => <div>{formatRelative(parseUtcTimestamp(row.getValue("createdAt")))}</div>,
+ cell: ({ row }) => (
+ <div className="text-neutral-600 dark:text-neutral-300">
+ {formatRelative(parseUtcTimestamp(row.getValue("createdAt")))}
+ </div>
+ ),
},
{
accessorKey: "monthlyEventCount",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("Monthly Events")}</SortableHeader>,
cell: ({ row }) => {
const count = row.getValue("monthlyEventCount") as number;
const isOverLimit = row.original.overMonthlyLimit;
+ const limit = row.original.subscription.eventLimit;
return (
- <div className={`font-medium ${isOverLimit ? "text-red-400" : ""}`}>
+ <div className={cn("tabular-nums", isOverLimit && "font-medium text-red-500 dark:text-red-400")}>
{formatter(count || 0)}
- {isOverLimit && <span className="text-red-400 ml-1">⚠️</span>}
+ {isOverLimit && limit ? (
+ <span className="ml-1 text-xs text-neutral-500 dark:text-neutral-400">/ {formatter(limit)}</span>
+ ) : null}
</div>
);
},
},
{
id: "eventsLast24Hours",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("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);
- },
+ cell: ({ getValue }) => <span className="tabular-nums">{formatter(getValue<number>())}</span>,
},
{
id: "eventsLast30Days",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("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);
- },
+ cell: ({ getValue }) => <span className="tabular-nums">{formatter(getValue<number>())}</span>,
},
{
id: "subscription",
@@ -128,15 +152,17 @@ export function OrganizationsTable({ organizations, isLoading, searchQuery }: Or
},
{
id: "sites",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("Sites")}</SortableHeader>,
accessorFn: row => row.sites.length,
- cell: ({ row }) => row.original.sites.length,
+ cell: ({ row }) => <span className="tabular-nums">{row.original.sites.length}</span>,
},
{
id: "members",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("Members")}</SortableHeader>,
accessorFn: row => row.members.length,
- cell: ({ row }) => row.original.members.length,
+ cell: ({ row }) => <span className="tabular-nums">{row.original.members.length}</span>,
},
],
[toggleExpand, expandedOrgs]
@@ -187,80 +213,77 @@ export function OrganizationsTable({ organizations, isLoading, searchQuery }: Or
return (
<>
- <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 => (
- <Fragment key={row.id}>
- <TableRow 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>
+ <TableShell>
+ <Table>
+ <TableHeader>
+ {table.getHeaderGroups().map(headerGroup => (
+ <TableRow key={headerGroup.id}>
+ {headerGroup.headers.map(header => (
+ <TableHead
+ key={header.id}
+ className={cn(
+ header.id === "expand" && "w-8",
+ (header.column.columnDef.meta as ColumnAlignMeta | undefined)?.align === "right" && "text-right"
+ )}
+ >
+ {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+ </TableHead>
+ ))}
+ </TableRow>
+ ))}
+ </TableHeader>
+ <TableBody>
+ {isLoading ? (
+ Array(10)
+ .fill(0)
+ .map((_, index) => (
+ <TableRow key={index}>
+ {SKELETON_CELLS.map((cell, cellIndex) => (
+ <TableCell key={cellIndex}>
+ <Skeleton className={cn("h-5", cell.width, cell.right && "ml-auto")} />
+ </TableCell>
+ ))}
</TableRow>
- )}
- </Fragment>
- ))
- ) : (
- <TableRow>
- <TableCell colSpan={columns.length} className="text-center py-6 text-muted-foreground">
- {searchQuery ? t("No organizations match your search") : t("No organizations found")}
- </TableCell>
- </TableRow>
- )}
- </TableBody>
- </Table>
- <div className="mt-4">
+ ))
+ ) : paginatedOrganizations && paginatedOrganizations.length > 0 ? (
+ paginatedOrganizations.map(row => (
+ <Fragment key={row.id}>
+ <TableRow className="cursor-pointer" onClick={() => toggleExpand(row.original.id)}>
+ {row.getVisibleCells().map(cell => (
+ <TableCell
+ key={cell.id}
+ className={cn(
+ (cell.column.columnDef.meta as ColumnAlignMeta | undefined)?.align === "right" &&
+ "text-right"
+ )}
+ >
+ {flexRender(cell.column.columnDef.cell, cell.getContext())}
+ </TableCell>
+ ))}
+ </TableRow>
+ {expandedOrgs.has(row.original.id) && (
+ <TableRow className="hover:bg-transparent dark:hover:bg-transparent">
+ <TableCell
+ colSpan={columns.length}
+ className="bg-neutral-50 px-8 py-4 dark:bg-neutral-950/40"
+ >
+ <OrganizationExpandedRow organization={row.original} />
+ </TableCell>
+ </TableRow>
+ )}
+ </Fragment>
+ ))
+ ) : (
+ <TableRow>
+ <TableCell colSpan={columns.length} className="py-8 text-center text-muted-foreground">
+ {searchQuery ? t("No organizations match your search") : t("No organizations found")}
+ </TableCell>
+ </TableRow>
+ )}
+ </TableBody>
+ </Table>
+ </TableShell>
+ <div className="mt-3">
<Pagination
table={paginationController}
data={
diff --git a/client/src/app/admin/components/shared/AdminLayout.tsx b/client/src/app/admin/components/shared/AdminLayout.tsx
index 46cfa238f..b8b2e7db7 100644
--- a/client/src/app/admin/components/shared/AdminLayout.tsx
+++ b/client/src/app/admin/components/shared/AdminLayout.tsx
@@ -1,8 +1,8 @@
"use client";
-import { Button } from "@/components/ui/button";
import { redirect } from "next/navigation";
import { ReactNode } from "react";
+import { useExtracted } from "next-intl";
import { useAdminPermission } from "../../hooks/useAdminPermission";
interface AdminLayoutProps {
@@ -11,19 +11,22 @@ interface AdminLayoutProps {
export function AdminLayout({ children }: AdminLayoutProps) {
const { isAdmin, isCheckingAdmin } = useAdminPermission();
+ const t = useExtracted();
- // If not admin, show access denied
if (!isAdmin && !isCheckingAdmin) {
redirect("/");
}
if (isCheckingAdmin) {
return (
- <div className="flex items-center justify-center min-h-[200px]">
- <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-neutral-400"></div>
+ <div className="flex min-h-[50vh] items-center justify-center">
+ <div className="flex items-center gap-3 text-sm text-neutral-500 dark:text-neutral-400">
+ <div className="h-4 w-4 animate-spin rounded-full border-2 border-neutral-300 border-t-transparent dark:border-neutral-600 dark:border-t-transparent" />
+ {t("Checking access...")}
+ </div>
</div>
);
}
- return <div>{children}</div>;
+ return <>{children}</>;
}
diff --git a/client/src/app/admin/components/shared/AdminTablePagination.tsx b/client/src/app/admin/components/shared/AdminTablePagination.tsx
deleted file mode 100644
index 61b291265..000000000
--- a/client/src/app/admin/components/shared/AdminTablePagination.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-"use client";
-
-import { Table } from "@tanstack/react-table";
-import { Pagination } from "@/components/pagination";
-
-interface AdminTablePaginationProps<TData> {
- table: Table<TData>;
- data: { items: TData[]; total: number } | undefined;
- pagination: { pageIndex: number; pageSize: number };
- setPagination: (value: { pageIndex: number; pageSize: number }) => void;
- isLoading: boolean;
- itemName: string;
-}
-
-export function AdminTablePagination<TData>({
- table,
- data,
- pagination,
- setPagination,
- isLoading,
- itemName,
-}: AdminTablePaginationProps<TData>) {
- return (
- <Pagination
- table={table}
- data={data}
- pagination={pagination}
- setPagination={setPagination}
- isLoading={isLoading}
- itemName={itemName}
- />
- );
-}
diff --git a/client/src/app/admin/components/shared/GrowthChart.tsx b/client/src/app/admin/components/shared/GrowthChart.tsx
index 5f8475329..ae6abc02a 100644
--- a/client/src/app/admin/components/shared/GrowthChart.tsx
+++ b/client/src/app/admin/components/shared/GrowthChart.tsx
@@ -11,11 +11,10 @@ import { ChartTooltip } from "@/components/charts/ChartTooltip";
interface GrowthChartProps {
data?: Array<{ createdAt: string }>;
- color?: string;
title: string;
}
-export function GrowthChart({ data, color = "#3b82f6", title }: GrowthChartProps) {
+export function GrowthChart({ data, title }: GrowthChartProps) {
const { width } = useWindowSize();
const maxTicks = Math.round((width ?? Infinity) / 200);
const nivoTheme = useNivoTheme();
@@ -111,8 +110,9 @@ export function GrowthChart({ data, color = "#3b82f6", title }: GrowthChartProps
useMesh={true}
animate={false}
enableSlices={"x"}
- colors={[color]}
- enableArea={false}
+ colors={["hsl(var(--dataviz))"]}
+ enableArea={true}
+ areaOpacity={0.1}
sliceTooltip={({ slice }: any) => {
const point = slice.points[0];
diff --git a/client/src/app/admin/components/shared/Panel.tsx b/client/src/app/admin/components/shared/Panel.tsx
new file mode 100644
index 000000000..131390a1e
--- /dev/null
+++ b/client/src/app/admin/components/shared/Panel.tsx
@@ -0,0 +1,48 @@
+"use client";
+
+import { cn } from "@/lib/utils";
+import { ReactNode } from "react";
+
+interface PanelProps {
+ /** Left side of the header row. Strings render as a title; nodes render as-is (e.g. a TabsList). */
+ title?: ReactNode;
+ /** Right side of the header row. */
+ actions?: ReactNode;
+ /** Render children flush against the panel edges (tables); default adds p-4. */
+ flush?: boolean;
+ className?: string;
+ children: ReactNode;
+}
+
+export function Panel({ title, actions, flush = false, className, children }: PanelProps) {
+ return (
+ <div
+ className={cn(
+ "overflow-hidden rounded-lg border border-neutral-100 bg-white dark:border-neutral-850 dark:bg-neutral-900",
+ className
+ )}
+ >
+ {(title || actions) && (
+ <div className="flex min-h-11 flex-wrap items-center justify-between gap-2 border-b border-neutral-100 px-4 py-2 dark:border-neutral-850">
+ {typeof title === "string" ? <h3 className="text-sm font-medium">{title}</h3> : (title ?? <div />)}
+ {actions}
+ </div>
+ )}
+ <div className={cn(!flush && "p-4")}>{children}</div>
+ </div>
+ );
+}
+
+/** Hairline-bordered wrapper that gives every admin table the same seams. */
+export function TableShell({ children, className }: { children: ReactNode; className?: string }) {
+ return (
+ <div
+ className={cn(
+ "overflow-hidden rounded-lg border border-neutral-100 bg-white dark:border-neutral-850 dark:bg-neutral-900",
+ className
+ )}
+ >
+ {children}
+ </div>
+ );
+}
diff --git a/client/src/app/admin/components/shared/StatStrip.tsx b/client/src/app/admin/components/shared/StatStrip.tsx
new file mode 100644
index 000000000..7aa8b05ba
--- /dev/null
+++ b/client/src/app/admin/components/shared/StatStrip.tsx
@@ -0,0 +1,54 @@
+"use client";
+
+import { Skeleton } from "@/components/ui/skeleton";
+import { cn } from "@/lib/utils";
+
+export interface StatItem {
+ label: string;
+ value: string;
+ hint?: string;
+}
+
+interface StatStripProps {
+ stats: StatItem[];
+ isLoading?: boolean;
+ className?: string;
+}
+
+/**
+ * A flat row of figures separated by hairlines: the instrument-panel
+ * replacement for icon KPI cards. 2-up on mobile, one row on desktop.
+ */
+export function StatStrip({ stats, isLoading = false, className }: StatStripProps) {
+ return (
+ <div
+ className={cn(
+ "grid grid-cols-2 overflow-hidden rounded-lg border border-neutral-100 bg-white dark:border-neutral-850 dark:bg-neutral-900",
+ stats.length === 3 ? "lg:grid-cols-3" : "lg:grid-cols-4",
+ className
+ )}
+ >
+ {stats.map((stat, i) => (
+ <div
+ key={stat.label}
+ className={cn(
+ "border-neutral-100 px-4 py-3 dark:border-neutral-850",
+ i % 2 === 1 && "border-l",
+ i >= 2 && "border-t lg:border-t-0",
+ i > 0 ? "lg:border-l" : "lg:border-l-0"
+ )}
+ >
+ <div className="text-xs font-medium text-neutral-500 dark:text-neutral-400">{stat.label}</div>
+ {isLoading ? (
+ <Skeleton className="mt-1.5 h-6 w-20" />
+ ) : (
+ <div className="mt-0.5 text-xl font-semibold tabular-nums tracking-tight">{stat.value}</div>
+ )}
+ {stat.hint && !isLoading && (
+ <div className="mt-0.5 text-xs text-neutral-500 dark:text-neutral-500">{stat.hint}</div>
+ )}
+ </div>
+ ))}
+ </div>
+ );
+}
diff --git a/client/src/app/admin/components/sites/Sites.tsx b/client/src/app/admin/components/sites/Sites.tsx
index 5ab59faad..a04f15bd3 100644
--- a/client/src/app/admin/components/sites/Sites.tsx
+++ b/client/src/app/admin/components/sites/Sites.tsx
@@ -32,16 +32,33 @@ import { useExtracted } from "next-intl";
import Link from "next/link";
import { useMemo, useState } from "react";
import { Favicon } from "../../../../components/Favicon";
+import { Pagination } from "../../../../components/pagination";
import { useDateTimeFormat } from "../../../../hooks/useDateTimeFormat";
import { parseUtcTimestamp } from "../../../../lib/dateTimeUtils";
-import { formatter, truncateString } from "../../../../lib/utils";
-import { AdminLayout } from "../shared/AdminLayout";
-import { AdminTablePagination } from "../shared/AdminTablePagination";
+import { cn, formatter, truncateString } from "../../../../lib/utils";
import { ErrorAlert } from "../shared/ErrorAlert";
import { GrowthChart } from "../shared/GrowthChart";
+import { Panel, TableShell } from "../shared/Panel";
import { SearchInput } from "../shared/SearchInput";
import { SortableHeader } from "../shared/SortableHeader";
+type ColumnAlignMeta = { align?: "right" };
+
+const SKELETON_CELLS: Array<{ width: string; right?: boolean }> = [
+ { width: "w-10" },
+ { width: "w-40" },
+ { width: "w-24" },
+ { width: "w-14" },
+ { width: "w-16", right: true },
+ { width: "w-16", right: true },
+ { width: "w-8", right: true },
+ { width: "w-8", right: true },
+ { width: "w-10" },
+ { width: "w-20" },
+ { width: "w-40" },
+ { width: "w-14" },
+];
+
function MoveSiteCell({ site }: { site: AdminSiteData }) {
const t = useExtracted();
const queryClient = useQueryClient();
@@ -144,18 +161,20 @@ export function Sites() {
accessorKey: "siteId",
header: ({ column }) => <SortableHeader column={column}>{t("Site ID")}</SortableHeader>,
cell: ({ row }) => (
- <div>
- <Link href={`/${row.getValue("siteId")}`} target="_blank" className="hover:underline">
- {row.getValue("siteId")}
- </Link>
- </div>
+ <Link
+ href={`/${row.getValue("siteId")}`}
+ target="_blank"
+ className="tabular-nums text-neutral-600 hover:underline dark:text-neutral-300"
+ >
+ {row.getValue("siteId")}
+ </Link>
),
},
{
accessorKey: "name",
header: ({ column }) => <SortableHeader column={column}>{t("Name")}</SortableHeader>,
cell: ({ row }) => (
- <div className="font-medium flex items-center gap-2">
+ <div className="flex items-center gap-2 font-medium">
<Favicon domain={row.original.domain} className="w-5 h-5 shrink-0" />
<Link href={`https://${row.original.domain}`} target="_blank" className="hover:underline">
{truncateString(row.original.domain, 35)}
@@ -166,45 +185,57 @@ export function Sites() {
{
accessorKey: "createdAt",
header: ({ column }) => <SortableHeader column={column}>{t("Created")}</SortableHeader>,
- cell: ({ row }) => <div>{formatRelative(parseUtcTimestamp(row.getValue("createdAt")))}</div>,
+ cell: ({ row }) => (
+ <div className="text-neutral-600 dark:text-neutral-300">
+ {formatRelative(parseUtcTimestamp(row.getValue("createdAt")))}
+ </div>
+ ),
},
{
accessorKey: "public",
header: ({ column }) => <SortableHeader column={column}>{t("Public")}</SortableHeader>,
- cell: ({ row }) => (
- <div>
- {row.getValue("public") ? <Badge>{t("Public")}</Badge> : <Badge variant="outline">{t("Private")}</Badge>}
- </div>
- ),
+ cell: ({ row }) =>
+ row.getValue("public") ? (
+ <Badge>{t("Public")}</Badge>
+ ) : (
+ <Badge variant="outline">{t("Private")}</Badge>
+ ),
},
{
accessorKey: "eventsLast24Hours",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("Events (24h)")}</SortableHeader>,
- cell: ({ row }) => <div>{formatter(Number(row.getValue("eventsLast24Hours")))}</div>,
+ cell: ({ row }) => <span className="tabular-nums">{formatter(Number(row.getValue("eventsLast24Hours")))}</span>,
},
{
accessorKey: "eventsLast30Days",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("Events (30d)")}</SortableHeader>,
- cell: ({ row }) => <div>{formatter(Number(row.getValue("eventsLast30Days")))}</div>,
+ cell: ({ row }) => <span className="tabular-nums">{formatter(Number(row.getValue("eventsLast30Days")))}</span>,
},
{
accessorKey: "goalsCount",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("Goals")}</SortableHeader>,
- cell: ({ row }) => <div>{row.getValue("goalsCount")}</div>,
+ cell: ({ row }) => <span className="tabular-nums">{row.getValue("goalsCount")}</span>,
},
{
accessorKey: "funnelsCount",
+ meta: { align: "right" } satisfies ColumnAlignMeta,
header: ({ column }) => <SortableHeader column={column}>{t("Funnels")}</SortableHeader>,
- cell: ({ row }) => <div>{row.getValue("funnelsCount")}</div>,
+ cell: ({ row }) => <span className="tabular-nums">{row.getValue("funnelsCount")}</span>,
},
{
accessorKey: "sessionReplay",
header: ({ column }) => <SortableHeader column={column}>{t("Replay")}</SortableHeader>,
- cell: ({ row }) => (
- <div>
- {row.getValue("sessionReplay") ? <Badge>{t("On")}</Badge> : <Badge variant="outline">{t("Off")}</Badge>}
- </div>
- ),
+ cell: ({ row }) =>
+ row.getValue("sessionReplay") ? (
+ <Badge variant="success">{t("On")}</Badge>
+ ) : (
+ <Badge variant="ghost" className="text-neutral-500 dark:text-neutral-400">
+ {t("Off")}
+ </Badge>
+ ),
},
{
id: "subscription",
@@ -212,19 +243,23 @@ export function Sites() {
accessorFn: row => row.subscription.planName,
cell: ({ row }) => {
const subscription = row.original.subscription;
- const statusColor =
- subscription.status === "active" || subscription.status === "trialing"
- ? "default"
- : subscription.status === "canceled"
- ? "destructive"
- : "secondary";
- return <Badge variant={statusColor}>{subscription.planName}</Badge>;
+ const variant =
+ subscription.status === "canceled"
+ ? ("destructive" as const)
+ : subscription.status === "active" || subscription.status === "trialing"
+ ? ("default" as const)
+ : ("secondary" as const);
+ return <Badge variant={variant}>{subscription.planName}</Badge>;
},
},
{
accessorKey: "organizationOwnerEmail",
header: ({ column }) => <SortableHeader column={column}>{t("Owner Email")}</SortableHeader>,
- cell: ({ row }) => <div>{row.getValue("organizationOwnerEmail") || "-"}</div>,
+ cell: ({ row }) => (
+ <div className="text-neutral-600 dark:text-neutral-300">
+ {row.getValue("organizationOwnerEmail") || "-"}
+ </div>
+ ),
},
{
id: "actions",
@@ -252,101 +287,99 @@ export function Sites() {
});
if (isError) {
- return (
- <AdminLayout>
- <ErrorAlert message={t("Failed to load sites data. Please try again later.")} />
- </AdminLayout>
- );
+ return <ErrorAlert message={t("Failed to load sites data. Please try again later.")} />;
}
return (
- <AdminLayout>
- <GrowthChart data={sites} title={t("Sites")} color="#10b981" />
+ <div className="space-y-6">
+ <Panel
+ title={t("New sites per day")}
+ actions={
+ sites ? (
+ <span className="text-xs tabular-nums text-neutral-500 dark:text-neutral-400">
+ {t("{count} total", { count: sites.length.toLocaleString() })}
+ </span>
+ ) : undefined
+ }
+ >
+ <GrowthChart data={sites} title={t("Sites")} />
+ </Panel>
- <div className="mb-4">
- <SearchInput
- placeholder={t("Search by domain or owner email...")}
- value={searchQuery}
- onChange={setSearchQuery}
- />
- </div>
+ <div className="space-y-3">
+ <div className="flex flex-wrap items-center gap-2">
+ <SearchInput
+ placeholder={t("Search by domain or owner email...")}
+ value={searchQuery}
+ onChange={setSearchQuery}
+ className="w-full sm:w-auto sm:min-w-[280px]"
+ />
+ {!isLoading && searchQuery && (
+ <span className="text-sm tabular-nums text-neutral-500 dark:text-neutral-400">
+ {t("{count} matching", { count: filteredSites.length.toLocaleString() })}
+ </span>
+ )}
+ </div>
- <Table>
- <TableHeader>
- {table.getHeaderGroups().map(headerGroup => (
- <TableRow key={headerGroup.id}>
- {headerGroup.headers.map(header => (
- <TableHead key={header.id}>
- {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
- </TableHead>
+ <TableShell>
+ <Table>
+ <TableHeader>
+ {table.getHeaderGroups().map(headerGroup => (
+ <TableRow key={headerGroup.id}>
+ {headerGroup.headers.map(header => (
+ <TableHead
+ key={header.id}
+ className={cn(
+ (header.column.columnDef.meta as ColumnAlignMeta | undefined)?.align === "right" &&
+ "text-right"
+ )}
+ >
+ {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+ </TableHead>
+ ))}
+ </TableRow>
))}
- </TableRow>
- ))}
- </TableHeader>
- <TableBody>
- {isLoading ? (
- Array(pagination.pageSize)
- .fill(0)
- .map((_, index) => (
- <TableRow key={index}>
- <TableCell>
- <Skeleton className="h-5 w-10" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-40" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-24" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-16" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-16" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-16" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-12" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-12" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-12" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-20" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-40" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-16" />
+ </TableHeader>
+ <TableBody>
+ {isLoading ? (
+ Array(10)
+ .fill(0)
+ .map((_, index) => (
+ <TableRow key={index}>
+ {SKELETON_CELLS.map((cell, cellIndex) => (
+ <TableCell key={cellIndex}>
+ <Skeleton className={cn("h-5", cell.width, cell.right && "ml-auto")} />
+ </TableCell>
+ ))}
+ </TableRow>
+ ))
+ ) : table.getRowModel().rows.length === 0 ? (
+ <TableRow>
+ <TableCell colSpan={columns.length} className="py-8 text-center text-muted-foreground">
+ {searchQuery ? t("No sites match your search") : t("No sites found")}
</TableCell>
</TableRow>
- ))
- ) : table.getRowModel().rows.length === 0 ? (
- <TableRow>
- <TableCell colSpan={columns.length} className="text-center py-6 text-muted-foreground">
- {searchQuery ? t("No sites match your search") : t("No sites found")}
- </TableCell>
- </TableRow>
- ) : (
- table.getRowModel().rows.map(row => (
- <TableRow key={row.id}>
- {row.getVisibleCells().map(cell => (
- <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
- ))}
- </TableRow>
- ))
- )}
- </TableBody>
- </Table>
+ ) : (
+ table.getRowModel().rows.map(row => (
+ <TableRow key={row.id}>
+ {row.getVisibleCells().map(cell => (
+ <TableCell
+ key={cell.id}
+ className={cn(
+ (cell.column.columnDef.meta as ColumnAlignMeta | undefined)?.align === "right" &&
+ "text-right"
+ )}
+ >
+ {flexRender(cell.column.columnDef.cell, cell.getContext())}
+ </TableCell>
+ ))}
+ </TableRow>
+ ))
+ )}
+ </TableBody>
+ </Table>
+ </TableShell>
- <div className="mt-4">
- <AdminTablePagination
+ <Pagination
table={table}
data={filteredSites ? { items: filteredSites, total: filteredSites.length } : undefined}
pagination={pagination}
@@ -355,6 +388,6 @@ export function Sites() {
itemName="sites"
/>
</div>
- </AdminLayout>
+ </div>
);
}
diff --git a/client/src/app/admin/components/users/UserFilters.tsx b/client/src/app/admin/components/users/UserFilters.tsx
index 121977386..6c8c47cb5 100644
--- a/client/src/app/admin/components/users/UserFilters.tsx
+++ b/client/src/app/admin/components/users/UserFilters.tsx
@@ -1,50 +1,37 @@
"use client";
-import { Search } from "lucide-react";
-import { Table } from "@tanstack/react-table";
-import { AdminUser } from "@/types/admin";
-import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { useExtracted } from "next-intl";
+import { SearchInput } from "../shared/SearchInput";
interface UserFiltersProps {
- table: Table<AdminUser>;
+ email: string;
+ onEmailChange: (value: string) => void;
+ role: string;
+ onRoleChange: (value: string) => void;
}
-export function UserFilters({ table }: UserFiltersProps) {
+export function UserFilters({ email, onEmailChange, role, onRoleChange }: UserFiltersProps) {
const t = useExtracted();
+
return (
- <div className="flex flex-col md:flex-row gap-4">
- <div className="relative flex-1">
- <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-500 dark:text-neutral-400" />
- <Input
- placeholder={t("Filter by email...")}
- value={(table.getColumn("email")?.getFilterValue() as string) ?? ""}
- onChange={e => table.getColumn("email")?.setFilterValue(e.target.value)}
- className="pl-9 bg-neutral-50 dark:bg-neutral-900 border-neutral-100 dark:border-neutral-800"
- />
- </div>
- <div className="w-full md:w-48">
- <Select
- value={(table.getColumn("role")?.getFilterValue() as string) ?? ""}
- onValueChange={value => {
- if (value === "all") {
- table.getColumn("role")?.setFilterValue("");
- } else {
- table.getColumn("role")?.setFilterValue(value);
- }
- }}
- >
- <SelectTrigger>
- <SelectValue placeholder={t("Filter by role")} />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="all">{t("All Roles")}</SelectItem>
- <SelectItem value="admin">{t("Admin")}</SelectItem>
- <SelectItem value="user">{t("User")}</SelectItem>
- </SelectContent>
- </Select>
- </div>
+ <div className="flex flex-wrap items-center gap-2">
+ <SearchInput
+ placeholder={t("Filter by email...")}
+ value={email}
+ onChange={onEmailChange}
+ className="w-full sm:w-auto sm:min-w-[280px]"
+ />
+ <Select value={role || "all"} onValueChange={value => onRoleChange(value === "all" ? "" : value)}>
+ <SelectTrigger className="w-36">
+ <SelectValue placeholder={t("All roles")} />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="all">{t("All roles")}</SelectItem>
+ <SelectItem value="admin">{t("Admin")}</SelectItem>
+ <SelectItem value="user">{t("User")}</SelectItem>
+ </SelectContent>
+ </Select>
</div>
);
}
diff --git a/client/src/app/admin/components/users/UserTableSkeleton.tsx b/client/src/app/admin/components/users/UserTableSkeleton.tsx
index ffc9fa480..1b210f9f8 100644
--- a/client/src/app/admin/components/users/UserTableSkeleton.tsx
+++ b/client/src/app/admin/components/users/UserTableSkeleton.tsx
@@ -1,40 +1,39 @@
"use client";
+import { Skeleton } from "@/components/ui/skeleton";
import { TableCell, TableRow } from "@/components/ui/table";
-interface SkeletonProps {
+interface UserTableSkeletonProps {
rowCount?: number;
- columnCount?: number;
}
-export function UserTableSkeleton({ rowCount = 50 }: SkeletonProps) {
+export function UserTableSkeleton({ rowCount = 10 }: UserTableSkeletonProps) {
return (
<>
{Array.from({ length: rowCount }).map((_, index) => (
- <TableRow key={index} className="animate-pulse">
- {/* User ID column */}
+ <TableRow key={index}>
+ {/* User (name + email) */}
<TableCell>
- <div className="h-6 bg-neutral-800 rounded w-32 font-mono"></div>
+ <div className="space-y-1 py-0.5">
+ <Skeleton className="h-4 w-32" />
+ <Skeleton className="h-3 w-44" />
+ </div>
</TableCell>
- {/* Name column */}
+ {/* Role */}
<TableCell>
- <div className="h-6 bg-neutral-800 rounded w-24"></div>
+ <Skeleton className="h-4 w-12" />
</TableCell>
- {/* Email column */}
+ {/* Created */}
<TableCell>
- <div className="h-6 bg-neutral-800 rounded w-48"></div>
+ <Skeleton className="h-4 w-24" />
</TableCell>
- {/* Role column */}
+ {/* User ID */}
<TableCell>
- <div className="h-6 bg-neutral-800 rounded w-16"></div>
+ <Skeleton className="h-4 w-24" />
</TableCell>
- {/* Created At column */}
+ {/* Actions */}
<TableCell>
- <div className="h-6 bg-neutral-800 rounded w-24"></div>
- </TableCell>
- {/* Action column */}
- <TableCell>
- <div className="h-8 bg-neutral-800 rounded w-28"></div>
+ <Skeleton className="ml-auto h-8 w-8" />
</TableCell>
</TableRow>
))}
diff --git a/client/src/app/admin/components/users/Users.tsx b/client/src/app/admin/components/users/Users.tsx
index 3401799c2..9d64a2b5d 100644
--- a/client/src/app/admin/components/users/Users.tsx
+++ b/client/src/app/admin/components/users/Users.tsx
@@ -1,7 +1,5 @@
"use client";
-import { AdminLayout } from "@/app/admin/components/shared/AdminLayout";
-import { AdminTablePagination } from "@/app/admin/components/shared/AdminTablePagination";
import { ErrorAlert } from "@/app/admin/components/shared/ErrorAlert";
import { UserFilters } from "@/app/admin/components/users/UserFilters";
import { UsersTable } from "@/app/admin/components/users/UsersTable";
@@ -14,15 +12,10 @@ export function Users() {
const t = useExtracted();
const {
- // Data
users,
total,
-
- // Loading state
isLoading,
isError,
-
- // Table state
sorting,
setSorting,
columnFilters,
@@ -31,12 +24,21 @@ export function Users() {
setPagination,
globalFilter,
setGlobalFilter,
-
- // Actions
handleImpersonate,
} = useAdminUsers();
- const data = { users, total };
+ const getFilterValue = (columnId: string) =>
+ (columnFilters.find(filter => filter.id === columnId)?.value as string) ?? "";
+
+ const setFilterValue = (columnId: string, value: string) => {
+ const next = columnFilters.filter(filter => filter.id !== columnId);
+ if (value) {
+ next.push({ id: columnId, value });
+ }
+ setColumnFilters(next);
+ // A new filter invalidates the current page
+ setPagination({ ...pagination, pageIndex: 0 });
+ };
// Handle impersonation with navigation
const onImpersonate = async (userId: string) => {
@@ -48,83 +50,31 @@ export function Users() {
};
if (isError) {
- return (
- <AdminLayout>
- <ErrorAlert message={t("Failed to load users. Please try again later.")} />
- </AdminLayout>
- );
+ return <ErrorAlert message={t("Failed to load users. Please try again later.")} />;
}
return (
- <AdminLayout>
- <div className="space-y-4">
- {/* Filters */}
- <UserFilters
- table={
- {
- getColumn: (columnId: string) => {
- const getFilterValue = () => columnFilters.find(filter => filter.id === columnId)?.value ?? "";
-
- const setFilterValue = (value: string) => {
- const newFilters = columnFilters.filter(filter => filter.id !== columnId);
- if (value) {
- newFilters.push({ id: columnId, value });
- }
- setColumnFilters(newFilters);
- };
-
- return {
- getFilterValue,
- setFilterValue,
- };
- },
- } as any
- }
- />
-
- {/* Users Table */}
- <UsersTable
- data={data}
- isLoading={isLoading}
- pagination={pagination}
- setPagination={setPagination}
- sorting={sorting}
- setSorting={setSorting}
- columnFilters={columnFilters}
- setColumnFilters={setColumnFilters}
- globalFilter={globalFilter}
- setGlobalFilter={setGlobalFilter}
- onImpersonate={onImpersonate}
- />
-
- {/* Pagination */}
- <AdminTablePagination
- table={
- {
- getCanPreviousPage: () => pagination.pageIndex > 0,
- getCanNextPage: () => pagination.pageIndex < Math.ceil(total / pagination.pageSize) - 1,
- getPageCount: () => Math.ceil(total / pagination.pageSize),
- getState: () => ({ pagination }),
- setPageIndex: (index: number) => setPagination({ ...pagination, pageIndex: index }),
- previousPage: () =>
- setPagination({
- ...pagination,
- pageIndex: Math.max(0, pagination.pageIndex - 1),
- }),
- nextPage: () =>
- setPagination({
- ...pagination,
- pageIndex: Math.min(Math.ceil(total / pagination.pageSize) - 1, pagination.pageIndex + 1),
- }),
- } as any
- }
- data={data ? { items: data.users, total: data.total } : undefined}
- pagination={pagination}
- setPagination={setPagination}
- isLoading={isLoading}
- itemName="users"
- />
- </div>
- </AdminLayout>
+ <div className="space-y-3">
+ <UserFilters
+ email={getFilterValue("email")}
+ onEmailChange={value => setFilterValue("email", value)}
+ role={getFilterValue("role")}
+ onRoleChange={value => setFilterValue("role", value)}
+ />
+ <UsersTable
+ data={{ users, total }}
+ isLoading={isLoading}
+ pagination={pagination}
+ setPagination={setPagination}
+ sorting={sorting}
+ setSorting={setSorting}
+ columnFilters={columnFilters}
+ setColumnFilters={setColumnFilters}
+ globalFilter={globalFilter}
+ setGlobalFilter={setGlobalFilter}
+ onImpersonate={onImpersonate}
+ hasActiveFilters={columnFilters.length > 0}
+ />
+ </div>
);
}
diff --git a/client/src/app/admin/components/users/UsersTable.tsx b/client/src/app/admin/components/users/UsersTable.tsx
index ac29d4284..25d993ce1 100644
--- a/client/src/app/admin/components/users/UsersTable.tsx
+++ b/client/src/app/admin/components/users/UsersTable.tsx
@@ -3,6 +3,7 @@
import { useMemo, useState } from "react";
import { AdminUser } from "@/types/admin";
import { Check, ChevronsUpDown, MoreVertical, User, UserMinus, UserPlus } from "lucide-react";
+import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
@@ -36,6 +37,8 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
import { UserTableSkeleton } from "./UserTableSkeleton";
import { userStore } from "@/lib/userStore";
import { SortableHeader } from "../shared/SortableHeader";
+import { TableShell } from "../shared/Panel";
+import { Pagination } from "@/components/pagination";
import { useDateTimeFormat } from "../../../../hooks/useDateTimeFormat";
import { parseUtcTimestamp } from "../../../../lib/dateTimeUtils";
import { AddToOrganizationDialog } from "./AddToOrganizationDialog";
@@ -45,6 +48,7 @@ import { toast } from "@/components/ui/sonner";
import { Label } from "@/components/ui/label";
import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { CopyText } from "../../../../components/CopyText";
import { cn } from "@/lib/utils";
import { useExtracted } from "next-intl";
@@ -60,6 +64,7 @@ interface UsersTableProps {
globalFilter: string;
setGlobalFilter: (filter: string) => void;
onImpersonate: (userId: string) => void;
+ hasActiveFilters?: boolean;
}
export function UsersTable({
@@ -74,6 +79,7 @@ export function UsersTable({
globalFilter,
setGlobalFilter,
onImpersonate,
+ hasActiveFilters = false,
}: UsersTableProps) {
const [selectedUser, setSelectedUser] = useState<AdminUser | null>(null);
const [showAddToOrgDialog, setShowAddToOrgDialog] = useState(false);
@@ -106,72 +112,94 @@ export function UsersTable({
// Define columns for the table
const columns = useMemo<ColumnDef<AdminUser>[]>(
() => [
- {
- accessorKey: "id",
- header: ({ column }) => <SortableHeader column={column}>{t("User ID")}</SortableHeader>,
- cell: ({ row }) => <div className="font-mono">{row.getValue("id")}</div>,
- },
- {
- accessorKey: "name",
- header: ({ column }) => <SortableHeader column={column}>{t("Name")}</SortableHeader>,
- cell: ({ row }) => row.getValue("name") || t("N/A"),
- },
{
accessorKey: "email",
- header: ({ column }) => <SortableHeader column={column}>{t("Email")}</SortableHeader>,
- cell: ({ row }) => row.getValue("email"),
+ header: ({ column }) => <SortableHeader column={column}>{t("User")}</SortableHeader>,
+ cell: ({ row }) => (
+ <div className="py-0.5">
+ <div className="font-medium">{row.original.name || row.original.email}</div>
+ {row.original.name && (
+ <div className="text-xs text-neutral-500 dark:text-neutral-400">{row.original.email}</div>
+ )}
+ </div>
+ ),
},
{
accessorKey: "role",
header: ({ column }) => <SortableHeader column={column}>{t("Role")}</SortableHeader>,
- cell: ({ row }) => row.getValue("role") || "user",
+ cell: ({ row }) => {
+ const role = (row.getValue("role") as string) || "user";
+ return role === "admin" ? (
+ <Badge variant="info">{t("admin")}</Badge>
+ ) : (
+ <span className="text-neutral-500 dark:text-neutral-400">{role}</span>
+ );
+ },
},
{
accessorKey: "createdAt",
- header: ({ column }) => <SortableHeader column={column}>{t("Created At")}</SortableHeader>,
- cell: ({ row }) => <div>{formatRelative(parseUtcTimestamp(row.getValue("createdAt")))}</div>,
+ header: ({ column }) => <SortableHeader column={column}>{t("Created")}</SortableHeader>,
+ cell: ({ row }) => (
+ <div className="text-neutral-600 dark:text-neutral-300">
+ {formatRelative(parseUtcTimestamp(row.getValue("createdAt")))}
+ </div>
+ ),
+ },
+ {
+ accessorKey: "id",
+ enableSorting: false,
+ header: () => <span>{t("User ID")}</span>,
+ cell: ({ row }) => (
+ <CopyText
+ text={row.original.id}
+ maxLength={10}
+ className="text-neutral-500 dark:text-neutral-400 [&>span]:text-xs"
+ />
+ ),
},
{
id: "actions",
- header: t("Actions"),
+ header: () => <span className="sr-only">{t("Actions")}</span>,
cell: ({ row }) => (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
- <MoreVertical className="h-4 w-4" />
- <span className="sr-only">{t("Open menu")}</span>
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem
- onClick={() => onImpersonate(row.original.id)}
- disabled={row.original.id === userStore.getState().user?.id}
- >
- <User className="h-4 w-4" />
- {t("Impersonate")}
- </DropdownMenuItem>
- <DropdownMenuItem
- onClick={() => {
- setSelectedUser(row.original);
- setShowAddToOrgDialog(true);
- }}
- >
- <UserPlus className="h-4 w-4" />
- {t("Add to Organization")}
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
- onClick={() => {
- setSelectedUser(row.original);
- setShowRemoveConfirmDialog(true);
- }}
- className="text-orange-500 focus:text-orange-600"
- >
- <UserMinus className="h-4 w-4" />
- {t("Remove from Organization")}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <div className="text-right">
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
+ <MoreVertical className="h-4 w-4" />
+ <span className="sr-only">{t("Open menu")}</span>
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem
+ onClick={() => onImpersonate(row.original.id)}
+ disabled={row.original.id === userStore.getState().user?.id}
+ >
+ <User className="h-4 w-4" />
+ {t("Impersonate")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() => {
+ setSelectedUser(row.original);
+ setShowAddToOrgDialog(true);
+ }}
+ >
+ <UserPlus className="h-4 w-4" />
+ {t("Add to Organization")}
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onClick={() => {
+ setSelectedUser(row.original);
+ setShowRemoveConfirmDialog(true);
+ }}
+ className="text-orange-500 focus:text-orange-600"
+ >
+ <UserMinus className="h-4 w-4" />
+ {t("Remove from Organization")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
),
},
],
@@ -205,38 +233,51 @@ export function UsersTable({
return (
<div>
- <Table>
- <TableHeader>
- {table.getHeaderGroups().map(headerGroup => (
- <TableRow key={headerGroup.id}>
- {headerGroup.headers.map(header => (
- <TableHead key={header.id}>
- {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
- </TableHead>
- ))}
- </TableRow>
- ))}
- </TableHeader>
- <TableBody>
- {isLoading ? (
- <UserTableSkeleton rowCount={pagination.pageSize} />
- ) : table.getRowModel().rows.length === 0 ? (
- <TableRow>
- <TableCell colSpan={columns.length} className="text-center py-4">
- {t("No users found")}
- </TableCell>
- </TableRow>
- ) : (
- table.getRowModel().rows.map(row => (
- <TableRow key={row.id}>
- {row.getVisibleCells().map(cell => (
- <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+ <TableShell>
+ <Table>
+ <TableHeader>
+ {table.getHeaderGroups().map(headerGroup => (
+ <TableRow key={headerGroup.id}>
+ {headerGroup.headers.map(header => (
+ <TableHead key={header.id} className={cn(header.id === "actions" && "w-10")}>
+ {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+ </TableHead>
))}
</TableRow>
- ))
- )}
- </TableBody>
- </Table>
+ ))}
+ </TableHeader>
+ <TableBody>
+ {isLoading ? (
+ <UserTableSkeleton rowCount={10} />
+ ) : table.getRowModel().rows.length === 0 ? (
+ <TableRow>
+ <TableCell colSpan={columns.length} className="py-8 text-center text-muted-foreground">
+ {hasActiveFilters ? t("No users match the current filters") : t("No users found")}
+ </TableCell>
+ </TableRow>
+ ) : (
+ table.getRowModel().rows.map(row => (
+ <TableRow key={row.id}>
+ {row.getVisibleCells().map(cell => (
+ <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+ ))}
+ </TableRow>
+ ))
+ )}
+ </TableBody>
+ </Table>
+ </TableShell>
+
+ <div className="mt-3">
+ <Pagination
+ table={table}
+ data={data ? { items: data.users, total: data.total } : undefined}
+ pagination={pagination}
+ setPagination={setPagination}
+ isLoading={isLoading}
+ itemName="users"
+ />
+ </div>
{/* Add to Organization Dialog */}
{selectedUser && (
diff --git a/client/src/app/admin/page.tsx b/client/src/app/admin/page.tsx
index e208165ba..31243d785 100644
--- a/client/src/app/admin/page.tsx
+++ b/client/src/app/admin/page.tsx
@@ -2,31 +2,26 @@
import { StandardPage } from "@/components/StandardPage";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { useState } from "react";
-import { Sites } from "./components/sites/Sites";
-import { Users } from "./components/users/Users";
-import { Organizations } from "./components/organizations/Organizations";
-import { AdminLayout } from "./components/shared/AdminLayout";
-import { Database } from "./components/database/Database";
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
+import { Menu } from "lucide-react";
+import { useExtracted } from "next-intl";
+import { parseAsStringLiteral, useQueryState } from "nuqs";
import { AppSidebar } from "../../components/AppSidebar";
-
-import { usePathname } from "next/navigation";
-import { useGetSite } from "../../api/admin/hooks/useSites";
import { Button } from "../../components/ui/button";
import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetTrigger } from "../../components/ui/sheet";
+import { Database } from "./components/database/Database";
+import { Organizations } from "./components/organizations/Organizations";
+import { AdminLayout } from "./components/shared/AdminLayout";
+import { Sites } from "./components/sites/Sites";
+import { Users } from "./components/users/Users";
-import { Menu } from "lucide-react";
-import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
-import { Favicon } from "../../components/Favicon";
-import { useExtracted } from "next-intl";
+const ADMIN_TABS = ["organizations", "sites", "users", "database"] as const;
function MobileSidebar() {
- const pathname = usePathname();
- const { data: site } = useGetSite(Number(pathname.split("/")[1]));
const t = useExtracted();
return (
- <div className="md:hidden flex items-center gap-2">
+ <div className="md:hidden">
<Sheet>
<SheetTrigger asChild>
<Button size="icon" variant="outline">
@@ -42,13 +37,15 @@ function MobileSidebar() {
<AppSidebar />
</SheetContent>
</Sheet>
- {site && <Favicon domain={site.domain} className="w-6 h-6" />}
</div>
);
}
export default function AdminPage() {
- const [activeTab, setActiveTab] = useState("organizations");
+ const [activeTab, setActiveTab] = useQueryState(
+ "tab",
+ parseAsStringLiteral(ADMIN_TABS).withDefault("organizations")
+ );
const t = useExtracted();
return (
@@ -57,34 +54,36 @@ export default function AdminPage() {
<AppSidebar />
</div>
<StandardPage showSidebar={false} fullWidth>
- <div className="mb-2">
- <MobileSidebar />
- </div>
- <div className="text-2xl font-bold mb-4">{t("Admin Dashboard")}</div>
- <Tabs defaultValue="organizations" value={activeTab} onValueChange={setActiveTab}>
- <TabsList className="mb-4">
- <TabsTrigger value="organizations">Organizations</TabsTrigger>
- <TabsTrigger value="sites">Sites</TabsTrigger>
- <TabsTrigger value="users">Users</TabsTrigger>
- <TabsTrigger value="settings">Database</TabsTrigger>
- </TabsList>
+ <AdminLayout>
+ <div className="mb-4 flex items-center gap-3">
+ <MobileSidebar />
+ <h1 className="text-xl font-semibold tracking-tight">{t("Admin")}</h1>
+ </div>
+ <Tabs value={activeTab} onValueChange={value => setActiveTab(value as (typeof ADMIN_TABS)[number])}>
+ <TabsList className="mb-4">
+ <TabsTrigger value="organizations">{t("Organizations")}</TabsTrigger>
+ <TabsTrigger value="sites">{t("Sites")}</TabsTrigger>
+ <TabsTrigger value="users">{t("Users")}</TabsTrigger>
+ <TabsTrigger value="database">{t("Database")}</TabsTrigger>
+ </TabsList>
- <TabsContent value="users">
- <Users />
- </TabsContent>
+ <TabsContent value="organizations">
+ <Organizations />
+ </TabsContent>
- <TabsContent value="organizations">
- <Organizations />
- </TabsContent>
+ <TabsContent value="sites">
+ <Sites />
+ </TabsContent>
- <TabsContent value="sites">
- <Sites />
- </TabsContent>
+ <TabsContent value="users">
+ <Users />
+ </TabsContent>
- <TabsContent value="settings">
- <Database />
- </TabsContent>
- </Tabs>
+ <TabsContent value="database">
+ <Database />
+ </TabsContent>
+ </Tabs>
+ </AdminLayout>
</StandardPage>
</div>
);