fixes csv export of saved searches that have _source field (elastic#4…

…3123) * fixes csv export of saved searches that have _source field * adding test
bmcconaghy · Aug 12, 2019 · 8fb330c · 8fb330c
1 parent a51ed7f
commit 8fb330c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/__tests__/format_csv_values.js b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/__tests__/format_csv_values.js
@@ -11,7 +11,16 @@ describe('formatCsvValues', function () {
  const separator = ',';
  const fields = ['foo', 'bar'];
  const mockEscapeValue = val => val;
-
+ describe('with _source as one of the fields', function () {
+ const formatsMap = new Map();
+ const formatCsvValues = createFormatCsvValues(mockEscapeValue, separator, ['foo', '_source'], formatsMap);
+ it('should return full _source for _source field', function () {
+ const values = {
+ foo: 'baz',
+ };
+ expect(formatCsvValues(values)).to.be('baz,{"foo":"baz"}');
+ });
+ });
  describe('without field formats', function () {
  const formatsMap = new Map();
  const formatCsvValues = createFormatCsvValues(mockEscapeValue, separator, fields, formatsMap);

diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/format_csv_values.js b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/format_csv_values.js
@@ -10,7 +10,12 @@ export function createFormatCsvValues(escapeValue, separator, fields, formatsMap
  return function formatCsvValues(values) {
  return fields
  .map(field => {
- const value = values[field];
+ let value;
+ if (field === '_source') {
+ value = values;
+ } else {
+ value = values[field];
+ }
  if (isNull(value) || isUndefined(value)) {
  return '';
  }