RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(admin): correct service details lookup (#19770)
Sbaaoui Idriss71370df44f34
diff --git a/web/src/pages/admin/service-status.tsx b/web/src/pages/admin/service-status.tsxindex 46da1b50b7..4917eb74cd 100644--- a/web/src/pages/admin/service-status.tsx+++ b/web/src/pages/admin/service-status.tsx@@ -87,6 +87,12 @@ const SERVICE_TYPE_FILTER_OPTIONS = [{ value: 'message_queue', label: 'message_queue' },];+const AdminServiceKeys = {+ list: () => ['admin/listServices'] as const,+ detail: (id: number | string | undefined) =>+ ['admin/serviceDetails', id] as const,+};+function AdminServiceStatus() {const { t } = useTranslation();const [extraInfoModalOpen, setExtraInfoModalOpen] = useState(false);@@ -95,15 +101,14 @@ function AdminServiceStatus() {useState<AdminService.ListServicesItem | null>(null);const { data: servicesList } = useQuery({- queryKey: ['admin/listServices'],- queryFn: async () => (await listServices()).data.data,+ queryKey: AdminServiceKeys.list(),+ queryFn: listServices,retry: false,});const { data: serviceDetails, error: serviceDetailsError } = useQuery({- queryKey: ['admin/serviceDetails', itemToMakeAction?.id],- queryFn: async () =>- (await showServiceDetails(itemToMakeAction!?.id)).data.data,+ queryKey: AdminServiceKeys.detail(itemToMakeAction?.id),+ queryFn: () => showServiceDetails(itemToMakeAction!.id),enabled: !!(itemToMakeAction && detailModalOpen),retry: false,});diff --git a/web/src/services/admin-service-adapter.ts b/web/src/services/admin-service-adapter.tsnew file mode 100644index 0000000000..8542245c29--- /dev/null+++ b/web/src/services/admin-service-adapter.ts@@ -0,0 +1,41 @@+import { pickByBackend } from '@/utils/backend-variant';++export type GoServiceStatus = {+ type: string;+ name: string;+ status: string;+ elapsed: string;+ message: string;+};++export const adaptServiceList = (+ services: AdminService.ListServicesItem[] | GoServiceStatus[],+): AdminService.ListServicesItem[] =>+ pickByBackend({+ go: () =>+ (services as GoServiceStatus[]).map((service) => ({+ id: service.name,+ name: service.name,+ service_type: service.type,+ status: service.status,+ host: '-',+ port: '-',+ extra: { elapsed: service.elapsed, message: service.message },+ })),+ python: () => services as AdminService.ListServicesItem[],+ })();++export const adaptServiceDetail = (+ detail: AdminService.ServiceDetail | GoServiceStatus,+): AdminService.ServiceDetail =>+ pickByBackend({+ go: () => {+ const service = detail as GoServiceStatus;+ return {+ service_name: service.name,+ status: service.status,+ message: service,+ };+ },+ python: () => detail as AdminService.ServiceDetail,+ })();diff --git a/web/src/services/admin-service.ts b/web/src/services/admin-service.tsindex 5e0697dd3f..bd6451fd7d 100644--- a/web/src/services/admin-service.ts+++ b/web/src/services/admin-service.ts@@ -27,6 +27,11 @@ import authorizationUtil, {} from '@/utils/authorization-util';import { convertTheKeysOfTheObjectToSnake } from '@/utils/common-util';import { ResultCode, RetcodeMessage } from '@/utils/request';+import {+ adaptServiceDetail,+ adaptServiceList,+ GoServiceStatus,+} from './admin-service-adapter';const request = axios.create({timeout: 300000,@@ -201,12 +206,19 @@ export const updateUserPassword = (email: string, password: string) =>export const deleteUser = (email: string) =>request.delete(adminDeleteUser(email));-export const listServices = () =>- request.get<ResponseData<AdminService.ListServicesItem[]>>(adminListServices);-export const showServiceDetails = (serviceId: number) =>- request.get<ResponseData<AdminService.ServiceDetail>>(- adminShowServiceDetails(String(serviceId)),- );+export const listServices = async () => {+ const { data } =+ await request.get<+ ResponseData<AdminService.ListServicesItem[] | GoServiceStatus[]>+ >(adminListServices);+ return data.code === 0 ? adaptServiceList(data.data) : [];+};+export const showServiceDetails = async (serviceId: number | string) => {+ const { data } = await request.get<+ ResponseData<AdminService.ServiceDetail | GoServiceStatus>+ >(adminShowServiceDetails(encodeURIComponent(String(serviceId))));+ return data.code === 0 ? adaptServiceDetail(data.data) : undefined;+};export const createRole = (params: {roleName: string;diff --git a/web/src/services/admin.service.d.ts b/web/src/services/admin.service.d.tsindex ccc41f20bf..a88a2369b2 100644--- a/web/src/services/admin.service.d.ts+++ b/web/src/services/admin.service.d.ts@@ -100,17 +100,17 @@ declare namespace AdminService {export type ListServicesItem = {extra: Record<string, unknown>;host: string;- id: number;+ id: number | string;name: string;- port: number;+ port: number | string;service_type: string;- status: 'alive' | 'timeout' | 'fail';+ status: string;};export type ServiceDetail =| {service_name: string;- status: 'alive' | 'timeout';+ status: string;message: string | Record<string, any> | Record<string, any>[];}| {