From 3feb1f0739f4ad033390b841d040c5e1feb1231d Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Tue, 13 Apr 2021 15:38:41 -0700
Subject: [PATCH] Remove extra logger, replace filter with reduce

---
 .../server/routes/data_streams/handlers.ts    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
index f0fd4f8f4d850..6d4d107adb796 100644
--- a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
@@ -13,7 +13,6 @@ import { KibanaSavedObjectType } from '../../../common';
 import type { GetDataStreamsResponse } from '../../../common';
 import { getPackageSavedObjects } from '../../services/epm/packages/get';
 import { defaultIngestErrorHandler } from '../../errors';
-import { appContextService } from '../../services';
 
 const DATA_STREAM_INDEX_PATTERN = 'logs-*-*,metrics-*-*,traces-*-*';
 
@@ -47,7 +46,6 @@ interface ESDataStreamStats {
 
 export const getListHandler: RequestHandler = async (context, request, response) => {
   const esClient = context.core.elasticsearch.client.asCurrentUser;
-  const logger = appContextService.getLogger();
 
   const body: GetDataStreamsResponse = {
     data_streams: [],
@@ -195,16 +193,22 @@ export const getListHandler: RequestHandler = async (context, request, response)
         if (!packageMetadata[pkgName]) {
           // then pick the dashboards from the package saved object
           const packageDashboardIds = dashboardIdsByPackageName[pkgName] || [];
-          const packageDashboards = packageDashboardIds.map((dashboardId) => {
+          const packageDashboards = packageDashboardIds.reduce<
+            Array<{ id: string; title: string }>
+          >((dashboards, dashboardId) => {
             const dashboard = allDashboardSavedObjectsById[dashboardId];
-            return dashboard
-              ? { id: dashboard.id, title: dashboard.attributes.title || dashboard.id }
-              : undefined;
-          });
+            if (dashboard) {
+              dashboards.push({
+                id: dashboard.id,
+                title: dashboard.attributes.title || dashboard.id,
+              });
+            }
+            return dashboards;
+          }, []);
 
           packageMetadata[pkgName] = {
             version: pkgSavedObject.attributes?.version || '',
-            dashboards: packageDashboards.filter((dashboard) => !!dashboard),
+            dashboards: packageDashboards,
           };
         }
 
@@ -226,7 +230,6 @@ export const getListHandler: RequestHandler = async (context, request, response)
       body,
     });
   } catch (error) {
-    logger.error(error);
     return defaultIngestErrorHandler({ error, response });
   }
 };