Fix error with reporting urls generated prior to 6.2 (when there was …

…no layout parameter) (#23508) (#23595)

* removed passing of ID in to creation of layout and added a new test without a layout param

* renamed test constant so it reflects what we are testing and added comment

* Recommended Changes

* removed */ from end of line

x-pack/plugins/reporting/export_types/printable_pdf/server/lib/layouts/create_layout.ts

@@ -14,11 +14,11 @@ interface LayoutParams {
   dimensions: Size;
 }
 
-export function createLayout(server: KbnServer, layoutParams: LayoutParams): Layout {
+export function createLayout(server: KbnServer, layoutParams?: LayoutParams): Layout {
   if (layoutParams && layoutParams.id === LayoutTypes.PRESERVE_LAYOUT) {
-    return new PreserveLayout(layoutParams.id, layoutParams.dimensions);
+    return new PreserveLayout(layoutParams.dimensions);
   }
 
   // this is the default because some jobs won't have anything specified
-  return new PrintLayout(server, layoutParams.id);
+  return new PrintLayout(server);
 }

x-pack/plugins/reporting/export_types/printable_pdf/server/lib/layouts/preserve_layout.ts

@@ -5,6 +5,7 @@
  */
 import path from 'path';
 import { Size } from '../../../../../types';
+import { LayoutTypes } from '../../../common/constants';
 import { Layout, PageSizeParams } from './layout';
 
 // We use a zoom of two to bump up the resolution of the screenshot a bit.
@@ -25,8 +26,8 @@ export class PreserveLayout extends Layout {
   private readonly scaledHeight: number;
   private readonly scaledWidth: number;
 
-  constructor(id: string, size: Size) {
-    super(id);
+  constructor(size: Size) {
+    super(LayoutTypes.PRESERVE_LAYOUT);
     this.height = size.height;
     this.width = size.width;
     this.scaledHeight = size.height * ZOOM;

x-pack/plugins/reporting/export_types/printable_pdf/server/lib/layouts/print_layout.ts

@@ -5,6 +5,7 @@
  */
 import path from 'path';
 import { EvaluateOptions, KbnServer, Size } from '../../../../../types';
+import { LayoutTypes } from '../../../common/constants';
 import { Layout } from './layout';
 import { CaptureConfig } from './types';
 
@@ -25,8 +26,8 @@ export class PrintLayout extends Layout {
 
   private captureConfig: CaptureConfig;
 
-  constructor(server: KbnServer, id: string) {
-    super(id);
+  constructor(server: KbnServer) {
+    super(LayoutTypes.PRINT);
     this.captureConfig = server.config().get('xpack.reporting.capture');
   }
 

x-pack/test/reporting/api/bwc_generation_urls.js

@@ -11,6 +11,21 @@ export default function ({ getService }) {
   const usageAPI = getService('usageAPI');
 
   describe('BWC report generation urls', () => {
+    describe('Pre 6_2', () => {
+      before(async () => {
+        await reportingAPI.deleteAllReportingIndexes();
+      });
+
+      // The URL being tested was captured from release 6.4 and then the layout section was removed to test structure before
+      // preserve_layout was introduced. See https://github.com/elastic/kibana/issues/23414
+      it('job posted successfully', async () => {
+        const path = await reportingAPI.postJob(GenerationUrls.PDF_PRINT_DASHBOARD_PRE_6_2);
+        await reportingAPI.waitForJobToFinish(path);
+        const stats = await usageAPI.getUsageStats();
+        reportingAPI.expectCompletedReportCount(stats, 1);
+      }).timeout(500000);
+    });
+
     describe('6_2', () => {
       before(async () => {
         await reportingAPI.deleteAllReportingIndexes();