Refactor admin API integration to use adminApi service for app, config, and user management functionalities

Author: sunnylqm

src/pages/admin-apps.tsx

@@ -15,6 +15,7 @@ import {
 } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
+import { adminApi } from '@/services/admin-api';
 import { api } from '@/services/api';
 
 const { Title } = Typography;
@@ -35,12 +36,12 @@ export const Component = () => {
 
   const { data, isLoading } = useQuery({
     queryKey: ['adminApps', debouncedSearch],
-    queryFn: () => api.searchApps(debouncedSearch || undefined),
+    queryFn: () => adminApi.searchApps(debouncedSearch || undefined),
   });
 
   const updateMutation = useMutation({
     mutationFn: ({ id, data }: { id: number; data: Partial<AdminApp> }) =>
-      api.updateApp(id, data),
+      adminApi.updateApp(id, data),
     onSuccess: () => {
       message.success('应用信息已更新');
       setIsModalOpen(false);

src/pages/admin-config.tsx

@@ -15,7 +15,7 @@ import {
 } from 'antd';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { JSONEditor, type Content, type OnChange } from 'vanilla-jsoneditor';
-import { api } from '@/services/api';
+import { adminApi } from '@/services/admin-api';
 
 const { Title } = Typography;
 
@@ -87,7 +87,7 @@ export const Component = () => {
 
   const { data, isLoading, refetch } = useQuery({
     queryKey: ['adminConfig'],
-    queryFn: () => api.getAdminConfig(),
+    queryFn: () => adminApi.getConfig(),
   });
 
   const configList: ConfigItem[] = data?.data
@@ -128,7 +128,7 @@ export const Component = () => {
       }
 
       const compactValue = JSON.stringify(parsedValue);
-      await api.setAdminConfig(key, compactValue);
+      await adminApi.setConfig(key, compactValue);
       message.success('保存成功');
       setIsModalOpen(false);
       queryClient.invalidateQueries({ queryKey: ['adminConfig'] });
@@ -140,7 +140,7 @@ export const Component = () => {
   const handleDelete = useCallback(
     async (key: string) => {
       try {
-        await api.deleteAdminConfig(key);
+        await adminApi.deleteConfig(key);
         message.success('已删除');
         refetch();
       } catch (error) {

src/pages/admin-users.tsx

@@ -17,7 +17,7 @@ import {
 import dayjs from 'dayjs';
 import { useEffect, useRef, useState } from 'react';
 import { JSONEditor, type Content, type OnChange } from 'vanilla-jsoneditor';
-import { api } from '@/services/api';
+import { adminApi } from '@/services/admin-api';
 
 const { Title } = Typography;
 
@@ -92,12 +92,12 @@ export const Component = () => {
 
   const { data, isLoading } = useQuery({
     queryKey: ['adminUsers', debouncedSearch],
-    queryFn: () => api.searchUsers(debouncedSearch || undefined),
+    queryFn: () => adminApi.searchUsers(debouncedSearch || undefined),
   });
 
   const updateMutation = useMutation({
     mutationFn: ({ id, data }: { id: number; data: Partial<AdminUser> }) =>
-      api.updateUser(id, data),
+      adminApi.updateUser(id, data),
     onSuccess: () => {
       message.success('用户信息已更新');
       setIsModalOpen(false);

src/services/admin-api.ts

@@ -0,0 +1,47 @@
+import type { AdminApp, AdminUser, AdminVersion } from '@/types';
+import request from './request';
+
+export const adminApi = {
+  // admin config
+  getConfig: () =>
+    request<{ data?: Record<string, string> }>('get', `/admin/config`),
+  setConfig: (key: string, value: string) =>
+    request<{ key: string; value: string }>('post', '/admin/config', {
+      key,
+      value,
+    }),
+  deleteConfig: (key: string) => request('delete', `/admin/config/${key}`),
+  // admin user management
+  searchUsers: (search?: string) =>
+    request<{ data: AdminUser[] }>(
+      'get',
+      search
+        ? `/admin/users?search=${encodeURIComponent(search)}`
+        : '/admin/users',
+    ),
+  updateUser: (id: number, data: Partial<AdminUser>) =>
+    request<AdminUser>('put', `/admin/users/${id}`, data),
+  // admin app management
+  searchApps: (search?: string) =>
+    request<{ data: AdminApp[] }>(
+      'get',
+      search
+        ? `/admin/apps?search=${encodeURIComponent(search)}`
+        : '/admin/apps',
+    ),
+  // admin version management
+  searchVersions: (params?: { search?: string; appId?: number }) => {
+    const queryParams = new URLSearchParams();
+    if (params?.search) queryParams.set('search', params.search);
+    if (params?.appId) queryParams.set('appId', String(params.appId));
+    const query = queryParams.toString();
+    return request<{ data: AdminVersion[] }>(
+      'get',
+      query ? `/admin/versions?${query}` : '/admin/versions',
+    );
+  },
+  updateVersion: (id: number, data: Partial<AdminVersion>) =>
+    request<AdminVersion>('put', `/admin/versions/${id}`, data),
+  updateApp: (id: number, data: Partial<AdminApp>) =>
+    request<AdminApp>('put', `/admin/apps/${id}`, data),
+};

src/services/api.ts

@@ -1,14 +1,4 @@
-import type {
-  AdminApp,
-  AdminUser,
-  AdminVersion,
-  App,
-  AuditLog,
-  Binding,
-  Package,
-  User,
-  Version,
-} from '@/types';
+import type { App, AuditLog, Binding, Package, User, Version } from '@/types';
 import { queryClient } from '@/utils/queryClient';
 import request from './request';
 
@@ -198,25 +188,6 @@ export const api = {
       'get',
       `/audit/logs?offset=${offset}&limit=${limit}&startDate=${startDate}`,
     ),
-  // admin
-  getAdminConfig: () =>
-    request<{ data?: Record<string, string> }>('get', `/admin/config`),
-  setAdminConfig: (key: string, value: string) =>
-    request<{ key: string; value: string }>('post', '/admin/config', {
-      key,
-      value,
-    }),
-  deleteAdminConfig: (key: string) => request('delete', `/admin/config/${key}`),
-  // admin user management
-  searchUsers: (search?: string) =>
-    request<{ data: AdminUser[] }>(
-      'get',
-      search
-        ? `/admin/users?search=${encodeURIComponent(search)}`
-        : '/admin/users',
-    ),
-  updateUser: (id: number, data: Partial<AdminUser>) =>
-    request<AdminUser>('put', `/admin/users/${id}`, data),
   // global metrics
   getGlobalMetrics: (params: {
     start: string;
@@ -238,23 +209,4 @@ export const api = {
       'get',
       `/metrics/app?appKey=${encodeURIComponent(params.appKey)}&start=${encodeURIComponent(params.start)}&end=${encodeURIComponent(params.end)}`,
     ),
-  // admin app management
-  searchApps: (search?: string) =>
-    request<{ data: AdminApp[] }>(
-      'get',
-      search
-        ? `/admin/apps?search=${encodeURIComponent(search)}`
-        : '/admin/apps',
-    ),
-  // admin version management
-  searchVersions: (params?: { search?: string; appId?: number }) => {
-    const queryParams = new URLSearchParams();
-    if (params?.search) queryParams.set('search', params.search);
-    if (params?.appId) queryParams.set('appId', String(params.appId));
-    const query = queryParams.toString();
-    return request<{ data: AdminVersion[] }>(
-      'get',
-      query ? `/admin/versions?${query}` : '/admin/versions',
-    );
-  },
 };