From e9a809e5435ad7eddc27031b391f9ef587228647 Mon Sep 17 00:00:00 2001
From: Timothy Sullivan <tsullivan@elastic.co>
Date: Wed, 12 Aug 2020 17:04:14 -0700
Subject: [PATCH] more strict 2

---
 .../plugins/reporting/server/export_types/csv/create_job.ts | 2 +-
 x-pack/plugins/reporting/server/export_types/csv/types.d.ts | 6 ++----
 .../reporting/server/export_types/printable_pdf/types.d.ts  | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/reporting/server/export_types/csv/create_job.ts b/x-pack/plugins/reporting/server/export_types/csv/create_job.ts
index a1ac52739be3a..252968e386b53 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/create_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/create_job.ts
@@ -24,9 +24,9 @@ export const scheduleTaskFnFactory: ScheduleTaskFnFactory<CreateJobFn<
     );
 
     return {
-      ...jobParams,
       headers: serializedEncryptedHeaders,
       indexPatternSavedObject,
+      ...jobParams,
     };
   };
 };
diff --git a/x-pack/plugins/reporting/server/export_types/csv/types.d.ts b/x-pack/plugins/reporting/server/export_types/csv/types.d.ts
index 9e86a5bb254a3..e0d09d04a3d3a 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/types.d.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/types.d.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ScheduledTaskParams } from '../../types';
+import { CreateJobBaseParams, ScheduledTaskParams } from '../../types';
 
 export type RawValue = string | object | null | undefined;
 
@@ -28,10 +28,8 @@ export interface IndexPatternSavedObject {
   };
 }
 
-export interface JobParamsDiscoverCsv {
-  browserTimezone: string;
+export interface JobParamsDiscoverCsv extends CreateJobBaseParams {
   indexPatternId: string;
-  objectType: string;
   title: string;
   searchRequest: SearchRequest;
   fields: string[];
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts
index b87138f14b9c7..7830f87780c2e 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/types.d.ts
@@ -8,11 +8,9 @@ import { CreateJobBaseParams, ScheduledTaskParams } from '../../../server/types'
 import { LayoutInstance, LayoutParams } from '../../lib/layouts';
 
 // Job params: structure of incoming user request data, after being parsed from RISON
-export interface JobParamsPDF {
-  objectType: string; // visualization, dashboard, etc. Used for job info & telemetry
+export interface JobParamsPDF extends CreateJobBaseParams {
   title: string;
   relativeUrls: string[];
-  browserTimezone: string;
   layout: LayoutInstance;
 }