feat(admins): enhance admin retrieval with pagination and statistics support

x0sina · x0sina · commit f23b26771292 · 2025-11-18T12:38:31.000+03:30
diff --git a/app/db/crud/admin.py b/app/db/crud/admin.py
@@ -175,7 +175,8 @@ async def get_admins(
     limit: int | None = None,
     username: str | None = None,
     sort: list[AdminsSortingOptions] | None = None,
-) -> list[Admin]:
+    return_with_count: bool = False,
+) -> list[Admin] | tuple[list[Admin], int, int, int]:
     """
     Retrieves a list of admins with optional filters and pagination.
 
@@ -185,14 +186,44 @@ async def get_admins(
         limit (Optional[int]): The maximum number of records to return.
         username (Optional[str]): The username to filter by.
         sort (Optional[list[AdminsSortingOptions]]): Sort options for ordering results.
+        return_with_count (bool): If True, returns tuple with (admins, total, active, disabled).
 
     Returns:
-        List[Admin]: A list of admin objects.
+        List[Admin] | tuple[list[Admin], int, int, int]: A list of admin objects or tuple with counts.
     """
-    query = select(Admin)
+    base_query = select(Admin)
     if username:
-        query = query.where(Admin.username.ilike(f"%{username}%"))
-
+        base_query = base_query.where(Admin.username.ilike(f"%{username}%"))
+
+    total = None
+    active = None
+    disabled = None
+    
+    if return_with_count:
+        # Get total count
+        count_stmt = select(func.count(Admin.id))
+        if username:
+            count_stmt = count_stmt.where(Admin.username.ilike(f"%{username}%"))
+        result = await db.execute(count_stmt)
+        total = result.scalar()
+        
+        # Get active count (not disabled)
+        active_stmt = select(func.count(Admin.id))
+        if username:
+            active_stmt = active_stmt.where(Admin.username.ilike(f"%{username}%"))
+        active_stmt = active_stmt.where(Admin.is_disabled == False)
+        result = await db.execute(active_stmt)
+        active = result.scalar()
+        
+        # Get disabled count
+        disabled_stmt = select(func.count(Admin.id))
+        if username:
+            disabled_stmt = disabled_stmt.where(Admin.username.ilike(f"%{username}%"))
+        disabled_stmt = disabled_stmt.where(Admin.is_disabled == True)
+        result = await db.execute(disabled_stmt)
+        disabled = result.scalar()
+
+    query = base_query
     if sort:
         query = query.order_by(*sort)
 
@@ -206,6 +237,8 @@ async def get_admins(
     for admin in admins:
         await load_admin_attrs(admin)
 
+    if return_with_count:
+        return admins, total, active, disabled
     return admins
 
 
diff --git a/app/models/admin.py b/app/models/admin.py
@@ -111,3 +111,11 @@ class AdminValidationResult(BaseModel):
     username: str
     is_sudo: bool
     is_disabled: bool
+
+
+class AdminsResponse(BaseModel):
+    """Response model for admins list with pagination and statistics."""
+    admins: list[AdminDetails]
+    total: int
+    active: int
+    disabled: int
diff --git a/app/operation/admin.py b/app/operation/admin.py
@@ -16,7 +16,7 @@
 from app.db.crud.bulk import activate_all_disabled_users, disable_all_active_users
 from app.db.crud.user import get_users, remove_users
 from app.db.models import Admin as DBAdmin
-from app.models.admin import AdminCreate, AdminDetails, AdminModify
+from app.models.admin import AdminCreate, AdminDetails, AdminModify, AdminsResponse
 from app.node import node_manager
 from app.operation import BaseOperation, OperatorType
 from app.operation.user import UserOperation
@@ -83,7 +83,7 @@ async def get_admins(
         offset: int | None = None,
         limit: int | None = None,
         sort: str | None = None,
-    ) -> list[DBAdmin]:
+    ) -> AdminsResponse:
         sort_list = []
         if sort is not None:
             opts = sort.strip(",").split(",")
