Simplify data returned from query, add functionality to data layer instead

coder-karen · coder-karen · commit f5eb778753b2 · 2025-08-12T08:59:01.000+01:00
diff --git a/client/dashboard/app/queries/site-logs.ts b/client/dashboard/app/queries/site-logs.ts
@@ -1,10 +1,5 @@
 import { queryOptions } from '@tanstack/react-query';
-import {
-	fetchSiteLogs,
-	SiteLogsParams,
-	PHPLogFromEndpoint,
-	ServerLogFromEndpoint,
-} from '../../data/site-logs';
+import { fetchSiteLogs, SiteLogsParams } from '../../data/site-logs';
 
 export const siteLogsQuery = ( siteId: number, params: SiteLogsParams ) =>
 	queryOptions( {
@@ -16,18 +11,4 @@ export const siteLogsQuery = ( siteId: number, params: SiteLogsParams ) =>
 			} ),
 		enabled: params.start <= params.end,
 		staleTime: Infinity, // The logs within a specified time range never change.
-		select: ( data ) => ( {
-			logs: Array.isArray( data.data.logs )
-				? data.data.logs.map(
-						( log: PHPLogFromEndpoint | ServerLogFromEndpoint, key: number ) => ( {
-							...log,
-							id: String( key ),
-						} )
-				  )
-				: [],
-			total_results:
-				typeof data.data.total_results === 'number'
-					? data.data.total_results
-					: data.data.total_results?.value ?? 0,
-		} ),
 	} );
diff --git a/client/dashboard/data/site-logs.ts b/client/dashboard/data/site-logs.ts
@@ -69,6 +69,11 @@ export interface SiteLogsParams {
 	pageIndex?: number;
 }
 
+export interface SiteLogsData {
+	total_results: number;
+	logs: ( PHPLog | ServerLog )[];
+}
+
 export async function fetchSiteLogs( {
 	siteId,
 	logType,
@@ -78,7 +83,7 @@ export async function fetchSiteLogs( {
 	sortOrder,
 	pageSize,
 	pageIndex,
-}: SiteLogsParams ): Promise< SiteLogsAPIResponse > {
+}: SiteLogsParams ): Promise< SiteLogsData > {
 	const logTypeFragment = logType === LogType.PHP ? 'error-logs' : 'logs';
 	const path = `/sites/${ siteId }/hosting/${ logTypeFragment }`;
 
@@ -98,13 +103,34 @@ export async function fetchSiteLogs( {
 			delete ( queryParams as Record< string, unknown > )[ key ]
 	);
 
-	const logs = await wpcom.req.get(
+	const response = await wpcom.req.get(
 		{
 			path,
 			apiNamespace: 'wpcom/v2',
 		},
 		{ ...queryParams }
 	);
 
-	return logs;
+	const { data } = response as SiteLogsAPIResponse;
+
+	const totalResults =
+		typeof data.total_results === 'number' ? data.total_results : data.total_results?.value ?? 0;
+
+	const logs = Array.isArray( data.logs ) ? data.logs : [];
+
+	if ( logType === LogType.PHP ) {
+		const normalized = ( logs as PHPLogFromEndpoint[] ).map(
+			( { atomic_site_id, ...logWithoutAtomicId } ) => ( {
+				...logWithoutAtomicId,
+				id: `${ logWithoutAtomicId.timestamp }|${ String( logWithoutAtomicId.line ) }`,
+			} )
+		);
+		return { total_results: totalResults, logs: normalized };
+	}
+
+	const normalized = ( logs as ServerLogFromEndpoint[] ).map( ( log ) => ( {
+		...log,
+		id: `${ String( log.timestamp ) }|${ log.status }`,
+	} ) );
+	return { total_results: totalResults, logs: normalized };
 }
