[Reporting] Formatting fixes for CSV export in Discover, CSV download from Dashboard panel

x-pack/plugins/reporting/common/types.ts

@@ -6,6 +6,8 @@
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 export { ReportingConfigType } from '../server/config';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+export { LayoutInstance } from '../server/export_types/common/layouts';
 
 export type JobId = string;
 export type JobStatus =

x-pack/plugins/reporting/public/plugin.tsx

@@ -26,7 +26,7 @@ import {
 import { ManagementSectionId, ManagementSetup } from '../../../../src/plugins/management/public';
 import { SharePluginSetup } from '../../../../src/plugins/share/public';
 import { LicensingPluginSetup } from '../../licensing/public';
-import { ReportingConfigType, JobId, JobStatusBuckets } from '../common/types';
+import { JobId, JobStatusBuckets, ReportingConfigType } from '../common/types';
 import { JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY } from '../constants';
 import { getGeneralErrorToast } from './components';
 import { ReportListing } from './components/report_listing';
@@ -144,7 +144,7 @@ export class ReportingPublicPlugin implements Plugin<void, void> {
 
     uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, action);
 
-    share.register(csvReportingProvider({ apiClient, toasts, license$ }));
+    share.register(csvReportingProvider({ apiClient, toasts, license$, uiSettings }));
     share.register(
       reportingPDFPNGProvider({
         apiClient,

x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx

@@ -5,22 +5,29 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import moment from 'moment-timezone';
 import React from 'react';
-
-import { ToastsSetup } from 'src/core/public';
+import { IUiSettingsClient, ToastsSetup } from 'src/core/public';
+import { ShareContext } from '../../../../../src/plugins/share/public';
+import { LicensingPluginSetup } from '../../../licensing/public';
+import { JobParamsDiscoverCsv, SearchRequest } from '../../server/export_types/csv/types';
 import { ReportingPanelContent } from '../components/reporting_panel_content';
-import { ReportingAPIClient } from '../lib/reporting_api_client';
 import { checkLicense } from '../lib/license_check';
-import { LicensingPluginSetup } from '../../../licensing/public';
-import { ShareContext } from '../../../../../src/plugins/share/public';
+import { ReportingAPIClient } from '../lib/reporting_api_client';
 
 interface ReportingProvider {
   apiClient: ReportingAPIClient;
   toasts: ToastsSetup;
   license$: LicensingPluginSetup['license$'];
+  uiSettings: IUiSettingsClient;
 }
 
-export const csvReportingProvider = ({ apiClient, toasts, license$ }: ReportingProvider) => {
+export const csvReportingProvider = ({
+  apiClient,
+  toasts,
+  license$,
+  uiSettings,
+}: ReportingProvider) => {
   let toolTipContent = '';
   let disabled = true;
   let hasCSVReporting = false;
@@ -33,6 +40,14 @@ export const csvReportingProvider = ({ apiClient, toasts, license$ }: ReportingP
     disabled = !enableLinks;
   });
 
+  // If the TZ is set to the default "Browser", it will not be useful for
+  // server-side export. We need to derive the timezone and pass it as a param
+  // to the export API.
+  const browserTimezone =
+    uiSettings.get('dateFormat:tz') === 'Browser'
+      ? moment.tz.guess()
+      : uiSettings.get('dateFormat:tz');
+
   const getShareMenuItems = ({
     objectType,
     objectId,
@@ -44,13 +59,19 @@ export const csvReportingProvider = ({ apiClient, toasts, license$ }: ReportingP
       return [];
     }
 
-    const getJobParams = () => {
-      return {
-        ...sharingData,
-        type: objectType,
-      };
+    const jobParams: JobParamsDiscoverCsv = {
+      browserTimezone,
+      objectType,
+      title: sharingData.title as string,
+      indexPatternId: sharingData.indexPatternId as string,
+      searchRequest: sharingData.searchRequest as SearchRequest,
+      fields: sharingData.fields as string[],
+      metaFields: sharingData.metaFields as string[],
+      conflictedTypesFields: sharingData.conflictedTypesFields as string[],
     };
 
+    const getJobParams = () => jobParams;
+
     const shareActions = [];
 
     if (hasCSVReporting) {

x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx

@@ -7,12 +7,15 @@
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
 import React from 'react';
-import { ToastsSetup, IUiSettingsClient } from 'src/core/public';
-import { ReportingAPIClient } from '../lib/reporting_api_client';
-import { checkLicense } from '../lib/license_check';
-import { ScreenCapturePanelContent } from '../components/screen_capture_panel_content';
-import { LicensingPluginSetup } from '../../../licensing/public';
+import { IUiSettingsClient, ToastsSetup } from 'src/core/public';
 import { ShareContext } from '../../../../../src/plugins/share/public';
+import { LicensingPluginSetup } from '../../../licensing/public';
+import { LayoutInstance } from '../../common/types';
+import { JobParamsPNG } from '../../server/export_types/png/types';
+import { JobParamsPDF } from '../../server/export_types/printable_pdf/types';
+import { ScreenCapturePanelContent } from '../components/screen_capture_panel_content';
+import { checkLicense } from '../lib/license_check';
+import { ReportingAPIClient } from '../lib/reporting_api_client';
 
 interface ReportingPDFPNGProvider {
   apiClient: ReportingAPIClient;
@@ -39,6 +42,14 @@ export const reportingPDFPNGProvider = ({
     disabled = !enableLinks;
   });
 
+  // If the TZ is set to the default "Browser", it will not be useful for
+  // server-side export. We need to derive the timezone and pass it as a param
+  // to the export API.
+  const browserTimezone =
+    uiSettings.get('dateFormat:tz') === 'Browser'
+      ? moment.tz.guess()
+      : uiSettings.get('dateFormat:tz');
+
   const getShareMenuItems = ({
     objectType,
     objectId,
@@ -57,44 +68,36 @@ export const reportingPDFPNGProvider = ({
       return [];
     }
 
-    const getReportingJobParams = () => {
+    const getPdfJobParams = (): JobParamsPDF => {
       // Relative URL must have URL prefix (Spaces ID prefix), but not server basePath
       // Replace hashes with original RISON values.
       const relativeUrl = shareableUrl.replace(
         window.location.origin + apiClient.getServerBasePath(),
         ''
       );
 
-      const browserTimezone =
-        uiSettings.get('dateFormat:tz') === 'Browser'
-          ? moment.tz.guess()
-          : uiSettings.get('dateFormat:tz');
-
       return {
-        ...sharingData,
         objectType,
         browserTimezone,
-        relativeUrls: [relativeUrl],
+        relativeUrls: [relativeUrl], // multi URL for PDF
+        layout: sharingData.layout as LayoutInstance,
+        title: sharingData.title as string,
       };
     };
 
-    const getPngJobParams = () => {
+    const getPngJobParams = (): JobParamsPNG => {
       // Replace hashes with original RISON values.
       const relativeUrl = shareableUrl.replace(
         window.location.origin + apiClient.getServerBasePath(),
         ''
       );
 
-      const browserTimezone =
-        uiSettings.get('dateFormat:tz') === 'Browser'
-          ? moment.tz.guess()
-          : uiSettings.get('dateFormat:tz');
-
       return {
-        ...sharingData,
         objectType,
         browserTimezone,
-        relativeUrl,
+        relativeUrl, // single URL for PNG
+        layout: sharingData.layout as LayoutInstance,
+        title: sharingData.title as string,
       };
     };
 
@@ -161,7 +164,7 @@ export const reportingPDFPNGProvider = ({
               reportType="printablePdf"
               objectType={objectType}
               objectId={objectId}
-              getJobParams={getReportingJobParams}
+              getJobParams={getPdfJobParams}
               isDirty={isDirty}
               onClose={onClose}
             />

x-pack/plugins/reporting/server/export_types/csv/server/create_job.ts

@@ -13,21 +13,19 @@ export const scheduleTaskFnFactory: ScheduleTaskFnFactory<ESQueueCreateJobFn<
 >> = function createJobFactoryFn(reporting) {
   const config = reporting.getConfig();
   const crypto = cryptoFactory(config.get('encryptionKey'));
-  const setupDeps = reporting.getPluginSetupDeps();
 
   return async function scheduleTask(jobParams, context, request) {
     const serializedEncryptedHeaders = await crypto.encrypt(request.headers);
 
     const savedObjectsClient = context.core.savedObjects.client;
     const indexPatternSavedObject = await savedObjectsClient.get(
       'index-pattern',
-      jobParams.indexPatternId!
+      jobParams.indexPatternId
     );
 
     return {
       headers: serializedEncryptedHeaders,
       indexPatternSavedObject,
-      basePath: setupDeps.basePath(request),
       ...jobParams,
     };
   };