@@ -94,7 +94,16 @@ async def get_admins(
                 except KeyError:
                     await self.raise_error(message=f'"{opt}" is not a valid sort option', code=400)
 
-        return await get_admins(db, offset, limit, username, sort_list if sort_list else None)
+        admins, total, active, disabled = await get_admins(
+            db, offset, limit, username, sort_list if sort_list else None, return_with_count=True
+        )
+        
+        return AdminsResponse(
+            admins=[AdminDetails.model_validate(admin) for admin in admins],
+            total=total,
+            active=active,
+            disabled=disabled,
+        )
 
     async def get_admins_count(self, db: AsyncSession) -> int:
         return await get_admins_count(db)
diff --git a/app/routers/admin.py b/app/routers/admin.py
@@ -5,7 +5,7 @@
 
 from app import notification
 from app.db import AsyncSession, get_db
-from app.models.admin import AdminCreate, AdminDetails, AdminModify, Token
+from app.models.admin import AdminCreate, AdminDetails, AdminModify, Token, AdminsResponse
 from app.operation import OperatorType
 from app.operation.admin import AdminOperation
 from app.utils import responses
@@ -119,7 +119,7 @@ def get_current_admin(admin: AdminDetails = Depends(get_current)):
     return admin
 
 
-@router.get("s", response_model=list[AdminDetails])
+@router.get("s", response_model=AdminsResponse)
 async def get_admins(
     username: str | None = None,
     offset: int | None = None,
diff --git a/dashboard/src/components/admins/admin-statistics.tsx b/dashboard/src/components/admins/admin-statistics.tsx
@@ -8,18 +8,18 @@ import { User, UserCheck, UserX } from 'lucide-react'
 import React, { useEffect, useState } from 'react'
 
 interface AdminsStatisticsProps {
-  data: AdminDetails[]
+  counts: { total: number; active: number; disabled: number } | null
 }
 
-export default function AdminStatisticsSection({ data }: AdminsStatisticsProps) {
+export default function AdminStatisticsSection({ counts }: AdminsStatisticsProps) {
   const { t } = useTranslation()
   const dir = useDirDetection()
   const [prevStats, setPrevStats] = useState<{ total: number; active: number; disabled: number } | null>(null)
   const [isIncreased, setIsIncreased] = useState<Record<string, boolean>>({})
 
-  const total = data.length
-  const disabled = data.filter(a => a.is_disabled).length
-  const active = total - disabled
+  const total = counts?.total || 0
+  const active = counts?.active || 0
+  const disabled = counts?.disabled || 0
 
   const currentStats = { total, active, disabled }
 
@@ -33,7 +33,7 @@ export default function AdminStatisticsSection({ data }: AdminsStatisticsProps)
     }
     setPrevStats(currentStats)
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [data])
+  }, [counts])
 
   const stats = [
     {
diff --git a/dashboard/src/components/admins/admins-table.tsx b/dashboard/src/components/admins/admins-table.tsx
@@ -4,7 +4,7 @@ import { useGetAdmins, useRemoveAllUsers } from '@/service/api'
 import { DataTable } from './data-table'
 import { setupColumns } from './columns'
 import { Filters } from './filters'
-import { useEffect, useState } from 'react'
+import { useEffect, useState, useRef } from 'react'
 import { PaginationControls } from './filters.tsx'
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'
 import { cn } from '@/lib/utils'
@@ -22,11 +22,11 @@ interface AdminFilters {
 }
 
 interface AdminsTableProps {
-  data: AdminDetails[]
   onEdit: (admin: AdminDetails) => void
   onDelete: (admin: AdminDetails) => void
   onToggleStatus: (admin: AdminDetails, checked: boolean) => void
   onResetUsage: (adminUsername: string) => void
+  onTotalAdminsChange?: (counts: { total: number; active: number; disabled: number } | null) => void
 }
 
 const DeleteAlertDialog = ({ admin, isOpen, onClose, onConfirm }: { admin: AdminDetails; isOpen: boolean; onClose: () => void; onConfirm: () => void }) => {
@@ -127,11 +127,13 @@ const RemoveAllUsersConfirmationDialog = ({ adminUsername, isOpen, onClose, onCo
   )
 }
 
-export default function AdminsTable({ onEdit, onDelete, onToggleStatus, onResetUsage }: AdminsTableProps) {
+export default function AdminsTable({ onEdit, onDelete, onToggleStatus, onResetUsage, onTotalAdminsChange }: AdminsTableProps) {
   const { t } = useTranslation()
   const [currentPage, setCurrentPage] = useState(0)
   const [itemsPerPage, setItemsPerPage] = useState(getAdminsPerPageLimitSize())
   const [isChangingPage, setIsChangingPage] = useState(false)
+  const isFirstLoadRef = useRef(true)
+  const isAutoRefreshingRef = useRef(false)
   const [filters, setFilters] = useState<AdminFilters>({
     limit: itemsPerPage,
     offset: 0,
@@ -145,8 +147,30 @@ export default function AdminsTable({ onEdit, onDelete, onToggleStatus, onResetU
   const [adminToReset, setAdminToReset] = useState<string | null>(null)
   const [adminToRemoveAllUsers, setAdminToRemoveAllUsers] = useState<string | null>(null)
 
-  const { data: totalAdmins } = useGetAdmins()
-  const { data: adminsData, refetch, isLoading, isFetching } = useGetAdmins(filters)
+  const { data: adminsResponse, isLoading, isFetching } = useGetAdmins(filters, {
+    query: {
+      staleTime: 0,
+      gcTime: 0,
+      retry: 1,
+    },
+  })
+
+  const adminsData = adminsResponse?.admins || []
+
+  // Expose counts to parent component for statistics
+  useEffect(() => {
+    if (onTotalAdminsChange) {
+      if (adminsResponse) {
+        onTotalAdminsChange({
+          total: adminsResponse.total,
+          active: adminsResponse.active,
+          disabled: adminsResponse.disabled,
+        })
+      } else {
+        onTotalAdminsChange(null)
+      }
+    }
+  }, [adminsResponse, onTotalAdminsChange])
   const removeAllUsersMutation = useRemoveAllUsers()
 
   // Update filters when pagination changes
@@ -158,6 +182,18 @@ export default function AdminsTable({ onEdit, onDelete, onToggleStatus, onResetU
     }))
   }, [currentPage, itemsPerPage])
 
+  useEffect(() => {
+    if (adminsData && isFirstLoadRef.current) {
+      isFirstLoadRef.current = false
+    }
+  }, [adminsData])
+
+  useEffect(() => {
+    if (!isFetching && isAutoRefreshingRef.current) {
+      isAutoRefreshingRef.current = false
+    }
+  }, [isFetching])
+
   // When filters change (e.g., search), reset page if needed
   const handleFilterChange = (newFilters: Partial<AdminFilters>) => {
     setFilters(prev => {
@@ -247,40 +283,20 @@ export default function AdminsTable({ onEdit, onDelete, onToggleStatus, onResetU
     }
   }
 
-  const handlePageChange = async (newPage: number) => {
+  const handlePageChange = (newPage: number) => {
     if (newPage === currentPage || isChangingPage) return
 
     setIsChangingPage(true)
     setCurrentPage(newPage)
-
-    try {
-      // Immediate refetch without delay
-      await refetch()
-    } finally {
-      // Minimal delay for instant response
-      setTimeout(() => {
-        setIsChangingPage(false)
-      }, 50)
-    }
+    setIsChangingPage(false)
   }
 
-  const handleItemsPerPageChange = async (value: number) => {
+  const handleItemsPerPageChange = (value: number) => {
     setIsChangingPage(true)
     setItemsPerPage(value)
     setCurrentPage(0) // Reset to first page when items per page changes
-
-    // Save to localStorage
     setAdminsPerPageLimitSize(value.toString())
-
-    try {
-      // Immediate refetch without delay
-      await refetch()
-    } finally {
-      // Minimal delay for instant response
-      setTimeout(() => {
-        setIsChangingPage(false)
-      }, 50)
-    }
+    setIsChangingPage(false)
   }
 
   const handleSort = (column: string) => {
@@ -312,6 +328,9 @@ export default function AdminsTable({ onEdit, onDelete, onToggleStatus, onResetU
     onRemoveAllUsers: handleRemoveAllUsersClick,
   })
 
+  const showLoadingSpinner = isLoading && isFirstLoadRef.current
+  const isPageLoading = isChangingPage
+
   return (
     <div>
       <Filters filters={filters} onFilterChange={handleFilterChange} />
@@ -324,15 +343,15 @@ export default function AdminsTable({ onEdit, onDelete, onToggleStatus, onResetU
         onResetUsage={handleResetUsersUsageClick}
         onRemoveAllUsers={handleRemoveAllUsersClick}
         setStatusToggleDialogOpen={setStatusToggleDialogOpen}
-        isLoading={isLoading}
-        isFetching={isFetching}
+        isLoading={showLoadingSpinner}
+        isFetching={isFetching && !isFirstLoadRef.current && !isAutoRefreshingRef.current}
       />
       <PaginationControls
         currentPage={currentPage}
-        totalPages={Math.ceil((totalAdmins?.length || 0) / itemsPerPage)}
+        totalPages={Math.ceil((adminsResponse?.total || 0) / itemsPerPage)}
         itemsPerPage={itemsPerPage}
-        totalItems={adminsData?.length || 0}
-        isLoading={isLoading || isFetching}
+        totalItems={adminsResponse?.total || 0}
+        isLoading={isPageLoading}
         onPageChange={handlePageChange}
         onItemsPerPageChange={handleItemsPerPageChange}
       />
diff --git a/dashboard/src/components/admins/filters.tsx b/dashboard/src/components/admins/filters.tsx
@@ -98,8 +98,8 @@ interface PaginationControlsProps {
   itemsPerPage: number
   totalItems: number
   isLoading: boolean
-  onPageChange: (page: number) => Promise<void>
-  onItemsPerPageChange: (value: number) => Promise<void>
+  onPageChange: (page: number) => void
+  onItemsPerPageChange: (value: number) => void
 }
 
 // Update PaginationControls to use props
diff --git a/dashboard/src/pages/_dashboard.admins.tsx b/dashboard/src/pages/_dashboard.admins.tsx
@@ -7,7 +7,7 @@ import { Separator } from '@/components/ui/separator'
 import { toast } from 'sonner'
 import AdminsTable from '@/components/admins/admins-table'
 import AdminModal, { adminFormSchema, AdminFormValues } from '@/components/dialogs/admin-modal'
-import { useActivateAllDisabledUsers, useDisableAllActiveUsers, useGetAdmins, useModifyAdmin, useRemoveAdmin, useResetAdminUsage } from '@/service/api'
+import { useActivateAllDisabledUsers, useDisableAllActiveUsers, useModifyAdmin, useRemoveAdmin, useResetAdminUsage } from '@/service/api'
 import type { AdminDetails } from '@/service/api'
 import AdminsStatistics from '@/components/admins/admin-statistics'
 import { zodResolver } from '@hookform/resolvers/zod'
@@ -40,12 +40,12 @@ export default function AdminsPage() {
   const { t } = useTranslation()
   const [editingAdmin, setEditingAdmin] = useState<Partial<AdminDetails> | null>(null)
   const [isDialogOpen, setIsDialogOpen] = useState(false)
+  const [adminCounts, setAdminCounts] = useState<{ total: number; active: number; disabled: number } | null>(null)
   const form = useForm<AdminFormValues>({
     resolver: zodResolver(adminFormSchema),
     defaultValues: initialDefaultValues,
   })
 
-  const { data: admins = [] } = useGetAdmins({})
   const removeAdminMutation = useRemoveAdmin()
   const modifyAdminMutation = useModifyAdmin()
   const modifyDisableAllAdminUsers = useDisableAllActiveUsers()
@@ -197,11 +197,11 @@ export default function AdminsPage() {
 
       <div className="w-full px-4 pt-2">
         <div className="mb-6 transform-gpu animate-slide-up" style={{ animationDuration: '500ms', animationDelay: '100ms', animationFillMode: 'both' }}>
-          <AdminsStatistics data={admins} />
+          <AdminsStatistics counts={adminCounts} />
         </div>
 
         <div className="transform-gpu animate-slide-up" style={{ animationDuration: '500ms', animationDelay: '250ms', animationFillMode: 'both' }}>
-          <AdminsTable data={admins} onEdit={handleEdit} onDelete={handleDelete} onToggleStatus={handleToggleStatus} onResetUsage={resetUsage} />
+          <AdminsTable onEdit={handleEdit} onDelete={handleDelete} onToggleStatus={handleToggleStatus} onResetUsage={resetUsage} onTotalAdminsChange={setAdminCounts} />
         </div>
 
         <AdminModal
diff --git a/dashboard/src/service/api/index.ts b/dashboard/src/service/api/index.ts
