Revert changes in getServices due to readability concerns

elastic · Nov 21, 2019 · 5bf33fd · 5bf33fd
1 parent b433369
commit 5bf33fd
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_services/index.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_services/index.ts
@@ -20,17 +20,19 @@ export type ServiceListAPIResponse = PromiseReturnType<typeof getServices>;
 export async function getServices(
   setup: Setup & SetupTimeRange & SetupUIFilters
 ) {
-  const itemsPromise = getServicesItems(setup);
-  const hasLegacyDataPromise = getLegacyDataStatus(setup);
-  const items = await itemsPromise;
+  const [items, hasLegacyData] = await Promise.all([
+    getServicesItems(setup),
+    getLegacyDataStatus(setup)
+  ]);
 
   const noDataInCurrentTimeRange = isEmpty(items);
+  const hasHistoricalData = noDataInCurrentTimeRange
+    ? await hasHistoricalAgentData(setup)
+    : true;
 
   return {
     items,
-    hasHistoricalData: noDataInCurrentTimeRange
-      ? await hasHistoricalAgentData(setup)
-      : true,
-    hasLegacyData: await hasLegacyDataPromise
+    hasHistoricalData,
+    hasLegacyData
   };
 }