Skip to content

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

refactor(admin): remove admin users management components and API

Bill Yang016cfd34116e
diff --git a/client/src/api/admin/getAdminUsers.ts b/client/src/api/admin/getAdminUsers.ts
deleted file mode 100644
index e9f05c792..000000000
--- a/client/src/api/admin/getAdminUsers.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { BACKEND_URL } from "../../lib/const";
-import { authedFetchWithError } from "../utils";
-
-export interface AdminUserData {
- id: string;
- name: string;
- email: string;
- role: string;
- createdAt: string;
- monthlyEventCount: number;
- sites: {
- siteId: number;
- name: string;
- domain: string;
- createdAt: string;
- }[];
-}
-
-export async function getAdminUsers() {
- return authedFetchWithError<AdminUserData[]>(`${BACKEND_URL}/admin/users`);
-}
-
-export function useAdminUsers() {
- return useQuery<AdminUserData[]>({
- queryKey: ["admin-users"],
- queryFn: getAdminUsers,
- });
-}
diff --git a/client/src/app/admin/components/users/OrgUsersList.tsx b/client/src/app/admin/components/users/OrgUsersList.tsx
deleted file mode 100644
index 055798719..000000000
--- a/client/src/app/admin/components/users/OrgUsersList.tsx
+++ /dev/null
@@ -1,413 +0,0 @@
-"use client";
-
-import { useState, useMemo, useCallback } from "react";
-import { useRouter } from "next/navigation";
-import { useAdminUsers, AdminUserData } from "@/api/admin/getAdminUsers";
-import {
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from "@/components/ui/table";
-import { Badge } from "@/components/ui/badge";
-import { Skeleton } from "@/components/ui/skeleton";
-import { formatDistanceToNow } from "date-fns";
-import { ChevronDown, ChevronRight, User } from "lucide-react";
-import Link from "next/link";
-import { Button } from "@/components/ui/button";
-import { TablePagination } from "@/components/pagination";
-import { authClient } from "@/lib/auth";
-import { userStore } from "@/lib/userStore";
-import {
- ColumnDef,
- flexRender,
- getCoreRowModel,
- useReactTable,
- getSortedRowModel,
- SortingState,
-} from "@tanstack/react-table";
-import { SortableHeader } from "../shared/SortableHeader";
-import { SearchInput } from "../shared/SearchInput";
-import { ErrorAlert } from "../shared/ErrorAlert";
-import { AdminLayout } from "../shared/AdminLayout";
-
-export function OrgUsersList() {
- const router = useRouter();
- const { data: users, isLoading, isError } = useAdminUsers();
- const [searchQuery, setSearchQuery] = useState("");
- const [expandedUsers, setExpandedUsers] = useState<Set<string>>(new Set());
- const [sorting, setSorting] = useState<SortingState>([]);
- const [pagination, setPagination] = useState({
- pageIndex: 0,
- pageSize: 50,
- });
-
- const toggleExpand = useCallback(
- (userId: string) => {
- const newExpanded = new Set(expandedUsers);
- if (newExpanded.has(userId)) {
- newExpanded.delete(userId);
- } else {
- newExpanded.add(userId);
- }
- setExpandedUsers(newExpanded);
- },
- [expandedUsers]
- );
-
- // Filter users based on search query
- const filteredUsers = useMemo(() => {
- if (!users) return [];
-
- if (!searchQuery.trim()) return users;
-
- const lowerSearchQuery = searchQuery.toLowerCase();
- return users.filter((user) => {
- return (
- user.name?.toLowerCase().includes(lowerSearchQuery) ||
- user.email.toLowerCase().includes(lowerSearchQuery) ||
- user.sites.some((site) =>
- site.domain.toLowerCase().includes(lowerSearchQuery)
- )
- );
- });
- }, [users, searchQuery]);
-
- // Impersonation handler
- const handleImpersonate = useCallback(
- async (userId: string) => {
- try {
- await authClient.admin.impersonateUser({
- userId,
- });
- window.location.reload();
- router.push("/");
- return true;
- } catch (err) {
- const errorMessage =
- err instanceof Error ? err.message : "Unknown error occurred";
- console.error(`Failed to impersonate user: ${errorMessage}`);
- return false;
- }
- },
- [router]
- );
-
- // Define columns for the table
- const columns = useMemo<ColumnDef<AdminUserData>[]>(
- () => [
- {
- id: "expand",
- header: "",
- cell: ({ row }) => (
- <Button
- variant="ghost"
- size="icon"
- className="h-5 w-5 p-0"
- onClick={() => toggleExpand(row.original.id)}
- >
- {expandedUsers.has(row.original.id) ? (
- <ChevronDown className="h-4 w-4" />
- ) : (
- <ChevronRight className="h-4 w-4" />
- )}
- </Button>
- ),
- enableSorting: false,
- },
- {
- accessorKey: "name",
- header: ({ column }) => (
- <SortableHeader column={column}>User</SortableHeader>
- ),
- cell: ({ row }) => (
- <div className="font-medium">{row.getValue("name") || "Unnamed"}</div>
- ),
- },
- {
- accessorKey: "email",
- header: ({ column }) => (
- <SortableHeader column={column}>Email</SortableHeader>
- ),
- cell: ({ row }) => row.getValue("email"),
- },
- {
- accessorKey: "role",
- header: ({ column }) => (
- <SortableHeader column={column}>Role</SortableHeader>
- ),
- cell: ({ row }) => row.getValue("role"),
- },
- {
- accessorKey: "createdAt",
- header: ({ column }) => (
- <SortableHeader column={column}>Created</SortableHeader>
- ),
- cell: ({ row }) =>
- formatDistanceToNow(new Date(row.getValue("createdAt")), {
- addSuffix: true,
- }),
- },
- {
- accessorKey: "monthlyEventCount",
- header: ({ column }) => (
- <SortableHeader column={column}>Monthly Events</SortableHeader>
- ),
- cell: ({ row }) =>
- (row.getValue("monthlyEventCount") as number)?.toLocaleString() || 0,
- },
- {
- id: "sites",
- header: ({ column }) => (
- <SortableHeader column={column}>Sites</SortableHeader>
- ),
- accessorFn: (row) => row.sites.length,
- cell: ({ row }) => <Badge>{row.original.sites.length}</Badge>,
- },
- {
- id: "actions",
- header: "Actions",
- cell: ({ row }) => (
- <Button
- onClick={() => handleImpersonate(row.original.id)}
- size="sm"
- variant="outline"
- className="flex items-center gap-1"
- disabled={row.original.id === userStore.getState().user?.id}
- >
- <User className="h-4 w-4" />
- Impersonate
- </Button>
- ),
- enableSorting: false,
- },
- ],
- [toggleExpand, handleImpersonate]
- );
-
- // Initialize the table
- const table = useReactTable({
- data: filteredUsers || [],
- columns,
- state: {
- sorting,
- },
- onSortingChange: setSorting,
- getCoreRowModel: getCoreRowModel(),
- getSortedRowModel: getSortedRowModel(),
- manualSorting: false,
- });
-
- // Paginate the sorted and filtered users
- const paginatedUsers = table
- .getRowModel()
- .rows.slice(
- pagination.pageIndex * pagination.pageSize,
- (pagination.pageIndex + 1) * pagination.pageSize
- );
-
- // Pagination controller for TablePagination
- const paginationController = {
- getState: () => ({ pagination }),
- getCanPreviousPage: () => pagination.pageIndex > 0,
- getCanNextPage: () =>
- table.getRowModel().rows.length > 0
- ? pagination.pageIndex <
- Math.ceil(table.getRowModel().rows.length / pagination.pageSize) - 1
- : false,
- getPageCount: () =>
- table.getRowModel().rows.length > 0
- ? Math.ceil(table.getRowModel().rows.length / pagination.pageSize)
- : 0,
- setPageIndex: (index: number) =>
- setPagination({ ...pagination, pageIndex: index }),
- previousPage: () =>
- setPagination({
- ...pagination,
- pageIndex: Math.max(0, pagination.pageIndex - 1),
- }),
- nextPage: () =>
- setPagination({
- ...pagination,
- pageIndex: Math.min(
- table.getRowModel().rows.length > 0
- ? Math.ceil(table.getRowModel().rows.length / pagination.pageSize) -
- 1
- : 0,
- pagination.pageIndex + 1
- ),
- }),
- };
-
- if (isError) {
- return (
- <AdminLayout title="Organization Owners">
- <ErrorAlert message="Failed to load organization users data. Please try again later." />
- </AdminLayout>
- );
- }
-
- return (
- <AdminLayout title="Organization Owners">
- <div className="mb-4">
- <SearchInput
- placeholder="Search by name, email or domain..."
- value={searchQuery}
- onChange={setSearchQuery}
- />
- </div>
-
- <div className="rounded-md border border-neutral-700">
- <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-40" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-20" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-24" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-20" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-5 w-16" />
- </TableCell>
- <TableCell>
- <Skeleton className="h-8 w-24" />
- </TableCell>
- </TableRow>
- ))
- ) : paginatedUsers && paginatedUsers.length > 0 ? (
- paginatedUsers.map((row) => (
- <>
- <TableRow key={row.id} className="group">
- {row.getVisibleCells().map((cell) => (
- <TableCell key={cell.id}>
- {flexRender(
- cell.column.columnDef.cell,
- cell.getContext()
- )}
- </TableCell>
- ))}
- </TableRow>
- {expandedUsers.has(row.original.id) && (
- <TableRow>
- <TableCell
- colSpan={columns.length}
- className="bg-neutral-900 py-2 px-8"
- >
- <div className="text-sm font-semibold mb-2">Sites:</div>
- {row.original.sites.length > 0 ? (
- <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3">
- {row.original.sites.map((site) => (
- <div
- key={site.siteId}
- className="p-3 border border-neutral-700 rounded"
- >
- <div className="font-medium">
- <Link
- href={`/${site.siteId}`}
- target="_blank"
- className="hover:underline"
- >
- {site.name || site.domain}
- </Link>
- </div>
- <div className="text-sm text-neutral-400 mt-1">
- <Link
- href={`https://${site.domain}`}
- target="_blank"
- className="hover:underline"
- >
- {site.domain}
- </Link>
- </div>
- <div className="text-xs text-neutral-500 mt-1">
- Created:{" "}
- {formatDistanceToNow(
- new Date(site.createdAt),
- { addSuffix: true }
- )}
- </div>
- </div>
- ))}
- </div>
- ) : (
- <div className="text-neutral-400">No sites</div>
- )}
- </TableCell>
- </TableRow>
- )}
- </>
- ))
- ) : (
- <TableRow>
- <TableCell
- colSpan={columns.length}
- className="text-center py-6 text-muted-foreground"
- >
- {searchQuery
- ? "No users match your search"
- : "No organization owners found"}
- </TableCell>
- </TableRow>
- )}
- </TableBody>
- </Table>
- </div>
-
- <div className="mt-4">
- <TablePagination
- table={paginationController}
- data={
- table.getRowModel().rows.length > 0
- ? {
- items: table.getRowModel().rows,
- total: table.getRowModel().rows.length,
- }
- : undefined
- }
- pagination={pagination}
- setPagination={setPagination}
- isLoading={isLoading}
- itemName="users"
- />
- </div>
- </AdminLayout>
- );
-}
diff --git a/client/src/app/admin/page.tsx b/client/src/app/admin/page.tsx
index 12df7b880..becfba402 100644
--- a/client/src/app/admin/page.tsx
+++ b/client/src/app/admin/page.tsx
@@ -4,7 +4,6 @@ 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 { OrgUsersList } from "./components/users/OrgUsersList";
import { Users } from "./components/users/Users";
import { Organizations } from "./components/organizations/Organizations";
import { AdminLayout } from "./components/shared/AdminLayout";
@@ -22,7 +21,6 @@ export default function AdminPage() {
>
<TabsList className="mb-4">
<TabsTrigger value="users">Users</TabsTrigger>
- <TabsTrigger value="org-users">Organization Owners</TabsTrigger>
<TabsTrigger value="organizations">Organizations</TabsTrigger>
<TabsTrigger value="sites">Sites</TabsTrigger>
<TabsTrigger value="settings">Settings</TabsTrigger>
@@ -32,10 +30,6 @@ export default function AdminPage() {
<Users />
</TabsContent>
- <TabsContent value="org-users">
- <OrgUsersList />
- </TabsContent>
-
<TabsContent value="organizations">
<Organizations />
</TabsContent>
diff --git a/server/src/api/admin/getAdminUsers.ts b/server/src/api/admin/getAdminUsers.ts
deleted file mode 100644
index ec9ccfd8b..000000000
--- a/server/src/api/admin/getAdminUsers.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { eq, inArray } from "drizzle-orm";
-import { FastifyReply, FastifyRequest } from "fastify";
-import { db } from "../../db/postgres/postgres.js";
-import { member, sites, user } from "../../db/postgres/schema.js";
-import { getIsUserAdmin } from "../../lib/auth-utils.js";
-
-export async function getAdminUsers(
- request: FastifyRequest,
- reply: FastifyReply
-) {
- const isAdmin = await getIsUserAdmin(request);
-
- if (!isAdmin) {
- return reply.status(401).send({ error: "Unauthorized" });
- }
-
- // Get all organization owners
- const orgOwners = await db
- .select({
- userId: member.userId,
- organizationId: member.organizationId,
- })
- .from(member)
- .where(eq(member.role, "owner"));
-
- // Create a map of user IDs to their owned organization IDs
- const userOrgMap = new Map<string, string[]>();
- for (const owner of orgOwners) {
- if (!userOrgMap.has(owner.userId)) {
- userOrgMap.set(owner.userId, []);
- }
- userOrgMap.get(owner.userId)?.push(owner.organizationId);
- }
-
- // Get all user details for organization owners
- const allOrgOwnerIds = [...userOrgMap.keys()];
- const ownerUsers = await db
- .select({
- id: user.id,
- name: user.name,
- email: user.email,
- role: user.role,
- createdAt: user.createdAt,
- monthlyEventCount: user.monthlyEventCount,
- })
- .from(user)
- .where(
- allOrgOwnerIds.length > 0 ? inArray(user.id, allOrgOwnerIds) : undefined
- );
-
- // Get all sites belonging to the organizations
- const allOrgIds = [
- ...new Set(orgOwners.map((owner) => owner.organizationId)),
- ];
- const orgSites = await db
- .select({
- siteId: sites.siteId,
- name: sites.name,
- domain: sites.domain,
- createdAt: sites.createdAt,
- organizationId: sites.organizationId,
- })
- .from(sites)
- .where(
- allOrgIds.length > 0
- ? inArray(sites.organizationId, allOrgIds)
- : undefined
- );
-
- // Create a map of organization IDs to their sites
- const orgSitesMap = new Map<string, any[]>();
- for (const site of orgSites) {
- if (site.organizationId) {
- if (!orgSitesMap.has(site.organizationId)) {
- orgSitesMap.set(site.organizationId, []);
- }
- orgSitesMap.get(site.organizationId)?.push({
- siteId: site.siteId,
- name: site.name,
- domain: site.domain,
- createdAt: site.createdAt,
- });
- }
- }
-
- // Combine user data with their organizations' sites
- const enrichedUsers = ownerUsers.map((user) => {
- const userOrgIds = userOrgMap.get(user.id) || [];
- const userSites = userOrgIds.flatMap(
- (orgId) => orgSitesMap.get(orgId) || []
- );
-
- return {
- ...user,
- sites: userSites,
- };
- });
-
- // Sort by monthlyEventCount in descending order
- enrichedUsers.sort(
- (a, b) => (b.monthlyEventCount || 0) - (a.monthlyEventCount || 0)
- );
-
- return reply.status(200).send(enrichedUsers);
-}
diff --git a/server/src/index.ts b/server/src/index.ts
index e21da7302..124897e00 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -5,7 +5,6 @@ import Fastify from "fastify";
import { dirname, join } from "path";
import { fileURLToPath } from "url";
import { getAdminSites } from "./api/admin/getAdminSites.js";
-import { getAdminUsers } from "./api/admin/getAdminUsers.js";
import { getAdminOrganizations } from "./api/admin/getAdminOrganizations.js";
import { createFunnel } from "./api/analytics/createFunnel.js";
import { createGoal } from "./api/analytics/createGoal.js";
@@ -260,7 +259,6 @@ if (IS_CLOUD) {
// Admin Routes
server.get("/admin/sites", getAdminSites);
- server.get("/admin/users", getAdminUsers);
server.get("/admin/organizations", getAdminOrganizations);
}