Skip to content

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

Refactor organization components for improved layout and functionality

Bill Yangd676e094a7b0
diff --git a/client/src/app/admin/components/organizations/FilteredStatsCards.tsx b/client/src/app/admin/components/organizations/FilteredStatsCards.tsx
index da2f53a89..ee304c25f 100644
--- a/client/src/app/admin/components/organizations/FilteredStatsCards.tsx
+++ b/client/src/app/admin/components/organizations/FilteredStatsCards.tsx
@@ -56,7 +56,7 @@ export function FilteredStatsCards({ organizations, isLoading }: FilteredStatsCa
];
return (
- <div className="grid grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
+ <div className="grid grid-cols-2 lg:grid-cols-4 gap-4">
{cards.map((card, index) => {
const Icon = card.icon;
return (
diff --git a/client/src/app/admin/components/organizations/OrganizationFilters.tsx b/client/src/app/admin/components/organizations/OrganizationFilters.tsx
index e938912d0..b9c84f936 100644
--- a/client/src/app/admin/components/organizations/OrganizationFilters.tsx
+++ b/client/src/app/admin/components/organizations/OrganizationFilters.tsx
@@ -29,7 +29,7 @@ export function OrganizationFilters({
setSelectedTiers,
}: OrganizationFiltersProps) {
return (
- <div className="flex items-start gap-4 mb-4 sm:flex-row flex-col sm:items-center">
+ <div className="flex items-start gap-4 sm:flex-row flex-col sm:items-center">
<div className="flex items-center gap-2">
<Switch id="show-zero-events" checked={showZeroEvents} onCheckedChange={setShowZeroEvents} />
<Label htmlFor="show-zero-events" className="text-sm cursor-pointer">
diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsx
index 5e5418b2f..0f8cd4622 100644
--- a/client/src/app/admin/components/organizations/Organizations.tsx
+++ b/client/src/app/admin/components/organizations/Organizations.tsx
@@ -15,6 +15,7 @@ import { OrganizationsTable } from "./OrganizationsTable";
import { OrganizationFilters, TierOption } from "./OrganizationFilters";
import { FilteredStatsCards } from "./FilteredStatsCards";
import { useFilteredOrganizations } from "./useFilteredOrganizations";
+import { DownloadIcon } from "lucide-react";
export function Organizations() {
const { data: organizations, isLoading, isError } = useAdminOrganizations();
@@ -127,32 +128,47 @@ export function Organizations() {
<SubscriptionTiersTable organizations={organizations} isLoading={isLoading} />
</TabsContent>
</Tabs>
-
- <div className="mb-4">
+ <div className="space-y-2">
<SearchInput
placeholder="Search by name, slug, domain, or member email..."
value={searchQuery}
onChange={setSearchQuery}
/>
+ <OrganizationFilters
+ showZeroEvents={showZeroEvents}
+ setShowZeroEvents={setShowZeroEvents}
+ showOnlyOverLimit={showOnlyOverLimit}
+ setShowOnlyOverLimit={setShowOnlyOverLimit}
+ availableTiers={availableTiers}
+ selectedTiers={selectedTiers}
+ setSelectedTiers={setSelectedTiers}
+ />
+ <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" />
+ Export
+ </Button>
+ <OrganizationsTable
+ organizations={filteredOrganizations}
+ isLoading={isLoading}
+ searchQuery={searchQuery}
+ />
</div>
-
- <OrganizationFilters
- showZeroEvents={showZeroEvents}
- setShowZeroEvents={setShowZeroEvents}
- showOnlyOverLimit={showOnlyOverLimit}
- setShowOnlyOverLimit={setShowOnlyOverLimit}
- availableTiers={availableTiers}
- selectedTiers={selectedTiers}
- setSelectedTiers={setSelectedTiers}
- />
-
- <FilteredStatsCards organizations={filteredOrganizations} isLoading={isLoading} />
-
- <OrganizationsTable
- organizations={filteredOrganizations}
- isLoading={isLoading}
- searchQuery={searchQuery}
- />
- </AdminLayout>
+ </AdminLayout >
);
}
+