refactor to tuples

jloleysens · Jun 1, 2021 · 5b2d07d · 5b2d07d
1 parent 6ae4825
commit 5b2d07d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/v2/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/v2/lib/generate_pdf.ts
@@ -17,6 +17,8 @@ import { ConditionalHeaders } from '../../../common';
 import { PdfMaker } from './pdf';
 import { getTracker } from './tracker';
 
+const REDIRECT_APP_URL = 'temp';
+
 const getTimeRange = (urlScreenshots: ScreenshotResults[]) => {
   const grouped = groupBy(urlScreenshots.map((u) => u.timeRange));
   const values = Object.values(grouped);
@@ -51,7 +53,7 @@ export async function generatePdfObservableFactory(reporting: ReportingCore) {
     tracker.startScreenshots();
     const screenshots$ = getScreenshots({
       logger,
-      locators,
+      urls: locators.map<[url: string, locator: Locator]>((locator) => [REDIRECT_APP_URL, locator]),
       conditionalHeaders,
       layout,
       browserTimezone,

diff --git a/x-pack/plugins/reporting/server/lib/screenshots/index.ts b/x-pack/plugins/reporting/server/lib/screenshots/index.ts
@@ -15,8 +15,7 @@ export { screenshotsObservableFactory } from './observable';
 
 export interface ScreenshotObservableOpts {
   logger: LevelLogger;
-  urls: string[];
-  locators?: Locator[];
+  urls: string[] | Array<[url: string, locator: Locator]>;
   conditionalHeaders: ConditionalHeaders;
   layout: LayoutInstance;
   browserTimezone?: string;

diff --git a/x-pack/plugins/reporting/server/lib/screenshots/observable.ts b/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
@@ -6,9 +6,9 @@
  */
 
 import apm from 'elastic-apm-node';
-import assert from 'assert';
 import * as Rx from 'rxjs';
 import { catchError, concatMap, first, mergeMap, take, takeUntil, toArray } from 'rxjs/operators';
+import { Locator } from '../../../common/types';
 import { HeadlessChromiumDriverFactory } from '../../browsers';
 import { CaptureConfig } from '../../types';
 import {
@@ -37,16 +37,13 @@ interface ScreenSetupData {
   error?: Error;
 }
 
-const REDIRECT_APP_URL = 'temp';
-
 export function screenshotsObservableFactory(
   captureConfig: CaptureConfig,
   browserDriverFactory: HeadlessChromiumDriverFactory
 ): ScreenshotsObservableFn {
   return function screenshotsObservable({
     logger,
-    urls,
-    locators,
+    urls: urlsOrTuples,
     conditionalHeaders,
     layout,
     browserTimezone,
@@ -59,23 +56,23 @@ export function screenshotsObservableFactory(
       logger
     );
 
-    // TODO: Delete this code once we have migrated to the new PDF/PNG export type
-    let finalUrls = urls;
-    if (locators) {
-      finalUrls = locators.map(() => REDIRECT_APP_URL);
-      logger.debug(`Detected locators, browser will navigate to ${REDIRECT_APP_URL} for redirect`);
-    }
-
     return create$.pipe(
       mergeMap(({ driver, exit$ }) => {
         apmCreatePage?.end();
         exit$.subscribe({ error: () => apmTrans?.end() });
 
-        return Rx.from(finalUrls).pipe(
-          concatMap((url, index) => {
+        return Rx.from(urlsOrTuples).pipe(
+          concatMap((urlOrTuple, index) => {
             const setup$: Rx.Observable<ScreenSetupData> = Rx.of(1).pipe(
               mergeMap(() => {
-                const locator = locators && locators[index];
+                let url: string;
+                let locator: undefined | Locator;
+                if (Array.isArray(urlOrTuple)) {
+                  [url, locator] = urlOrTuple;
+                } else {
+                  url = urlOrTuple;
+                }
+                // const locator = locators && locators[index];
                 // If we're moving to another page in the app, we'll want to wait for the app to tell us
                 // it's loaded the next page.
                 const p = index + 1;