fix: update admins data access in multiple components

Author: x0sina

dashboard/src/components/common/admins-selector.tsx

@@ -37,7 +37,7 @@ export default function AdminsSelector<T extends FieldValues>({ control, name, o
   })
 
   const selectedAdmins = (field.value as string[]) || []
-  const filteredAdmins = (adminsData || []).filter((admin: any) => admin.username.toLowerCase().includes(searchQuery.toLowerCase()))
+  const filteredAdmins = (adminsData?.admins || []).filter((admin: any) => admin.username.toLowerCase().includes(searchQuery.toLowerCase()))
 
   const handleSelectAll = (checked: boolean) => {
     const newAdmins = checked ? filteredAdmins.map((admin: any) => admin.username) : []

dashboard/src/pages/_dashboard.bulk.data.tsx

@@ -215,7 +215,7 @@ export default function BulkDataPage() {
             <SelectorPanel
               icon={Shield}
               title={t('bulk.selectAdmins', { defaultValue: 'Select Admins' })}
-              items={(adminsData || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
+              items={(adminsData?.admins || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
               selected={selectedAdmins}
               setSelected={setSelectedAdmins}
               search={adminSearch}

dashboard/src/pages/_dashboard.bulk.expire.tsx

@@ -263,7 +263,7 @@ export default function BulkExpirePage() {
             <SelectorPanel
               icon={Shield}
               title={t('bulk.selectAdmins', { defaultValue: 'Select Admins' })}
-              items={(adminsData || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
+              items={(adminsData?.admins || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
               selected={selectedAdmins}
               setSelected={setSelectedAdmins}
               search={adminSearch}

dashboard/src/pages/_dashboard.bulk.groups.tsx

@@ -206,7 +206,7 @@ export default function BulkGroupsPage() {
             <SelectorPanel
               icon={Shield}
               title={t('bulk.selectAdmins', { defaultValue: 'Select Admins' })}
-              items={(adminsData || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
+              items={(adminsData?.admins || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
               selected={selectedAdmins}
               setSelected={setSelectedAdmins}
               search={adminSearch}

dashboard/src/pages/_dashboard.bulk.proxy.tsx

@@ -201,7 +201,7 @@ export default function BulkProxyPage() {
             <SelectorPanel
               icon={Shield}
               title={t('bulk.selectAdmins', { defaultValue: 'Select Admins' })}
-              items={(adminsData || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
+              items={(adminsData?.admins || []).filter(a => typeof a.id === 'number' && typeof a.username === 'string').map(a => ({ id: a.id as number, username: a.username as string }))}
               selected={selectedAdmins}
               setSelected={setSelectedAdmins}
               search={adminSearch}

dashboard/src/pages/_dashboard.settings.cleanup.tsx

@@ -68,7 +68,7 @@ export default function CleanupSettings() {
     usernameParam = adminSearch
   }
 
-  const { data: fetchedAdmins = [] } = useGetAdmins(
+  const { data: fetchedAdminsResponse } = useGetAdmins(
     {
       limit: PAGE_SIZE,
       offset,
@@ -82,12 +82,13 @@ export default function CleanupSettings() {
   )
 
   useEffect(() => {
-    if (fetchedAdmins) {
+    if (fetchedAdminsResponse) {
+      const fetchedAdmins = fetchedAdminsResponse.admins || []
       setAdmins(prev => (offset === 0 ? fetchedAdmins : [...prev, ...fetchedAdmins]))
       setHasMore(fetchedAdmins.length === PAGE_SIZE)
       setIsLoading(false)
     }
-  }, [fetchedAdmins, offset])
+  }, [fetchedAdminsResponse, offset])
 
   const handleScroll = useCallback(() => {
     if (!listRef.current || isLoading || !hasMore) return