From 337410602800f9e17395d5254156e30aea1463e4 Mon Sep 17 00:00:00 2001
From: Zhongnan Su <szhongna@amazon.com>
Date: Wed, 9 Dec 2020 16:46:04 -0800
Subject: [PATCH] refine visual report selectors

---
 kibana-reports/server/routes/utils/constants.ts  |  1 -
 .../utils/visual_report/visualReportHelper.ts    | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kibana-reports/server/routes/utils/constants.ts b/kibana-reports/server/routes/utils/constants.ts
index 911239d5..9e8f245b 100644
--- a/kibana-reports/server/routes/utils/constants.ts
+++ b/kibana-reports/server/routes/utils/constants.ts
@@ -68,7 +68,6 @@ export enum DELIVERY_TYPE {
 export enum SELECTOR {
   dashboard = '#dashboardViewport',
   visualization = '.visEditor__content',
-  topNavBar = '#globalHeaderBars',
 }
 
 // https://www.elastic.co/guide/en/elasticsearch/reference/6.8/search-request-from-size.html
diff --git a/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts b/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts
index 848bf256..3d53ab70 100644
--- a/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts
+++ b/kibana-reports/server/routes/utils/visual_report/visualReportHelper.ts
@@ -51,7 +51,6 @@ export const createVisualReport = async (
     report_format: reportFormat,
   } = coreParams;
 
-  // TODO: polish default header, maybe add a logo, depends on UX design
   const window = new JSDOM('').window;
   const DOMPurify = createDOMPurify(window);
 
@@ -93,16 +92,17 @@ export const createVisualReport = async (
   // remove top nav bar
   await page.evaluate(
     /* istanbul ignore next */
-    (selector) => {
-      document.querySelector(selector)?.remove();
+    () => {
+      // remove buttons
       document
         .querySelectorAll("[class^='euiButton']")
         .forEach((e) => e.remove());
-      document.querySelector(
-        '.coreSystemRootDomElement.euiBody--headerIsFixed'
-      ).style.paddingTop = '0px';
-    },
-    SELECTOR.topNavBar
+      // remove top navBar
+      document
+        .querySelectorAll("[class^='euiHeader']")
+        .forEach((e) => e.remove());
+      document.body.style.paddingTop = '0px';
+    }
   );
   // force wait for any resize to load after the above DOM modification
   await page.waitFor(1000);