feedback

elastic · Apr 7, 2021 · dbac397 · dbac397
1 parent 1aab963
commit dbac397
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/plugins/discover/public/application/helpers/get_sharing_data.ts b/src/plugins/discover/public/application/helpers/get_sharing_data.ts
@@ -13,14 +13,19 @@ import type { SavedSearch, SortOrder } from '../../saved_searches/types';
 import { AppState } from '../angular/discover_state';
 import { getSortForSearchSource } from '../angular/doc_table';
 
+interface SharingData {
+  columns: string[];
+  searchSource: SearchSourceFields;
+}
+
 /**
  * Preparing data to share the current state as link or CSV/Report
  */
 export async function getSharingData(
   currentSearchSource: ISearchSource,
   state: AppState | SavedSearch,
   config: IUiSettingsClient
-): Promise<{ columns: string[]; searchSource: SearchSourceFields }> {
+): Promise<SharingData> {
   const searchSource = currentSearchSource.createCopy();
   const index = searchSource.getField('index')!;
 

diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
@@ -20,6 +20,7 @@ import {
   ISearchSource,
   ISearchStartSearchSource,
   SearchFieldValue,
+  SearchSourceFields,
   tabifyDocs,
 } from '../../../../../../../src/plugins/data/common';
 import { KbnServerError } from '../../../../../../../src/plugins/kibana_utils/server';
@@ -60,8 +61,8 @@ function isPlainStringArray(
 }
 
 export class CsvGenerator {
-  private _columns: string[] | null = null;
-  private _formatters: Record<string, FieldFormat> | null = null;
+  private _columns?: string[];
+  private _formatters?: Record<string, FieldFormat>;
   private csvContainsFormulas = false;
   private maxSizeReached = false;
   private csvRowCount = 0;
@@ -144,7 +145,7 @@ export class CsvGenerator {
     // if columns is not provided in job params,
     // default to use fields/fieldsFromSource from the searchSource to get the ordering of columns
     const getFromSearchSource = (): string[] => {
-      const fieldValues: Record<string, string | boolean | SearchFieldValue[] | undefined> = {
+      const fieldValues: Pick<SearchSourceFields, 'fields' | 'fieldsFromSource'> = {
         fields: searchSource.getField('fields'),
         fieldsFromSource: searchSource.getField('fieldsFromSource'),
       };